diff -upr --new-file binutils-2.9.5.0.42/ChangeLog binutils-2.9.5.0.46/ChangeLog --- binutils-2.9.5.0.42/ChangeLog Fri May 12 08:02:59 2000 +++ binutils-2.9.5.0.46/ChangeLog Thu Jun 1 11:08:57 2000 @@ -1,3 +1,67 @@ +Mon May 29 13:50:03 2000 Andrew Cagney + + * texinfo/texinfo.tex: Update. Version from makeinfo 4.0. + +Tue May 30 19:01:12 2000 Andrew Cagney + + * config.sub: Import CVS version 1.167 Tue May 30 09:00:07 2000. + * config.guess: Import CVS version 1.148 Tue May 30 09:00:06 2000 + +20000-05-21 H.J. Lu (hjl@gnu.org) + + * configure: Revert changes made on May 18 and May 19. + + * Makefile.in (CC_FOR_TARGET): Make sure as/ld in the gcc + directory are used if they exist. Make sure + $(build_tooldir)/include is searched for header files, + $(build_tooldir)/lib/ for library files. + (GCC_FOR_TARGET): Likewise. + (CXX_FOR_TARGET): Likewise. + +20000-05-19 H.J. Lu (hjl@gnu.org) + + * configure: Provide --disable-target-dir-sanity-checking to + disable the gcc directory checking for cross compiling. + +20000-05-18 H.J. Lu (hjl@gnu.org) + + * configure: Ask to create the gcc directory for cross + compiling if necessary. + +Thu May 18 10:58:13 2000 Jeffrey A Law (law@cygnus.com) + + * configure.in (hppa*64*-*-*): Do build ld for this configuration. + +2000-05-18 David Edelsohn + + * configure.in: Special case powerpc*-*-aix* target_makefile_frag. + +Wed May 17 16:03:48 2000 Alexandre Oliva + + * Makefile.in (configure-target-libiberty): Depend on + configure-target-newlib. + +Tue May 16 10:06:21 2000 Andrew Cagney + + Thu Apr 27 11:01:48 2000 Andrew Cagney : + * Makefile.in (do-tar-bz2, do-md5sum): Skip CVS directories. + +Tue May 16 09:57:35 2000 Andrew Cagney + + Wed Apr 26 17:03:53 2000 Andrew Cagney : + * Makefile.in (do-djunpack): New target. Update djunpack.bat with + current version information. Add to proto-toplev directory. + (gdb-taz): Build do-djunpack. + +2000-05-13 Alexandre Oliva + + * ltmain.sh: Preserve in relink_command any environment + variables that may affect the linker behavior. + +Fri May 12 11:23:17 2000 Jeffrey A Law (law@cygnus.com) + + * config.sub (basic_machine): Recognize hppa64 as a valid cpu type. + Wed May 10 21:26:51 2000 Jim Wilson * configure.in (ia64*-*-elf*): Add gdb and friends to noconfigdirs. diff -upr --new-file binutils-2.9.5.0.42/MAINTAINERS binutils-2.9.5.0.46/MAINTAINERS --- binutils-2.9.5.0.42/MAINTAINERS Wed Dec 31 16:00:00 1969 +++ binutils-2.9.5.0.46/MAINTAINERS Tue May 30 09:39:39 2000 @@ -0,0 +1,76 @@ +Please feel free to add, edit, delete this file. +Please do not make ChangeLog entries. + +COPYING, COPYING.LIB, README + http://gnu.org. + +Makefile.in, configure, configure.in + Please notify the following of any committed patches. + binutils@sourceware.cygnus.com + gdb-patches@sourceware.cygnus.com + +bfd/, binutils/, gas/, gprof/, ld/, opcodes/ & BFD's part of include/ + binutils: http://sourceware.cygnus.com/binutils/ + Patches to binutils@sourceware.cygnus.com. + Please notify the following of any interface changes: + gdb-patches@sourceware.cygnus.com + +config.guess, config.sub + config: http://gnu.org + Changes need to be done in tandem with the official CONFIG + sources or submitted to the master file maintainer and brought + in via a merge. + +libiberty/ & libiberty's part of include/ + gcc: http://gcc.gnu.org + Changes need to be done in tandem with the official GCC + sources or submitted to the master file maintainer and brought + in via a merge. + +ltconfig, ltmain.sh + libtool: http://gnu.org + Changes need to be done in tandem with the official LIBTOOL + sources or submitted to the master file maintainer and brought + in via a merge. + +mkinstalldirs, move-if-change, symlink-tree + autoconf: http://gnu.org + Change need to be done in tandem with the official AUTOCONF + sources or submitted to the master file maintainer and brought + in via a merge. + +newlib/, libgloss/ + http://sourceware.cygnus.com/newlib/ + Patches to newlib@sourceware.cygnus.com. + +gdb/, mmalloc/, readline/, sim/ & GDB's part of include/ + gdb: http://sourceware.cygnus.com/gdb/ + Patches to gdb-patches@sourceware.cygnus.com. + See also gdb/MAINTAINERS, sim/MAINTAINERS, mmalloc/MAINTAINERS. + +itcl/, tcl/, tix/, tk/, libgui/ + insight: http://sourceware.cygnus.com/insight/ + Contact insight@sourceware.cygnus.com. + +winsup/ + cygwin: http://sourceware.cygnus.com/cygwin + Patches to cygwin-patches@sourceware.cygnus.com. + General discussion cygwin@sourceware.cygnus.com. + See also winsup/MAINTAINERS. + +expect/, dejagnu/, config-ml.in, mpw-README, mpw-build.in, +mpw-config.in, mpw-configure, mpw-install, setup.com, texinfo/, +missing, makefile.vms, utils/, config/, config.if, makefile.vms, +missing, ylwrap, mkdep, etc/, install-sh, intl/ + ? + +modules file + Obviously changes to this file should not go through + overseers@sourceware.cygnus.com. If you understand the file + format (or can cut-and-paste existing entries), modify it. If + it scares you, get someone who does understand it to help you. + Be prepared to fix it if you do break it. + +/* Local variables: */ +/* change-log-default-name: "/dev/null" */ +/* End: */ diff -upr --new-file binutils-2.9.5.0.42/Makefile.in binutils-2.9.5.0.46/Makefile.in --- binutils-2.9.5.0.42/Makefile.in Thu Apr 20 15:13:28 2000 +++ binutils-2.9.5.0.46/Makefile.in Sun May 21 14:19:02 2000 @@ -223,7 +223,7 @@ CC_FOR_TARGET = ` \ ;; \ esac \ else \ - echo $$r/gcc/xgcc -B$$r/gcc/; \ + echo $$r/gcc/xgcc -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -B$$r/gcc/ -isystem $(build_tooldir)/include; \ fi; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ @@ -237,7 +237,7 @@ CC_FOR_TARGET = ` \ # variable is passed down to the gcc Makefile, where it is used to # build libgcc2.a. We define it here so that it can itself be # overridden on the command line. -GCC_FOR_TARGET = $$r/gcc/xgcc -B$$r/gcc/ +GCC_FOR_TARGET = $$r/gcc/xgcc -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -B$$r/gcc/ -I$(build_tooldir)/include CHILL_FOR_TARGET = ` \ if [ -f $$r/gcc/xgcc ] ; then \ @@ -262,7 +262,7 @@ CXX_FOR_TARGET = ` \ ;; \ esac \ else \ - echo $$r/gcc/xgcc -B$$r/gcc/; \ + echo $$r/gcc/g++ -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -B$$r/gcc/ -I$(build_tooldir)/include; \ fi; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ @@ -1629,7 +1629,7 @@ all-target-winsup: all-target-newlib all configure-target-winsup: configure-target-newlib all-uudecode: all-libiberty all-zip: -configure-target-libiberty: $(ALL_GCC) +configure-target-libiberty: $(ALL_GCC) configure-target-newlib all-target-libiberty: configure-target-libiberty all-gcc all-ld all-target-newlib all-target: $(ALL_TARGET_MODULES) install-target: $(INSTALL_TARGET_MODULES) @@ -1717,7 +1717,19 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) te .PHONY: gdb-taz gdb-taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex - $(MAKE) -f Makefile.in taz \ + $(MAKE) -f Makefile.in do-proto-toplev \ + TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \ + MD5PROG="$(MD5PROG)" \ + SUPPORT_FILES="$(SUPPORT_FILES)" + $(MAKE) -f Makefile.in do-md5sum \ + TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \ + MD5PROG="$(MD5PROG)" \ + SUPPORT_FILES="$(SUPPORT_FILES)" + $(MAKE) -f Makefile.in do-djunpack \ + TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \ + MD5PROG="$(MD5PROG)" \ + SUPPORT_FILES="$(SUPPORT_FILES)" + $(MAKE) -f Makefile.in do-tar-bz2 \ TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \ MD5PROG="$(MD5PROG)" \ SUPPORT_FILES="$(SUPPORT_FILES)" @@ -1781,14 +1793,27 @@ do-proto-toplev: $(DEVO_SUPPORT) $(SUPPO .PHONY: do-tar-bz2 do-tar-bz2: echo "==> Making $(PACKAGE)-$(VER).tar.bz2" - tar cfh $(PACKAGE)-$(VER).tar $(PACKAGE)-$(VER) + -rm -f $(PACKAGE)-$(VER).tar.bz2 + find $(PACKAGE)-$(VER) -follow -name CVS -prune -o -type f -print \ + | tar cTfh - $(PACKAGE)-$(VER).tar $(BZIPPROG) -v -9 $(PACKAGE)-$(VER).tar .PHONY: do-md5sum do-md5sum: echo "==> Adding md5 checksum to top-level directory" - ( cd proto-toplev && find * -follow -type f -print | xargs $(MD5PROG) ) > md5.sum + cd proto-toplev && find * -follow -name CVS -prune -o -type f -print \ + | xargs $(MD5PROG) > ../md5.sum mv md5.sum proto-toplev + +.PHONY: do-djunpack +do-djunpack: + echo "==> Adding updated djunpack.bat to top-level directory" + echo - 's /gdb-[0-9\.]*/gdb-'"$(VER)"'/' + sed < djunpack.bat > djunpack.new \ + -e 's/gdb-[0-9][0-9\.]*/gdb-'"$(VER)"'/' + mv djunpack.new djunpack.bat + -rm -f proto-toplev/djunpack.bat + ln -s ../djunpack.bat proto-toplev/djunpack.bat TEXINFO_SUPPORT= texinfo/texinfo.tex DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT) diff -upr --new-file binutils-2.9.5.0.42/bfd/ChangeLog binutils-2.9.5.0.46/bfd/ChangeLog --- binutils-2.9.5.0.42/bfd/ChangeLog Fri May 12 09:20:11 2000 +++ binutils-2.9.5.0.46/bfd/ChangeLog Fri Jun 2 16:25:51 2000 @@ -1,3 +1,208 @@ +2000-06-01 J.T. Conklin + + * config.bfd (i[3456]86-*-netbsdelf*): New target. + (i[3456]86-*-netbsdaout*): New target. + (i[3456]86-*-netbsd*): Add bfd_elf32_i386_vec to targ_selvecs. + (i[3456]86-*-openbsd*): Likewise. + +Tue May 30 15:39:04 2000 Andrew Cagney + + * trad-core.c: From hpux-core.c, include or + when possible. + +2000-05-31 Nick Clifton + + * opintl.h (_(String)): Explain why dgettext is used instead + of gettext. + +2000-05-31 Ulrich Drepper + + * elf.c (_bfd_elf_slurp_version_tables): Correct reading of version + definitions. We must not assume they are sorted in the file + according to their index numbers. + +2000-05-31 Alan Modra + + * elf-hppa.h: (elf_hppa_final_link_relocate): Use e_rsel field + selector for R_PARISC_PCREL17R. R_PARISC_DIR17R and + R_PARISC_DIR17F are for absolute branches; Handle them as such. + +2000-05-30 Nick Clifton + + * cpu-i960.c (scan_960_mach): Accept 80960KA, 80960KB, + 80960CA, 80960MC as valid machine names. + +2000-05-30 H.J. Lu + + * elflink.c (_bfd_elf_link_record_dynamic_symbol): Clear the + visibility bits if the symbol is undefined. Correctly handle + weak undefined symbols with hidden and internal attributes. + + * elflink.h (elf_link_add_object_symbols): Always turn the + symbol into local if it has the hidden or internal attribute. + +2000-05-29 Philip Blundell + + * ppcboot.c: Add packed attribute if compiling with GCC. + +2000-05-29 Anatoly Vorobey + + * elf.c (_bfd_elf_link_hash_table_init): Initialize dynlocal. + +2000-05-26 Alan Modra + + * Makefile.am: Update dependencies with "make dep-am" + * Makefile.in: Regenerate. + + * sysdep.h (gettext, dgettext, dcgettext, textdomain, + bindtextdomain): Replace defines with those from intl/libgettext.h + to quieten gcc warnings. + +2000-05-26 Eli Zaretskii + + * aoutx.h (find_nearest_line): Use IS_ABSOLUTE_PATH. + + * archive.c (normalize, bfd_bsd_truncate_arname, + bfd_gnu_truncate_arname) [HAVE_DOS_BASED_FILE_SYSTEM]: Support + file names with backslashes. + + * cache.c (bfd_open_file) [__MSDOS__]: Don't unlink the file + before opening it. + + * sysdep.h: Include filenames.h. + +2000-05-26 Alan Modra + + * opncls.c (bfd_close_all_done): Mask file perms with 0777 not 0x777. + +2000-05-26 Jakub Jelinek + + * elf64-sparc.c (sparc64_elf_relax_section): New. + (sparc64_elf_relocate_section): Optimize tail call into branch always + if possible. + * elf32-sparc.c (elf32_sparc_relocate_section): Likewise. + (elf32_sparc_relax_section): New. + +2000-05-26 Jakub Jelinek + + * elf64-sparc.c: Add ATTRIBUTE_UNUSED to unused function parameters. + Remove unusued variables. + (sparc64_elf_relocate_section): Change r_symndx type to unsigned long. + (sparc64_elf_merge_private_bfd_data): Fix shared library case from + previous fix, so that shared libs really don't influence targets + extension mask and memory model. + +2000-05-23 H.J. Lu + + * elf64-alpha.c (elf64_alpha_relocate_section): Check + h->root.other not h->other. + * elf32-mips.c (mips_elf_calculate_relocation): Likewise. + + * elf32-ppc.c (ppc_elf_relocate_section): Fix a typo. + +2000-05-23 H.J. Lu + + * elf32-i386.c (elf_i386_relocate_section): Don't allow the + undefined symbol with the non-default visibility attributes. + * elf-hppa.h (elf_hppa_relocate_section): Likewise. + * elf32-arm.h (elf32_arm_relocate_section): Likewise. + * elf32-i370.c (i370_elf_relocate_section): Likewise. + * elf32-m68k.c (elf_m68k_relocate_section): Likewise. + * elf32-mcore.c (mcore_elf_relocate_section): Likewise. + * elf32-mips.c (mips_elf_calculate_relocation): Likewise. + * elf32-ppc.c (ppc_elf_relocate_section): Likewise. + * elf32-sparc.c (elf32_sparc_relocate_section): Likewise. + * elf64-alpha.c (elf64_alpha_relocate_section): Likewise. + * elf64-ia64.c (elf64_ia64_relocate_section): Likewise. + * elf64-sparc.c (sparc64_elf_relocate_section): Likewise. + +2000-05-22 Richard Henderson + + * elf64-ia64.c (ia64_howto_table): Add PCREL60B, PCREL21BI, + PCREL22, PCREL64I. Zero size of special relocs. + (elf64_ia64_reloc_type_lookup): Likewise. + (USE_BRL, oor_brl, oor_ip): New. + (elf64_ia64_relax_section): New. + (elf64_ia64_check_relocs): Handle PCREL60B, PCREL22, PCREL64I. + (elf64_ia64_install_value): Likewise, plus PCREL21BI. + (elf64_ia64_relocate_section): Likewise. + (bfd_elf64_bfd_relax_section): New. + * reloc.c (BFD_RELOC_IA64_PCREL21BI): New. + (BFD_RELOC_IA64_{PCREL22,PCREL60B,PCREL64I}): New. + * bfd-in2.h, libbfd.h: Regenerate. + +2000-05-22 Nick Clifton + + * configure.in : Add peigen.lo to MIPS PE targets. + * configure: Regenerate. + +2000-05-22 Momchil Velikov + + * libbfd.c (_bfd_generic_verify_endian_match): Compare endianess + only if it is known for both input and output bfds. Separate + error message strings as in some languages, it may be necessary + to change more than one place in the string to change between + 'big' and 'little'. + + * elf32-ppc.c (ppc_elf_merge_private_bfd_data): Remove inline + endianess checks, call _bfd_generic_verify_endian_match() instead. + + * elf32-mips.c (_bfd_mips_elf_merge_private_bfd_data): Likewise. + + * elf32-mcore.c (mcore_elf_merge_private_bfd_data): Likewise. + + * elf32-arm.h (elf32_arm_merge_private_bfd_data): Likewise. Verify + endianess before checking bfd flavours. + +2000-05-22 H.J. Lu + + * elflink.h (elf_link_output_extsym): Clear the visibility + field for symbols not defined locally. + +2000-05-18 Alan Modra + + * libhppa.h (re_assemble_3, re_assemble_12, re_assemble_16, + re_assemble_17, re_assemble_21, re_assemble_22): Don't mask insn. + (hppa_rebuild_insn): Mask immediate bits here instead. + * elf-hppa.h (elf_hppa_relocate_insn): Mask here too. + +2000-05-18 Momchil Velikov + + * elflink.h (elf_bfd_final_link, elf_link_input_bfd): When emiting + relocs for an executable, ensure that they are virtual addresses. + +Thu May 18 10:55:47 2000 Jeffrey A Law (law@cygnus.com) + + * config.bfd (hppa*64*-*-hpux11*): New target triplet. + +2000-05-17 S. Bharadwaj Yadavalli + Rick Gorton + + * elflink.h: Add emitrelocations support: when enabled, relocation + information and relocation sections are put into final output + executables. If the emitrelocations flag is set, do the following: + (elf_bfd_final_link): Emit relocation sections. + (elf_link_input_bfd): Compute relocation section contents. + (elf_gc_sections): Don't clean relocation sections. + +2000-05-16 Catherine Moore + + * som.c (som_decode_symclass): Recognize weak symbols. + +2000-05-16 Szabolcs Szakacsits + + * peigen.c (pe_print_idata): Undo part of 2000-05-12 change that + read idata section only from dataoff. + (pe_print_edata): Correctly check for valid eat_member. + +Tue May 16 00:04:11 2000 J"orn Rennecke + + * elf32-sh.c (sh_elf_relax_delete_bytes): Handle R_SH_SWITCH8. + +2000-05-14 Philip Blundell + + * config.bfd (armeb-*-elf, arm*b-*-linux-gnu*): New targets. + 2000-05-12 Alan Modra * targets.c (bfd_target_vector): #ifdef BFD64 rs6000coff64_vec @@ -86,7 +291,7 @@ Fri May 5 16:51:03 2000 Clinton Popetz 2000-05-02 H.J. Lu - * elf.c (prep_headers): USe ELFOSABI_NONE instead of + * elf.c (prep_headers): Use ELFOSABI_NONE instead of ELFOSABI_SYSV. 2000-05-02 Alan Modra @@ -309,7 +514,7 @@ Mon Apr 24 15:20:35 2000 Clinton Popetz * config.bfd: Add bfd_powerpc_64_arch to targ_arch and define targ_selvecs to include rs6000coff64_vec for rs6000. * configure.in: Add rs6000coff64_vec case. - * cpu-powerpc.c: New bfd_arch_info_type. + * cpu-powerpc.c: New bfd_arch_info_type. Mon Apr 24 02:17:31 2000 Jeffrey A Law (law@cygnus.com) @@ -483,7 +688,6 @@ Mon Apr 17 19:14:36 2000 David Mosberge 2000-04-12 Alan Modra * dep-in.sed: Match space before file name, not after. - * Makefile.am: Regenerate dependencies. * Makefile.in: Regenerate. @@ -509,9 +713,9 @@ Mon Apr 17 19:14:36 2000 David Mosberge unitialized variable. Fri Apr 7 15:56:57 2000 Andrew Cagney - + * configure.in (WARN_CFLAGS): Set to -W -Wall by default. Add - --enable-build-warnings option. + --enable-build-warnings option. * Makefile.am (AM_CFLAGS, WARN_CFLAGS): Add definitions. * Makefile.in, configure: Re-generate. @@ -617,10 +821,10 @@ Wed Apr 5 22:04:20 2000 J"orn Rennecke 2000-04-03 Kevin Buettner - * configure.in: Added corefile support for AIX 4.3. In particular, - AIX_CORE_DUMPX_CORE will be defined in addition to AIX_CORE when - compiling rs6000-core.c. - * configure: Regenerated. + * configure.in: Added corefile support for AIX 4.3. In particular, + AIX_CORE_DUMPX_CORE will be defined in addition to AIX_CORE when + compiling rs6000-core.c. + * configure: Regenerated. 2000-04-03 H.J. Lu @@ -706,9 +910,9 @@ Wed Mar 30 15:28:00 2000 Donald Lindsay "boolean overflow" with "bfd_reloc_status_type flag". 2000-03-14 Doug Evans - - * elf32-m32r.c (m32r_elf_lo16_reloc): Rewrite. - + + * elf32-m32r.c (m32r_elf_lo16_reloc): Rewrite. + 2000-03-14 Kazu Hirata * reloc16.c (bfd_coff_reloc16_relax_section): Count the total number @@ -729,7 +933,7 @@ Wed Mar 30 15:28:00 2000 Donald Lindsay * elf32-mips.c (_bfd_mips_elf_relocate_section): Do proper sign-extension and big-endian compensation for - R_MIPS_64 even in ld -r. + R_MIPS_64 even in ld -r. 2000-03-10 Geoffrey Keating @@ -820,7 +1024,7 @@ Wed Mar 30 15:28:00 2000 Donald Lindsay * coffcode.h (styp_to_sec_flags): Initialise 'target_name'. * elf-m10300.c (mn10300_elf_relax_section): Initialise - 'sym_sec'. + 'sym_sec'. * elf32-i370.c: Add ATTRIBUTE_UNUSED to unused function parameters. @@ -1030,10 +1234,10 @@ Fri Feb 25 18:39:26 2000 Rodney Brown ( * elflink.h (elf_link_add_object_symbols): If a version symbol is not defined, don't add a second ELF_VER_CHR. - * elflink.h (elf_bfd_final_link): Call output_extsym for global + * elflink.h (elf_bfd_final_link): Call output_extsym for global symbols converted to local symbols even when stripping all symbols. - (elf_link_output_extsym): Process global symbols converted to + (elf_link_output_extsym): Process global symbols converted to local symbols even if they are being stripped. 2000-02-21 Alan Modra @@ -1228,28 +1432,28 @@ Thu Feb 10 20:07:50 GMT 2000 Toshiyasu 2000-02-08 Mark Elbrecht * coff-go32.c: Update comment. Update copyright. - + 2000-01-27 Thomas de Lellis - * syms.c (bfd_decode_symclass) - Two new class characters were added - 'V' and 'v'. The - meaning of 'W' is now restricted to just weak non-object - symbols. This allows differentiation between, for example, - weak functions vs weak objects. nm for example now dumps: - 'W' = weak global - 'w' = weak unresolved - 'V' = weak global object - 'v' = weak unresolved object + * syms.c (bfd_decode_symclass) + Two new class characters were added - 'V' and 'v'. The + meaning of 'W' is now restricted to just weak non-object + symbols. This allows differentiation between, for example, + weak functions vs weak objects. nm for example now dumps: + 'W' = weak global + 'w' = weak unresolved + 'V' = weak global object + 'v' = weak unresolved object (bfd_is_undefined_symclass): New function. Return true if the given symbol class represents and undefined/unresolved symbol. - (bfd_symbol_info): Use bfd_is_undefined_symclass to check for + (bfd_symbol_info): Use bfd_is_undefined_symclass to check for unresolved symbols. * bfd-in2.h: Add prototype for bfd_is_undefined_symbol(). - * elf32-arm.h (elf32_arm_get_symbol_type): If a symbol has the + * elf32-arm.h (elf32_arm_get_symbol_type): If a symbol has the STT_ARM_16BIT flag set, but it is not attached to a data object return STT_ARM_16BIT so that it will be treated as code by the disassembler. @@ -1267,7 +1471,7 @@ Thu Feb 10 20:07:50 GMT 2000 Toshiyasu 2000-01-24 Robert Lipe (robertl@sco.com) - * coffcode.h (coff_write_object_contents): Get buff via bfd_malloc + * coffcode.h (coff_write_object_contents): Get buff via bfd_malloc instead of using GNU C extension. 2000-01-21 Nick Clifton @@ -1444,8 +1648,8 @@ Thu Feb 10 20:07:50 GMT 2000 Toshiyasu 1999-12-09 Nick Clifton * elflink.h (elf_link_add_archive_symbols): Add an archive - element even if contains a symbol which is currently only - considered to be a common. + element even if contains a symbol which is currently only + considered to be a common. * targets.c (struct bfd_target): Add new field _bfd_allow_commons_in_armap. @@ -1606,7 +1810,7 @@ Tue Nov 2 01:44:41 1999 Jeffrey A Law Sat Oct 23 17:36:12 1999 Andrew Cagney * archures.c: Add definitions bfd_mach_d10v, bfd_mach_d10v_ts2 and - bfd_mach_d10v_ts3. + bfd_mach_d10v_ts3. * cpu-d10v.c (d10v_ts3_info, d10v_ts2_info): Add. * bfd-in2.h: Regenerate. @@ -1629,8 +1833,8 @@ Fri Oct 8 13:03:45 1999 Geoffrey Keati * elf32-mips.c (mips_elf_calculate_relocation): R_MIPS_LITERAL relocs also need the GP value. (_bfd_mips_elf_relocate_section): Handle unpaired LO16 relocs - properly. Handle sign-extension for R_MIPS_64 correctly. Correct - the GP value for R_MIPS_LITERAL relocs too. Handle + properly. Handle sign-extension for R_MIPS_64 correctly. Correct + the GP value for R_MIPS_LITERAL relocs too. Handle R_MIPS_64 relocs properly on big-endian MIPS. (mips_elf_sign_extend): Behave properly with 'long long'. (mips_elf_highest): Correct typo. @@ -2088,7 +2292,7 @@ Tue Sep 7 17:25:12 1999 Jeffrey A Law (pj-*-*, pjl-*-*): New targets. * configure.in (bfd_elf32_pj_vec): New target vector. (bfd_elf32_pjl_vec): New target vector. - * archures.c (bfd_arch_pj): Define. + * archures.c (bfd_arch_pj): Define. * elf.c (prep_headers): Handle bfd_arch_pj. * reloc.c: Define BFD_RELOC_PJ_* relocations. * targets.c (bfd_elf32_pj_vec, bfd_elf32_pjl_vec): Declare and add @@ -2555,9 +2759,9 @@ Wed Aug 4 18:08:07 1999 Jeffrey A Law Mon Jul 19 14:03:44 1999 Mark P. Mitchell * elf32-mips.c (_bfd_mips_elf_final_link): Restore setting of GP - removed in previous change. + removed in previous change. (_bfd_mips_elf_relocate_section): Adjust GP relative relocations - in relocateable output. + in relocateable output. 1999-07-19 Ian Lance Taylor @@ -2585,8 +2789,8 @@ Mon Jul 19 14:03:44 1999 Mark P. Mitche * coffcode.h (CREATE_BIG_COFF_TARGET_VEC): New macro. (CREATE_LITTLE_COFF_TARGET_VEC): New macro. - * aix386-core.c: Initialise new field of bfd_target structure. - * aout-adobe.c: Initialise new field of bfd_target structure. + * aix386-core.c: Initialise new field of bfd_target structure. + * aout-adobe.c: Initialise new field of bfd_target structure. * aout-arm.c: Initialise new field of bfd_target structure. * aout-target.h: Initialise new field of bfd_target structure. * aout-tic30.c: Initialise new field of bfd_target structure. @@ -3746,7 +3950,7 @@ Wed Jun 2 11:51:12 1999 Andreas Schwab section. (elf32_arm_final_link_relocate): New parameter h. (elf32_arm_relocate_section): Pass symbol hash entry to above - routine. + routine. (elf32_arm_gc_sweep_hook, elf32_arm_check relocs): Correct comments. @@ -3765,7 +3969,7 @@ Wed Jun 2 11:51:12 1999 Andreas Schwab 1999-05-24 Philip Blundell * elf32-arm.h (elf32_arm_relocate_section): Undo change of - 1999-03-25. + 1999-03-25. Mon May 17 13:35:35 1999 Stan Cox @@ -3798,7 +4002,7 @@ Mon May 17 13:35:35 1999 Stan Cox * elf32-arm.h (elf32_arm_relocate_section): Fix operator - precedence between bit-and and comparison. + precedence between bit-and and comparison. Thu May 13 09:45:23 1999 Joel Sherrill (joel@OARcorp.com) @@ -4387,8 +4591,8 @@ Fri Jan 29 00:47:21 1999 H.J. Lu * binary.c (binary_set_section_contents): Don't return early for a - non-loadable section, in case the first section is non-loadable. - Don't set the low lma for a SEC_NEVER_LOAD section. From Maciej + non-loadable section, in case the first section is non-loadable. + Don't set the low lma for a SEC_NEVER_LOAD section. From Maciej W. Rozycki . 1999-01-28 Nick Clifton @@ -4398,8 +4602,8 @@ Thu Jan 28 20:05:22 1999 Ian Lance Tayl Thu Jan 28 11:08:16 1999 Catherine Moore - * elflink.h (elf_link_output_sym): Zero syms which are - part of sections which have been excluded. + * elflink.h (elf_link_output_sym): Zero syms which are + part of sections which have been excluded. Wed Jan 27 13:35:35 1999 Stan Cox @@ -4538,32 +4742,32 @@ Tue Dec 8 16:21:35 1998 Ian Lance Tayl Wed Dec 2 15:03:59 1998 David Taylor The following changes were made by David Taylor - , Edith Epstein - , Jim Blandy - , and Elena Zannoni - as part of the project to merge in - changes originally made by HP; HP did not create ChangeLog - entries. + , Edith Epstein + , Jim Blandy + , and Elena Zannoni + as part of the project to merge in + changes originally made by HP; HP did not create ChangeLog + entries. * aclocal.m4, configure, Makefile.in: Rebuilt using latest - automake macro library. + automake macro library. * hpux-core.c (hpux_core_core_file_p): this function now - understands HPUX 10.30 thread info. Yes, the thread stacks can be - found in the corefile! Also, in hpux_core_core_file_p, if we - encounter a section with an unknown type, don't punt. Instead, - just skip it. Also, count the number of sections of known type - that we encounter. If we encounter at least one good one, then - we'll declare that the file is a core file. If we encounter any - unknown ones but some known ones, then we'll issue a warning (but - still declare it to be a core file). Also, correctly decide when a - file is not a core. + understands HPUX 10.30 thread info. Yes, the thread stacks can be + found in the corefile! Also, in hpux_core_core_file_p, if we + encounter a section with an unknown type, don't punt. Instead, + just skip it. Also, count the number of sections of known type + that we encounter. If we encounter at least one good one, then + we'll declare that the file is a core file. If we encounter any + unknown ones but some known ones, then we'll issue a warning (but + still declare it to be a core file). Also, correctly decide when a + file is not a core. (PROC_INFO_HAS_THREAD_ID): define if CORE_ANON_SHMEM defined. (CORE_ANON_SHMEM): define if not defined. (hpux_core_struct): add members lwpid and user_tid. (core_kernel_thread_id, core_user_thread_id): new macros. (make_bfd_asection): use bfd_alloc to allocate room for a copy of - the name before storing it in the bfd. + the name before storing it in the bfd. (hpux_core_core_file_p): handle threads. * libhppa.h (GET_FIELD): protect against redefinition. @@ -4744,15 +4948,15 @@ Tue Nov 17 15:28:31 1998 Nick Clifton Mon Nov 16 22:19:21 1998 DJ Delorie * archive.c (bfd_ar_hdr_from_filesystem): support BFD_IN_MEMORY - bfds; they have no "file" so we fake it. + bfds; they have no "file" so we fake it. * bfd-in2.h: add bfd_make_writable and bfd_make_readable (regen) * libbfd.c (bfd_write): Allow writing to BFD_IN_MEMORY bfds by - resizing the memory buffer. + resizing the memory buffer. * opncls.c (bfd_make_writable): New function; lets you write a - bfd_create'd bfd to an in-memory buffer. + bfd_create'd bfd to an in-memory buffer. (bfd_make_readable): New function; lets you read back that buffer - as if it were from bfd_openr. Used to build generated archive - members (winsup's ld's dlltool) + as if it were from bfd_openr. Used to build generated archive + members (winsup's ld's dlltool) Mon Nov 16 19:15:19 1998 Dave Brolley @@ -4793,8 +4997,8 @@ Tue Nov 10 15:13:59 1998 Nick Clifton Tue Nov 10 13:37:36 1998 Felix Lee * acinclude.m4 (BFD_HAVE_SYS_PROCFS_TYPE, - BFD_HAVE_SYS_PROCFS_TYPE_MEMBER): didn't define macro when value - was cached. + BFD_HAVE_SYS_PROCFS_TYPE_MEMBER): didn't define macro when value + was cached. * aclocal.m4, configure: regenerated. Tue Nov 10 14:31:01 1998 Catherine Moore @@ -4905,13 +5109,13 @@ Mon Oct 19 16:57:05 1998 Felix Lee * acinclude.m4, aclocal.m4: move gettext-related fragments from - aclocal.m4 to acinclude.m4, so they don't get lost. + aclocal.m4 to acinclude.m4, so they don't get lost. * elfcore.h: rewrite for better corefile support. * elf.c (elfcore_*): new functions. * elf-bfd.h (elf_obj_tdata): new structure members. * acconfig.h, acinclude.m4, configure.in: add feature-tests for - flavor of procfs. + flavor of procfs. * aclocal.m4, config.in, configure, Makefile.in: regenerated. Fri Oct 16 14:07:45 1998 Catherine Moore @@ -5092,20 +5296,20 @@ Wed Sep 16 11:26:49 CDT 1998 Catherine Tue Sep 15 12:40:05 1998 Catherine Moore - * elf-bfd.h: Add argument to elf_backend_get_symbol_type. + * elf-bfd.h: Add argument to elf_backend_get_symbol_type. Tue Sep 15 08:34:40 1998 Catherine Moore - * elf.c (swap_out_syms): Pass type to elf_backend_get_symbol_type. - * elf32-arm.c: Add HOWTO entries for R_ARM_GNU_VTINHERIT and - R_ARM_GNU_VTENTRY. - (elf32_arm_gc_mark_hook): New. - (elf32_arm_gc_sweep_hook): New. - (elf32_arm_check_relocs): New. - (elf32_arm_final_link_relocate): Handle VTINHERIT and VTENTRY - relocations. - (elf32_arm_relocate_section): Handle VTINHERIT and VTENTRY - relocations. + * elf.c (swap_out_syms): Pass type to elf_backend_get_symbol_type. + * elf32-arm.c: Add HOWTO entries for R_ARM_GNU_VTINHERIT and + R_ARM_GNU_VTENTRY. + (elf32_arm_gc_mark_hook): New. + (elf32_arm_gc_sweep_hook): New. + (elf32_arm_check_relocs): New. + (elf32_arm_final_link_relocate): Handle VTINHERIT and VTENTRY + relocations. + (elf32_arm_relocate_section): Handle VTINHERIT and VTENTRY + relocations. 1998-09-10 Geoff Keating @@ -5246,28 +5450,28 @@ Fri Aug 14 09:12:28 1998 Stan Cox - * bfd-in.h: Add prototypes for elf32_arm_get_bfd_for_interworking, - elf32_arm_allocate_interworking_sections and - elf32_arm_process_before_allocation. - * bfd-in2.h: Regenerated. - * elf32-arm.c Define elf32_arm_link_hash_table. - (insert_thumb_branch): New routine. - (find_thumb_glue): New routine. - (find_arm_glue): New routine. - (record_arm_to_thumb_glue): New routine. - (record_thumb_to_arm_glue): New routine. - (elf32_arm_link_hash_table_create): New routine. - (elf32_arm_get_bfd_for_interworking): New routine. - (elf32_arm_allocate_interworking_sections) New routine. - (elf32_arm_process_before_allocation) New routine. - (elf32_thumb_to_arm_stub): New routine. - (elf32_arm_to_thumb_stub): New routine. - (elf32_print_private_bfd_data): Fix typo. - (elf32_arm_final_link_relocate): Add argument sym_sec. - Check for branches to thumb symbols in case R_ARM_PC24. - Check for branches to arm symbols in case R_ARM_THM_PC22. - (elf32_arm_relocate_section): Pass symbol section to - elf32_arm_final_link_relocate. + * bfd-in.h: Add prototypes for elf32_arm_get_bfd_for_interworking, + elf32_arm_allocate_interworking_sections and + elf32_arm_process_before_allocation. + * bfd-in2.h: Regenerated. + * elf32-arm.c Define elf32_arm_link_hash_table. + (insert_thumb_branch): New routine. + (find_thumb_glue): New routine. + (find_arm_glue): New routine. + (record_arm_to_thumb_glue): New routine. + (record_thumb_to_arm_glue): New routine. + (elf32_arm_link_hash_table_create): New routine. + (elf32_arm_get_bfd_for_interworking): New routine. + (elf32_arm_allocate_interworking_sections) New routine. + (elf32_arm_process_before_allocation) New routine. + (elf32_thumb_to_arm_stub): New routine. + (elf32_arm_to_thumb_stub): New routine. + (elf32_print_private_bfd_data): Fix typo. + (elf32_arm_final_link_relocate): Add argument sym_sec. + Check for branches to thumb symbols in case R_ARM_PC24. + Check for branches to arm symbols in case R_ARM_THM_PC22. + (elf32_arm_relocate_section): Pass symbol section to + elf32_arm_final_link_relocate. Wed Aug 12 19:00:39 1998 Geoff Keating @@ -5281,16 +5485,16 @@ Wed Aug 12 14:48:33 1998 Ian Lance Tayl Wed Aug 12 08:10:11 1998 Catherine Moore - * elf32-arm.c (elf32_arm_final_link_relocate): Rework - R_ARM_PC24 relocation. + * elf32-arm.c (elf32_arm_final_link_relocate): Rework + R_ARM_PC24 relocation. Tue Aug 11 14:42:26 1998 Catherine Moore - * elf32-arm.c (elf32_arm_final_link_relocate): Remove unused - argument is_local. Add argument sym_flags. Check sym_flags - in R_ARM_ABS32 case. Include addend for R_ARM_THM_PC22 case. - (elf32_arm_relocate_section): Don't pass local sym and pass - sym_flags to elf32_arm_final_link_relocate. + * elf32-arm.c (elf32_arm_final_link_relocate): Remove unused + argument is_local. Add argument sym_flags. Check sym_flags + in R_ARM_ABS32 case. Include addend for R_ARM_THM_PC22 case. + (elf32_arm_relocate_section): Don't pass local sym and pass + sym_flags to elf32_arm_final_link_relocate. Mon Aug 10 20:38:39 1998 Richard Henderson @@ -5675,7 +5879,7 @@ Wed Jul 1 17:05:53 1998 Nick Clifton Wed Jul 1 16:58:50 1998 Ian Lance Taylor * coff-sh.c (sh_relax_delete_bytes): Correct address comparisons - when handling 32 bit immediate relocs. + when handling 32 bit immediate relocs. * elf32-sh.c (sh_elf_relax_delete_bytes): Likewise. Tue Jun 30 09:55:03 1998 Jeffrey A Law (law@cygnus.com) @@ -5793,8 +5997,8 @@ Fri Jun 19 17:08:18 1998 Ian Lance Tayl Tue Jun 16 11:55:55 1998 Ian Lance Taylor * elf.c (copy_private_bfd_data): Improve handling of Solaris - native linker output. Avoid putting an empty section in more than - one segment. + native linker output. Avoid putting an empty section in more than + one segment. Fri Jun 12 13:30:17 1998 Tom Tromey @@ -5856,7 +6060,7 @@ Tue Jun 2 15:29:35 1998 Ian Lance Tayl * elflink.h (elf_merge_symbol): Don't always set type_change_ok and size_change_ok. - (elf_link_add_object_symbols): Set type_change_ok and + (elf_link_add_object_symbols): Set type_change_ok and size_change_ok before calling elf_merge_symbol. * elf32-mips.c (mips_elf_relocate_section): If we issue an @@ -5920,7 +6124,7 @@ Tue May 19 18:41:19 1998 Ian Lance Tayl * bfd-in.h: Move over patch to bfd-in2.h. * reloc.c (bfd_check_overflow): Add casts before shifts which may - not fit in 32 bits. + not fit in 32 bits. (_bfd_relocate_contents): Likewise. Mon May 18 14:44:15 1998 Nick Clifton @@ -6200,8 +6404,8 @@ Thu Apr 16 13:49:00 1998 Richard Hender Thu Apr 16 11:43:33 1998 Ian Lance Taylor * archive.c (bfd_generic_archive_p): If a slurp subroutine returns - an error other than bfd_error_system_call, set the error to - bfd_error_wrong_format. + an error other than bfd_error_system_call, set the error to + bfd_error_wrong_format. * targets.c (bfd_target_vector) [SELECT_VECS not defined]: Add bfd_elf32_powerpcle_vec. @@ -6545,10 +6749,10 @@ Wed Mar 25 11:19:28 1998 Ian Lance Tayl From Yan Meroth : * ihex.c (ihex_scan): Add extbase variable so that getting an - extended linear address record does not ignore any previous - extended address. + extended linear address record does not ignore any previous + extended address. (ihex_write_object_contents): When writing out an extended linear - address record, zero out any previous extended address. + address record, zero out any previous extended address. Tue Mar 24 16:09:43 1998 Manfred Hollstein @@ -6620,8 +6824,8 @@ Mon Feb 23 16:17:08 1998 Ian Lance Tayl Sun Feb 22 20:39:00 1998 Richard Henderson * elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Don't create - a plt entry when we can determine that we authoritatively define - the symbol. + a plt entry when we can determine that we authoritatively define + the symbol. Sun Feb 22 20:33:05 1998 Richard Henderson @@ -6685,7 +6889,7 @@ Thu Feb 12 17:31:11 1998 Ian Lance Tayl netbsd-core.lo, set COREFLAG to -DNETBSD_CORE. * config.bfd (alpha*-*-netbsd*): New target. * Makefile.am: Rebuild dependencies. - (BFD32_BACKENDS): Add vaxnetbsd.lo. + (BFD32_BACKENDS): Add vaxnetbsd.lo. (BFD32_BACKENDS_CFILES): Add vaxnetbsd.c. * configure, Makefile.in: Rebuild. @@ -6750,8 +6954,8 @@ Thu Feb 5 11:51:05 1998 Ian Lance Tayl skip empty sections, to match coff_write_object_contents. * elf64-mips.c (mips_elf64_swap_reloca_out): Swap out r_addend, - rather than swapping out r_offset twice. From Luke Deller - . + rather than swapping out r_offset twice. From Luke Deller + . Wed Feb 4 19:11:28 1998 Ian Lance Taylor @@ -6834,7 +7038,7 @@ Fri Jan 30 19:07:07 1998 Geoff Keating * elf32-ppc.c (ppc_elf_check_relocs): Don't emit R_PPC_REL* relocs against _GLOBAL_OFFSET_TABLE_. - (ppc_elf_relocate_section): Don't emit R_PPC_REL32 relocs in + (ppc_elf_relocate_section): Don't emit R_PPC_REL32 relocs in shared libraries which refer to local symbols. Make sure that the test for allocating space for a reloc in a shared object is the same as the test for emitting a reloc. @@ -6912,10 +7116,10 @@ Thu Jan 22 21:13:39 1998 Richard Hender Wed Jan 21 21:19:03 1998 Ian Lance Taylor * coff-i386.c (coff_i386_rtype_to_howto): If COFF_WITH_PE, don't - adjust addend for an output common symbol (from Jimmy Blair - ). If COFF_WITH_PE, adjust addend for PC relative - defined symbol to counteract adjustment made in generic relocation - code. + adjust addend for an output common symbol (from Jimmy Blair + ). If COFF_WITH_PE, adjust addend for PC relative + defined symbol to counteract adjustment made in generic relocation + code. * dwarf2.c: Include sysdep.h, not stdio.h and stdlib.h. diff -upr --new-file binutils-2.9.5.0.42/bfd/Makefile.am binutils-2.9.5.0.46/bfd/Makefile.am --- binutils-2.9.5.0.42/bfd/Makefile.am Fri May 12 08:11:30 2000 +++ binutils-2.9.5.0.46/bfd/Makefile.am Tue May 30 12:34:26 2000 @@ -670,496 +670,561 @@ config.status: $(srcdir)/configure $(src # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -archive.lo: archive.c $(INCDIR)/aout/ar.h $(INCDIR)/aout/ranlib.h -archures.lo: archures.c -bfd.lo: bfd.c $(INCDIR)/libiberty.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h libcoff.h \ - libecoff.h $(INCDIR)/coff/ecoff.h elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h -cache.lo: cache.c -coffgen.lo: coffgen.c $(INCDIR)/coff/internal.h libcoff.h \ - $(INCDIR)/bfdlink.h -corefile.lo: corefile.c -format.lo: format.c -init.lo: init.c -libbfd.lo: libbfd.c -opncls.lo: opncls.c $(INCDIR)/objalloc.h -reloc.lo: reloc.c $(INCDIR)/bfdlink.h -section.lo: section.c $(INCDIR)/bfdlink.h -syms.lo: syms.c $(INCDIR)/bfdlink.h $(INCDIR)/aout/stab_gnu.h \ +archive.lo: archive.c $(INCDIR)/filenames.h $(INCDIR)/aout/ar.h \ + $(INCDIR)/aout/ranlib.h +archures.lo: archures.c $(INCDIR)/filenames.h +bfd.lo: bfd.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h \ + libcoff.h libecoff.h $(INCDIR)/coff/ecoff.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h +cache.lo: cache.c $(INCDIR)/filenames.h +coffgen.lo: coffgen.c $(INCDIR)/filenames.h $(INCDIR)/coff/internal.h \ + libcoff.h $(INCDIR)/bfdlink.h +corefile.lo: corefile.c $(INCDIR)/filenames.h +format.lo: format.c $(INCDIR)/filenames.h +init.lo: init.c $(INCDIR)/filenames.h +libbfd.lo: libbfd.c $(INCDIR)/filenames.h +opncls.lo: opncls.c $(INCDIR)/filenames.h $(INCDIR)/objalloc.h +reloc.lo: reloc.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h +section.lo: section.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h +syms.lo: syms.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def +targets.lo: targets.c $(INCDIR)/filenames.h $(INCDIR)/fnmatch.h \ + targmatch.h +hash.lo: hash.c $(INCDIR)/filenames.h $(INCDIR)/objalloc.h +linker.lo: linker.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + genlink.h +srec.lo: srec.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h +binary.lo: binary.c $(INCDIR)/filenames.h +tekhex.lo: tekhex.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h +ihex.lo: ihex.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h +stabs.lo: stabs.c $(INCDIR)/filenames.h $(INCDIR)/aout/stab_gnu.h \ $(INCDIR)/aout/stab.def -targets.lo: targets.c $(INCDIR)/fnmatch.h targmatch.h -hash.lo: hash.c $(INCDIR)/objalloc.h -linker.lo: linker.c $(INCDIR)/bfdlink.h genlink.h -srec.lo: srec.c $(INCDIR)/libiberty.h -binary.lo: binary.c -tekhex.lo: tekhex.c $(INCDIR)/libiberty.h -ihex.lo: ihex.c $(INCDIR)/libiberty.h -stabs.lo: stabs.c $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def stab-syms.lo: stab-syms.c libaout.h $(INCDIR)/bfdlink.h \ $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab.def -cpu-a29k.lo: cpu-a29k.c -cpu-alpha.lo: cpu-alpha.c -cpu-arc.lo: cpu-arc.c -cpu-arm.lo: cpu-arm.c -cpu-avr.lo: cpu-avr.c -cpu-d10v.lo: cpu-d10v.c -cpu-d30v.lo: cpu-d30v.c -cpu-fr30.lo: cpu-fr30.c -cpu-h8300.lo: cpu-h8300.c -cpu-h8500.lo: cpu-h8500.c -cpu-hppa.lo: cpu-hppa.c -cpu-ia64.lo: cpu-ia64.c cpu-ia64-opc.c $(srcdir)/../opcodes/ia64-opc.h \ - $(INCDIR)/opcode/ia64.h -cpu-i370.lo: cpu-i370.c -cpu-i386.lo: cpu-i386.c -cpu-i860.lo: cpu-i860.c -cpu-i960.lo: cpu-i960.c -cpu-m32r.lo: cpu-m32r.c -cpu-m68k.lo: cpu-m68k.c -cpu-m88k.lo: cpu-m88k.c -cpu-m10200.lo: cpu-m10200.c -cpu-m10300.lo: cpu-m10300.c -cpu-mcore.lo: cpu-mcore.c -cpu-mips.lo: cpu-mips.c -cpu-ns32k.lo: cpu-ns32k.c ns32k.h -cpu-pj.lo: cpu-pj.c -cpu-powerpc.lo: cpu-powerpc.c -cpu-rs6000.lo: cpu-rs6000.c -cpu-sh.lo: cpu-sh.c -cpu-sparc.lo: cpu-sparc.c -cpu-tic30.lo: cpu-tic30.c -cpu-tic54x.lo: cpu-tic54x.c -cpu-tic80.lo: cpu-tic80.c -cpu-v850.lo: cpu-v850.c -cpu-vax.lo: cpu-vax.c -cpu-we32k.lo: cpu-we32k.c -cpu-w65.lo: cpu-w65.c -cpu-z8k.lo: cpu-z8k.c -aout-adobe.lo: aout-adobe.c $(INCDIR)/aout/adobe.h \ +cpu-a29k.lo: cpu-a29k.c $(INCDIR)/filenames.h +cpu-alpha.lo: cpu-alpha.c $(INCDIR)/filenames.h +cpu-arc.lo: cpu-arc.c $(INCDIR)/filenames.h +cpu-arm.lo: cpu-arm.c $(INCDIR)/filenames.h +cpu-avr.lo: cpu-avr.c $(INCDIR)/filenames.h +cpu-d10v.lo: cpu-d10v.c $(INCDIR)/filenames.h +cpu-d30v.lo: cpu-d30v.c $(INCDIR)/filenames.h +cpu-fr30.lo: cpu-fr30.c $(INCDIR)/filenames.h +cpu-h8300.lo: cpu-h8300.c $(INCDIR)/filenames.h +cpu-h8500.lo: cpu-h8500.c $(INCDIR)/filenames.h +cpu-hppa.lo: cpu-hppa.c $(INCDIR)/filenames.h +cpu-ia64.lo: cpu-ia64.c $(INCDIR)/filenames.h cpu-ia64-opc.c \ + $(srcdir)/../opcodes/ia64-opc.h $(INCDIR)/opcode/ia64.h +cpu-i370.lo: cpu-i370.c $(INCDIR)/filenames.h +cpu-i386.lo: cpu-i386.c $(INCDIR)/filenames.h +cpu-i860.lo: cpu-i860.c $(INCDIR)/filenames.h +cpu-i960.lo: cpu-i960.c $(INCDIR)/filenames.h +cpu-m32r.lo: cpu-m32r.c $(INCDIR)/filenames.h +cpu-m68k.lo: cpu-m68k.c $(INCDIR)/filenames.h +cpu-m88k.lo: cpu-m88k.c $(INCDIR)/filenames.h +cpu-m10200.lo: cpu-m10200.c $(INCDIR)/filenames.h +cpu-m10300.lo: cpu-m10300.c $(INCDIR)/filenames.h +cpu-mcore.lo: cpu-mcore.c $(INCDIR)/filenames.h +cpu-mips.lo: cpu-mips.c $(INCDIR)/filenames.h +cpu-ns32k.lo: cpu-ns32k.c $(INCDIR)/filenames.h ns32k.h +cpu-pj.lo: cpu-pj.c $(INCDIR)/filenames.h +cpu-powerpc.lo: cpu-powerpc.c $(INCDIR)/filenames.h +cpu-rs6000.lo: cpu-rs6000.c $(INCDIR)/filenames.h +cpu-sh.lo: cpu-sh.c $(INCDIR)/filenames.h +cpu-sparc.lo: cpu-sparc.c $(INCDIR)/filenames.h +cpu-tic30.lo: cpu-tic30.c $(INCDIR)/filenames.h +cpu-tic54x.lo: cpu-tic54x.c $(INCDIR)/filenames.h +cpu-tic80.lo: cpu-tic80.c $(INCDIR)/filenames.h +cpu-v850.lo: cpu-v850.c $(INCDIR)/filenames.h +cpu-vax.lo: cpu-vax.c $(INCDIR)/filenames.h +cpu-we32k.lo: cpu-we32k.c $(INCDIR)/filenames.h +cpu-w65.lo: cpu-w65.c $(INCDIR)/filenames.h +cpu-z8k.lo: cpu-z8k.c $(INCDIR)/filenames.h +aout-adobe.lo: aout-adobe.c $(INCDIR)/filenames.h $(INCDIR)/aout/adobe.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def libaout.h \ $(INCDIR)/bfdlink.h -aout-arm.lo: aout-arm.c libaout.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/aout/aout64.h aoutx.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h +aout-arm.lo: aout-arm.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h aoutx.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ + aout-target.h aout-ns32k.lo: aout-ns32k.c $(INCDIR)/aout/aout64.h \ ns32k.h libaout.h $(INCDIR)/bfdlink.h aout-sparcle.lo: aout-sparcle.c $(INCDIR)/bfdlink.h \ - libaout.h aoutf1.h $(INCDIR)/aout/sun4.h $(INCDIR)/aout/aout64.h \ - $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ - aout-target.h -aout-tic30.lo: aout-tic30.c libaout.h $(INCDIR)/bfdlink.h \ + libaout.h aoutf1.h $(INCDIR)/filenames.h $(INCDIR)/aout/sun4.h \ $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ - $(INCDIR)/aout/ar.h aoutx.h -aout0.lo: aout0.c aoutf1.h $(INCDIR)/aout/sun4.h libaout.h \ + $(INCDIR)/aout/ar.h aout-target.h +aout-tic30.lo: aout-tic30.c $(INCDIR)/filenames.h libaout.h \ $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h -aout32.lo: aout32.c aoutx.h $(INCDIR)/bfdlink.h libaout.h \ - $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ - $(INCDIR)/aout/ar.h -armnetbsd.lo: armnetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ + $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aoutx.h +aout0.lo: aout0.c aoutf1.h $(INCDIR)/filenames.h $(INCDIR)/aout/sun4.h \ + libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ + aout-target.h +aout32.lo: aout32.c aoutx.h $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + libaout.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -bout.lo: bout.c $(INCDIR)/bfdlink.h genlink.h $(INCDIR)/bout.h \ - $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def libaout.h -cf-i386lynx.lo: cf-i386lynx.c coff-i386.c $(INCDIR)/coff/i386.h \ +armnetbsd.lo: armnetbsd.c netbsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +bout.lo: bout.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + genlink.h $(INCDIR)/bout.h $(INCDIR)/aout/stab_gnu.h \ + $(INCDIR)/aout/stab.def libaout.h +cf-i386lynx.lo: cf-i386lynx.c $(INCDIR)/filenames.h \ + coff-i386.c $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h +cf-m68klynx.lo: cf-m68klynx.c coff-m68k.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/m68k.h $(INCDIR)/coff/internal.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h coffswap.h +cf-sparclynx.lo: cf-sparclynx.c coff-sparc.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/sparc.h $(INCDIR)/coff/internal.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h coffswap.h +coff-a29k.lo: coff-a29k.c $(INCDIR)/filenames.h $(INCDIR)/coff/a29k.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -cf-m68klynx.lo: cf-m68klynx.c coff-m68k.c $(INCDIR)/coff/m68k.h \ +coff-apollo.lo: coff-apollo.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/apollo.h $(INCDIR)/coff/internal.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h coffswap.h +coff-arm.lo: coff-arm.c $(INCDIR)/filenames.h $(INCDIR)/coff/arm.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -cf-sparclynx.lo: cf-sparclynx.c coff-sparc.c $(INCDIR)/coff/sparc.h \ +coff-aux.lo: coff-aux.c $(INCDIR)/filenames.h $(INCDIR)/coff/aux-coff.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/m68k.h coff-m68k.c \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h +coff-h8300.lo: coff-h8300.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + genlink.h $(INCDIR)/coff/h8300.h $(INCDIR)/coff/internal.h \ + libcoff.h coffcode.h coffswap.h +coff-h8500.lo: coff-h8500.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/h8500.h $(INCDIR)/coff/internal.h libcoff.h \ + coffcode.h coffswap.h +coff-i386.lo: coff-i386.c $(INCDIR)/filenames.h $(INCDIR)/coff/i386.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-a29k.lo: coff-a29k.c $(INCDIR)/coff/a29k.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -coff-apollo.lo: coff-apollo.c $(INCDIR)/coff/apollo.h \ +coff-i860.lo: coff-i860.c $(INCDIR)/filenames.h $(INCDIR)/coff/i860.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-arm.lo: coff-arm.c $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -coff-aux.lo: coff-aux.c $(INCDIR)/coff/aux-coff.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/m68k.h coff-m68k.c libcoff.h $(INCDIR)/bfdlink.h \ +coff-go32.lo: coff-go32.c coff-i386.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h coffswap.h +coff-i960.lo: coff-i960.c $(INCDIR)/filenames.h $(INCDIR)/coff/i960.h \ + $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-h8300.lo: coff-h8300.c $(INCDIR)/bfdlink.h genlink.h \ - $(INCDIR)/coff/h8300.h $(INCDIR)/coff/internal.h libcoff.h \ +coff-m68k.lo: coff-m68k.c $(INCDIR)/filenames.h $(INCDIR)/coff/m68k.h \ + $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-h8500.lo: coff-h8500.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/h8500.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h -coff-i386.lo: coff-i386.c $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -coff-i860.lo: coff-i860.c $(INCDIR)/coff/i860.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -coff-go32.lo: coff-go32.c coff-i386.c $(INCDIR)/coff/i386.h \ +coff-m88k.lo: coff-m88k.c $(INCDIR)/filenames.h $(INCDIR)/coff/m88k.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-i960.lo: coff-i960.c $(INCDIR)/coff/i960.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -coff-m68k.lo: coff-m68k.c $(INCDIR)/coff/m68k.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -coff-m88k.lo: coff-m88k.c $(INCDIR)/coff/m88k.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -coff-mips.lo: coff-mips.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \ - $(INCDIR)/coff/mips.h libcoff.h libecoff.h coffswap.h \ - ecoffswap.h -coff-pmac.lo: coff-pmac.c $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/rs6000.h libcoff.h $(INCDIR)/bfdlink.h \ - xcoff-target.h coffcode.h coffswap.h -coff-rs6000.lo: coff-rs6000.c $(INCDIR)/coff/internal.h \ +coff-mips.lo: coff-mips.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h \ + $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/mips.h libcoff.h \ + libecoff.h coffswap.h ecoffswap.h +coff-pmac.lo: coff-pmac.c $(INCDIR)/filenames.h $(INCDIR)/coff/internal.h \ $(INCDIR)/coff/rs6000.h libcoff.h $(INCDIR)/bfdlink.h \ xcoff-target.h coffcode.h coffswap.h -coff-sh.lo: coff-sh.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/sh.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h -coff-sparc.lo: coff-sparc.c $(INCDIR)/coff/sparc.h \ +coff-rs6000.lo: coff-rs6000.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/rs6000.h libcoff.h \ + $(INCDIR)/bfdlink.h xcoff-target.h coffcode.h coffswap.h +coff-sh.lo: coff-sh.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/sh.h $(INCDIR)/coff/internal.h libcoff.h \ + coffcode.h coffswap.h +coff-sparc.lo: coff-sparc.c $(INCDIR)/filenames.h $(INCDIR)/coff/sparc.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-stgo32.lo: coff-stgo32.c coff-i386.c $(INCDIR)/coff/i386.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/go32exe.h \ +coff-stgo32.lo: coff-stgo32.c coff-i386.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/go32exe.h \ libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h \ go32stub.h -coff-svm68k.lo: coff-svm68k.c coff-m68k.c $(INCDIR)/coff/m68k.h \ - $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ +coff-svm68k.lo: coff-svm68k.c coff-m68k.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/m68k.h $(INCDIR)/coff/internal.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h coffswap.h +coff-tic30.lo: coff-tic30.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/tic30.h $(INCDIR)/coff/internal.h libcoff.h \ coffcode.h coffswap.h -coff-tic30.lo: coff-tic30.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/tic30.h \ +coff-tic54x.lo: coff-tic54x.c $(INCDIR)/filenames.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/coff/tic54x.h $(INCDIR)/coff/ti.h \ $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h -coff-tic54x.lo: coff-tic54x.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/tic54x.h \ - $(INCDIR)/coff/ti.h $(INCDIR)/coff/internal.h libcoff.h \ +coff-tic80.lo: coff-tic80.c $(INCDIR)/bfdlink.h $(INCDIR)/filenames.h \ + $(INCDIR)/coff/tic80.h $(INCDIR)/coff/internal.h libcoff.h \ coffcode.h coffswap.h -coff-tic80.lo: coff-tic80.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/tic80.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h -coff-u68k.lo: coff-u68k.c coff-m68k.c $(INCDIR)/coff/m68k.h \ +coff-u68k.lo: coff-u68k.c coff-m68k.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/m68k.h $(INCDIR)/coff/internal.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h coffswap.h +coff-we32k.lo: coff-we32k.c $(INCDIR)/filenames.h $(INCDIR)/coff/we32k.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-we32k.lo: coff-we32k.c $(INCDIR)/coff/we32k.h \ - $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ +coff-w65.lo: coff-w65.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/w65.h $(INCDIR)/coff/internal.h libcoff.h \ coffcode.h coffswap.h -coff-w65.lo: coff-w65.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/w65.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h -coff-z8k.lo: coff-z8k.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/z8k.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h -cofflink.lo: cofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \ - libcoff.h -dwarf1.lo: dwarf1.c $(INCDIR)/libiberty.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/bfdlink.h $(INCDIR)/elf/dwarf.h -dwarf2.lo: dwarf2.c $(INCDIR)/libiberty.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/bfdlink.h $(INCDIR)/elf/dwarf2.h -ecoff.lo: ecoff.c $(INCDIR)/bfdlink.h $(INCDIR)/aout/ar.h \ - $(INCDIR)/aout/ranlib.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ - libaout.h $(INCDIR)/aout/aout64.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \ - libcoff.h libecoff.h -ecofflink.lo: ecofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/objalloc.h \ - $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \ - libcoff.h libecoff.h -efi-app-ia32.lo: efi-app-ia32.c coff-i386.c $(INCDIR)/coff/i386.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -elf.lo: elf.c $(INCDIR)/bfdlink.h elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h -elf32-arc.lo: elf32-arc.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/arc.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elfarm-oabi.lo: elfarm-oabi.c $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h \ +coff-z8k.lo: coff-z8k.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/z8k.h $(INCDIR)/coff/internal.h libcoff.h \ + coffcode.h coffswap.h +cofflink.lo: cofflink.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/internal.h libcoff.h +dwarf1.lo: dwarf1.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \ elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h elf32-arm.h \ - elf32-target.h -elfarm-nabi.lo: elfarm-nabi.c $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h \ + $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/dwarf.h +dwarf2.lo: dwarf2.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/dwarf2.h +ecoff.lo: ecoff.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/aout/ar.h $(INCDIR)/aout/ranlib.h $(INCDIR)/aout/stab_gnu.h \ + $(INCDIR)/aout/stab.def libaout.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h \ + $(INCDIR)/coff/ecoff.h libcoff.h libecoff.h +ecofflink.lo: ecofflink.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/objalloc.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h \ + $(INCDIR)/coff/ecoff.h libcoff.h libecoff.h +efi-app-ia32.lo: efi-app-ia32.c $(INCDIR)/filenames.h \ + coff-i386.c $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h coffcode.h \ + peicode.h libpei.h +elf.lo: elf.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h elf32-arm.h \ + $(INCDIR)/elf/external.h +elf32-arc.lo: elf32-arc.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/arc.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf32-avr.lo: elf32-avr.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/avr.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-d10v.lo: elf32-d10v.c elf-bfd.h $(INCDIR)/elf/common.h \ +elfarm-oabi.lo: elfarm-oabi.c $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h \ + $(INCDIR)/filenames.h elf-bfd.h $(INCDIR)/elf/common.h \ $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - elf32-target.h -elf32-d30v.lo: elf32-d30v.c elf-bfd.h $(INCDIR)/elf/common.h \ + elf32-arm.h elf32-target.h +elfarm-nabi.lo: elfarm-nabi.c $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h \ + $(INCDIR)/filenames.h elf-bfd.h $(INCDIR)/elf/common.h \ $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + elf32-arm.h elf32-target.h +elf32-avr.lo: elf32-avr.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/avr.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf32-fr30.lo: elf32-fr30.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/fr30.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-gen.lo: elf32-gen.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ +elf32-d10v.lo: elf32-d10v.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h elf32-target.h +elf32-d30v.lo: elf32-d30v.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h elf32-target.h +elf32-fr30.lo: elf32-fr30.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/fr30.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf32-hppa.lo: elf32-hppa.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h libhppa.h \ - elf32-hppa.h elf-hppa.h hppa_stubs.h elf32-target.h -elf32-i370.lo: elf32-i370.c $(INCDIR)/bfdlink.h elf-bfd.h \ +elf32-gen.lo: elf32-gen.c $(INCDIR)/filenames.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/i370.h elf32-target.h -elf32-i386.lo: elf32-i386.c $(INCDIR)/bfdlink.h elf-bfd.h \ + $(INCDIR)/bfdlink.h elf32-target.h +elf32-hppa.lo: elf32-hppa.c $(INCDIR)/filenames.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/i386.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-i860.lo: elf32-i860.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h \ + libhppa.h elf32-hppa.h elf-hppa.h hppa_stubs.h elf32-target.h +elf32-i370.lo: elf32-i370.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/i370.h elf32-target.h +elf32-i386.lo: elf32-i386.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/i386.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf32-i960.lo: elf32-i960.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/i960.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-m32r.lo: elf32-m32r.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/m32r.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-m68k.lo: elf32-m68k.c $(INCDIR)/bfdlink.h elf-bfd.h \ +elf32-i860.lo: elf32-i860.c $(INCDIR)/filenames.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/m68k.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-m88k.lo: elf32-m88k.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/bfdlink.h elf32-target.h +elf32-i960.lo: elf32-i960.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/i960.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf-m10200.lo: elf-m10200.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ +elf32-m32r.lo: elf32-m32r.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/m32r.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf-m10300.lo: elf-m10300.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/reloc-macros.h \ +elf32-m68k.lo: elf32-m68k.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/m68k.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf32-mcore.lo: elf32-mcore.c $(INCDIR)/bfdlink.h elf-bfd.h \ +elf32-m88k.lo: elf32-m88k.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h elf32-target.h +elf-m10200.lo: elf-m10200.c $(INCDIR)/filenames.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/mcore.h $(INCDIR)/elf/reloc-macros.h \ + $(INCDIR)/bfdlink.h elf32-target.h +elf-m10300.lo: elf-m10300.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf32-mips.lo: elf32-mips.c $(INCDIR)/bfdlink.h genlink.h \ - elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ +elf32-mcore.lo: elf32-mcore.c $(INCDIR)/filenames.h \ + $(INCDIR)/bfdlink.h elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/elf/mcore.h \ + $(INCDIR)/elf/reloc-macros.h elf32-target.h +elf32-mips.lo: elf32-mips.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + genlink.h elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h \ $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/internal.h \ $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/mips.h ecoffswap.h \ elf32-target.h -elf32-pj.lo: elf32-pj.c $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/pj.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-ppc.lo: elf32-ppc.c $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-sh.lo: elf32-sh.c $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-sparc.lo: elf32-sparc.c $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/sparc.h $(INCDIR)/elf/reloc-macros.h \ +elf32-pj.lo: elf32-pj.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/pj.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf32-v850.lo: elf32-v850.c $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/v850.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32.lo: elf32.c elfcode.h $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - elfcore.h elflink.h -elflink.lo: elflink.c $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h -epoc-pe-arm.lo: epoc-pe-arm.c pe-arm.c coff-arm.c $(INCDIR)/coff/arm.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -epoc-pei-arm.lo: epoc-pei-arm.c pei-arm.c coff-arm.c \ - $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ - libpei.h -hp300bsd.lo: hp300bsd.c libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +elf32-ppc.lo: elf32-ppc.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h \ + elf32-target.h +elf32-sh.lo: elf32-sh.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \ + elf32-target.h +elf32-sparc.lo: elf32-sparc.c $(INCDIR)/filenames.h \ + $(INCDIR)/bfdlink.h elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/elf/sparc.h \ + $(INCDIR)/elf/reloc-macros.h $(INCDIR)/opcode/sparc.h \ + elf32-target.h +elf32-v850.lo: elf32-v850.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/v850.h $(INCDIR)/elf/reloc-macros.h \ + elf32-target.h +elf32.lo: elf32.c elfcode.h $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h elfcore.h elflink.h +elflink.lo: elflink.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h +epoc-pe-arm.lo: epoc-pe-arm.c pe-arm.c $(INCDIR)/filenames.h \ + coff-arm.c $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h coffcode.h \ + peicode.h libpei.h +epoc-pei-arm.lo: epoc-pei-arm.c pei-arm.c $(INCDIR)/filenames.h \ + coff-arm.c $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h coffcode.h \ + peicode.h libpei.h +hp300bsd.lo: hp300bsd.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h hp300hpux.lo: hp300hpux.c $(INCDIR)/aout/hp300hpux.h \ - aoutx.h $(INCDIR)/bfdlink.h libaout.h $(INCDIR)/aout/aout64.h \ - $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ - aout-target.h -som.lo: som.c -i386aout.lo: i386aout.c $(INCDIR)/aout/aout64.h libaout.h \ - $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -i386bsd.lo: i386bsd.c libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ + aoutx.h $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h libaout.h \ + $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ + $(INCDIR)/aout/ar.h aout-target.h +som.lo: som.c $(INCDIR)/filenames.h +i386aout.lo: i386aout.c $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/stab_gnu.h \ $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +i386bsd.lo: i386bsd.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h i386dynix.lo: i386dynix.c $(INCDIR)/aout/dynix3.h aoutx.h \ - $(INCDIR)/bfdlink.h libaout.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h libaout.h \ + $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ + $(INCDIR)/aout/ar.h aout-target.h +i386freebsd.lo: i386freebsd.c freebsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +i386linux.lo: i386linux.c $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ - aout-target.h -i386freebsd.lo: i386freebsd.c freebsd.h libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -i386linux.lo: i386linux.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \ - $(INCDIR)/bfdlink.h aout-target.h -i386lynx.lo: i386lynx.c libaout.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/aout/aout64.h aout-target.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -i386msdos.lo: i386msdos.c libaout.h $(INCDIR)/bfdlink.h -i386netbsd.lo: i386netbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -i386mach3.lo: i386mach3.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \ - $(INCDIR)/bfdlink.h aout-target.h -i386os9k.lo: i386os9k.c $(INCDIR)/bfdlink.h libaout.h \ - $(INCDIR)/os9k.h -ieee.lo: ieee.c $(INCDIR)/ieee.h libieee.h -m68k4knetbsd.lo: m68k4knetbsd.c netbsd.h libaout.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h +i386lynx.lo: i386lynx.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h aout-target.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +i386msdos.lo: i386msdos.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h +i386netbsd.lo: i386netbsd.c netbsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +i386mach3.lo: i386mach3.c $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h +i386os9k.lo: i386os9k.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + libaout.h $(INCDIR)/os9k.h +ieee.lo: ieee.c $(INCDIR)/filenames.h $(INCDIR)/ieee.h \ + libieee.h +m68k4knetbsd.lo: m68k4knetbsd.c netbsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +m68klinux.lo: m68klinux.c $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h +m68klynx.lo: m68klynx.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h aout-target.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +m68knetbsd.lo: m68knetbsd.c netbsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +m88kmach3.lo: m88kmach3.c $(INCDIR)/filenames.h libaout.h \ $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -m68klinux.lo: m68klinux.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \ - $(INCDIR)/bfdlink.h aout-target.h -m68klynx.lo: m68klynx.c libaout.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/aout/aout64.h aout-target.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -m68knetbsd.lo: m68knetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -m88kmach3.lo: m88kmach3.c libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -mipsbsd.lo: mipsbsd.c libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -newsos3.lo: newsos3.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \ - $(INCDIR)/bfdlink.h aout-target.h -nlm.lo: nlm.c libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \ - $(INCDIR)/nlm/external.h -nlm32-i386.lo: nlm32-i386.c $(INCDIR)/nlm/i386-ext.h \ +mipsbsd.lo: mipsbsd.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +newsos3.lo: newsos3.c $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h +nlm.lo: nlm.c $(INCDIR)/filenames.h libnlm.h $(INCDIR)/nlm/common.h \ + $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h +nlm32-i386.lo: nlm32-i386.c $(INCDIR)/filenames.h $(INCDIR)/nlm/i386-ext.h \ libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \ $(INCDIR)/nlm/external.h nlmswap.h nlm-target.h -nlm32-sparc.lo: nlm32-sparc.c $(INCDIR)/nlm/sparc32-ext.h \ +nlm32-sparc.lo: nlm32-sparc.c $(INCDIR)/filenames.h \ + $(INCDIR)/nlm/sparc32-ext.h libnlm.h $(INCDIR)/nlm/common.h \ + $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h nlmswap.h \ + nlm-target.h +nlm32-ppc.lo: nlm32-ppc.c $(INCDIR)/filenames.h $(INCDIR)/nlm/ppc-ext.h \ libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \ $(INCDIR)/nlm/external.h nlmswap.h nlm-target.h -nlm32-ppc.lo: nlm32-ppc.c $(INCDIR)/nlm/ppc-ext.h libnlm.h \ - $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h \ - nlmswap.h nlm-target.h -nlm32.lo: nlm32.c nlmcode.h libnlm.h $(INCDIR)/nlm/common.h \ - $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h -ns32knetbsd.lo: ns32knetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -oasys.lo: oasys.c $(INCDIR)/oasys.h liboasys.h -pc532-mach.lo: pc532-mach.c libaout.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/aout/aout64.h aout-target.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -pe-arm.lo: pe-arm.c coff-arm.c $(INCDIR)/coff/arm.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pei-arm.lo: pei-arm.c coff-arm.c $(INCDIR)/coff/arm.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pe-i386.lo: pe-i386.c coff-i386.c $(INCDIR)/coff/i386.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pei-i386.lo: pei-i386.c coff-i386.c $(INCDIR)/coff/i386.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pe-mcore.lo: pe-mcore.c coff-mcore.c $(INCDIR)/coff/mcore.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pei-mcore.lo: pei-mcore.c coff-mcore.c $(INCDIR)/coff/mcore.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pe-ppc.lo: pe-ppc.c coff-ppc.c $(INCDIR)/coff/powerpc.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pei-ppc.lo: pei-ppc.c coff-ppc.c $(INCDIR)/coff/powerpc.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pe-sh.lo: pe-sh.c coff-sh.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/sh.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - coffcode.h peicode.h libpei.h -pei-sh.lo: pei-sh.c coff-sh.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/sh.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - coffcode.h peicode.h libpei.h -pe-mips.lo: pe-mips.c $(INCDIR)/coff/mipspe.h $(INCDIR)/coff/internal.h \ +nlm32.lo: nlm32.c nlmcode.h $(INCDIR)/filenames.h libnlm.h \ + $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h +ns32knetbsd.lo: ns32knetbsd.c netbsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +oasys.lo: oasys.c $(INCDIR)/filenames.h $(INCDIR)/oasys.h \ + liboasys.h +pc532-mach.lo: pc532-mach.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h aout-target.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +pe-arm.lo: pe-arm.c $(INCDIR)/filenames.h coff-arm.c \ + $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ + libpei.h +pei-arm.lo: pei-arm.c $(INCDIR)/filenames.h coff-arm.c \ + $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ + libpei.h +pe-i386.lo: pe-i386.c $(INCDIR)/filenames.h coff-i386.c \ + $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ + libpei.h +pei-i386.lo: pei-i386.c $(INCDIR)/filenames.h coff-i386.c \ + $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ + libpei.h +pe-mcore.lo: pe-mcore.c $(INCDIR)/filenames.h coff-mcore.c \ + $(INCDIR)/coff/mcore.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ + libpei.h +pei-mcore.lo: pei-mcore.c $(INCDIR)/filenames.h coff-mcore.c \ + $(INCDIR)/coff/mcore.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ + libpei.h +pe-ppc.lo: pe-ppc.c $(INCDIR)/filenames.h coff-ppc.c \ + $(INCDIR)/coff/powerpc.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h coffcode.h \ + peicode.h libpei.h +pei-ppc.lo: pei-ppc.c $(INCDIR)/filenames.h coff-ppc.c \ + $(INCDIR)/coff/powerpc.h $(INCDIR)/coff/internal.h \ $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h coffcode.h \ peicode.h libpei.h -pei-mips.lo: pei-mips.c pe-mips.c $(INCDIR)/coff/mipspe.h \ +pe-sh.lo: pe-sh.c $(INCDIR)/filenames.h coff-sh.c $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/sh.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h coffcode.h peicode.h libpei.h +pei-sh.lo: pei-sh.c $(INCDIR)/filenames.h coff-sh.c \ + $(INCDIR)/bfdlink.h $(INCDIR)/coff/sh.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/pe.h libcoff.h coffcode.h peicode.h \ + libpei.h +pe-mips.lo: pe-mips.c $(INCDIR)/filenames.h $(INCDIR)/coff/mipspe.h \ $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -peigen.lo: peigen.c $(INCDIR)/coff/internal.h $(INCDIR)/coff/i386.h \ - $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h libpei.h -ppcboot.lo: ppcboot.c -reloc16.lo: reloc16.c $(INCDIR)/bfdlink.h genlink.h \ - $(INCDIR)/coff/internal.h libcoff.h -riscix.lo: riscix.c libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \ - aout-target.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ - $(INCDIR)/aout/ar.h -sparclinux.lo: sparclinux.c $(INCDIR)/aout/aout64.h \ +pei-mips.lo: pei-mips.c $(INCDIR)/filenames.h pe-mips.c \ + $(INCDIR)/coff/mipspe.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ + libpei.h +peigen.lo: peigen.c $(INCDIR)/filenames.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/i386.h $(INCDIR)/coff/pe.h libcoff.h \ + $(INCDIR)/bfdlink.h libpei.h +ppcboot.lo: ppcboot.c $(INCDIR)/filenames.h +reloc16.lo: reloc16.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + genlink.h $(INCDIR)/coff/internal.h libcoff.h +riscix.lo: riscix.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h aout-target.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +sparclinux.lo: sparclinux.c $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ libaout.h $(INCDIR)/bfdlink.h aout-target.h -sparclynx.lo: sparclynx.c $(INCDIR)/aout/sun4.h libaout.h \ - $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h -sparcnetbsd.lo: sparcnetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -sunos.lo: sunos.c $(INCDIR)/bfdlink.h libaout.h aoutf1.h \ - $(INCDIR)/aout/sun4.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h -vaxnetbsd.lo: vaxnetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -versados.lo: versados.c $(INCDIR)/libiberty.h -vms.lo: vms.c $(INCDIR)/bfdlink.h vms.h -vms-gsd.lo: vms-gsd.c $(INCDIR)/bfdlink.h vms.h -vms-hdr.lo: vms-hdr.c $(INCDIR)/bfdlink.h vms.h -vms-misc.lo: vms-misc.c $(INCDIR)/bfdlink.h vms.h -vms-tir.lo: vms-tir.c $(INCDIR)/bfdlink.h vms.h -xcofflink.lo: xcofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \ - libcoff.h -aout64.lo: aout64.c aoutx.h $(INCDIR)/bfdlink.h libaout.h \ - $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ - $(INCDIR)/aout/ar.h -coff-alpha.lo: coff-alpha.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \ - $(INCDIR)/coff/alpha.h $(INCDIR)/aout/ar.h libcoff.h \ - libecoff.h coffswap.h ecoffswap.h -coff64-rs6000.lo: coff64-rs6000.c $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/rs6k64.h libcoff.h $(INCDIR)/bfdlink.h \ - xcoff-target.h coffcode.h coffswap.h -demo64.lo: demo64.c aoutf1.h $(INCDIR)/aout/sun4.h \ +sparclynx.lo: sparclynx.c $(INCDIR)/filenames.h $(INCDIR)/aout/sun4.h \ libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ aout-target.h -efi-app-ia64.lo: efi-app-ia64.c coff-ia64.c $(INCDIR)/coff/ia64.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -elf64-alpha.lo: elf64-alpha.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/alpha.h $(INCDIR)/elf/reloc-macros.h \ +sparcnetbsd.lo: sparcnetbsd.c netbsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +sunos.lo: sunos.c $(INCDIR)/bfdlink.h libaout.h aoutf1.h \ + $(INCDIR)/filenames.h $(INCDIR)/aout/sun4.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ + aout-target.h +vaxnetbsd.lo: vaxnetbsd.c netbsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +versados.lo: versados.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h +vms.lo: vms.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + vms.h +vms-gsd.lo: vms-gsd.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + vms.h +vms-hdr.lo: vms-hdr.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + vms.h +vms-misc.lo: vms-misc.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + vms.h +vms-tir.lo: vms-tir.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + vms.h +xcofflink.lo: xcofflink.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/internal.h libcoff.h +aout64.lo: aout64.c aoutx.h $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + libaout.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ + $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +coff-alpha.lo: coff-alpha.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h \ $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/alpha.h $(INCDIR)/aout/ar.h \ - libcoff.h libecoff.h ecoffswap.h elf64-target.h -elf64-hppa.lo: elf64-hppa.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h libhppa.h \ - elf64-hppa.h elf-hppa.h elf64-target.h -elf64-ia64.lo: elf64-ia64.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/opcode/ia64.h $(INCDIR)/elf/ia64.h $(INCDIR)/elf/reloc-macros.h \ - elf64-target.h -elf64-gen.lo: elf64-gen.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - elf64-target.h -elf64-mips.lo: elf64-mips.c $(INCDIR)/aout/ar.h $(INCDIR)/bfdlink.h \ - genlink.h elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/alpha.h ecoffswap.h \ - elf64-target.h -elf64-sparc.lo: elf64-sparc.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + libcoff.h libecoff.h coffswap.h ecoffswap.h +coff64-rs6000.lo: coff64-rs6000.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/rs6k64.h libcoff.h \ + $(INCDIR)/bfdlink.h xcoff-target.h coffcode.h coffswap.h +demo64.lo: demo64.c aoutf1.h $(INCDIR)/filenames.h \ + $(INCDIR)/aout/sun4.h libaout.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ + $(INCDIR)/aout/ar.h aout-target.h +efi-app-ia64.lo: efi-app-ia64.c $(INCDIR)/filenames.h \ + coff-ia64.c $(INCDIR)/coff/ia64.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h coffcode.h \ + peicode.h libpei.h +elf64-alpha.lo: elf64-alpha.c $(INCDIR)/filenames.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/alpha.h \ + $(INCDIR)/elf/reloc-macros.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \ + $(INCDIR)/coff/alpha.h $(INCDIR)/aout/ar.h libcoff.h \ + libecoff.h ecoffswap.h elf64-target.h +elf64-hppa.lo: elf64-hppa.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h \ + libhppa.h elf64-hppa.h elf-hppa.h elf64-target.h +elf64-ia64.lo: elf64-ia64.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/opcode/ia64.h $(INCDIR)/elf/ia64.h \ + $(INCDIR)/elf/reloc-macros.h elf64-target.h +elf64-gen.lo: elf64-gen.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h elf64-target.h +elf64-mips.lo: elf64-mips.c $(INCDIR)/filenames.h $(INCDIR)/aout/ar.h \ + $(INCDIR)/bfdlink.h genlink.h elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h \ + $(INCDIR)/elf/reloc-macros.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/alpha.h \ + ecoffswap.h elf64-target.h +elf64-sparc.lo: elf64-sparc.c $(INCDIR)/filenames.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/opcode/sparc.h \ $(INCDIR)/elf/sparc.h $(INCDIR)/elf/reloc-macros.h \ elf64-target.h -elf64.lo: elf64.c elfcode.h $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - elfcore.h elflink.h -nlm32-alpha.lo: nlm32-alpha.c $(INCDIR)/nlm/alpha-ext.h \ - libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \ - $(INCDIR)/nlm/external.h nlmswap.h nlm-target.h -nlm64.lo: nlm64.c nlmcode.h libnlm.h $(INCDIR)/nlm/common.h \ - $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h -aix386-core.lo: aix386-core.c $(INCDIR)/coff/i386.h \ - $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h -hpux-core.lo: hpux-core.c -irix-core.lo: irix-core.c -lynx-core.lo: lynx-core.c -osf-core.lo: osf-core.c -sco5-core.lo: sco5-core.c libaout.h $(INCDIR)/bfdlink.h -trad-core.lo: trad-core.c libaout.h $(INCDIR)/bfdlink.h -cisco-core.lo: cisco-core.c +elf64.lo: elf64.c elfcode.h $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h elfcore.h elflink.h +nlm32-alpha.lo: nlm32-alpha.c $(INCDIR)/filenames.h \ + $(INCDIR)/nlm/alpha-ext.h libnlm.h $(INCDIR)/nlm/common.h \ + $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h nlmswap.h \ + nlm-target.h +nlm64.lo: nlm64.c nlmcode.h $(INCDIR)/filenames.h libnlm.h \ + $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h +aix386-core.lo: aix386-core.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h libcoff.h \ + $(INCDIR)/bfdlink.h +hpux-core.lo: hpux-core.c $(INCDIR)/filenames.h +irix-core.lo: irix-core.c $(INCDIR)/filenames.h +lynx-core.lo: lynx-core.c $(INCDIR)/filenames.h +osf-core.lo: osf-core.c $(INCDIR)/filenames.h +sco5-core.lo: sco5-core.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h +trad-core.lo: trad-core.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h +cisco-core.lo: cisco-core.c $(INCDIR)/filenames.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff -upr --new-file binutils-2.9.5.0.42/bfd/Makefile.in binutils-2.9.5.0.46/bfd/Makefile.in --- binutils-2.9.5.0.42/bfd/Makefile.in Fri May 12 08:11:30 2000 +++ binutils-2.9.5.0.46/bfd/Makefile.in Tue May 30 12:34:26 2000 @@ -1198,498 +1198,563 @@ config.status: $(srcdir)/configure $(src # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -archive.lo: archive.c $(INCDIR)/aout/ar.h $(INCDIR)/aout/ranlib.h -archures.lo: archures.c -bfd.lo: bfd.c $(INCDIR)/libiberty.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h libcoff.h \ - libecoff.h $(INCDIR)/coff/ecoff.h elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h -cache.lo: cache.c -coffgen.lo: coffgen.c $(INCDIR)/coff/internal.h libcoff.h \ - $(INCDIR)/bfdlink.h -corefile.lo: corefile.c -format.lo: format.c -init.lo: init.c -libbfd.lo: libbfd.c -opncls.lo: opncls.c $(INCDIR)/objalloc.h -reloc.lo: reloc.c $(INCDIR)/bfdlink.h -section.lo: section.c $(INCDIR)/bfdlink.h -syms.lo: syms.c $(INCDIR)/bfdlink.h $(INCDIR)/aout/stab_gnu.h \ +archive.lo: archive.c $(INCDIR)/filenames.h $(INCDIR)/aout/ar.h \ + $(INCDIR)/aout/ranlib.h +archures.lo: archures.c $(INCDIR)/filenames.h +bfd.lo: bfd.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h \ + libcoff.h libecoff.h $(INCDIR)/coff/ecoff.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h +cache.lo: cache.c $(INCDIR)/filenames.h +coffgen.lo: coffgen.c $(INCDIR)/filenames.h $(INCDIR)/coff/internal.h \ + libcoff.h $(INCDIR)/bfdlink.h +corefile.lo: corefile.c $(INCDIR)/filenames.h +format.lo: format.c $(INCDIR)/filenames.h +init.lo: init.c $(INCDIR)/filenames.h +libbfd.lo: libbfd.c $(INCDIR)/filenames.h +opncls.lo: opncls.c $(INCDIR)/filenames.h $(INCDIR)/objalloc.h +reloc.lo: reloc.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h +section.lo: section.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h +syms.lo: syms.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def +targets.lo: targets.c $(INCDIR)/filenames.h $(INCDIR)/fnmatch.h \ + targmatch.h +hash.lo: hash.c $(INCDIR)/filenames.h $(INCDIR)/objalloc.h +linker.lo: linker.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + genlink.h +srec.lo: srec.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h +binary.lo: binary.c $(INCDIR)/filenames.h +tekhex.lo: tekhex.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h +ihex.lo: ihex.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h +stabs.lo: stabs.c $(INCDIR)/filenames.h $(INCDIR)/aout/stab_gnu.h \ $(INCDIR)/aout/stab.def -targets.lo: targets.c $(INCDIR)/fnmatch.h targmatch.h -hash.lo: hash.c $(INCDIR)/objalloc.h -linker.lo: linker.c $(INCDIR)/bfdlink.h genlink.h -srec.lo: srec.c $(INCDIR)/libiberty.h -binary.lo: binary.c -tekhex.lo: tekhex.c $(INCDIR)/libiberty.h -ihex.lo: ihex.c $(INCDIR)/libiberty.h -stabs.lo: stabs.c $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def stab-syms.lo: stab-syms.c libaout.h $(INCDIR)/bfdlink.h \ $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab.def -cpu-a29k.lo: cpu-a29k.c -cpu-alpha.lo: cpu-alpha.c -cpu-arc.lo: cpu-arc.c -cpu-arm.lo: cpu-arm.c -cpu-avr.lo: cpu-avr.c -cpu-d10v.lo: cpu-d10v.c -cpu-d30v.lo: cpu-d30v.c -cpu-fr30.lo: cpu-fr30.c -cpu-h8300.lo: cpu-h8300.c -cpu-h8500.lo: cpu-h8500.c -cpu-hppa.lo: cpu-hppa.c -cpu-ia64.lo: cpu-ia64.c cpu-ia64-opc.c $(srcdir)/../opcodes/ia64-opc.h \ - $(INCDIR)/opcode/ia64.h -cpu-i370.lo: cpu-i370.c -cpu-i386.lo: cpu-i386.c -cpu-i860.lo: cpu-i860.c -cpu-i960.lo: cpu-i960.c -cpu-m32r.lo: cpu-m32r.c -cpu-m68k.lo: cpu-m68k.c -cpu-m88k.lo: cpu-m88k.c -cpu-m10200.lo: cpu-m10200.c -cpu-m10300.lo: cpu-m10300.c -cpu-mcore.lo: cpu-mcore.c -cpu-mips.lo: cpu-mips.c -cpu-ns32k.lo: cpu-ns32k.c ns32k.h -cpu-pj.lo: cpu-pj.c -cpu-powerpc.lo: cpu-powerpc.c -cpu-rs6000.lo: cpu-rs6000.c -cpu-sh.lo: cpu-sh.c -cpu-sparc.lo: cpu-sparc.c -cpu-tic30.lo: cpu-tic30.c -cpu-tic54x.lo: cpu-tic54x.c -cpu-tic80.lo: cpu-tic80.c -cpu-v850.lo: cpu-v850.c -cpu-vax.lo: cpu-vax.c -cpu-we32k.lo: cpu-we32k.c -cpu-w65.lo: cpu-w65.c -cpu-z8k.lo: cpu-z8k.c -aout-adobe.lo: aout-adobe.c $(INCDIR)/aout/adobe.h \ +cpu-a29k.lo: cpu-a29k.c $(INCDIR)/filenames.h +cpu-alpha.lo: cpu-alpha.c $(INCDIR)/filenames.h +cpu-arc.lo: cpu-arc.c $(INCDIR)/filenames.h +cpu-arm.lo: cpu-arm.c $(INCDIR)/filenames.h +cpu-avr.lo: cpu-avr.c $(INCDIR)/filenames.h +cpu-d10v.lo: cpu-d10v.c $(INCDIR)/filenames.h +cpu-d30v.lo: cpu-d30v.c $(INCDIR)/filenames.h +cpu-fr30.lo: cpu-fr30.c $(INCDIR)/filenames.h +cpu-h8300.lo: cpu-h8300.c $(INCDIR)/filenames.h +cpu-h8500.lo: cpu-h8500.c $(INCDIR)/filenames.h +cpu-hppa.lo: cpu-hppa.c $(INCDIR)/filenames.h +cpu-ia64.lo: cpu-ia64.c $(INCDIR)/filenames.h cpu-ia64-opc.c \ + $(srcdir)/../opcodes/ia64-opc.h $(INCDIR)/opcode/ia64.h +cpu-i370.lo: cpu-i370.c $(INCDIR)/filenames.h +cpu-i386.lo: cpu-i386.c $(INCDIR)/filenames.h +cpu-i860.lo: cpu-i860.c $(INCDIR)/filenames.h +cpu-i960.lo: cpu-i960.c $(INCDIR)/filenames.h +cpu-m32r.lo: cpu-m32r.c $(INCDIR)/filenames.h +cpu-m68k.lo: cpu-m68k.c $(INCDIR)/filenames.h +cpu-m88k.lo: cpu-m88k.c $(INCDIR)/filenames.h +cpu-m10200.lo: cpu-m10200.c $(INCDIR)/filenames.h +cpu-m10300.lo: cpu-m10300.c $(INCDIR)/filenames.h +cpu-mcore.lo: cpu-mcore.c $(INCDIR)/filenames.h +cpu-mips.lo: cpu-mips.c $(INCDIR)/filenames.h +cpu-ns32k.lo: cpu-ns32k.c $(INCDIR)/filenames.h ns32k.h +cpu-pj.lo: cpu-pj.c $(INCDIR)/filenames.h +cpu-powerpc.lo: cpu-powerpc.c $(INCDIR)/filenames.h +cpu-rs6000.lo: cpu-rs6000.c $(INCDIR)/filenames.h +cpu-sh.lo: cpu-sh.c $(INCDIR)/filenames.h +cpu-sparc.lo: cpu-sparc.c $(INCDIR)/filenames.h +cpu-tic30.lo: cpu-tic30.c $(INCDIR)/filenames.h +cpu-tic54x.lo: cpu-tic54x.c $(INCDIR)/filenames.h +cpu-tic80.lo: cpu-tic80.c $(INCDIR)/filenames.h +cpu-v850.lo: cpu-v850.c $(INCDIR)/filenames.h +cpu-vax.lo: cpu-vax.c $(INCDIR)/filenames.h +cpu-we32k.lo: cpu-we32k.c $(INCDIR)/filenames.h +cpu-w65.lo: cpu-w65.c $(INCDIR)/filenames.h +cpu-z8k.lo: cpu-z8k.c $(INCDIR)/filenames.h +aout-adobe.lo: aout-adobe.c $(INCDIR)/filenames.h $(INCDIR)/aout/adobe.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def libaout.h \ $(INCDIR)/bfdlink.h -aout-arm.lo: aout-arm.c libaout.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/aout/aout64.h aoutx.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h +aout-arm.lo: aout-arm.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h aoutx.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ + aout-target.h aout-ns32k.lo: aout-ns32k.c $(INCDIR)/aout/aout64.h \ ns32k.h libaout.h $(INCDIR)/bfdlink.h aout-sparcle.lo: aout-sparcle.c $(INCDIR)/bfdlink.h \ - libaout.h aoutf1.h $(INCDIR)/aout/sun4.h $(INCDIR)/aout/aout64.h \ - $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ - aout-target.h -aout-tic30.lo: aout-tic30.c libaout.h $(INCDIR)/bfdlink.h \ + libaout.h aoutf1.h $(INCDIR)/filenames.h $(INCDIR)/aout/sun4.h \ $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ - $(INCDIR)/aout/ar.h aoutx.h -aout0.lo: aout0.c aoutf1.h $(INCDIR)/aout/sun4.h libaout.h \ + $(INCDIR)/aout/ar.h aout-target.h +aout-tic30.lo: aout-tic30.c $(INCDIR)/filenames.h libaout.h \ $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h -aout32.lo: aout32.c aoutx.h $(INCDIR)/bfdlink.h libaout.h \ - $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ - $(INCDIR)/aout/ar.h -armnetbsd.lo: armnetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ + $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aoutx.h +aout0.lo: aout0.c aoutf1.h $(INCDIR)/filenames.h $(INCDIR)/aout/sun4.h \ + libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ + aout-target.h +aout32.lo: aout32.c aoutx.h $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + libaout.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -bout.lo: bout.c $(INCDIR)/bfdlink.h genlink.h $(INCDIR)/bout.h \ - $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def libaout.h -cf-i386lynx.lo: cf-i386lynx.c coff-i386.c $(INCDIR)/coff/i386.h \ +armnetbsd.lo: armnetbsd.c netbsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +bout.lo: bout.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + genlink.h $(INCDIR)/bout.h $(INCDIR)/aout/stab_gnu.h \ + $(INCDIR)/aout/stab.def libaout.h +cf-i386lynx.lo: cf-i386lynx.c $(INCDIR)/filenames.h \ + coff-i386.c $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h +cf-m68klynx.lo: cf-m68klynx.c coff-m68k.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/m68k.h $(INCDIR)/coff/internal.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h coffswap.h +cf-sparclynx.lo: cf-sparclynx.c coff-sparc.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/sparc.h $(INCDIR)/coff/internal.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h coffswap.h +coff-a29k.lo: coff-a29k.c $(INCDIR)/filenames.h $(INCDIR)/coff/a29k.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -cf-m68klynx.lo: cf-m68klynx.c coff-m68k.c $(INCDIR)/coff/m68k.h \ +coff-apollo.lo: coff-apollo.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/apollo.h $(INCDIR)/coff/internal.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h coffswap.h +coff-arm.lo: coff-arm.c $(INCDIR)/filenames.h $(INCDIR)/coff/arm.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -cf-sparclynx.lo: cf-sparclynx.c coff-sparc.c $(INCDIR)/coff/sparc.h \ +coff-aux.lo: coff-aux.c $(INCDIR)/filenames.h $(INCDIR)/coff/aux-coff.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/m68k.h coff-m68k.c \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h +coff-h8300.lo: coff-h8300.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + genlink.h $(INCDIR)/coff/h8300.h $(INCDIR)/coff/internal.h \ + libcoff.h coffcode.h coffswap.h +coff-h8500.lo: coff-h8500.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/h8500.h $(INCDIR)/coff/internal.h libcoff.h \ + coffcode.h coffswap.h +coff-i386.lo: coff-i386.c $(INCDIR)/filenames.h $(INCDIR)/coff/i386.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-a29k.lo: coff-a29k.c $(INCDIR)/coff/a29k.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -coff-apollo.lo: coff-apollo.c $(INCDIR)/coff/apollo.h \ +coff-i860.lo: coff-i860.c $(INCDIR)/filenames.h $(INCDIR)/coff/i860.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-arm.lo: coff-arm.c $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -coff-aux.lo: coff-aux.c $(INCDIR)/coff/aux-coff.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/m68k.h coff-m68k.c libcoff.h $(INCDIR)/bfdlink.h \ +coff-go32.lo: coff-go32.c coff-i386.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h coffswap.h +coff-i960.lo: coff-i960.c $(INCDIR)/filenames.h $(INCDIR)/coff/i960.h \ + $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-h8300.lo: coff-h8300.c $(INCDIR)/bfdlink.h genlink.h \ - $(INCDIR)/coff/h8300.h $(INCDIR)/coff/internal.h libcoff.h \ +coff-m68k.lo: coff-m68k.c $(INCDIR)/filenames.h $(INCDIR)/coff/m68k.h \ + $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-h8500.lo: coff-h8500.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/h8500.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h -coff-i386.lo: coff-i386.c $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -coff-i860.lo: coff-i860.c $(INCDIR)/coff/i860.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -coff-go32.lo: coff-go32.c coff-i386.c $(INCDIR)/coff/i386.h \ +coff-m88k.lo: coff-m88k.c $(INCDIR)/filenames.h $(INCDIR)/coff/m88k.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-i960.lo: coff-i960.c $(INCDIR)/coff/i960.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -coff-m68k.lo: coff-m68k.c $(INCDIR)/coff/m68k.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -coff-m88k.lo: coff-m88k.c $(INCDIR)/coff/m88k.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -coff-mips.lo: coff-mips.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \ - $(INCDIR)/coff/mips.h libcoff.h libecoff.h coffswap.h \ - ecoffswap.h -coff-pmac.lo: coff-pmac.c $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/rs6000.h libcoff.h $(INCDIR)/bfdlink.h \ - xcoff-target.h coffcode.h coffswap.h -coff-rs6000.lo: coff-rs6000.c $(INCDIR)/coff/internal.h \ +coff-mips.lo: coff-mips.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h \ + $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/mips.h libcoff.h \ + libecoff.h coffswap.h ecoffswap.h +coff-pmac.lo: coff-pmac.c $(INCDIR)/filenames.h $(INCDIR)/coff/internal.h \ $(INCDIR)/coff/rs6000.h libcoff.h $(INCDIR)/bfdlink.h \ xcoff-target.h coffcode.h coffswap.h -coff-sh.lo: coff-sh.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/sh.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h -coff-sparc.lo: coff-sparc.c $(INCDIR)/coff/sparc.h \ +coff-rs6000.lo: coff-rs6000.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/rs6000.h libcoff.h \ + $(INCDIR)/bfdlink.h xcoff-target.h coffcode.h coffswap.h +coff-sh.lo: coff-sh.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/sh.h $(INCDIR)/coff/internal.h libcoff.h \ + coffcode.h coffswap.h +coff-sparc.lo: coff-sparc.c $(INCDIR)/filenames.h $(INCDIR)/coff/sparc.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-stgo32.lo: coff-stgo32.c coff-i386.c $(INCDIR)/coff/i386.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/go32exe.h \ +coff-stgo32.lo: coff-stgo32.c coff-i386.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/go32exe.h \ libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h \ go32stub.h -coff-svm68k.lo: coff-svm68k.c coff-m68k.c $(INCDIR)/coff/m68k.h \ - $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ +coff-svm68k.lo: coff-svm68k.c coff-m68k.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/m68k.h $(INCDIR)/coff/internal.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h coffswap.h +coff-tic30.lo: coff-tic30.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/tic30.h $(INCDIR)/coff/internal.h libcoff.h \ coffcode.h coffswap.h -coff-tic30.lo: coff-tic30.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/tic30.h \ +coff-tic54x.lo: coff-tic54x.c $(INCDIR)/filenames.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/coff/tic54x.h $(INCDIR)/coff/ti.h \ $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h -coff-tic54x.lo: coff-tic54x.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/tic54x.h \ - $(INCDIR)/coff/ti.h $(INCDIR)/coff/internal.h libcoff.h \ +coff-tic80.lo: coff-tic80.c $(INCDIR)/bfdlink.h $(INCDIR)/filenames.h \ + $(INCDIR)/coff/tic80.h $(INCDIR)/coff/internal.h libcoff.h \ coffcode.h coffswap.h -coff-tic80.lo: coff-tic80.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/tic80.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h -coff-u68k.lo: coff-u68k.c coff-m68k.c $(INCDIR)/coff/m68k.h \ +coff-u68k.lo: coff-u68k.c coff-m68k.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/m68k.h $(INCDIR)/coff/internal.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h coffswap.h +coff-we32k.lo: coff-we32k.c $(INCDIR)/filenames.h $(INCDIR)/coff/we32k.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-we32k.lo: coff-we32k.c $(INCDIR)/coff/we32k.h \ - $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ +coff-w65.lo: coff-w65.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/w65.h $(INCDIR)/coff/internal.h libcoff.h \ coffcode.h coffswap.h -coff-w65.lo: coff-w65.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/w65.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h -coff-z8k.lo: coff-z8k.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/z8k.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h -cofflink.lo: cofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \ - libcoff.h -dwarf1.lo: dwarf1.c $(INCDIR)/libiberty.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/bfdlink.h $(INCDIR)/elf/dwarf.h -dwarf2.lo: dwarf2.c $(INCDIR)/libiberty.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/bfdlink.h $(INCDIR)/elf/dwarf2.h -ecoff.lo: ecoff.c $(INCDIR)/bfdlink.h $(INCDIR)/aout/ar.h \ - $(INCDIR)/aout/ranlib.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ - libaout.h $(INCDIR)/aout/aout64.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \ - libcoff.h libecoff.h -ecofflink.lo: ecofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/objalloc.h \ - $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \ - libcoff.h libecoff.h -efi-app-ia32.lo: efi-app-ia32.c coff-i386.c $(INCDIR)/coff/i386.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -elf.lo: elf.c $(INCDIR)/bfdlink.h elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h -elf32-arc.lo: elf32-arc.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/arc.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elfarm-oabi.lo: elfarm-oabi.c $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h \ +coff-z8k.lo: coff-z8k.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/z8k.h $(INCDIR)/coff/internal.h libcoff.h \ + coffcode.h coffswap.h +cofflink.lo: cofflink.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/internal.h libcoff.h +dwarf1.lo: dwarf1.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \ elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h elf32-arm.h \ - elf32-target.h -elfarm-nabi.lo: elfarm-nabi.c $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h \ + $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/dwarf.h +dwarf2.lo: dwarf2.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/dwarf2.h +ecoff.lo: ecoff.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/aout/ar.h $(INCDIR)/aout/ranlib.h $(INCDIR)/aout/stab_gnu.h \ + $(INCDIR)/aout/stab.def libaout.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h \ + $(INCDIR)/coff/ecoff.h libcoff.h libecoff.h +ecofflink.lo: ecofflink.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/objalloc.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h \ + $(INCDIR)/coff/ecoff.h libcoff.h libecoff.h +efi-app-ia32.lo: efi-app-ia32.c $(INCDIR)/filenames.h \ + coff-i386.c $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h coffcode.h \ + peicode.h libpei.h +elf.lo: elf.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h elf32-arm.h \ + $(INCDIR)/elf/external.h +elf32-arc.lo: elf32-arc.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/arc.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf32-avr.lo: elf32-avr.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/avr.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-d10v.lo: elf32-d10v.c elf-bfd.h $(INCDIR)/elf/common.h \ +elfarm-oabi.lo: elfarm-oabi.c $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h \ + $(INCDIR)/filenames.h elf-bfd.h $(INCDIR)/elf/common.h \ $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - elf32-target.h -elf32-d30v.lo: elf32-d30v.c elf-bfd.h $(INCDIR)/elf/common.h \ + elf32-arm.h elf32-target.h +elfarm-nabi.lo: elfarm-nabi.c $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h \ + $(INCDIR)/filenames.h elf-bfd.h $(INCDIR)/elf/common.h \ $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + elf32-arm.h elf32-target.h +elf32-avr.lo: elf32-avr.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/avr.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf32-fr30.lo: elf32-fr30.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/fr30.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-gen.lo: elf32-gen.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ +elf32-d10v.lo: elf32-d10v.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h elf32-target.h +elf32-d30v.lo: elf32-d30v.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h elf32-target.h +elf32-fr30.lo: elf32-fr30.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/fr30.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf32-hppa.lo: elf32-hppa.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h libhppa.h \ - elf32-hppa.h elf-hppa.h hppa_stubs.h elf32-target.h -elf32-i370.lo: elf32-i370.c $(INCDIR)/bfdlink.h elf-bfd.h \ +elf32-gen.lo: elf32-gen.c $(INCDIR)/filenames.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/i370.h elf32-target.h -elf32-i386.lo: elf32-i386.c $(INCDIR)/bfdlink.h elf-bfd.h \ + $(INCDIR)/bfdlink.h elf32-target.h +elf32-hppa.lo: elf32-hppa.c $(INCDIR)/filenames.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/i386.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-i860.lo: elf32-i860.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h \ + libhppa.h elf32-hppa.h elf-hppa.h hppa_stubs.h elf32-target.h +elf32-i370.lo: elf32-i370.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/i370.h elf32-target.h +elf32-i386.lo: elf32-i386.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/i386.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf32-i960.lo: elf32-i960.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/i960.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-m32r.lo: elf32-m32r.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/m32r.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-m68k.lo: elf32-m68k.c $(INCDIR)/bfdlink.h elf-bfd.h \ +elf32-i860.lo: elf32-i860.c $(INCDIR)/filenames.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/m68k.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-m88k.lo: elf32-m88k.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/bfdlink.h elf32-target.h +elf32-i960.lo: elf32-i960.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/i960.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf-m10200.lo: elf-m10200.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ +elf32-m32r.lo: elf32-m32r.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/m32r.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf-m10300.lo: elf-m10300.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/reloc-macros.h \ +elf32-m68k.lo: elf32-m68k.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/m68k.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf32-mcore.lo: elf32-mcore.c $(INCDIR)/bfdlink.h elf-bfd.h \ +elf32-m88k.lo: elf32-m88k.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h elf32-target.h +elf-m10200.lo: elf-m10200.c $(INCDIR)/filenames.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/mcore.h $(INCDIR)/elf/reloc-macros.h \ + $(INCDIR)/bfdlink.h elf32-target.h +elf-m10300.lo: elf-m10300.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf32-mips.lo: elf32-mips.c $(INCDIR)/bfdlink.h genlink.h \ - elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ +elf32-mcore.lo: elf32-mcore.c $(INCDIR)/filenames.h \ + $(INCDIR)/bfdlink.h elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/elf/mcore.h \ + $(INCDIR)/elf/reloc-macros.h elf32-target.h +elf32-mips.lo: elf32-mips.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + genlink.h elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h \ $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/internal.h \ $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/mips.h ecoffswap.h \ elf32-target.h -elf32-pj.lo: elf32-pj.c $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/pj.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-ppc.lo: elf32-ppc.c $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-sh.lo: elf32-sh.c $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32-sparc.lo: elf32-sparc.c $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/sparc.h $(INCDIR)/elf/reloc-macros.h \ +elf32-pj.lo: elf32-pj.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/pj.h $(INCDIR)/elf/reloc-macros.h \ elf32-target.h -elf32-v850.lo: elf32-v850.c $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/v850.h $(INCDIR)/elf/reloc-macros.h elf32-target.h -elf32.lo: elf32.c elfcode.h $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - elfcore.h elflink.h -elflink.lo: elflink.c $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h -epoc-pe-arm.lo: epoc-pe-arm.c pe-arm.c coff-arm.c $(INCDIR)/coff/arm.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -epoc-pei-arm.lo: epoc-pei-arm.c pei-arm.c coff-arm.c \ - $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ - libpei.h -hp300bsd.lo: hp300bsd.c libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +elf32-ppc.lo: elf32-ppc.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h \ + elf32-target.h +elf32-sh.lo: elf32-sh.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \ + elf32-target.h +elf32-sparc.lo: elf32-sparc.c $(INCDIR)/filenames.h \ + $(INCDIR)/bfdlink.h elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/elf/sparc.h \ + $(INCDIR)/elf/reloc-macros.h $(INCDIR)/opcode/sparc.h \ + elf32-target.h +elf32-v850.lo: elf32-v850.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/v850.h $(INCDIR)/elf/reloc-macros.h \ + elf32-target.h +elf32.lo: elf32.c elfcode.h $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h elfcore.h elflink.h +elflink.lo: elflink.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h +epoc-pe-arm.lo: epoc-pe-arm.c pe-arm.c $(INCDIR)/filenames.h \ + coff-arm.c $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h coffcode.h \ + peicode.h libpei.h +epoc-pei-arm.lo: epoc-pei-arm.c pei-arm.c $(INCDIR)/filenames.h \ + coff-arm.c $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h coffcode.h \ + peicode.h libpei.h +hp300bsd.lo: hp300bsd.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h hp300hpux.lo: hp300hpux.c $(INCDIR)/aout/hp300hpux.h \ - aoutx.h $(INCDIR)/bfdlink.h libaout.h $(INCDIR)/aout/aout64.h \ - $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ - aout-target.h -som.lo: som.c -i386aout.lo: i386aout.c $(INCDIR)/aout/aout64.h libaout.h \ - $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -i386bsd.lo: i386bsd.c libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ + aoutx.h $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h libaout.h \ + $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ + $(INCDIR)/aout/ar.h aout-target.h +som.lo: som.c $(INCDIR)/filenames.h +i386aout.lo: i386aout.c $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/stab_gnu.h \ $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +i386bsd.lo: i386bsd.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h i386dynix.lo: i386dynix.c $(INCDIR)/aout/dynix3.h aoutx.h \ - $(INCDIR)/bfdlink.h libaout.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h libaout.h \ + $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ + $(INCDIR)/aout/ar.h aout-target.h +i386freebsd.lo: i386freebsd.c freebsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +i386linux.lo: i386linux.c $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ - aout-target.h -i386freebsd.lo: i386freebsd.c freebsd.h libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -i386linux.lo: i386linux.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \ - $(INCDIR)/bfdlink.h aout-target.h -i386lynx.lo: i386lynx.c libaout.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/aout/aout64.h aout-target.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -i386msdos.lo: i386msdos.c libaout.h $(INCDIR)/bfdlink.h -i386netbsd.lo: i386netbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -i386mach3.lo: i386mach3.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \ - $(INCDIR)/bfdlink.h aout-target.h -i386os9k.lo: i386os9k.c $(INCDIR)/bfdlink.h libaout.h \ - $(INCDIR)/os9k.h -ieee.lo: ieee.c $(INCDIR)/ieee.h libieee.h -m68k4knetbsd.lo: m68k4knetbsd.c netbsd.h libaout.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h +i386lynx.lo: i386lynx.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h aout-target.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +i386msdos.lo: i386msdos.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h +i386netbsd.lo: i386netbsd.c netbsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +i386mach3.lo: i386mach3.c $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h +i386os9k.lo: i386os9k.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + libaout.h $(INCDIR)/os9k.h +ieee.lo: ieee.c $(INCDIR)/filenames.h $(INCDIR)/ieee.h \ + libieee.h +m68k4knetbsd.lo: m68k4knetbsd.c netbsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +m68klinux.lo: m68klinux.c $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h +m68klynx.lo: m68klynx.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h aout-target.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +m68knetbsd.lo: m68knetbsd.c netbsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +m88kmach3.lo: m88kmach3.c $(INCDIR)/filenames.h libaout.h \ $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -m68klinux.lo: m68klinux.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \ - $(INCDIR)/bfdlink.h aout-target.h -m68klynx.lo: m68klynx.c libaout.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/aout/aout64.h aout-target.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -m68knetbsd.lo: m68knetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -m88kmach3.lo: m88kmach3.c libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -mipsbsd.lo: mipsbsd.c libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -newsos3.lo: newsos3.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \ - $(INCDIR)/bfdlink.h aout-target.h -nlm.lo: nlm.c libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \ - $(INCDIR)/nlm/external.h -nlm32-i386.lo: nlm32-i386.c $(INCDIR)/nlm/i386-ext.h \ +mipsbsd.lo: mipsbsd.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +newsos3.lo: newsos3.c $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h +nlm.lo: nlm.c $(INCDIR)/filenames.h libnlm.h $(INCDIR)/nlm/common.h \ + $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h +nlm32-i386.lo: nlm32-i386.c $(INCDIR)/filenames.h $(INCDIR)/nlm/i386-ext.h \ libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \ $(INCDIR)/nlm/external.h nlmswap.h nlm-target.h -nlm32-sparc.lo: nlm32-sparc.c $(INCDIR)/nlm/sparc32-ext.h \ +nlm32-sparc.lo: nlm32-sparc.c $(INCDIR)/filenames.h \ + $(INCDIR)/nlm/sparc32-ext.h libnlm.h $(INCDIR)/nlm/common.h \ + $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h nlmswap.h \ + nlm-target.h +nlm32-ppc.lo: nlm32-ppc.c $(INCDIR)/filenames.h $(INCDIR)/nlm/ppc-ext.h \ libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \ $(INCDIR)/nlm/external.h nlmswap.h nlm-target.h -nlm32-ppc.lo: nlm32-ppc.c $(INCDIR)/nlm/ppc-ext.h libnlm.h \ - $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h \ - nlmswap.h nlm-target.h -nlm32.lo: nlm32.c nlmcode.h libnlm.h $(INCDIR)/nlm/common.h \ - $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h -ns32knetbsd.lo: ns32knetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -oasys.lo: oasys.c $(INCDIR)/oasys.h liboasys.h -pc532-mach.lo: pc532-mach.c libaout.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/aout/aout64.h aout-target.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -pe-arm.lo: pe-arm.c coff-arm.c $(INCDIR)/coff/arm.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pei-arm.lo: pei-arm.c coff-arm.c $(INCDIR)/coff/arm.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pe-i386.lo: pe-i386.c coff-i386.c $(INCDIR)/coff/i386.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pei-i386.lo: pei-i386.c coff-i386.c $(INCDIR)/coff/i386.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pe-mcore.lo: pe-mcore.c coff-mcore.c $(INCDIR)/coff/mcore.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pei-mcore.lo: pei-mcore.c coff-mcore.c $(INCDIR)/coff/mcore.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pe-ppc.lo: pe-ppc.c coff-ppc.c $(INCDIR)/coff/powerpc.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pei-ppc.lo: pei-ppc.c coff-ppc.c $(INCDIR)/coff/powerpc.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -pe-sh.lo: pe-sh.c coff-sh.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/sh.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - coffcode.h peicode.h libpei.h -pei-sh.lo: pei-sh.c coff-sh.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/sh.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - coffcode.h peicode.h libpei.h -pe-mips.lo: pe-mips.c $(INCDIR)/coff/mipspe.h $(INCDIR)/coff/internal.h \ +nlm32.lo: nlm32.c nlmcode.h $(INCDIR)/filenames.h libnlm.h \ + $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h +ns32knetbsd.lo: ns32knetbsd.c netbsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +oasys.lo: oasys.c $(INCDIR)/filenames.h $(INCDIR)/oasys.h \ + liboasys.h +pc532-mach.lo: pc532-mach.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h aout-target.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +pe-arm.lo: pe-arm.c $(INCDIR)/filenames.h coff-arm.c \ + $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ + libpei.h +pei-arm.lo: pei-arm.c $(INCDIR)/filenames.h coff-arm.c \ + $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ + libpei.h +pe-i386.lo: pe-i386.c $(INCDIR)/filenames.h coff-i386.c \ + $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ + libpei.h +pei-i386.lo: pei-i386.c $(INCDIR)/filenames.h coff-i386.c \ + $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ + libpei.h +pe-mcore.lo: pe-mcore.c $(INCDIR)/filenames.h coff-mcore.c \ + $(INCDIR)/coff/mcore.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ + libpei.h +pei-mcore.lo: pei-mcore.c $(INCDIR)/filenames.h coff-mcore.c \ + $(INCDIR)/coff/mcore.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ + libpei.h +pe-ppc.lo: pe-ppc.c $(INCDIR)/filenames.h coff-ppc.c \ + $(INCDIR)/coff/powerpc.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h coffcode.h \ + peicode.h libpei.h +pei-ppc.lo: pei-ppc.c $(INCDIR)/filenames.h coff-ppc.c \ + $(INCDIR)/coff/powerpc.h $(INCDIR)/coff/internal.h \ $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h coffcode.h \ peicode.h libpei.h -pei-mips.lo: pei-mips.c pe-mips.c $(INCDIR)/coff/mipspe.h \ +pe-sh.lo: pe-sh.c $(INCDIR)/filenames.h coff-sh.c $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/sh.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h coffcode.h peicode.h libpei.h +pei-sh.lo: pei-sh.c $(INCDIR)/filenames.h coff-sh.c \ + $(INCDIR)/bfdlink.h $(INCDIR)/coff/sh.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/pe.h libcoff.h coffcode.h peicode.h \ + libpei.h +pe-mips.lo: pe-mips.c $(INCDIR)/filenames.h $(INCDIR)/coff/mipspe.h \ $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -peigen.lo: peigen.c $(INCDIR)/coff/internal.h $(INCDIR)/coff/i386.h \ - $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h libpei.h -ppcboot.lo: ppcboot.c -reloc16.lo: reloc16.c $(INCDIR)/bfdlink.h genlink.h \ - $(INCDIR)/coff/internal.h libcoff.h -riscix.lo: riscix.c libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \ - aout-target.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ - $(INCDIR)/aout/ar.h -sparclinux.lo: sparclinux.c $(INCDIR)/aout/aout64.h \ +pei-mips.lo: pei-mips.c $(INCDIR)/filenames.h pe-mips.c \ + $(INCDIR)/coff/mipspe.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h \ + libcoff.h $(INCDIR)/bfdlink.h coffcode.h peicode.h \ + libpei.h +peigen.lo: peigen.c $(INCDIR)/filenames.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/i386.h $(INCDIR)/coff/pe.h libcoff.h \ + $(INCDIR)/bfdlink.h libpei.h +ppcboot.lo: ppcboot.c $(INCDIR)/filenames.h +reloc16.lo: reloc16.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + genlink.h $(INCDIR)/coff/internal.h libcoff.h +riscix.lo: riscix.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h aout-target.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +sparclinux.lo: sparclinux.c $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ libaout.h $(INCDIR)/bfdlink.h aout-target.h -sparclynx.lo: sparclynx.c $(INCDIR)/aout/sun4.h libaout.h \ - $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h -sparcnetbsd.lo: sparcnetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -sunos.lo: sunos.c $(INCDIR)/bfdlink.h libaout.h aoutf1.h \ - $(INCDIR)/aout/sun4.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h -vaxnetbsd.lo: vaxnetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \ - aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -versados.lo: versados.c $(INCDIR)/libiberty.h -vms.lo: vms.c $(INCDIR)/bfdlink.h vms.h -vms-gsd.lo: vms-gsd.c $(INCDIR)/bfdlink.h vms.h -vms-hdr.lo: vms-hdr.c $(INCDIR)/bfdlink.h vms.h -vms-misc.lo: vms-misc.c $(INCDIR)/bfdlink.h vms.h -vms-tir.lo: vms-tir.c $(INCDIR)/bfdlink.h vms.h -xcofflink.lo: xcofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \ - libcoff.h -aout64.lo: aout64.c aoutx.h $(INCDIR)/bfdlink.h libaout.h \ - $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ - $(INCDIR)/aout/ar.h -coff-alpha.lo: coff-alpha.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \ - $(INCDIR)/coff/alpha.h $(INCDIR)/aout/ar.h libcoff.h \ - libecoff.h coffswap.h ecoffswap.h -coff64-rs6000.lo: coff64-rs6000.c $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/rs6k64.h libcoff.h $(INCDIR)/bfdlink.h \ - xcoff-target.h coffcode.h coffswap.h -demo64.lo: demo64.c aoutf1.h $(INCDIR)/aout/sun4.h \ +sparclynx.lo: sparclynx.c $(INCDIR)/filenames.h $(INCDIR)/aout/sun4.h \ libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ aout-target.h -efi-app-ia64.lo: efi-app-ia64.c coff-ia64.c $(INCDIR)/coff/ia64.h \ - $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ - $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h -elf64-alpha.lo: elf64-alpha.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/alpha.h $(INCDIR)/elf/reloc-macros.h \ +sparcnetbsd.lo: sparcnetbsd.c netbsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +sunos.lo: sunos.c $(INCDIR)/bfdlink.h libaout.h aoutf1.h \ + $(INCDIR)/filenames.h $(INCDIR)/aout/sun4.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ + aout-target.h +vaxnetbsd.lo: vaxnetbsd.c netbsd.h $(INCDIR)/filenames.h \ + libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +versados.lo: versados.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h +vms.lo: vms.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + vms.h +vms-gsd.lo: vms-gsd.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + vms.h +vms-hdr.lo: vms-hdr.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + vms.h +vms-misc.lo: vms-misc.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + vms.h +vms-tir.lo: vms-tir.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + vms.h +xcofflink.lo: xcofflink.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/coff/internal.h libcoff.h +aout64.lo: aout64.c aoutx.h $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + libaout.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ + $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h +coff-alpha.lo: coff-alpha.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h \ $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/alpha.h $(INCDIR)/aout/ar.h \ - libcoff.h libecoff.h ecoffswap.h elf64-target.h -elf64-hppa.lo: elf64-hppa.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h libhppa.h \ - elf64-hppa.h elf-hppa.h elf64-target.h -elf64-ia64.lo: elf64-ia64.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/opcode/ia64.h $(INCDIR)/elf/ia64.h $(INCDIR)/elf/reloc-macros.h \ - elf64-target.h -elf64-gen.lo: elf64-gen.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - elf64-target.h -elf64-mips.lo: elf64-mips.c $(INCDIR)/aout/ar.h $(INCDIR)/bfdlink.h \ - genlink.h elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/alpha.h ecoffswap.h \ - elf64-target.h -elf64-sparc.lo: elf64-sparc.c elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + libcoff.h libecoff.h coffswap.h ecoffswap.h +coff64-rs6000.lo: coff64-rs6000.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/rs6k64.h libcoff.h \ + $(INCDIR)/bfdlink.h xcoff-target.h coffcode.h coffswap.h +demo64.lo: demo64.c aoutf1.h $(INCDIR)/filenames.h \ + $(INCDIR)/aout/sun4.h libaout.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ + $(INCDIR)/aout/ar.h aout-target.h +efi-app-ia64.lo: efi-app-ia64.c $(INCDIR)/filenames.h \ + coff-ia64.c $(INCDIR)/coff/ia64.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h coffcode.h \ + peicode.h libpei.h +elf64-alpha.lo: elf64-alpha.c $(INCDIR)/filenames.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/alpha.h \ + $(INCDIR)/elf/reloc-macros.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \ + $(INCDIR)/coff/alpha.h $(INCDIR)/aout/ar.h libcoff.h \ + libecoff.h ecoffswap.h elf64-target.h +elf64-hppa.lo: elf64-hppa.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h \ + libhppa.h elf64-hppa.h elf-hppa.h elf64-target.h +elf64-ia64.lo: elf64-ia64.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/opcode/ia64.h $(INCDIR)/elf/ia64.h \ + $(INCDIR)/elf/reloc-macros.h elf64-target.h +elf64-gen.lo: elf64-gen.c $(INCDIR)/filenames.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h elf64-target.h +elf64-mips.lo: elf64-mips.c $(INCDIR)/filenames.h $(INCDIR)/aout/ar.h \ + $(INCDIR)/bfdlink.h genlink.h elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h \ + $(INCDIR)/elf/reloc-macros.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/alpha.h \ + ecoffswap.h elf64-target.h +elf64-sparc.lo: elf64-sparc.c $(INCDIR)/filenames.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/opcode/sparc.h \ $(INCDIR)/elf/sparc.h $(INCDIR)/elf/reloc-macros.h \ elf64-target.h -elf64.lo: elf64.c elfcode.h $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - elfcore.h elflink.h -nlm32-alpha.lo: nlm32-alpha.c $(INCDIR)/nlm/alpha-ext.h \ - libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \ - $(INCDIR)/nlm/external.h nlmswap.h nlm-target.h -nlm64.lo: nlm64.c nlmcode.h libnlm.h $(INCDIR)/nlm/common.h \ - $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h -aix386-core.lo: aix386-core.c $(INCDIR)/coff/i386.h \ - $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h -hpux-core.lo: hpux-core.c -irix-core.lo: irix-core.c -lynx-core.lo: lynx-core.c -osf-core.lo: osf-core.c -sco5-core.lo: sco5-core.c libaout.h $(INCDIR)/bfdlink.h -trad-core.lo: trad-core.c libaout.h $(INCDIR)/bfdlink.h -cisco-core.lo: cisco-core.c +elf64.lo: elf64.c elfcode.h $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h elfcore.h elflink.h +nlm32-alpha.lo: nlm32-alpha.c $(INCDIR)/filenames.h \ + $(INCDIR)/nlm/alpha-ext.h libnlm.h $(INCDIR)/nlm/common.h \ + $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h nlmswap.h \ + nlm-target.h +nlm64.lo: nlm64.c nlmcode.h $(INCDIR)/filenames.h libnlm.h \ + $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h +aix386-core.lo: aix386-core.c $(INCDIR)/filenames.h \ + $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h libcoff.h \ + $(INCDIR)/bfdlink.h +hpux-core.lo: hpux-core.c $(INCDIR)/filenames.h +irix-core.lo: irix-core.c $(INCDIR)/filenames.h +lynx-core.lo: lynx-core.c $(INCDIR)/filenames.h +osf-core.lo: osf-core.c $(INCDIR)/filenames.h +sco5-core.lo: sco5-core.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h +trad-core.lo: trad-core.c $(INCDIR)/filenames.h libaout.h \ + $(INCDIR)/bfdlink.h +cisco-core.lo: cisco-core.c $(INCDIR)/filenames.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -upr --new-file binutils-2.9.5.0.42/bfd/aoutx.h binutils-2.9.5.0.46/bfd/aoutx.h --- binutils-2.9.5.0.42/bfd/aoutx.h Mon Apr 3 10:08:23 2000 +++ binutils-2.9.5.0.46/bfd/aoutx.h Tue May 30 12:34:26 2000 @@ -1,5 +1,5 @@ /* BFD semi-generic back-end for a.out binaries. - Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999 + Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. Written by Cygnus Support. @@ -2833,7 +2833,7 @@ NAME(aout,find_nearest_line) } if (main_file_name == NULL - || main_file_name[0] == '/' + || IS_ABSOLUTE_PATH (main_file_name) || directory_name == NULL) filelen = 0; else @@ -2857,7 +2857,7 @@ NAME(aout,find_nearest_line) if (main_file_name != NULL) { - if (main_file_name[0] == '/' || directory_name == NULL) + if (IS_ABSOLUTE_PATH (main_file_name) || directory_name == NULL) *filename_ptr = main_file_name; else { diff -upr --new-file binutils-2.9.5.0.42/bfd/archive.c binutils-2.9.5.0.46/bfd/archive.c --- binutils-2.9.5.0.42/bfd/archive.c Mon Apr 24 09:33:03 2000 +++ binutils-2.9.5.0.46/bfd/archive.c Mon May 29 22:35:06 2000 @@ -1,5 +1,5 @@ /* BFD back-end for archive files (libraries). - Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999 + Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. Written by Cygnus Support. Mostly Gumby Henkel-Wallace's fault. @@ -1183,6 +1183,17 @@ normalize (abfd, file) { const char *filename = strrchr (file, '/'); + +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + { + /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */ + char *bslash = strrchr (file, '\\'); + if (bslash > filename) + filename = bslash; + if (filename == NULL && file[0] != '\0' && file[1] == ':') + filename = file + 1; + } +#endif if (filename != (char *) NULL) filename++; else @@ -1566,6 +1577,17 @@ bfd_bsd_truncate_arname (abfd, pathname, CONST char *filename = strrchr (pathname, '/'); int maxlen = ar_maxnamelen (abfd); +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + { + /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */ + char *bslash = strrchr (pathname, '\\'); + if (bslash > filename) + filename = bslash; + if (filename == NULL && pathname[0] != '\0' && pathname[1] == ':') + filename = pathname + 1; + } +#endif + if (filename == NULL) filename = pathname; else @@ -1605,6 +1627,17 @@ bfd_gnu_truncate_arname (abfd, pathname, int length; CONST char *filename = strrchr (pathname, '/'); int maxlen = ar_maxnamelen (abfd); + +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + { + /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */ + char *bslash = strrchr (pathname, '\\'); + if (bslash > filename) + filename = bslash; + if (filename == NULL && pathname[0] != '\0' && pathname[1] == ':') + filename = pathname + 1; + } +#endif if (filename == NULL) filename = pathname; diff -upr --new-file binutils-2.9.5.0.42/bfd/bfd-in2.h binutils-2.9.5.0.46/bfd/bfd-in2.h --- binutils-2.9.5.0.42/bfd/bfd-in2.h Fri May 12 08:11:30 2000 +++ binutils-2.9.5.0.46/bfd/bfd-in2.h Tue May 30 12:34:26 2000 @@ -2479,8 +2479,12 @@ this offset in the reloc's section offse BFD_RELOC_IA64_FPTR64MSB, BFD_RELOC_IA64_FPTR64LSB, BFD_RELOC_IA64_PCREL21B, + BFD_RELOC_IA64_PCREL21BI, BFD_RELOC_IA64_PCREL21M, BFD_RELOC_IA64_PCREL21F, + BFD_RELOC_IA64_PCREL22, + BFD_RELOC_IA64_PCREL60B, + BFD_RELOC_IA64_PCREL64I, BFD_RELOC_IA64_PCREL32MSB, BFD_RELOC_IA64_PCREL32LSB, BFD_RELOC_IA64_PCREL64MSB, diff -upr --new-file binutils-2.9.5.0.42/bfd/cache.c binutils-2.9.5.0.46/bfd/cache.c --- binutils-2.9.5.0.42/bfd/cache.c Tue Apr 4 10:17:30 2000 +++ binutils-2.9.5.0.46/bfd/cache.c Tue May 30 12:34:26 2000 @@ -1,5 +1,6 @@ /* BFD library -- caching of file descriptors. - Copyright 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. + Copyright 1990, 91, 92, 93, 94, 95, 1996, 2000 + Free Software Foundation, Inc. Hacked by Steve Chamberlain of Cygnus Support (steve@cygnus.com). This file is part of BFD, the Binary File Descriptor library. @@ -300,10 +301,17 @@ bfd_open_file (abfd) So we unlink the output file if and only if it has non-zero size. */ +#ifndef __MSDOS__ + /* Don't do this for MSDOS: it doesn't care about overwriting + a running binary, but if this file is already open by + another BFD, we will be in deep trouble if we delete an + open file. In fact, objdump does just that if invoked with + the --info option. */ struct stat s; if (stat (abfd->filename, &s) == 0 && s.st_size != 0) unlink (abfd->filename); +#endif abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_WB); abfd->opened_once = true; } diff -upr --new-file binutils-2.9.5.0.42/bfd/config.bfd binutils-2.9.5.0.46/bfd/config.bfd --- binutils-2.9.5.0.42/bfd/config.bfd Tue May 2 10:23:17 2000 +++ binutils-2.9.5.0.46/bfd/config.bfd Fri Jun 2 16:36:32 2000 @@ -131,6 +131,10 @@ case "${targ}" in targ_selvecs=armcoff_big_vec targ_underscore=yes ;; + armeb-*-elf | arm*b-*-linux-gnu*) + targ_defvec=bfd_elf32_bigarm_vec + targ_selvecs=bfd_elf32_littlearm_vec + ;; arm-*-elf | arm*-*-linux-gnu* | arm*-*-conix*) targ_defvec=bfd_elf32_littlearm_vec targ_selvecs=bfd_elf32_bigarm_vec @@ -227,16 +231,12 @@ case "${targ}" in hppa*-*-*elf* | hppa*-*-linux-gnu* | hppa*-*-lites* | hppa*-*-sysv4* | hppa*-*-rtems*) targ_defvec=bfd_elf32_hppa_vec ;; -#if 0 #ifdef BFD64 - # Do not enable this until we've settled the configury issues - # with the GCC, GDB, binutils, and autoconf maintainers. - hppa*w-*-hpux11*) + hppa*64*-*-hpux11*) targ_defvec=bfd_elf64_hppa_vec targ_cflags=-DHPUX_LARGE_AR_IDS ;; #endif -#endif #if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) || defined (HOST_HPPAOSF) || defined (HOST_HPPAMPEIX) hppa*-*-bsd*) targ_defvec=som_vec @@ -299,9 +299,13 @@ case "${targ}" in targ_defvec=bfd_elf32_i386_vec targ_selvecs=i386coff_vec ;; - i[3456]86-*-netbsd* | i[3456]86-*-openbsd*) + i[3456]86-*-netbsdelf*) + targ_defvec=bfd_elf32_i386_vec + targ_selvecs=i386netbsd_vec + ;; + i[3456]86-*-netbsdaout* | i[3456]86-*-netbsd* | i[3456]86-*-openbsd*) targ_defvec=i386netbsd_vec - targ_selvecs=i386bsd_vec + targ_selvecs="bfd_elf32_i386_vec i386bsd_vec" targ_underscore=yes ;; i[3456]86-*-netware*) diff -upr --new-file binutils-2.9.5.0.42/bfd/configure binutils-2.9.5.0.46/bfd/configure --- binutils-2.9.5.0.42/bfd/configure Fri May 12 08:12:11 2000 +++ binutils-2.9.5.0.46/bfd/configure Thu Jun 1 11:20:16 2000 @@ -1063,7 +1063,7 @@ fi PACKAGE=bfd -VERSION=2.9.5.0.42 +VERSION=2.9.5.0.46 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -5120,9 +5120,6 @@ do target64=true ;; bfd_elf64_ia64_big_vec) tb="$tb elf64-ia64.lo elf64.lo $elf" target64=true ;; - bfd_efi_app_ia32_vec) tb="$tb efi-app-ia32.lo cofflink.lo" ;; - bfd_efi_app_ia64_vec) tb="$tb efi-app-ia64.lo cofflink.lo" - target64=true ;; bfd_elf32_avr_vec) tb="$tb elf32-avr.lo elf32.lo $elf" ;; bfd_elf32_littlearc_vec) tb="$tb elf32-arc.lo elf32.lo $elf" ;; bfd_elf32_littlearm_vec) tb="$tb elfarm-nabi.lo elf32.lo $elf" ;; @@ -5211,8 +5208,8 @@ do m68kaux_coff_vec) tb="$tb coff-aux.lo coff-m68k.lo cofflink.lo" ;; m68ksysvcoff_vec) tb="$tb coff-svm68k.lo cofflink.lo" ;; m88kbcs_vec) tb="$tb coff-m88k.lo" ;; - mipslpe_vec) tb="$tb pe-mips.lo cofflink.lo" ;; - mipslpei_vec) tb="$tb pei-mips.lo cofflink.lo" ;; + mipslpe_vec) tb="$tb pe-mips.lo peigen.lo cofflink.lo" ;; + mipslpei_vec) tb="$tb pei-mips.lo peigen.lo cofflink.lo" ;; mcore_pe_big_vec) tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;; mcore_pe_little_vec) tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;; mcore_pei_big_vec) tb="$tb pei-mcore.lo peigen.lo cofflink.lo" ;; @@ -5349,17 +5346,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5353: checking for $ac_hdr" >&5 +echo "configure:5350: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5388,12 +5385,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5392: checking for $ac_func" >&5 +echo "configure:5389: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5441,7 +5438,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:5445: checking for working mmap" >&5 +echo "configure:5442: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5449,7 +5446,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -5614,12 +5611,12 @@ fi for ac_func in madvise mprotect do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5618: checking for $ac_func" >&5 +echo "configure:5615: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else diff -upr --new-file binutils-2.9.5.0.42/bfd/configure.in binutils-2.9.5.0.46/bfd/configure.in --- binutils-2.9.5.0.42/bfd/configure.in Fri May 12 08:12:11 2000 +++ binutils-2.9.5.0.46/bfd/configure.in Thu Jun 1 11:20:16 2000 @@ -7,7 +7,7 @@ AC_INIT(libbfd.c) AC_CANONICAL_SYSTEM AC_ISC_POSIX -AM_INIT_AUTOMAKE(bfd, 2.9.5.0.42) +AM_INIT_AUTOMAKE(bfd, 2.9.5.0.46) dnl These must be called before AM_PROG_LIBTOOL, because it may want dnl to call AC_CHECK_PROG. @@ -477,9 +477,6 @@ do target64=true ;; bfd_elf64_ia64_big_vec) tb="$tb elf64-ia64.lo elf64.lo $elf" target64=true ;; - bfd_efi_app_ia32_vec) tb="$tb efi-app-ia32.lo cofflink.lo" ;; - bfd_efi_app_ia64_vec) tb="$tb efi-app-ia64.lo cofflink.lo" - target64=true ;; bfd_elf32_avr_vec) tb="$tb elf32-avr.lo elf32.lo $elf" ;; bfd_elf32_littlearc_vec) tb="$tb elf32-arc.lo elf32.lo $elf" ;; bfd_elf32_littlearm_vec) tb="$tb elfarm-nabi.lo elf32.lo $elf" ;; @@ -568,8 +565,8 @@ do m68kaux_coff_vec) tb="$tb coff-aux.lo coff-m68k.lo cofflink.lo" ;; m68ksysvcoff_vec) tb="$tb coff-svm68k.lo cofflink.lo" ;; m88kbcs_vec) tb="$tb coff-m88k.lo" ;; - mipslpe_vec) tb="$tb pe-mips.lo cofflink.lo" ;; - mipslpei_vec) tb="$tb pei-mips.lo cofflink.lo" ;; + mipslpe_vec) tb="$tb pe-mips.lo peigen.lo cofflink.lo" ;; + mipslpei_vec) tb="$tb pei-mips.lo peigen.lo cofflink.lo" ;; mcore_pe_big_vec) tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;; mcore_pe_little_vec) tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;; mcore_pei_big_vec) tb="$tb pei-mcore.lo peigen.lo cofflink.lo" ;; diff -upr --new-file binutils-2.9.5.0.42/bfd/cpu-i960.c binutils-2.9.5.0.46/bfd/cpu-i960.c --- binutils-2.9.5.0.42/bfd/cpu-i960.c Thu Jun 3 11:01:53 1999 +++ binutils-2.9.5.0.46/bfd/cpu-i960.c Thu Jun 1 11:09:29 2000 @@ -34,28 +34,44 @@ scan_960_mach (ap, string) const char *string; { unsigned long machine; + int i; + int fail_because_not_80960 = false; + + for (i = 0; i < strlen (string); i ++) + string[i] = tolower (string[i]); - /* Look for the string i960, or somesuch at the front of the string */ + /* Look for the string i960 at the front of the string. */ + if (strncmp ("i960", string, 4) == 0) + { + string += 4; - if (strncmp("i960",string,4) == 0) { - string+=4; - } - else { - /* no match, can be us */ - return false; - } - if (string[0] == 0) { - /* i960 on it's own means core to us*/ - if (ap->mach == bfd_mach_i960_core) return true; - return false; - } + /* i960 on it's own means core to us. */ + if (* string == 0) + return ap->mach == bfd_mach_i960_core; + + /* "i960:*" is valid, anything else is not. */ + if (* string != ':') + return false; - if (string[0] != ':') { + string ++; + } + /* In some bfds the cpu-id is written as "80960KA", "80960KB", + "80960CA" or "80960MC". */ + else if (strncmp ("80960", string, 5) == 0) + { + string += 5; + + /* Sett his to true here. If a correct matching postfix + is detected below it will be reset to false. */ + fail_because_not_80960 = true; + } + /* No match, can't be us. */ + else return false; - } - string++; - if (string[0] == '\0') + + if (* string == '\0') return false; + if (string[0] == 'c' && string[1] == 'o' && string[2] == 'r' && string[3] == 'e' && string[4] == '\0') machine = bfd_mach_i960_core; @@ -63,20 +79,20 @@ scan_960_mach (ap, string) machine = bfd_mach_i960_ka_sa; else if (strcmp (string, "kb_sb") == 0) machine = bfd_mach_i960_kb_sb; - else if (string[1] == '\0' || string[2] != '\0') /* rest are 2-char */ + else if (string[1] == '\0' || string[2] != '\0') /* rest are 2-char. */ return false; else if (string[0] == 'k' && string[1] == 'b') - machine = bfd_mach_i960_kb_sb; + { machine = bfd_mach_i960_kb_sb; fail_because_not_80960 = false; } else if (string[0] == 's' && string[1] == 'b') machine = bfd_mach_i960_kb_sb; else if (string[0] == 'm' && string[1] == 'c') - machine = bfd_mach_i960_mc; + { machine = bfd_mach_i960_mc; fail_because_not_80960 = false; } else if (string[0] == 'x' && string[1] == 'a') machine = bfd_mach_i960_xa; else if (string[0] == 'c' && string[1] == 'a') - machine = bfd_mach_i960_ca; + { machine = bfd_mach_i960_ca; fail_because_not_80960 = false; } else if (string[0] == 'k' && string[1] == 'a') - machine = bfd_mach_i960_ka_sa; + { machine = bfd_mach_i960_ka_sa; fail_because_not_80960 = false; } else if (string[0] == 's' && string[1] == 'a') machine = bfd_mach_i960_ka_sa; else if (string[0] == 'j' && string[1] == 'x') @@ -85,7 +101,13 @@ scan_960_mach (ap, string) machine = bfd_mach_i960_hx; else return false; - if (machine == ap->mach) return true; + + if (fail_because_not_80960) + return false; + + if (machine == ap->mach) + return true; + return false; } diff -upr --new-file binutils-2.9.5.0.42/bfd/doc/ChangeLog binutils-2.9.5.0.46/bfd/doc/ChangeLog --- binutils-2.9.5.0.42/bfd/doc/ChangeLog Tue May 2 10:07:39 2000 +++ binutils-2.9.5.0.46/bfd/doc/ChangeLog Mon May 29 22:35:46 2000 @@ -1,3 +1,8 @@ +Wed May 24 12:03:25 2000 Hans-Peter Nilsson + + * bfdint.texi (BFD ELF processor required): Add paragraph about + target necessities for readelf. + 2000-04-30 Ben Elliston * bfdint.texi (BFD generated files): Fix another typo. diff -upr --new-file binutils-2.9.5.0.42/bfd/doc/bfdint.texi binutils-2.9.5.0.46/bfd/doc/bfdint.texi --- binutils-2.9.5.0.42/bfd/doc/bfdint.texi Tue May 2 10:07:40 2000 +++ binutils-2.9.5.0.46/bfd/doc/bfdint.texi Mon May 29 22:35:46 2000 @@ -19,7 +19,7 @@ This document describes some BFD interna helpful when working on BFD. It is very incomplete. This document is not updated regularly, and may be out of date. It was -last modified on $Date: 2000/04/30 15:04:58 $. +last modified on $Date: 2000/05/25 00:39:59 $. The initial version of this document was written by Ian Lance Taylor @email{ian@@cygnus.com}. @@ -1606,6 +1606,10 @@ it should use the @samp{START_RELOC_NUMB @samp{FAKE_RELOC}, @samp{EMPTY_RELOC} and @samp{END_RELOC_NUMBERS} macros to create a table mapping the number used to indentify a relocation to a name describing that relocation. + +While not a BFD component, you probably also want to make the binutils +program @samp{readelf} parse your ELF objects. For this, you need to add +code for @code{EM_@var{cpu}} as appropriate in @file{binutils/readelf.c}. @node BFD ELF processor linker @subsubsection Processor specific linker support diff -upr --new-file binutils-2.9.5.0.42/bfd/elf-hppa.h binutils-2.9.5.0.46/bfd/elf-hppa.h --- binutils-2.9.5.0.42/bfd/elf-hppa.h Tue May 2 10:23:17 2000 +++ binutils-2.9.5.0.46/bfd/elf-hppa.h Thu Jun 1 11:19:42 2000 @@ -1341,7 +1341,8 @@ elf_hppa_relocate_section (output_bfd, i relocation = 0; } /* Allow undefined symbols in shared libraries. */ - else if (info->shared && !info->no_undefined) + else if (info->shared && !info->no_undefined + && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT) { if (info->symbolic) (*info->callbacks->undefined_symbol) @@ -1520,7 +1521,10 @@ elf_hppa_final_link_relocate (rel, input + input_section->output_section->vma); /* Adjust for any field selectors. */ - value = hppa_field_adjust (value, -8 + addend, e_fsel); + if (r_type == R_PARISC_PCREL17R) + value = hppa_field_adjust (value, -8 + addend, e_rsel); + else + value = hppa_field_adjust (value, -8 + addend, e_fsel); /* All branches are implicitly shifted by 2 places. */ value >>= 2; @@ -1680,8 +1684,9 @@ elf_hppa_final_link_relocate (rel, input case R_PARISC_DIR16DF: { /* All DIR relocations are basically the same at this point, - except that we need different field selectors for the 21bit - version vs the 14bit versions. */ + except that branch offsets need to be divided by four, and + we need different field selectors. Note that we don't + redirect absolute calls to local stubs. */ if (r_type == R_PARISC_DIR21L) value = hppa_field_adjust (value, addend, e_lrsel); @@ -1693,6 +1698,12 @@ elf_hppa_final_link_relocate (rel, input else value = hppa_field_adjust (value, addend, e_rrsel); + if (r_type == R_PARISC_DIR17R || r_type == R_PARISC_DIR17F) + { + /* All branches are implicitly shifted by 2 places. */ + value >>= 2; + } + insn = elf_hppa_relocate_insn (insn, value, r_type); break; } @@ -1965,7 +1976,7 @@ elf_hppa_relocate_insn (insn, sym_value, the "B" instruction. */ case R_PARISC_PCREL22F: case R_PARISC_PCREL22C: - return re_assemble_22 (insn, sym_value); + return re_assemble_22 (insn & ~ 0x3ff1ffd, sym_value); /* This is any 17bit branch. In PA2.0 syntax it also corresponds to the "B" instruction as well as BE. */ @@ -1974,7 +1985,7 @@ elf_hppa_relocate_insn (insn, sym_value, case R_PARISC_DIR17R: case R_PARISC_PCREL17C: case R_PARISC_PCREL17R: - return re_assemble_17 (insn, sym_value); + return re_assemble_17 (insn & ~ 0x1f1ffd, sym_value); /* ADDIL or LDIL instructions. */ case R_PARISC_DLTREL21L: @@ -1985,7 +1996,7 @@ elf_hppa_relocate_insn (insn, sym_value, case R_PARISC_DPREL21L: case R_PARISC_PLTOFF21L: case R_PARISC_DIR21L: - return re_assemble_21 (insn, sym_value); + return re_assemble_21 (insn & ~ 0x1fffff, sym_value); /* LDO and integer loads/stores with 14bit displacements. */ case R_PARISC_DLTREL14R: diff -upr --new-file binutils-2.9.5.0.42/bfd/elf.c binutils-2.9.5.0.46/bfd/elf.c --- binutils-2.9.5.0.42/bfd/elf.c Fri May 12 08:11:30 2000 +++ binutils-2.9.5.0.46/bfd/elf.c Thu Jun 1 11:19:42 2000 @@ -977,6 +977,7 @@ _bfd_elf_link_hash_table_init (table, ab table->needed = NULL; table->hgot = NULL; table->stab_info = NULL; + table->dynlocal = NULL; return _bfd_link_hash_table_init (&table->root, abfd, newfunc); } @@ -4505,18 +4506,13 @@ _bfd_elf_slurp_version_tables (abfd) Elf_Internal_Shdr *hdr; Elf_External_Verdef *everdef; Elf_Internal_Verdef *iverdef; + Elf_Internal_Verdef *iverdefarr; + Elf_Internal_Verdef iverdefmem; unsigned int i; + unsigned int maxidx; hdr = &elf_tdata (abfd)->dynverdef_hdr; - elf_tdata (abfd)->verdef = - ((Elf_Internal_Verdef *) - bfd_zalloc (abfd, hdr->sh_info * sizeof (Elf_Internal_Verdef))); - if (elf_tdata (abfd)->verdef == NULL) - goto error_return; - - elf_tdata (abfd)->cverdefs = hdr->sh_info; - contents = (bfd_byte *) bfd_malloc (hdr->sh_size); if (contents == NULL) goto error_return; @@ -4524,15 +4520,42 @@ _bfd_elf_slurp_version_tables (abfd) || bfd_read ((PTR) contents, 1, hdr->sh_size, abfd) != hdr->sh_size) goto error_return; + /* We know the number of entries in the section but not the maximum + index. Therefore we have to run through all entries and find + the maximum. */ everdef = (Elf_External_Verdef *) contents; - iverdef = elf_tdata (abfd)->verdef; - for (i = 0; i < hdr->sh_info; i++, iverdef++) + maxidx = 0; + for (i = 0; i < hdr->sh_info; ++i) + { + _bfd_elf_swap_verdef_in (abfd, everdef, &iverdefmem); + + if ((iverdefmem.vd_ndx & VERSYM_VERSION) > maxidx) + maxidx = iverdefmem.vd_ndx & VERSYM_VERSION; + + everdef = ((Elf_External_Verdef *) + ((bfd_byte *) everdef + iverdefmem.vd_next)); + } + + elf_tdata (abfd)->verdef = + ((Elf_Internal_Verdef *) + bfd_zalloc (abfd, maxidx * sizeof (Elf_Internal_Verdef))); + if (elf_tdata (abfd)->verdef == NULL) + goto error_return; + + elf_tdata (abfd)->cverdefs = maxidx; + + everdef = (Elf_External_Verdef *) contents; + iverdefarr = elf_tdata (abfd)->verdef; + for (i = 0; i < hdr->sh_info; i++) { Elf_External_Verdaux *everdaux; Elf_Internal_Verdaux *iverdaux; unsigned int j; - _bfd_elf_swap_verdef_in (abfd, everdef, iverdef); + _bfd_elf_swap_verdef_in (abfd, everdef, &iverdefmem); + + iverdef = &iverdefarr[(iverdefmem.vd_ndx & VERSYM_VERSION) - 1]; + memcpy (iverdef, &iverdefmem, sizeof (Elf_Internal_Verdef)); iverdef->vd_bfd = abfd; diff -upr --new-file binutils-2.9.5.0.42/bfd/elf32-arm.h binutils-2.9.5.0.46/bfd/elf32-arm.h --- binutils-2.9.5.0.42/bfd/elf32-arm.h Wed Apr 12 10:27:27 2000 +++ binutils-2.9.5.0.46/bfd/elf32-arm.h Tue May 30 12:34:26 2000 @@ -1838,14 +1838,17 @@ elf32_arm_relocate_section (output_bfd, } else if (h->root.type == bfd_link_hash_undefweak) relocation = 0; - else if (info->shared && !info->symbolic && !info->no_undefined) + else if (info->shared && !info->symbolic + && !info->no_undefined + && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT) relocation = 0; else { if (!((*info->callbacks->undefined_symbol) (info, h->root.root.string, input_bfd, input_section, rel->r_offset, - (!info->shared || info->no_undefined)))) + (!info->shared || info->no_undefined + || ELF_ST_VISIBILITY (h->other))))) return false; relocation = 0; } @@ -2007,24 +2010,13 @@ elf32_arm_merge_private_bfd_data (ibfd, flagword out_flags; flagword in_flags; + /* Check if we have the same endianess */ + if (_bfd_generic_verify_endian_match (ibfd, obfd) == false) + return false; + if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) return true; - - /* Check if we have the same endianess */ - if ( ibfd->xvec->byteorder != obfd->xvec->byteorder - && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN - && ibfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN) - { - (*_bfd_error_handler) - (_("%s: compiled for a %s endian system and target is %s endian"), - bfd_get_filename (ibfd), - bfd_big_endian (ibfd) ? "big" : "little", - bfd_big_endian (obfd) ? "big" : "little"); - - bfd_set_error (bfd_error_wrong_format); - return false; - } /* The input BFD must have had its flags initialised. */ /* The following seems bogus to me -- The flags are initialized in diff -upr --new-file binutils-2.9.5.0.42/bfd/elf32-i370.c binutils-2.9.5.0.46/bfd/elf32-i370.c --- binutils-2.9.5.0.42/bfd/elf32-i370.c Sun Mar 12 09:40:13 2000 +++ binutils-2.9.5.0.46/bfd/elf32-i370.c Tue May 30 12:34:26 2000 @@ -1413,7 +1413,8 @@ i370_elf_relocate_section (output_bfd, i } else if (h->root.type == bfd_link_hash_undefweak) relocation = 0; - else if (info->shared) + else if (info->shared + && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT) relocation = 0; else { diff -upr --new-file binutils-2.9.5.0.42/bfd/elf32-i386.c binutils-2.9.5.0.46/bfd/elf32-i386.c --- binutils-2.9.5.0.42/bfd/elf32-i386.c Tue May 2 10:23:17 2000 +++ binutils-2.9.5.0.46/bfd/elf32-i386.c Tue May 30 12:34:26 2000 @@ -1390,14 +1390,17 @@ elf_i386_relocate_section (output_bfd, i } else if (h->root.type == bfd_link_hash_undefweak) relocation = 0; - else if (info->shared && !info->symbolic && !info->no_undefined) + else if (info->shared && !info->symbolic + && !info->no_undefined + && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT) relocation = 0; else { if (! ((*info->callbacks->undefined_symbol) (info, h->root.root.string, input_bfd, input_section, rel->r_offset, - (!info->shared || info->no_undefined)))) + (!info->shared || info->no_undefined + || ELF_ST_VISIBILITY (h->other))))) return false; relocation = 0; } diff -upr --new-file binutils-2.9.5.0.42/bfd/elf32-m68k.c binutils-2.9.5.0.46/bfd/elf32-m68k.c --- binutils-2.9.5.0.42/bfd/elf32-m68k.c Tue May 2 10:23:17 2000 +++ binutils-2.9.5.0.46/bfd/elf32-m68k.c Tue May 30 12:34:26 2000 @@ -1479,14 +1479,17 @@ elf_m68k_relocate_section (output_bfd, i } else if (h->root.type == bfd_link_hash_undefweak) relocation = 0; - else if (info->shared && !info->symbolic && !info->no_undefined) + else if (info->shared && !info->symbolic + && !info->no_undefined + && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT) relocation = 0; else { if (!(info->callbacks->undefined_symbol (info, h->root.root.string, input_bfd, input_section, rel->r_offset, - (!info->shared || info->no_undefined)))) + (!info->shared || info->no_undefined + || ELF_ST_VISIBILITY (h->other))))) return false; relocation = 0; } diff -upr --new-file binutils-2.9.5.0.42/bfd/elf32-mcore.c binutils-2.9.5.0.46/bfd/elf32-mcore.c --- binutils-2.9.5.0.42/bfd/elf32-mcore.c Sun Mar 12 09:40:13 2000 +++ binutils-2.9.5.0.46/bfd/elf32-mcore.c Tue May 30 12:34:26 2000 @@ -322,18 +322,8 @@ mcore_elf_merge_private_bfd_data (ibfd, flagword new_flags; /* Check if we have the same endianess */ - if ( ibfd->xvec->byteorder != obfd->xvec->byteorder - && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN) - { - (*_bfd_error_handler) - (_("%s: compiled for a %s endian system and target is %s endian.\n"), - bfd_get_filename (ibfd), - bfd_big_endian (ibfd) ? "big" : "little", - bfd_big_endian (obfd) ? "big" : "little"); - - bfd_set_error (bfd_error_wrong_format); - return false; - } + if (_bfd_generic_verify_endian_match (ibfd, obfd) == false) + return false; if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) @@ -532,7 +522,8 @@ mcore_elf_relocate_section (output_bfd, } else if (h->root.type == bfd_link_hash_undefweak) relocation = 0; - else if (info->shared) + else if (info->shared + && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT) relocation = 0; else { diff -upr --new-file binutils-2.9.5.0.42/bfd/elf32-mips.c binutils-2.9.5.0.46/bfd/elf32-mips.c --- binutils-2.9.5.0.42/bfd/elf32-mips.c Sun Apr 16 10:13:29 2000 +++ binutils-2.9.5.0.46/bfd/elf32-mips.c Tue May 30 12:34:26 2000 @@ -2460,21 +2460,8 @@ _bfd_mips_elf_merge_private_bfd_data (ib boolean ok; /* Check if we have the same endianess */ - if (ibfd->xvec->byteorder != obfd->xvec->byteorder - && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN) - { - const char *msg; - - if (bfd_big_endian (ibfd)) - msg = _("%s: compiled for a big endian system and target is little endian"); - else - msg = _("%s: compiled for a little endian system and target is big endian"); - - (*_bfd_error_handler) (msg, bfd_get_filename (ibfd)); - - bfd_set_error (bfd_error_wrong_format); - return false; - } + if (_bfd_generic_verify_endian_match (ibfd, obfd) == false) + return false; if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) @@ -5930,7 +5917,8 @@ mips_elf_calculate_relocation (abfd, and check to see if they exist by looking at their addresses. */ symbol = 0; - else if (info->shared && !info->symbolic && !info->no_undefined) + else if (info->shared && !info->symbolic && !info->no_undefined + && ELF_ST_VISIBILITY (h->root.other) == STV_DEFAULT) symbol = 0; else if (strcmp (h->root.root.root.string, "_DYNAMIC_LINK") == 0) { @@ -5948,7 +5936,8 @@ mips_elf_calculate_relocation (abfd, if (! ((*info->callbacks->undefined_symbol) (info, h->root.root.root.string, input_bfd, input_section, relocation->r_offset, - (!info->shared || info->no_undefined)))) + (!info->shared || info->no_undefined + || ELF_ST_VISIBILITY (h->root.other))))) return bfd_reloc_undefined; symbol = 0; } diff -upr --new-file binutils-2.9.5.0.42/bfd/elf32-ppc.c binutils-2.9.5.0.46/bfd/elf32-ppc.c --- binutils-2.9.5.0.42/bfd/elf32-ppc.c Tue May 2 10:23:17 2000 +++ binutils-2.9.5.0.46/bfd/elf32-ppc.c Tue May 30 12:34:26 2000 @@ -1399,21 +1399,8 @@ ppc_elf_merge_private_bfd_data (ibfd, ob boolean error; /* Check if we have the same endianess */ - if (ibfd->xvec->byteorder != obfd->xvec->byteorder - && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN) - { - const char *msg; - - if (bfd_big_endian (ibfd)) - msg = _("%s: compiled for a big endian system and target is little endian"); - else - msg = _("%s: compiled for a little endian system and target is big endian"); - - (*_bfd_error_handler) (msg, bfd_get_filename (ibfd)); - - bfd_set_error (bfd_error_wrong_format); - return false; - } + if (_bfd_generic_verify_endian_match (ibfd, obfd) == false) + return false; if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) @@ -3104,7 +3091,9 @@ ppc_elf_relocate_section (output_bfd, in } else if (h->root.type == bfd_link_hash_undefweak) relocation = 0; - else if (info->shared && !info->symbolic && !info->no_undefined) + else if (info->shared && !info->symbolic + && !info->no_undefined + && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT) relocation = 0; else { @@ -3114,7 +3103,8 @@ ppc_elf_relocate_section (output_bfd, in input_section, rel->r_offset, (!info->shared - || info->no_undefined))) + || info->no_undefined + || ELF_ST_VISIBILITY (h->other)))) return false; relocation = 0; } diff -upr --new-file binutils-2.9.5.0.42/bfd/elf32-sh.c binutils-2.9.5.0.46/bfd/elf32-sh.c --- binutils-2.9.5.0.42/bfd/elf32-sh.c Wed Apr 5 17:14:13 2000 +++ binutils-2.9.5.0.46/bfd/elf32-sh.c Thu May 18 15:10:35 2000 @@ -1394,6 +1394,13 @@ sh_elf_relax_delete_bytes (abfd, sec, ad bfd_put_16 (abfd, insn, contents + nraddr); break; + case R_SH_SWITCH8: + voff += adjust; + if (voff < 0 || voff >= 0xff) + overflow = true; + bfd_put_8 (abfd, voff, contents + nraddr); + break; + case R_SH_SWITCH16: voff += adjust; if (voff < - 0x8000 || voff >= 0x8000) diff -upr --new-file binutils-2.9.5.0.42/bfd/elf32-sparc.c binutils-2.9.5.0.46/bfd/elf32-sparc.c --- binutils-2.9.5.0.42/bfd/elf32-sparc.c Sun Mar 12 09:40:13 2000 +++ binutils-2.9.5.0.46/bfd/elf32-sparc.c Tue May 30 12:34:26 2000 @@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit #include "libbfd.h" #include "elf-bfd.h" #include "elf/sparc.h" +#include "opcode/sparc.h" static reloc_howto_type *elf32_sparc_reloc_type_lookup PARAMS ((bfd *, bfd_reloc_code_real_type)); @@ -36,6 +37,8 @@ static boolean elf32_sparc_adjust_dynami PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *)); static boolean elf32_sparc_size_dynamic_sections PARAMS ((bfd *, struct bfd_link_info *)); +static boolean elf32_sparc_relax_section + PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *)); static boolean elf32_sparc_relocate_section PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **)); @@ -1059,6 +1062,23 @@ elf32_sparc_size_dynamic_sections (outpu return true; } + +#define SET_SEC_DO_RELAX(section) do { elf_section_data(section)->tdata = (void *)1; } while (0) +#define SEC_DO_RELAX(section) (elf_section_data(section)->tdata == (void *)1) + +/*ARGSUSED*/ +static boolean +elf32_sparc_relax_section (abfd, section, link_info, again) + bfd *abfd ATTRIBUTE_UNUSED; + asection *section ATTRIBUTE_UNUSED; + struct bfd_link_info *link_info ATTRIBUTE_UNUSED; + boolean *again; +{ + *again = false; + SET_SEC_DO_RELAX (section); + return true; +} + /* Relocate a SPARC ELF section. */ static boolean @@ -1213,14 +1233,17 @@ elf32_sparc_relocate_section (output_bfd } else if (h->root.type == bfd_link_hash_undefweak) relocation = 0; - else if (info->shared && !info->symbolic && !info->no_undefined) + else if (info->shared && !info->symbolic + && !info->no_undefined + && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT) relocation = 0; else { if (! ((*info->callbacks->undefined_symbol) (info, h->root.root.string, input_bfd, input_section, rel->r_offset, - (!info->shared || info->no_undefined)))) + (!info->shared || info->no_undefined + || ELF_ST_VISIBILITY (h->other))))) return false; relocation = 0; } @@ -1515,6 +1538,7 @@ elf32_sparc_relocate_section (output_bfd break; } + r = bfd_reloc_continue; if (r_type == R_SPARC_WDISP16) { bfd_vma x; @@ -1546,7 +1570,97 @@ elf32_sparc_relocate_section (output_bfd bfd_putl32 (/*input_bfd,*/ x, contents + rel->r_offset); r = bfd_reloc_ok; } - else + else if ((r_type == R_SPARC_WDISP30 || r_type == R_SPARC_WPLT30) + && SEC_DO_RELAX (input_section) + && rel->r_offset + 4 < input_section->_raw_size) + { +#define G0 0 +#define O7 15 +#define XCC (2 << 20) +#define COND(x) (((x)&0xf)<<25) +#define CONDA COND(0x8) +#define INSN_BPA (F2(0,1) | CONDA | BPRED | XCC) +#define INSN_BA (F2(0,2) | CONDA) +#define INSN_OR F3(2, 0x2, 0) +#define INSN_NOP F2(0,4) + + bfd_vma x, y; + + /* If the instruction is a call with either: + restore + arithmetic instruction with rd == %o7 + where rs1 != %o7 and rs2 if it is register != %o7 + then we can optimize if the call destination is near + by changing the call into a branch always. */ + x = bfd_get_32 (input_bfd, contents + rel->r_offset); + y = bfd_get_32 (input_bfd, contents + rel->r_offset + 4); + if ((x & OP(~0)) == OP(1) && (y & OP(~0)) == OP(2)) + { + if (((y & OP3(~0)) == OP3(0x3d) /* restore */ + || ((y & OP3(0x28)) == 0 /* arithmetic */ + && (y & RD(~0)) == RD(O7))) + && (y & RS1(~0)) != RS1(O7) + && ((y & F3I(~0)) + || (y & RS2(~0)) != RS2(O7))) + { + bfd_vma reloc; + + reloc = relocation + rel->r_addend - rel->r_offset; + reloc -= (input_section->output_section->vma + + input_section->output_offset); + + /* Ensure the reloc fits into simm22. */ + if ((reloc & 3) == 0 + && ((reloc & ~(bfd_vma)0x7fffff) == 0 + || ((reloc | 0x7fffff) == ~(bfd_vma)0))) + { + reloc >>= 2; + + /* Check whether it fits into simm19 on v9. */ + if (((reloc & 0x3c0000) == 0 + || (reloc & 0x3c0000) == 0x3c0000) + && (elf_elfheader (output_bfd)->e_flags & EF_SPARC_32PLUS)) + x = INSN_BPA | (reloc & 0x7ffff); /* ba,pt %xcc */ + else + x = INSN_BA | (reloc & 0x3fffff); /* ba */ + bfd_put_32 (input_bfd, x, contents + rel->r_offset); + r = bfd_reloc_ok; + if (rel->r_offset >= 4 + && (y & (0xffffffff ^ RS1(~0))) + == (INSN_OR | RD(O7) | RS2(G0))) + { + bfd_vma z; + unsigned int reg; + + z = bfd_get_32 (input_bfd, + contents + rel->r_offset - 4); + if ((z & (0xffffffff ^ RD(~0))) + != (INSN_OR | RS1(O7) | RS2(G0))) + break; + + /* The sequence was + or %o7, %g0, %rN + call foo + or %rN, %g0, %o7 + + If call foo was replaced with ba, replace + or %rN, %g0, %o7 with nop. */ + + reg = (y & RS1(~0)) >> 14; + if (reg != ((z & RD(~0)) >> 25) + || reg == G0 || reg == O7) + break; + + bfd_put_32 (input_bfd, INSN_NOP, + contents + rel->r_offset + 4); + } + + } + } + } + } + + if (r == bfd_reloc_continue) r = _bfd_final_link_relocate (howto, input_bfd, input_section, contents, rel->r_offset, relocation, rel->r_addend); @@ -1964,6 +2078,7 @@ elf32_sparc_final_write_processing (abfd #define ELF_MAXPAGESIZE 0x10000 #define bfd_elf32_bfd_reloc_type_lookup elf32_sparc_reloc_type_lookup +#define bfd_elf32_bfd_relax_section elf32_sparc_relax_section #define elf_info_to_howto elf32_sparc_info_to_howto #define elf_backend_create_dynamic_sections \ _bfd_elf_create_dynamic_sections diff -upr --new-file binutils-2.9.5.0.42/bfd/elf64-alpha.c binutils-2.9.5.0.46/bfd/elf64-alpha.c --- binutils-2.9.5.0.42/bfd/elf64-alpha.c Mon Apr 3 10:08:23 2000 +++ binutils-2.9.5.0.46/bfd/elf64-alpha.c Tue May 30 12:34:26 2000 @@ -3475,14 +3475,17 @@ elf64_alpha_relocate_section (output_bfd } else if (h->root.root.type == bfd_link_hash_undefweak) relocation = 0; - else if (info->shared && !info->symbolic && !info->no_undefined) + else if (info->shared && !info->symbolic + && !info->no_undefined + && ELF_ST_VISIBILITY (h->root.other) == STV_DEFAULT) relocation = 0; else { if (!((*info->callbacks->undefined_symbol) (info, h->root.root.root.string, input_bfd, input_section, rel->r_offset, - (!info->shared || info->no_undefined)))) + (!info->shared || info->no_undefined + || ELF_ST_VISIBILITY (h->root.other))))) return false; relocation = 0; } diff -upr --new-file binutils-2.9.5.0.42/bfd/elf64-ia64.c binutils-2.9.5.0.46/bfd/elf64-ia64.c --- binutils-2.9.5.0.42/bfd/elf64-ia64.c Sun Apr 23 09:40:31 2000 +++ binutils-2.9.5.0.46/bfd/elf64-ia64.c Mon May 29 22:35:45 2000 @@ -1,5 +1,5 @@ /* IA-64 support for 64-bit ELF - Copyright 1998, 1999 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000 Free Software Foundation, Inc. Contributed by David Mosberger-Tang This file is part of BFD, the Binary File Descriptor library. @@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suit #include "opcode/ia64.h" #include "elf/ia64.h" + /* * THE RULES for all the stuff the linker creates -- * @@ -154,6 +155,9 @@ static reloc_howto_type *elf64_ia64_relo PARAMS ((bfd *abfd, bfd_reloc_code_real_type bfd_code)); static void elf64_ia64_info_to_howto PARAMS ((bfd *abfd, arelent *bfd_reloc, Elf64_Internal_Rela *elf_reloc)); +static boolean elf64_ia64_relax_section + PARAMS((bfd *abfd, asection *sec, struct bfd_link_info *link_info, + boolean *again)); static boolean elf64_ia64_section_from_shdr PARAMS ((bfd *, Elf64_Internal_Shdr *, char *)); static boolean elf64_ia64_fake_sections @@ -329,12 +333,13 @@ static reloc_howto_type ia64_howto_table IA64_HOWTO (R_IA64_PLTOFF64MSB, "PLTOFF64MSB", 4, false, true), IA64_HOWTO (R_IA64_PLTOFF64LSB, "PLTOFF64LSB", 4, false, true), - IA64_HOWTO (R_IA64_FPTR64I, "FPTR64I", 4, false, true), + IA64_HOWTO (R_IA64_FPTR64I, "FPTR64I", 0, false, true), IA64_HOWTO (R_IA64_FPTR32MSB, "FPTR32MSB", 2, false, true), IA64_HOWTO (R_IA64_FPTR32LSB, "FPTR32LSB", 2, false, true), IA64_HOWTO (R_IA64_FPTR64MSB, "FPTR64MSB", 4, false, true), IA64_HOWTO (R_IA64_FPTR64LSB, "FPTR64LSB", 4, false, true), + IA64_HOWTO (R_IA64_PCREL60B, "PCREL60B", 0, true, true), IA64_HOWTO (R_IA64_PCREL21B, "PCREL21B", 0, true, true), IA64_HOWTO (R_IA64_PCREL21M, "PCREL21M", 0, true, true), IA64_HOWTO (R_IA64_PCREL21F, "PCREL21F", 0, true, true), @@ -343,8 +348,8 @@ static reloc_howto_type ia64_howto_table IA64_HOWTO (R_IA64_PCREL64MSB, "PCREL64MSB", 4, true, true), IA64_HOWTO (R_IA64_PCREL64LSB, "PCREL64LSB", 4, true, true), - IA64_HOWTO (R_IA64_LTOFF_FPTR22, "LTOFF_FPTR22", 4, false, true), - IA64_HOWTO (R_IA64_LTOFF_FPTR64I, "LTOFF_FPTR64I", 4, false, true), + IA64_HOWTO (R_IA64_LTOFF_FPTR22, "LTOFF_FPTR22", 0, false, true), + IA64_HOWTO (R_IA64_LTOFF_FPTR64I, "LTOFF_FPTR64I", 0, false, true), IA64_HOWTO (R_IA64_LTOFF_FPTR64MSB, "LTOFF_FPTR64MSB", 4, false, true), IA64_HOWTO (R_IA64_LTOFF_FPTR64LSB, "LTOFF_FPTR64LSB", 4, false, true), @@ -369,6 +374,10 @@ static reloc_howto_type ia64_howto_table IA64_HOWTO (R_IA64_LTV64MSB, "LTV64MSB", 4, false, true), IA64_HOWTO (R_IA64_LTV64LSB, "LTV64LSB", 4, false, true), + IA64_HOWTO (R_IA64_PCREL21BI, "PCREL21BI", 0, true, true), + IA64_HOWTO (R_IA64_PCREL22, "PCREL22", 0, true, true), + IA64_HOWTO (R_IA64_PCREL64I, "PCREL64I", 0, true, true), + IA64_HOWTO (R_IA64_IPLTMSB, "IPLTMSB", 4, false, true), IA64_HOWTO (R_IA64_IPLTLSB, "IPLTLSB", 4, false, true), IA64_HOWTO (R_IA64_EPLTMSB, "EPLTMSB", 4, false, true), @@ -377,10 +386,10 @@ static reloc_howto_type ia64_howto_table IA64_HOWTO (R_IA64_LTOFF22X, "LTOFF22X", 0, false, true), IA64_HOWTO (R_IA64_LDXMOV, "LDXMOV", 0, false, true), - IA64_HOWTO (R_IA64_TPREL22, "TPREL22", 4, false, false), + IA64_HOWTO (R_IA64_TPREL22, "TPREL22", 0, false, false), IA64_HOWTO (R_IA64_TPREL64MSB, "TPREL64MSB", 8, false, false), IA64_HOWTO (R_IA64_TPREL64LSB, "TPREL64LSB", 8, false, false), - IA64_HOWTO (R_IA64_LTOFF_TP22, "LTOFF_TP22", 4, false, false), + IA64_HOWTO (R_IA64_LTOFF_TP22, "LTOFF_TP22", 0, false, false), }; static unsigned char elf_code_to_howto_index[R_IA64_MAX_RELOC_CODE + 1]; @@ -451,8 +460,12 @@ elf64_ia64_reloc_type_lookup (abfd, bfd_ case BFD_RELOC_IA64_FPTR64LSB: rtype = R_IA64_FPTR64LSB; break; case BFD_RELOC_IA64_PCREL21B: rtype = R_IA64_PCREL21B; break; + case BFD_RELOC_IA64_PCREL21BI: rtype = R_IA64_PCREL21BI; break; case BFD_RELOC_IA64_PCREL21M: rtype = R_IA64_PCREL21M; break; case BFD_RELOC_IA64_PCREL21F: rtype = R_IA64_PCREL21F; break; + case BFD_RELOC_IA64_PCREL22: rtype = R_IA64_PCREL22; break; + case BFD_RELOC_IA64_PCREL60B: rtype = R_IA64_PCREL60B; break; + case BFD_RELOC_IA64_PCREL64I: rtype = R_IA64_PCREL64I; break; case BFD_RELOC_IA64_PCREL32MSB: rtype = R_IA64_PCREL32MSB; break; case BFD_RELOC_IA64_PCREL32LSB: rtype = R_IA64_PCREL32LSB; break; case BFD_RELOC_IA64_PCREL64MSB: rtype = R_IA64_PCREL64MSB; break; @@ -549,6 +562,353 @@ static const bfd_byte plt_full_entry[PLT }; #define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1" + +/* Select out of range branch fixup type. Note that Itanium does + not support brl, and so it gets emulated by the kernel. */ +#undef USE_BRL + +static const bfd_byte oor_brl[16] = +{ + 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, /* [MLX] nop.m 0 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* brl.sptk.few tgt;; */ + 0x00, 0x00, 0x00, 0xc0 +}; + +static const bfd_byte oor_ip[48] = +{ + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, /* [MLX] nop.m 0 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, /* movl r15=0 */ + 0x01, 0x00, 0x00, 0x60, + 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, /* [MII] nop.m 0 */ + 0x00, 0x01, 0x00, 0x60, 0x00, 0x00, /* mov r16=ip;; */ + 0xf2, 0x80, 0x00, 0x80, /* add r16=r15,r16;; */ + 0x11, 0x00, 0x00, 0x00, 0x01, 0x00, /* [MIB] nop.m 0 */ + 0x60, 0x80, 0x04, 0x80, 0x03, 0x00, /* mov b6=r16 */ + 0x60, 0x00, 0x80, 0x00 /* br b6;; */ +}; + +/* These functions do relaxation for IA-64 ELF. + + This is primarily to support branches to targets out of range; + relaxation of R_IA64_LTOFF22X and R_IA64_LDXMOV not yet supported. */ + +static boolean +elf64_ia64_relax_section (abfd, sec, link_info, again) + bfd *abfd; + asection *sec; + struct bfd_link_info *link_info; + boolean *again; +{ + struct one_fixup + { + struct one_fixup *next; + asection *tsec; + bfd_vma toff; + bfd_vma trampoff; + }; + + Elf_Internal_Shdr *symtab_hdr; + Elf_Internal_Rela *internal_relocs; + Elf_Internal_Rela *free_relocs; + Elf_Internal_Rela *irel, *irelend; + bfd_byte *contents; + bfd_byte *free_contents; + Elf64_External_Sym *extsyms; + Elf64_External_Sym *free_extsyms; + struct elf64_ia64_link_hash_table *ia64_info; + struct one_fixup *fixups = NULL; + boolean changed_contents = false; + boolean changed_relocs = false; + + /* Assume we're not going to change any sizes, and we we'll only + need one pass. */ + *again = false; + + /* Nothing to do if there are no relocations. */ + if ((sec->flags & SEC_RELOC) == 0 + || sec->reloc_count == 0) + return true; + + /* If this is the first time we have been called for this section, + initialize the cooked size. */ + if (sec->_cooked_size == 0) + sec->_cooked_size = sec->_raw_size; + + symtab_hdr = &elf_tdata (abfd)->symtab_hdr; + + /* Load the relocations for this section. */ + internal_relocs = (_bfd_elf64_link_read_relocs + (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL, + link_info->keep_memory)); + if (internal_relocs == NULL) + goto error_return; + free_relocs = NULL; + if (! link_info->keep_memory) + free_relocs = internal_relocs; + + ia64_info = elf64_ia64_hash_table (link_info); + irelend = internal_relocs + sec->reloc_count; + + for (irel = internal_relocs; irel < irelend; irel++) + if (ELF64_R_TYPE (irel->r_info) == (int) R_IA64_PCREL21B) + break; + + /* No branch-type relocations. */ + if (irel == irelend) + { + if (free_relocs != NULL) + free (free_relocs); + return true; + } + + /* Get the section contents. */ + free_contents = NULL; + if (elf_section_data (sec)->this_hdr.contents != NULL) + contents = elf_section_data (sec)->this_hdr.contents; + else + { + contents = (bfd_byte *) bfd_malloc (sec->_raw_size); + if (contents == NULL) + goto error_return; + free_contents = contents; + + if (! bfd_get_section_contents (abfd, sec, contents, + (file_ptr) 0, sec->_raw_size)) + goto error_return; + } + + /* Read this BFD's symbols. */ + free_extsyms = NULL; + if (symtab_hdr->contents != NULL) + extsyms = (Elf64_External_Sym *) symtab_hdr->contents; + else + { + extsyms = (Elf64_External_Sym *) bfd_malloc (symtab_hdr->sh_size); + if (extsyms == NULL) + goto error_return; + free_extsyms = extsyms; + if (bfd_seek (abfd, symtab_hdr->sh_offset, SEEK_SET) != 0 + || (bfd_read (extsyms, 1, symtab_hdr->sh_size, abfd) + != symtab_hdr->sh_size)) + goto error_return; + } + + for (; irel < irelend; irel++) + { + bfd_vma symaddr, reladdr, trampoff, toff, roff; + Elf_Internal_Sym isym; + asection *tsec; + struct one_fixup *f; + + if (ELF64_R_TYPE (irel->r_info) != (int) R_IA64_PCREL21B) + continue; + + /* Get the value of the symbol referred to by the reloc. */ + if (ELF64_R_SYM (irel->r_info) < symtab_hdr->sh_info) + { + /* A local symbol. */ + bfd_elf64_swap_symbol_in (abfd, + extsyms + ELF64_R_SYM (irel->r_info), + &isym); + if (isym.st_shndx == SHN_UNDEF) + continue; /* We can't do anthing with undefined symbols. */ + else if (isym.st_shndx == SHN_ABS) + tsec = bfd_abs_section_ptr; + else if (isym.st_shndx == SHN_COMMON) + tsec = bfd_com_section_ptr; + else if (isym.st_shndx > 0 && isym.st_shndx < SHN_LORESERVE) + tsec = bfd_section_from_elf_index (abfd, isym.st_shndx); + else + continue; /* who knows. */ + + toff = isym.st_value; + } + else + { + unsigned long indx; + struct elf_link_hash_entry *h; + struct elf64_ia64_dyn_sym_info *dyn_i; + + indx = ELF64_R_SYM (irel->r_info) - symtab_hdr->sh_info; + h = elf_sym_hashes (abfd)[indx]; + BFD_ASSERT (h != NULL); + + while (h->root.type == bfd_link_hash_indirect + || h->root.type == bfd_link_hash_warning) + h = (struct elf_link_hash_entry *) h->root.u.i.link; + + dyn_i = get_dyn_sym_info (ia64_info, h, abfd, irel, false); + + /* For branches to dynamic symbols, we're interested instead + in a branch to the PLT entry. */ + if (dyn_i && dyn_i->want_plt2) + { + tsec = ia64_info->plt_sec; + toff = dyn_i->plt2_offset; + } + else + { + /* We can't do anthing with undefined symbols. */ + if (h->root.type == bfd_link_hash_undefined + || h->root.type == bfd_link_hash_undefweak) + continue; + + tsec = h->root.u.def.section; + toff = h->root.u.def.value; + } + } + + symaddr = (tsec->output_section->vma + + tsec->output_offset + + toff + + irel->r_addend); + + roff = irel->r_offset; + reladdr = (sec->output_section->vma + + sec->output_offset + + roff) & -4; + + /* If the branch is in range, no need to do anything. */ + if ((bfd_signed_vma) (symaddr - reladdr) >= -0x1000000 + && (bfd_signed_vma) (symaddr - reladdr) <= 0x0FFFFF0) + continue; + + /* If the branch and target are in the same section, you've + got one honking big section and we can't help you. You'll + get an error message later. */ + if (tsec == sec) + continue; + + /* Look for an existing fixup to this address. */ + for (f = fixups; f ; f = f->next) + if (f->tsec == tsec && f->toff == toff) + break; + + if (f == NULL) + { + /* Two alternatives: If it's a branch to a PLT entry, we can + make a copy of the FULL_PLT entry. Otherwise, we'll have + to use a `brl' insn to get where we're going. */ + + int size; + + if (tsec == ia64_info->plt_sec) + size = sizeof (plt_full_entry); + else + { +#ifdef USE_BRL + size = sizeof (oor_brl); +#else + size = sizeof (oor_ip); +#endif + } + + /* Resize the current section to make room for the new branch. */ + trampoff = (sec->_cooked_size + 15) & -16; + contents = (bfd_byte *) bfd_realloc (contents, trampoff + size); + if (contents == NULL) + goto error_return; + sec->_cooked_size = trampoff + size; + + if (tsec == ia64_info->plt_sec) + { + memcpy (contents + trampoff, plt_full_entry, size); + + /* Hijack the old relocation for use as the PLTOFF reloc. */ + irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info), + R_IA64_PLTOFF22); + irel->r_offset = trampoff; + } + else + { +#ifdef USE_BRL + memcpy (contents + trampoff, oor_brl, size); + irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info), + R_IA64_PCREL60B); + irel->r_offset = trampoff + 2; +#else + memcpy (contents + trampoff, oor_ip, size); + irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info), + R_IA64_PCREL64I); + irel->r_addend -= 16; + irel->r_offset = trampoff + 2; +#endif + } + + /* Record the fixup so we don't do it again this section. */ + f = (struct one_fixup *) bfd_malloc (sizeof (*f)); + f->next = fixups; + f->tsec = tsec; + f->toff = toff; + f->trampoff = trampoff; + fixups = f; + } + else + { + /* Nop out the reloc, since we're finalizing things here. */ + irel->r_info = ELF64_R_INFO (0, R_IA64_NONE); + } + + /* Fix up the existing branch to hit the trampoline. Hope like + hell this doesn't overflow too. */ + if (elf64_ia64_install_value (abfd, contents + roff, + f->trampoff - (roff & -4), + R_IA64_PCREL21B) != bfd_reloc_ok) + goto error_return; + + changed_contents = true; + changed_relocs = true; + } + + /* Clean up and go home. */ + while (fixups) + { + struct one_fixup *f = fixups; + fixups = fixups->next; + free (f); + } + + if (changed_relocs) + elf_section_data (sec)->relocs = internal_relocs; + else if (free_relocs != NULL) + free (free_relocs); + + if (changed_contents) + elf_section_data (sec)->this_hdr.contents = contents; + else if (free_contents != NULL) + { + if (! link_info->keep_memory) + free (free_contents); + else + { + /* Cache the section contents for elf_link_input_bfd. */ + elf_section_data (sec)->this_hdr.contents = contents; + } + } + + if (free_extsyms != NULL) + { + if (! link_info->keep_memory) + free (free_extsyms); + else + { + /* Cache the symbols for elf_link_input_bfd. */ + symtab_hdr->contents = extsyms; + } + } + + *again = changed_contents || changed_relocs; + return true; + + error_return: + if (free_relocs != NULL) + free (free_relocs); + if (free_contents != NULL) + free (free_contents); + if (free_extsyms != NULL) + free (free_extsyms); + return false; +} /* Handle an IA-64 specific section when reading an object file. This is called when elfcode.h finds a section with an unknown type. */ @@ -1468,6 +1828,7 @@ elf64_ia64_check_relocs (abfd, info, sec break; case R_IA64_PCREL21B: + case R_IA64_PCREL60B: /* Depending on where this symbol is defined, we may or may not need a full plt entry. Only skip if we know we'll not need the entry -- static or symbolic, and the symbol definition @@ -1489,6 +1850,8 @@ elf64_ia64_check_relocs (abfd, info, sec dynrel_type = R_IA64_DIR64LSB; break; + case R_IA64_PCREL22: + case R_IA64_PCREL64I: case R_IA64_PCREL32MSB: case R_IA64_PCREL32LSB: case R_IA64_PCREL64MSB: @@ -2185,15 +2548,21 @@ elf64_ia64_install_value (abfd, hit_addr /* Instruction relocations. */ case R_IA64_IMM14: opnd = IA64_OPND_IMM14; break; + case R_IA64_PCREL21F: opnd = IA64_OPND_TGT25; break; case R_IA64_PCREL21M: opnd = IA64_OPND_TGT25b; break; - case R_IA64_PCREL21B: opnd = IA64_OPND_TGT25c; break; + case R_IA64_PCREL60B: opnd = IA64_OPND_TGT64; break; + case R_IA64_PCREL21B: + case R_IA64_PCREL21BI: + opnd = IA64_OPND_TGT25c; + break; case R_IA64_IMM22: case R_IA64_GPREL22: case R_IA64_LTOFF22: case R_IA64_LTOFF22X: case R_IA64_PLTOFF22: + case R_IA64_PCREL22: case R_IA64_LTOFF_FPTR22: opnd = IA64_OPND_IMM22; break; @@ -2202,6 +2571,7 @@ elf64_ia64_install_value (abfd, hit_addr case R_IA64_GPREL64I: case R_IA64_LTOFF64I: case R_IA64_PLTOFF64I: + case R_IA64_PCREL64I: case R_IA64_FPTR64I: case R_IA64_LTOFF_FPTR64I: opnd = IA64_OPND_IMMU64; @@ -2308,6 +2678,31 @@ elf64_ia64_install_value (abfd, hit_addr bfd_put_64 (abfd, t1, hit_addr + 8); break; + case IA64_OPND_TGT64: + hit_addr -= (long) hit_addr & 0x3; + t0 = bfd_get_64 (abfd, hit_addr); + t1 = bfd_get_64 (abfd, hit_addr + 8); + + /* tmpl/s: bits 0.. 5 in t0 + slot 0: bits 5..45 in t0 + slot 1: bits 46..63 in t0, bits 0..22 in t1 + slot 2: bits 23..63 in t1 */ + + /* First, clear the bits that form the 64 bit constant. */ + t0 &= ~(0x3ffffLL << 46); + t1 &= ~(0x7fffffLL + | ((1LL << 36 | 0xfffffLL << 13) << 23)); + + val >>= 4; + t0 |= ((val >> 20) & 0xffffLL) << 2 << 46; /* 16 lsbs of imm39 */ + t1 |= ((val >> 36) & 0x7fffffLL) << 0; /* 23 msbs of imm39 */ + t1 |= ((((val >> 0) & 0xfffffLL) << 13) /* imm20b */ + | (((val >> 59) & 0x1LL) << 36)) << 23; /* i */ + + bfd_put_64 (abfd, t0, hit_addr); + bfd_put_64 (abfd, t1, hit_addr + 8); + break; + default: switch ((long) hit_addr & 0x3) { @@ -2863,14 +3258,17 @@ elf64_ia64_relocate_section (output_bfd, } else if (h->root.type == bfd_link_hash_undefweak) undef_weak_ref = true; - else if (info->shared && !info->symbolic && !info->no_undefined) + else if (info->shared && !info->symbolic + && !info->no_undefined + && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT) ; else { if (! ((*info->callbacks->undefined_symbol) (info, h->root.root.string, input_bfd, input_section, rel->r_offset, - (!info->shared || info->no_undefined)))) + (!info->shared || info->no_undefined + || ELF_ST_VISIBILITY (h->other))))) return false; ret_val = false; continue; @@ -3090,6 +3488,7 @@ elf64_ia64_relocate_section (output_bfd, } goto finish_pcrel; + case R_IA64_PCREL21BI: case R_IA64_PCREL21F: case R_IA64_PCREL21M: /* ??? These two are only used for speculation fixup code. @@ -3113,10 +3512,8 @@ elf64_ia64_relocate_section (output_bfd, goto finish_pcrel; case R_IA64_PCREL21B: + case R_IA64_PCREL60B: /* We should have created a PLT entry for any dynamic symbol. */ - /* ??? How to handle out of range branches, which are supposed - to be fixed up by a conforming linker. */ - dyn_i = NULL; if (h) dyn_i = get_dyn_sym_info (ia64_info, h, NULL, NULL, false); @@ -3145,6 +3542,8 @@ elf64_ia64_relocate_section (output_bfd, } goto finish_pcrel; + case R_IA64_PCREL22: + case R_IA64_PCREL64I: finish_pcrel: /* Make pc-relative. */ value -= (input_section->output_section->vma @@ -3650,6 +4049,8 @@ elf64_ia64_print_private_bfd_data (abfd, elf64_ia64_reloc_type_lookup #define bfd_elf64_bfd_is_local_label_name \ elf64_ia64_is_local_label_name +#define bfd_elf64_bfd_relax_section \ + elf64_ia64_relax_section /* Stuff for the BFD linker: */ #define bfd_elf64_bfd_link_hash_table_create \ diff -upr --new-file binutils-2.9.5.0.42/bfd/elf64-sparc.c binutils-2.9.5.0.46/bfd/elf64-sparc.c --- binutils-2.9.5.0.42/bfd/elf64-sparc.c Sun Mar 12 09:40:13 2000 +++ binutils-2.9.5.0.46/bfd/elf64-sparc.c Tue May 30 12:34:26 2000 @@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suit #include "sysdep.h" #include "libbfd.h" #include "elf-bfd.h" +#include "opcode/sparc.h" /* This is defined if one wants to build upward compatible binaries with the original sparc64-elf toolchain. The support is kept in for @@ -65,6 +66,8 @@ static void sparc64_elf_symbol_processin static boolean sparc64_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *)); +static boolean sparc64_elf_relax_section + PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *)); static boolean sparc64_elf_relocate_section PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **)); @@ -212,7 +215,7 @@ static CONST struct elf_reloc_map sparc_ static reloc_howto_type * sparc64_elf_reloc_type_lookup (abfd, code) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; bfd_reloc_code_real_type code; { unsigned int i; @@ -226,7 +229,7 @@ sparc64_elf_reloc_type_lookup (abfd, cod static void sparc64_elf_info_to_howto (abfd, cache_ptr, dst) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; arelent *cache_ptr; Elf64_Internal_Rela *dst; { @@ -240,7 +243,7 @@ sparc64_elf_info_to_howto (abfd, cache_p static long sparc64_elf_get_reloc_upper_bound (abfd, sec) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; asection *sec; { return (sec->reloc_count * 2 + 1) * sizeof (arelent *); @@ -266,7 +269,6 @@ sparc64_elf_slurp_one_reloc_table (abfd, asymbol **symbols; boolean dynamic; { - struct elf_backend_data * const ebd = get_elf_backend_data (abfd); PTR allocated = NULL; bfd_byte *native_relocs; arelent *relent; @@ -501,7 +503,6 @@ sparc64_elf_write_relocs (abfd, sec, dat for (idx = 0; idx < sec->reloc_count; idx++) { bfd_vma addr; - unsigned int i; ++count; @@ -723,13 +724,13 @@ sparc_elf_notsup_reloc (abfd, input_section, output_bfd, error_message) - bfd *abfd; - arelent *reloc_entry; - asymbol *symbol; - PTR data; - asection *input_section; - bfd *output_bfd; - char **error_message; + bfd *abfd ATTRIBUTE_UNUSED; + arelent *reloc_entry ATTRIBUTE_UNUSED; + asymbol *symbol ATTRIBUTE_UNUSED; + PTR data ATTRIBUTE_UNUSED; + asection *input_section ATTRIBUTE_UNUSED; + bfd *output_bfd ATTRIBUTE_UNUSED; + char **error_message ATTRIBUTE_UNUSED; { return bfd_reloc_notsupported; } @@ -745,7 +746,7 @@ sparc_elf_wdisp16_reloc (abfd, reloc_ent PTR data; asection *input_section; bfd *output_bfd; - char **error_message; + char **error_message ATTRIBUTE_UNUSED; { bfd_vma relocation; bfd_vma insn; @@ -783,7 +784,7 @@ sparc_elf_hix22_reloc (abfd, PTR data; asection *input_section; bfd *output_bfd; - char **error_message; + char **error_message ATTRIBUTE_UNUSED; { bfd_vma relocation; bfd_vma insn; @@ -820,7 +821,7 @@ sparc_elf_lox10_reloc (abfd, PTR data; asection *input_section; bfd *output_bfd; - char **error_message; + char **error_message ATTRIBUTE_UNUSED; { bfd_vma relocation; bfd_vma insn; @@ -1265,9 +1266,9 @@ sparc64_elf_add_symbol_hook (abfd, info, struct bfd_link_info *info; const Elf_Internal_Sym *sym; const char **namep; - flagword *flagsp; - asection **secp; - bfd_vma *valp; + flagword *flagsp ATTRIBUTE_UNUSED; + asection **secp ATTRIBUTE_UNUSED; + bfd_vma *valp ATTRIBUTE_UNUSED; { static char *stt_types[] = { "NOTYPE", "OBJECT", "FUNCTION" }; @@ -1387,7 +1388,7 @@ sparc64_elf_add_symbol_hook (abfd, info, static boolean sparc64_elf_output_arch_syms (output_bfd, info, finfo, func) - bfd *output_bfd; + bfd *output_bfd ATTRIBUTE_UNUSED; struct bfd_link_info *info; PTR finfo; boolean (*func) PARAMS ((PTR, const char *, @@ -1460,7 +1461,7 @@ sparc64_elf_get_symbol_type (elf_sym, ty static void sparc64_elf_symbol_processing (abfd, asym) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; asymbol *asym; { elf_symbol_type *elfsym; @@ -1855,6 +1856,22 @@ sparc64_elf_size_dynamic_sections (outpu return true; } +#define SET_SEC_DO_RELAX(section) do { elf_section_data(section)->tdata = (void *)1; } while (0) +#define SEC_DO_RELAX(section) (elf_section_data(section)->tdata == (void *)1) + +/*ARGSUSED*/ +static boolean +sparc64_elf_relax_section (abfd, section, link_info, again) + bfd *abfd ATTRIBUTE_UNUSED; + asection *section ATTRIBUTE_UNUSED; + struct bfd_link_info *link_info ATTRIBUTE_UNUSED; + boolean *again; +{ + *again = false; + SET_SEC_DO_RELAX (section); + return true; +} + /* Relocate a SPARC64 ELF section. */ static boolean @@ -1898,7 +1915,7 @@ sparc64_elf_relocate_section (output_bfd { int r_type; reloc_howto_type *howto; - long r_symndx; + unsigned long r_symndx; struct elf_link_hash_entry *h; Elf_Internal_Sym *sym; asection *sec; @@ -2049,14 +2066,17 @@ sparc64_elf_relocate_section (output_bfd } else if (h->root.type == bfd_link_hash_undefweak) relocation = 0; - else if (info->shared && !info->symbolic && !info->no_undefined) + else if (info->shared && !info->symbolic + && !info->no_undefined + && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT) relocation = 0; else { if (! ((*info->callbacks->undefined_symbol) (info, h->root.root.string, input_bfd, input_section, rel->r_offset, - (!info->shared || info->no_undefined)))) + (!info->shared || info->no_undefined + || ELF_ST_VISIBILITY (h->other))))) return false; relocation = 0; } @@ -2393,6 +2413,8 @@ sparc64_elf_relocate_section (output_bfd relocation = (splt->output_section->vma + splt->output_offset + sparc64_elf_plt_entry_offset (h->plt.offset)); + if (r_type == R_SPARC_WPLT30) + goto do_wplt30; goto do_default; case R_SPARC_OLO10: @@ -2468,6 +2490,97 @@ sparc64_elf_relocate_section (output_bfd } break; + case R_SPARC_WDISP30: + do_wplt30: + if (SEC_DO_RELAX (input_section) + && rel->r_offset + 4 < input_section->_raw_size) + { +#define G0 0 +#define O7 15 +#define XCC (2 << 20) +#define COND(x) (((x)&0xf)<<25) +#define CONDA COND(0x8) +#define INSN_BPA (F2(0,1) | CONDA | BPRED | XCC) +#define INSN_BA (F2(0,2) | CONDA) +#define INSN_OR F3(2, 0x2, 0) +#define INSN_NOP F2(0,4) + + bfd_vma x, y; + + /* If the instruction is a call with either: + restore + arithmetic instruction with rd == %o7 + where rs1 != %o7 and rs2 if it is register != %o7 + then we can optimize if the call destination is near + by changing the call into a branch always. */ + x = bfd_get_32 (input_bfd, contents + rel->r_offset); + y = bfd_get_32 (input_bfd, contents + rel->r_offset + 4); + if ((x & OP(~0)) == OP(1) && (y & OP(~0)) == OP(2)) + { + if (((y & OP3(~0)) == OP3(0x3d) /* restore */ + || ((y & OP3(0x28)) == 0 /* arithmetic */ + && (y & RD(~0)) == RD(O7))) + && (y & RS1(~0)) != RS1(O7) + && ((y & F3I(~0)) + || (y & RS2(~0)) != RS2(O7))) + { + bfd_vma reloc; + + reloc = relocation + rel->r_addend - rel->r_offset; + reloc -= (input_section->output_section->vma + + input_section->output_offset); + if (reloc & 3) + goto do_default; + + /* Ensure the branch fits into simm22. */ + if ((reloc & ~(bfd_vma)0x7fffff) + && ((reloc | 0x7fffff) != MINUS_ONE)) + goto do_default; + reloc >>= 2; + + /* Check whether it fits into simm19. */ + if ((reloc & 0x3c0000) == 0 + || (reloc & 0x3c0000) == 0x3c0000) + x = INSN_BPA | (reloc & 0x7ffff); /* ba,pt %xcc */ + else + x = INSN_BA | (reloc & 0x3fffff); /* ba */ + bfd_put_32 (input_bfd, x, contents + rel->r_offset); + r = bfd_reloc_ok; + if (rel->r_offset >= 4 + && (y & (0xffffffff ^ RS1(~0))) + == (INSN_OR | RD(O7) | RS2(G0))) + { + bfd_vma z; + unsigned int reg; + + z = bfd_get_32 (input_bfd, + contents + rel->r_offset - 4); + if ((z & (0xffffffff ^ RD(~0))) + != (INSN_OR | RS1(O7) | RS2(G0))) + break; + + /* The sequence was + or %o7, %g0, %rN + call foo + or %rN, %g0, %o7 + + If call foo was replaced with ba, replace + or %rN, %g0, %o7 with nop. */ + + reg = (y & RS1(~0)) >> 14; + if (reg != ((z & RD(~0)) >> 25) + || reg == G0 || reg == O7) + break; + + bfd_put_32 (input_bfd, INSN_NOP, + contents + rel->r_offset + 4); + } + break; + } + } + } + /* FALLTHROUGH */ + default: do_default: r = _bfd_final_link_relocate (howto, input_bfd, input_section, @@ -2806,8 +2919,8 @@ sparc64_elf_merge_private_bfd_data (ibfd /* We don't want dynamic objects memory ordering and architecture to have any role. That's what dynamic linker should do. */ - old_flags &= ~(EF_SPARCV9_MM | EF_SPARC_SUN_US1 | EF_SPARC_HAL_R1); - old_flags |= (new_flags + new_flags &= ~(EF_SPARCV9_MM | EF_SPARC_SUN_US1 | EF_SPARC_HAL_R1); + new_flags |= (old_flags & (EF_SPARCV9_MM | EF_SPARC_SUN_US1 | EF_SPARC_HAL_R1)); @@ -2860,7 +2973,7 @@ sparc64_elf_merge_private_bfd_data (ibfd static const char * sparc64_elf_print_symbol_all (abfd, filep, symbol) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; PTR filep; asymbol *symbol; { @@ -2960,6 +3073,8 @@ const struct elf_size_info sparc64_elf_s sparc64_elf_canonicalize_dynamic_reloc #define bfd_elf64_bfd_reloc_type_lookup \ sparc64_elf_reloc_type_lookup +#define bfd_elf64_bfd_relax_section \ + sparc64_elf_relax_section #define elf_backend_create_dynamic_sections \ _bfd_elf_create_dynamic_sections diff -upr --new-file binutils-2.9.5.0.42/bfd/elflink.c binutils-2.9.5.0.46/bfd/elflink.c --- binutils-2.9.5.0.42/bfd/elflink.c Tue May 2 10:23:17 2000 +++ binutils-2.9.5.0.46/bfd/elflink.c Tue May 30 12:32:42 2000 @@ -235,10 +235,16 @@ _bfd_elf_link_record_dynamic_symbol (inf (*info->callbacks->undefined_symbol) (info, name, abfd, bfd_und_section_ptr, 0, true); + + /* We have flaged a fatal error. We now treat this as + a normal symbol to avoid further error messages. */ + h->other ^= ELF_ST_VISIBILITY (h->other); + } + else if (h->root.type != bfd_link_hash_undefweak) + { + h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL; + return true; } - - h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL; - return true; default: break; diff -upr --new-file binutils-2.9.5.0.42/bfd/elflink.h binutils-2.9.5.0.46/bfd/elflink.h --- binutils-2.9.5.0.42/bfd/elflink.h Tue May 2 10:23:17 2000 +++ binutils-2.9.5.0.46/bfd/elflink.h Tue May 30 14:05:11 2000 @@ -357,7 +357,6 @@ elf_link_add_archive_symbols (abfd, info } /* We need to include this archive member. */ - element = _bfd_get_elt_at_filepos (abfd, symdef->file_offset); if (element == (bfd *) NULL) goto error_return; @@ -891,7 +890,6 @@ elf_link_add_object_symbols (abfd, info) Elf_External_Sym *esym; Elf_External_Sym *esymend; struct elf_backend_data *bed; - boolean visibility_changed = false; bed = get_elf_backend_data (abfd); add_symbol_hook = bed->elf_add_symbol_hook; @@ -1582,10 +1580,7 @@ elf_link_add_object_symbols (abfd, info) unsigned char symvis = ELF_ST_VISIBILITY (sym.st_other); if (symvis && (hvis > symvis || hvis == 0)) - { - visibility_changed = true; - h->other = sym.st_other; - } + h->other = sym.st_other; /* If neither has visibility, use the st_other of the definition. This is an arbitrary choice, since the @@ -1856,7 +1851,7 @@ elf_link_add_object_symbols (abfd, info) goto error_return; } } - else if (dynsym && h->dynindx != -1 && visibility_changed) + else if (dynsym && h->dynindx != -1) /* If the symbol already has a dynamic index, but visibility says it should not be visible, turn it into a local symbol. */ @@ -4104,7 +4099,7 @@ elf_bfd_final_link (abfd, info) the linker has decided to not include. */ sec->linker_mark = true; - if (info->relocateable) + if (info->relocateable || info->emitrelocations) o->reloc_count += sec->reloc_count; if (sec->_raw_size > max_contents_size) @@ -4172,7 +4167,7 @@ elf_bfd_final_link (abfd, info) /* Figure out how many relocations we will have in each section. Just using RELOC_COUNT isn't good enough since that doesn't maintain a separate value for REL vs. RELA relocations. */ - if (info->relocateable) + if (info->relocateable || info->emitrelocations) for (sub = info->input_bfds; sub != NULL; sub = sub->link_next) for (o = sub->sections; o != NULL; o = o->next) { @@ -4280,7 +4275,7 @@ elf_bfd_final_link (abfd, info) /* Start writing out the symbol table. The first symbol is always a dummy symbol. */ - if (info->strip != strip_all || info->relocateable) + if (info->strip != strip_all || info->relocateable || info->emitrelocations) { elfsym.st_value = 0; elfsym.st_size = 0; @@ -4313,7 +4308,7 @@ elf_bfd_final_link (abfd, info) symbols have no names. We store the index of each one in the index field of the section, so that we can find it again when outputting relocs. */ - if (info->strip != strip_all || info->relocateable) + if (info->strip != strip_all || info->relocateable || info->emitrelocations) { elfsym.st_size = 0; elfsym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION); @@ -5090,6 +5085,11 @@ elf_link_output_extsym (h, data) sym.st_info = ELF_ST_INFO (bindtype, ELF_ST_TYPE (sym.st_info)); } + /* If a symbol is not defined locally, we clear the visibility + field. */ + if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0) + sym.st_other ^= ELF_ST_VISIBILITY(sym.st_other); + /* If this symbol should be put in the .dynsym section, then put it there now. We have already know the symbol index. We also fill in the entry in the .hash section. */ @@ -5492,7 +5492,7 @@ elf_link_input_bfd (finfo, input_bfd) finfo->sections)) return false; - if (finfo->info->relocateable) + if (finfo->info->relocateable || finfo->info->emitrelocations) { Elf_Internal_Rela *irela; Elf_Internal_Rela *irelaend; @@ -5515,6 +5515,10 @@ elf_link_input_bfd (finfo, input_bfd) irela->r_offset += o->output_offset; + /* Relocs in an executable have to be virtual addresses. */ + if (finfo->info->emitrelocations) + irela->r_offset += o->output_section->vma; + r_symndx = ELF_R_SYM (irela->r_info); if (r_symndx == 0) @@ -6421,7 +6425,7 @@ elf_gc_sections (abfd, info) struct elf_link_hash_entry *h, Elf_Internal_Sym *)); if (!get_elf_backend_data (abfd)->can_gc_sections - || info->relocateable + || info->relocateable || info->emitrelocations || elf_hash_table (info)->dynamic_sections_created) return true; diff -upr --new-file binutils-2.9.5.0.42/bfd/libbfd.c binutils-2.9.5.0.46/bfd/libbfd.c --- binutils-2.9.5.0.42/bfd/libbfd.c Thu Feb 24 11:11:17 2000 +++ binutils-2.9.5.0.46/bfd/libbfd.c Mon May 29 22:35:34 2000 @@ -1306,13 +1306,17 @@ _bfd_generic_verify_endian_match (ibfd, bfd *obfd; { if (ibfd->xvec->byteorder != obfd->xvec->byteorder + && ibfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN) { - (*_bfd_error_handler) - ("%s: compiled for a %s endian system and target is %s endian", - bfd_get_filename (ibfd), - bfd_big_endian (ibfd) ? "big" : "little", - bfd_big_endian (obfd) ? "big" : "little"); + const char *msg; + + if (bfd_big_endian (ibfd)) + msg = _("%s: compiled for a big endian system and target is little endian"); + else + msg = _("%s: compiled for a little endian system and target is big endian"); + + (*_bfd_error_handler) (msg, bfd_get_filename (ibfd)); bfd_set_error (bfd_error_wrong_format); return false; diff -upr --new-file binutils-2.9.5.0.42/bfd/libbfd.h binutils-2.9.5.0.46/bfd/libbfd.h --- binutils-2.9.5.0.42/bfd/libbfd.h Tue May 2 10:23:17 2000 +++ binutils-2.9.5.0.46/bfd/libbfd.h Tue May 30 12:34:26 2000 @@ -923,8 +923,12 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_IA64_FPTR64MSB", "BFD_RELOC_IA64_FPTR64LSB", "BFD_RELOC_IA64_PCREL21B", + "BFD_RELOC_IA64_PCREL21BI", "BFD_RELOC_IA64_PCREL21M", "BFD_RELOC_IA64_PCREL21F", + "BFD_RELOC_IA64_PCREL22", + "BFD_RELOC_IA64_PCREL60B", + "BFD_RELOC_IA64_PCREL64I", "BFD_RELOC_IA64_PCREL32MSB", "BFD_RELOC_IA64_PCREL32LSB", "BFD_RELOC_IA64_PCREL64MSB", diff -upr --new-file binutils-2.9.5.0.42/bfd/libhppa.h binutils-2.9.5.0.46/bfd/libhppa.h --- binutils-2.9.5.0.42/bfd/libhppa.h Fri May 12 08:03:42 2000 +++ binutils-2.9.5.0.46/bfd/libhppa.h Sun May 21 14:19:27 2000 @@ -390,7 +390,7 @@ re_assemble_3 (insn, as3) unsigned int insn; unsigned int as3; { - return ((insn & ~ (7 << 13)) + return (insn | ((as3 & 4) << (13-2)) | ((as3 & 3) << (13+1))); } @@ -400,7 +400,7 @@ re_assemble_12 (insn, as12) unsigned int insn; unsigned int as12; { - return ((insn & ~ 0x1ffd) + return (insn | ((as12 & 0x800) >> 11) | ((as12 & 0x400) >> (10 - 2)) | ((as12 & 0x3ff) << (1 + 2))); @@ -419,14 +419,14 @@ re_assemble_16 (insn, as16, wide) /* Unusual 16-bit encoding. */ t = (as16 << 1) & 0xffff; s = (as16 & 0x8000); - return (insn & ~ 0xffff) | (t ^ s ^ (s >> 1)) | (s >> 15); + return insn | (t ^ s ^ (s >> 1)) | (s >> 15); } else { /* Standard 14-bit encoding. */ t = (as16 << 1) & 0x3fff; s = (as16 & 0x2000); - return (insn & ~ 0xffff) | t | (s >> 13); + return insn | t | (s >> 13); } } @@ -435,7 +435,7 @@ re_assemble_17 (insn, as17) unsigned int insn; unsigned int as17; { - return ((insn & ~ 0x1f1ffd) + return (insn | ((as17 & 0x10000) >> 16) | ((as17 & 0x0f800) << (16 - 11)) | ((as17 & 0x00400) >> (10 - 2)) @@ -447,7 +447,7 @@ re_assemble_21 (insn, as21) unsigned int insn; unsigned int as21; { - return ((insn & ~ 0x1fffff) + return (insn | ((as21 & 0x100000) >> 20) | ((as21 & 0x0ffe00) >> 8) | ((as21 & 0x000180) << 7) @@ -460,7 +460,7 @@ re_assemble_22 (insn, as22) unsigned int insn; unsigned int as22; { - return ((insn & ~ 0x3ff1ffd) + return (insn | ((as22 & 0x200000) >> 21) | ((as22 & 0x1f0000) << (21 - 16)) | ((as22 & 0x00f800) << (16 - 11)) @@ -697,10 +697,10 @@ hppa_rebuild_insn (abfd, insn, value, r_ switch (r_format) { case 11: return (insn & ~ 0x7ff) | low_sign_unext (value, 11); - case 12: return re_assemble_12 (insn, value); + case 12: return re_assemble_12 (insn & ~ 0x1ffd, value); case 14: return (insn & ~ 0x3fff) | low_sign_unext (value, 14); - case 17: return re_assemble_17 (insn, value); - case 21: return re_assemble_21 (insn, value); + case 17: return re_assemble_17 (insn & ~ 0x1f1ffd, value); + case 21: return re_assemble_21 (insn & ~ 0x1fffff, value); case 32: return value; default: diff -upr --new-file binutils-2.9.5.0.42/bfd/opncls.c binutils-2.9.5.0.46/bfd/opncls.c --- binutils-2.9.5.0.42/bfd/opncls.c Thu Jun 3 11:01:54 1999 +++ binutils-2.9.5.0.46/bfd/opncls.c Mon May 29 22:35:36 2000 @@ -486,7 +486,7 @@ bfd_close_all_done (abfd) int mask = umask (0); umask (mask); chmod (abfd->filename, - (0x777 + (0777 & (buf.st_mode | ((S_IXUSR | S_IXGRP | S_IXOTH) &~ mask)))); } } diff -upr --new-file binutils-2.9.5.0.42/bfd/peigen.c binutils-2.9.5.0.46/bfd/peigen.c --- binutils-2.9.5.0.42/bfd/peigen.c Fri May 12 08:03:46 2000 +++ binutils-2.9.5.0.46/bfd/peigen.c Thu May 18 14:21:13 2000 @@ -1108,8 +1108,8 @@ pe_print_idata (abfd, vfile) offset = abfd->start_address - rel_section->vma; - start_address = bfd_get_32(abfd, data+offset); - loadable_toc_address = bfd_get_32(abfd, data+offset+4); + start_address = bfd_get_32 (abfd, data + offset); + loadable_toc_address = bfd_get_32 (abfd, data + offset + 4); toc_address = loadable_toc_address - 32768; fprintf(file, @@ -1134,14 +1134,16 @@ pe_print_idata (abfd, vfile) fprintf(file, _(" Table Stamp Chain Name Thunk\n")); - data = (bfd_byte *) bfd_malloc (datasize); + data = (bfd_byte *) bfd_malloc (dataoff + datasize); if (data == NULL) return false; - if (! bfd_get_section_contents (abfd, section, (PTR) data, dataoff, datasize)) + /* Read the whole section. Some of the fields might be before dataoff. */ + if (! bfd_get_section_contents (abfd, section, (PTR) data, + 0, dataoff + datasize)) return false; - adj = section->vma - extra->ImageBase + dataoff; + adj = section->vma - extra->ImageBase; for (i = 0; i < datasize; i += onaline) { @@ -1155,7 +1157,7 @@ pe_print_idata (abfd, vfile) char *dll; /* print (i + extra->DataDirectory[1].VirtualAddress) */ - fprintf (file, " %08lx\t", (unsigned long) (i + adj)); + fprintf (file, " %08lx\t", (unsigned long) (i + adj + dataoff)); if (i + 20 > datasize) { @@ -1163,11 +1165,11 @@ pe_print_idata (abfd, vfile) ; } - hint_addr = bfd_get_32 (abfd, data + i); - time_stamp = bfd_get_32 (abfd, data + i + 4); - forward_chain = bfd_get_32 (abfd, data + i + 8); - dll_name = bfd_get_32 (abfd, data + i + 12); - first_thunk = bfd_get_32 (abfd, data + i + 16); + hint_addr = bfd_get_32 (abfd, data + i + dataoff); + time_stamp = bfd_get_32 (abfd, data + i + 4 + dataoff); + forward_chain = bfd_get_32 (abfd, data + i + 8 + dataoff); + dll_name = bfd_get_32 (abfd, data + i + 12 + dataoff); + first_thunk = bfd_get_32 (abfd, data + i + 16 + dataoff); fprintf (file, "%08lx %08lx %08lx %08lx %08lx\n", (unsigned long) hint_addr, @@ -1257,8 +1259,7 @@ pe_print_idata (abfd, vfile) } else { - ordinal = bfd_get_16(abfd, - data + iat_member - adj); + ordinal = bfd_get_16 (abfd, data + iat_member - adj); member_name = (char *) data + iat_member - adj + 2; fprintf(file, "\t%04lx\t %4d %s\n", (unsigned long) iat_member, @@ -1451,16 +1452,12 @@ pe_print_edata (abfd, vfile) { bfd_vma eat_member = bfd_get_32 (abfd, data + edt.eat_addr + (i * 4) - adj); - bfd_vma eat_actual = eat_member; - bfd_vma edata_start = bfd_get_section_vma (abfd, section); - bfd_vma edata_end = edata_start + datasize; - if (eat_member == 0) continue; - if (edata_start < eat_actual && eat_actual < edata_end) + if (eat_member - adj <= datasize) { - /* this rva is to a name (forwarding function) in our section */ + /* This rva is to a name (forwarding function) in our section. */ /* Should locate a function descriptor */ fprintf (file, "\t[%4ld] +base[%4ld] %04lx %s -- %s\n", diff -upr --new-file binutils-2.9.5.0.42/bfd/ppcboot.c binutils-2.9.5.0.46/bfd/ppcboot.c --- binutils-2.9.5.0.42/bfd/ppcboot.c Mon Jul 19 09:13:23 1999 +++ binutils-2.9.5.0.46/bfd/ppcboot.c Mon May 29 22:35:37 2000 @@ -64,7 +64,11 @@ typedef struct ppcboot_hdr { bfd_byte os_id; /* OS_ID */ char partition_name[32]; /* partition name */ bfd_byte reserved1[470]; /* reserved */ -} ppcboot_hdr_t; +} +#ifdef __GNUC__ + __attribute__ ((packed)) +#endif +ppcboot_hdr_t; /* Signature bytes for last 2 bytes of the 512 byte record */ #define SIGNATURE0 0x55 diff -upr --new-file binutils-2.9.5.0.42/bfd/reloc.c binutils-2.9.5.0.46/bfd/reloc.c --- binutils-2.9.5.0.42/bfd/reloc.c Tue May 2 10:23:17 2000 +++ binutils-2.9.5.0.46/bfd/reloc.c Tue May 30 12:34:26 2000 @@ -2802,9 +2802,17 @@ ENUMX ENUMX BFD_RELOC_IA64_PCREL21B ENUMX + BFD_RELOC_IA64_PCREL21BI +ENUMX BFD_RELOC_IA64_PCREL21M ENUMX BFD_RELOC_IA64_PCREL21F +ENUMX + BFD_RELOC_IA64_PCREL22 +ENUMX + BFD_RELOC_IA64_PCREL60B +ENUMX + BFD_RELOC_IA64_PCREL64I ENUMX BFD_RELOC_IA64_PCREL32MSB ENUMX diff -upr --new-file binutils-2.9.5.0.42/bfd/som.c binutils-2.9.5.0.46/bfd/som.c --- binutils-2.9.5.0.42/bfd/som.c Tue Feb 29 11:00:25 2000 +++ binutils-2.9.5.0.46/bfd/som.c Thu May 18 14:21:14 2000 @@ -5365,6 +5365,8 @@ som_decode_symclass (symbol) return 'U'; if (bfd_is_ind_section (symbol->section)) return 'I'; + if (symbol->flags & BSF_WEAK) + return 'W'; if (!(symbol->flags & (BSF_GLOBAL|BSF_LOCAL))) return '?'; diff -upr --new-file binutils-2.9.5.0.42/bfd/sysdep.h binutils-2.9.5.0.46/bfd/sysdep.h --- binutils-2.9.5.0.42/bfd/sysdep.h Thu Jun 3 11:01:55 1999 +++ binutils-2.9.5.0.46/bfd/sysdep.h Thu Jun 1 11:09:54 2000 @@ -1,5 +1,5 @@ /* sysdep.h -- handle host dependencies for the BFD library - Copyright 1995, 96, 97, 98, 1999 Free Software Foundation, Inc. + Copyright 1995, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. Written by Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -102,6 +102,8 @@ extern char *strrchr (); #define SEEK_CUR 1 #endif +#include "filenames.h" + #ifdef NEED_DECLARATION_STRSTR extern char *strstr (); #endif @@ -124,6 +126,18 @@ extern char *getenv (); #ifdef ENABLE_NLS #include +/* Note the use of dgetext() and PACKAGE here, rather than gettext(). + + This is because the code in this directory is used to build a library which + will be linked with code in other directories to form programs. We want to + maintain a seperate translation file for this directory however, rather + than being forced to merge it with that of any program linked to libbfd. + This is a library, so it cannot depend on the catalog currently loaded. + + In order to do this, we have to make sure that when we extract messages we + use the OPCODES domain rather than the domain of the program that included + the bfd library, (eg OBJDUMP). Hence we use dgettext (PACKAGE, String) + and define PACKAGE to be 'bfd'. (See the code in configure). */ #define _(String) dgettext (PACKAGE, String) #ifdef gettext_noop #define N_(String) gettext_noop (String) @@ -131,14 +145,13 @@ extern char *getenv (); #define N_(String) (String) #endif #else -/* Stubs that do something close enough. */ -#define textdomain(String) (String) -#define gettext(String) (String) -#define dgettext(Domain,Message) (Message) -#define dcgettext(Domain,Message,Type) (Message) -#define bindtextdomain(Domain,Directory) (Domain) -#define _(String) (String) -#define N_(String) (String) +# define gettext(Msgid) (Msgid) +# define dgettext(Domainname, Msgid) (Msgid) +# define dcgettext(Domainname, Msgid, Category) (Msgid) +# define textdomain(Domainname) while (0) /* nothing */ +# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */ +# define _(String) (String) +# define N_(String) (String) #endif #endif /* ! defined (BFD_SYSDEP_H) */ diff -upr --new-file binutils-2.9.5.0.42/bfd/trad-core.c binutils-2.9.5.0.46/bfd/trad-core.c --- binutils-2.9.5.0.42/bfd/trad-core.c Fri May 12 08:03:49 2000 +++ binutils-2.9.5.0.46/bfd/trad-core.c Thu Jun 1 11:09:55 2000 @@ -25,7 +25,19 @@ Foundation, Inc., 59 Temple Place - Suit #include "libaout.h" /* BFD a.out internal data structures */ #include -#include +#ifdef HAVE_DIRENT_H +# include +#else +# ifdef HAVE_SYS_NDIR_H +# include +# endif +# ifdef HAVE_SYS_DIR_H +# include +# endif +# ifdef HAVE_NDIR_H +# include +# endif +#endif #include #include /* After a.out.h */ diff -upr --new-file binutils-2.9.5.0.42/binutils/ChangeLog binutils-2.9.5.0.46/binutils/ChangeLog --- binutils-2.9.5.0.42/binutils/ChangeLog Fri May 12 08:03:00 2000 +++ binutils-2.9.5.0.46/binutils/ChangeLog Fri Jun 2 16:25:34 2000 @@ -1,3 +1,95 @@ +2000-06-02 David O'Brien + + * strings.c (isgraphic): Interpret as a printable character, + analogous to . + +2000-05-30 Alan Modra + + * objdump.c (display_target_list): Use bfd_close_all_done, not + bfd_close to fix crash caused by 2000-05-24 change. + +2000-05-25 DJ Delorie + + * resrc.c (close_input_stream): zero out cpp_pipe after closing it. + +2000-05-26 Alan Modra + + * Makefile.am: Update dependencies with "make dep-am" + * Makefile.in: Regenerate. + +2000-05-26 Eli Zaretskii + + * ar.c: Include filenames.h. + (normalize) [HAVE_DOS_BASED_FILE_SYSTEM]: Support backslashes + and drive letters in file names. + (main): Support backslashes and drive letters in argv[0]. Drop + the .exe suffix, if any, in argv[0] if is_ranlib is negative. Use + FILENAME_CMP instead of strcmp to compare file names. + (open_inarch) [__GO32__]: Don't ifdef errno != ENOENT test for + DJGPP v2. + (do_quick_append) [__GO32__]: Ditto. + (get_pos_bfd, delete_members, move_members, replace_members): + Compare file names with FILENAME_CMP. + + * bucomm.c: Include filenames.h. + (make_tempname) [HAVE_DOS_BASED_FILE_SYSTEM]: Support mixed + forward/backward slashes and drive letters in file names. + + * ieee.c (ieee_start_compilation_unit, ieee_add_bb11): Support + mixed forward/backward slashes and drive letters in file names. + + * strings.c (O_BINARY, setmode, SET_BINARY): Define. + (main) [SET_BINARY]: Use SET_BINARY to switch stdin into binary + mode. + + * objcopy.c: Include filenames.h. + (main) [HAVE_DOS_BASED_FILE_SYSTEM]: Drop the .exe suffix + before comparing to "strip". + Use FILENAME_CMP to compare file names. + + * arsup.c: Include filenames.h. + (map_over_list, ar_delete, ar_replace, ar_extract): Use + FILENAME_CMP to compare file names. + (ar_open): Prepend "tmp-" instead of appending "-tmp", to create + the temporary file name. + + * configure.in: Check for setmode. + * configure: Regenerate. + +2000-05-24 Alan Modra + + * objdump.c (display_target_list): Close the bfd. + (display_info_table): Likewise. + +2000-05-14 H.J. Lu (hjl@gnu.org) + + * objcopy.c (filter_symbols): Don't strip global symbols in + relocatable object files. + +2000-05-14 Alan Modra + + * size.c (usage): Associate short options with corresponding long + option to give a clue as to their function. + +2000-05-14 Philippe De Muyter + + * size.c (main): Accept and ignore `-f' option. + +2000-05-13 Alan Modra + + * bucomm.h (gettext, dgettext, dcgettext, textdomain, + bindtextdomain): Replace defines with those from intl/libgettext.h + to quieten gcc warnings. + +2000-05-12 H.J. Lu + + * nlmconv.c (temp_filename): Removed. + + * nlmconv.c (link_inputs): Use make_temp_file () instead of + choose_temp_base (). + * objdump.c (display_target_list): Likewise. + (display_info_table): Likewise. + 2000-05-08 Alan Modra * objcopy.c (setup_section): Add const and gettext calls for err. diff -upr --new-file binutils-2.9.5.0.42/binutils/ChangeLog.linux binutils-2.9.5.0.46/binutils/ChangeLog.linux --- binutils-2.9.5.0.42/binutils/ChangeLog.linux Fri May 12 08:11:30 2000 +++ binutils-2.9.5.0.46/binutils/ChangeLog.linux Sun May 14 10:28:28 2000 @@ -1,12 +1,3 @@ -2000-05-08 H.J. Lu (hjl@gnu.org) - - * nlmconv.c (temp_filename): Removed. - - * nlmconv.c (link_inputs): Use make_temp_file () instead of - choose_temp_base (). - * objdump.c (display_target_list): Likewise. - (display_info_table): Likewise. - Mon Oct 11 15:23:43 1999 H.J. Lu (hjl@gnu.org) * configure.in: Check HAVE_WEAK_SYMBOL before checking dlopen. diff -upr --new-file binutils-2.9.5.0.42/binutils/Makefile.am binutils-2.9.5.0.46/binutils/Makefile.am --- binutils-2.9.5.0.42/binutils/Makefile.am Sun Apr 23 09:48:02 2000 +++ binutils-2.9.5.0.46/binutils/Makefile.am Tue May 30 09:57:08 2000 @@ -377,13 +377,13 @@ addr2line.o: addr2line.c ../bfd/bfd.h $( ar.o: ar.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ $(INCDIR)/progress.h bucomm.h config.h $(INCDIR)/bin-bugs.h \ $(INCDIR)/fopen-same.h $(INCDIR)/aout/ar.h $(BFDDIR)/libbfd.h \ - arsup.h + arsup.h $(INCDIR)/filenames.h arsup.o: arsup.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ arsup.h $(INCDIR)/libiberty.h bucomm.h config.h $(INCDIR)/bin-bugs.h \ - $(INCDIR)/fopen-same.h + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h bucomm.o: bucomm.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h bucomm.h config.h $(INCDIR)/bin-bugs.h \ - $(INCDIR)/fopen-same.h + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h coffdump.o: coffdump.c coffgrok.h bucomm.h config.h \ $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h coffgrok.o: coffgrok.c bucomm.h config.h $(INCDIR)/bin-bugs.h \ @@ -400,7 +400,7 @@ filemode.o: filemode.c ../bfd/bfd.h $(IN bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h ieee.o: ieee.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/ieee.h \ bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \ - $(INCDIR)/libiberty.h debug.h budbg.h + $(INCDIR)/libiberty.h debug.h budbg.h $(INCDIR)/filenames.h is-ranlib.o: is-ranlib.c is-strip.o: is-strip.c maybe-ranlib.o: maybe-ranlib.c @@ -417,7 +417,8 @@ not-ranlib.o: not-ranlib.c not-strip.o: not-strip.c objcopy.o: objcopy.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ $(INCDIR)/progress.h bucomm.h config.h $(INCDIR)/bin-bugs.h \ - $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h budbg.h + $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h budbg.h \ + $(INCDIR)/filenames.h objdump.o: objdump.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ $(INCDIR)/getopt.h $(INCDIR)/progress.h bucomm.h config.h \ $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h $(INCDIR)/dis-asm.h \ @@ -481,10 +482,9 @@ readelf.o: readelf.c ../bfd/bfd.h $(INCD $(INCDIR)/elf/sparc.h $(INCDIR)/elf/m32r.h $(INCDIR)/elf/d10v.h \ $(INCDIR)/elf/d30v.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/mn10200.h \ $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/hppa.h $(INCDIR)/elf/arc.h \ - $(INCDIR)/elf/ia64.h \ $(INCDIR)/elf/fr30.h $(INCDIR)/elf/mcore.h $(INCDIR)/elf/i960.h \ - $(INCDIR)/elf/pj.h $(INCDIR)/elf/avr.h bucomm.h config.h \ - $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h + $(INCDIR)/elf/pj.h $(INCDIR)/elf/avr.h $(INCDIR)/elf/ia64.h \ + bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h resres.o: resres.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \ $(INCDIR)/libiberty.h windres.h winduni.h diff -upr --new-file binutils-2.9.5.0.42/binutils/Makefile.in binutils-2.9.5.0.46/binutils/Makefile.in --- binutils-2.9.5.0.42/binutils/Makefile.in Sun Apr 23 09:48:02 2000 +++ binutils-2.9.5.0.46/binutils/Makefile.in Tue May 30 09:57:08 2000 @@ -1233,13 +1233,13 @@ addr2line.o: addr2line.c ../bfd/bfd.h $( ar.o: ar.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ $(INCDIR)/progress.h bucomm.h config.h $(INCDIR)/bin-bugs.h \ $(INCDIR)/fopen-same.h $(INCDIR)/aout/ar.h $(BFDDIR)/libbfd.h \ - arsup.h + arsup.h $(INCDIR)/filenames.h arsup.o: arsup.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ arsup.h $(INCDIR)/libiberty.h bucomm.h config.h $(INCDIR)/bin-bugs.h \ - $(INCDIR)/fopen-same.h + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h bucomm.o: bucomm.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h bucomm.h config.h $(INCDIR)/bin-bugs.h \ - $(INCDIR)/fopen-same.h + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h coffdump.o: coffdump.c coffgrok.h bucomm.h config.h \ $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h coffgrok.o: coffgrok.c bucomm.h config.h $(INCDIR)/bin-bugs.h \ @@ -1256,7 +1256,7 @@ filemode.o: filemode.c ../bfd/bfd.h $(IN bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h ieee.o: ieee.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/ieee.h \ bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \ - $(INCDIR)/libiberty.h debug.h budbg.h + $(INCDIR)/libiberty.h debug.h budbg.h $(INCDIR)/filenames.h is-ranlib.o: is-ranlib.c is-strip.o: is-strip.c maybe-ranlib.o: maybe-ranlib.c @@ -1273,7 +1273,8 @@ not-ranlib.o: not-ranlib.c not-strip.o: not-strip.c objcopy.o: objcopy.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ $(INCDIR)/progress.h bucomm.h config.h $(INCDIR)/bin-bugs.h \ - $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h budbg.h + $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h budbg.h \ + $(INCDIR)/filenames.h objdump.o: objdump.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ $(INCDIR)/getopt.h $(INCDIR)/progress.h bucomm.h config.h \ $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h $(INCDIR)/dis-asm.h \ @@ -1337,10 +1338,9 @@ readelf.o: readelf.c ../bfd/bfd.h $(INCD $(INCDIR)/elf/sparc.h $(INCDIR)/elf/m32r.h $(INCDIR)/elf/d10v.h \ $(INCDIR)/elf/d30v.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/mn10200.h \ $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/hppa.h $(INCDIR)/elf/arc.h \ - $(INCDIR)/elf/ia64.h \ $(INCDIR)/elf/fr30.h $(INCDIR)/elf/mcore.h $(INCDIR)/elf/i960.h \ - $(INCDIR)/elf/pj.h $(INCDIR)/elf/avr.h bucomm.h config.h \ - $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h + $(INCDIR)/elf/pj.h $(INCDIR)/elf/avr.h $(INCDIR)/elf/ia64.h \ + bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h resres.o: resres.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \ $(INCDIR)/libiberty.h windres.h winduni.h diff -upr --new-file binutils-2.9.5.0.42/binutils/ar.c binutils-2.9.5.0.46/binutils/ar.c --- binutils-2.9.5.0.42/binutils/ar.c Wed Apr 12 10:27:32 2000 +++ binutils-2.9.5.0.46/binutils/ar.c Tue May 30 09:57:08 2000 @@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suit #include "aout/ar.h" #include "libbfd.h" #include "arsup.h" +#include "filenames.h" #include #ifdef __GO32___ @@ -215,7 +216,7 @@ map_over_members (arch, function, files, bfd_stat_arch_elt (head, &buf); } if ((head->filename != NULL) && - (!strcmp (normalize (*files, arch), head->filename))) + (!FILENAME_CMP (normalize (*files, arch), head->filename))) { ++match_count; if (counted_name_mode @@ -302,6 +303,16 @@ normalize (file, abfd) return file; filename = strrchr (file, '/'); +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + { + /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */ + char *bslash = strrchr (file, '\\'); + if (bslash > filename) + filename = bslash; + if (filename == NULL && file[0] != '\0' && file[1] == ':') + filename = file + 1; + } +#endif if (filename != (char *) NULL) filename++; else @@ -377,12 +388,22 @@ main (argc, argv) char *temp; temp = strrchr (program_name, '/'); +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + { + /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */ + char *bslash = strrchr (program_name, '\\'); + if (bslash > temp) + temp = bslash; + if (temp == NULL && program_name[0] != '\0' && program_name[1] == ':') + temp = program_name + 1; + } +#endif if (temp == NULL) temp = program_name; else ++temp; if (strlen (temp) >= 6 - && strcmp (temp + strlen (temp) - 6, "ranlib") == 0) + && FILENAME_CMP (temp + strlen (temp) - 6, "ranlib") == 0) is_ranlib = 1; else is_ranlib = 0; @@ -697,12 +718,15 @@ open_inarch (archive_filename, file) if (stat (archive_filename, &sbuf) != 0) { -#ifndef __GO32__ +#if !defined(__GO32__) || defined(__DJGPP__) + + /* FIXME: I don't understand why this fragment was ifndef'ed + away for __GO32__; perhaps it was in the days of DJGPP v1.x. + stat() works just fine in v2.x, so I think this should be + removed. For now, I enable it for DJGPP v2. -- EZ. */ /* KLUDGE ALERT! Temporary fix until I figger why - * stat() is wrong ... think it's buried in GO32's IDT - * - Jax - */ + stat() is wrong ... think it's buried in GO32's IDT - Jax */ if (errno != ENOENT) bfd_fatal (archive_filename); #endif @@ -932,12 +956,18 @@ do_quick_append (archive_filename, files if (stat (archive_filename, &sbuf) != 0) { -#ifndef __GO32__ +#if !defined(__GO32__) || defined(__DJGPP__) + + /* FIXME: I don't understand why this fragment was ifndef'ed + away for __GO32__; perhaps it was in the days of DJGPP v1.x. + stat() works just fine in v2.x, so I think this should be + removed. For now, I enable it for DJGPP v2. + + (And yes, I know this is all unused, but somebody, someday, + might wish to resurrect this again... -- EZ. */ /* KLUDGE ALERT! Temporary fix until I figger why - * stat() is wrong ... think it's buried in GO32's IDT - * - Jax - */ + stat() is wrong ... think it's buried in GO32's IDT - Jax */ if (errno != ENOENT) bfd_fatal (archive_filename); @@ -1107,7 +1137,7 @@ get_pos_bfd (contents, default_pos, defa else { for (; *after_bfd; after_bfd = &(*after_bfd)->next) - if (strcmp ((*after_bfd)->filename, realposname) == 0) + if (FILENAME_CMP ((*after_bfd)->filename, realposname) == 0) { if (realpos == pos_after) after_bfd = &(*after_bfd)->next; @@ -1147,7 +1177,7 @@ delete_members (arch, files_to_delete) current_ptr_ptr = &(arch->next); while (*current_ptr_ptr) { - if (strcmp (normalize (*files_to_delete, arch), + if (FILENAME_CMP (normalize (*files_to_delete, arch), (*current_ptr_ptr)->filename) == 0) { ++match_count; @@ -1204,8 +1234,8 @@ move_members (arch, files_to_move) while (*current_ptr_ptr) { bfd *current_ptr = *current_ptr_ptr; - if (strcmp (normalize (*files_to_move, arch), - current_ptr->filename) == 0) + if (FILENAME_CMP (normalize (*files_to_move, arch), + current_ptr->filename) == 0) { /* Move this file to the end of the list - first cut from where it is. */ @@ -1260,8 +1290,8 @@ replace_members (arch, files_to_move, qu /* For compatibility with existing ar programs, we permit the same file to be added multiple times. */ - if (strcmp (normalize (*files_to_move, arch), - normalize (current->filename, arch)) == 0 + if (FILENAME_CMP (normalize (*files_to_move, arch), + normalize (current->filename, arch)) == 0 && current->arelt_data != NULL) { if (newer_only) diff -upr --new-file binutils-2.9.5.0.42/binutils/arsup.c binutils-2.9.5.0.46/binutils/arsup.c --- binutils-2.9.5.0.42/binutils/arsup.c Mon Jul 12 10:13:37 1999 +++ binutils-2.9.5.0.46/binutils/arsup.c Mon May 29 22:34:49 2000 @@ -1,5 +1,5 @@ /* arsup.c - Archive support for MRI compatibility - Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 1999 + Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -31,6 +31,7 @@ style librarian command syntax + 1 word #include "arsup.h" #include "libiberty.h" #include "bucomm.h" +#include "filenames.h" static void map_over_list PARAMS ((bfd *, void (*function) (bfd *, bfd *), struct list *)); @@ -76,7 +77,7 @@ map_over_list (arch, function, list) for (head = arch->next; head; head = head->next) { if (head->filename != NULL - && strcmp (ptr->name, head->filename) == 0) + && FILENAME_CMP (ptr->name, head->filename) == 0) { found = true; function (head, prev); @@ -160,7 +161,9 @@ DEFUN(ar_open,(name, t), { char *tname = (char *) xmalloc (strlen (name) + 10); real_name = name; - sprintf(tname, "%s-tmp", name); + /* Prepend tmp- to the beginning, to avoid file-name clashes after + truncation on filesystems with limited namespaces (DOS). */ + sprintf(tname, "tmp-%s", name); obfd = bfd_openw(tname, NULL); if (!obfd) { @@ -289,7 +292,7 @@ DEFUN(ar_delete, (list), bfd **prev = &(obfd->archive_head); int found = 0; while (member) { - if (strcmp(member->filename, list->name) == 0) { + if (FILENAME_CMP(member->filename, list->name) == 0) { *prev = member->next; found = 1; } @@ -346,7 +349,7 @@ DEFUN(ar_replace, (list), int found = 0; while (member) { - if (strcmp(member->filename, list->name) == 0) + if (FILENAME_CMP(member->filename, list->name) == 0) { /* Found the one to replace */ bfd *abfd = bfd_openr(list->name, 0); @@ -437,7 +440,7 @@ DEFUN(ar_extract,(list), int found = 0; while (member && !found) { - if (strcmp(member->filename, list->name) == 0) + if (FILENAME_CMP(member->filename, list->name) == 0) { extract_file(member); found = 1; diff -upr --new-file binutils-2.9.5.0.42/binutils/bucomm.c binutils-2.9.5.0.46/binutils/bucomm.c --- binutils-2.9.5.0.42/binutils/bucomm.c Wed Apr 12 10:04:48 2000 +++ binutils-2.9.5.0.46/binutils/bucomm.c Mon May 29 22:34:49 2000 @@ -25,6 +25,7 @@ #include "bfd.h" #include "libiberty.h" #include "bucomm.h" +#include "filenames.h" #include #include /* ctime, maybe time_t */ @@ -214,9 +215,15 @@ make_tempname (filename) char *tmpname; char *slash = strrchr (filename, '/'); -#if defined (__DJGPP__) || defined (__GO32__) || defined (_WIN32) - if (slash == NULL) - slash = strrchr (filename, '\\'); +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + { + /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */ + char *bslash = strrchr (filename, '\\'); + if (bslash > slash) + slash = bslash; + if (slash == NULL && filename[0] != '\0' && filename[1] == ':') + slash = filename + 1; + } #endif if (slash != (char *) NULL) @@ -225,8 +232,15 @@ make_tempname (filename) c = *slash; *slash = 0; - tmpname = xmalloc (strlen (filename) + sizeof (template) + 1); + tmpname = xmalloc (strlen (filename) + sizeof (template) + 2); strcpy (tmpname, filename); +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + /* If tmpname is "X:", appending a slash will make it a root + directory on drive X, which is NOT the same as the current + directory on drive X. */ + if (tmpname[1] == ':' && tmpname[2] == '\0') + strcat (tmpname, "."); +#endif strcat (tmpname, "/"); strcat (tmpname, template); mktemp (tmpname); diff -upr --new-file binutils-2.9.5.0.42/binutils/bucomm.h binutils-2.9.5.0.46/binutils/bucomm.h --- binutils-2.9.5.0.42/binutils/bucomm.h Wed Apr 12 10:04:48 2000 +++ binutils-2.9.5.0.46/binutils/bucomm.h Sun May 14 10:21:12 2000 @@ -138,12 +138,11 @@ void *alloca (); # define N_(String) (String) # endif #else -/* Stubs that do something close enough. */ -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) +# define gettext(Msgid) (Msgid) +# define dgettext(Domainname, Msgid) (Msgid) +# define dcgettext(Domainname, Msgid, Category) (Msgid) +# define textdomain(Domainname) while (0) /* nothing */ +# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */ # define _(String) (String) # define N_(String) (String) #endif diff -upr --new-file binutils-2.9.5.0.42/binutils/config.in binutils-2.9.5.0.46/binutils/config.in --- binutils-2.9.5.0.42/binutils/config.in Tue Oct 12 09:04:29 1999 +++ binutils-2.9.5.0.46/binutils/config.in Tue May 30 09:57:08 2000 @@ -82,6 +82,9 @@ /* Define if you have the setlocale function. */ #undef HAVE_SETLOCALE +/* Define if you have the setmode function. */ +#undef HAVE_SETMODE + /* Define if you have the stpcpy function. */ #undef HAVE_STPCPY diff -upr --new-file binutils-2.9.5.0.42/binutils/configure binutils-2.9.5.0.46/binutils/configure --- binutils-2.9.5.0.42/binutils/configure Wed Apr 12 10:27:32 2000 +++ binutils-2.9.5.0.46/binutils/configure Tue May 30 09:57:08 2000 @@ -4325,7 +4325,7 @@ EOF fi -for ac_func in sbrk utimes +for ac_func in sbrk utimes setmode do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:4332: checking for $ac_func" >&5 diff -upr --new-file binutils-2.9.5.0.42/binutils/configure.in binutils-2.9.5.0.46/binutils/configure.in --- binutils-2.9.5.0.42/binutils/configure.in Wed Apr 12 10:27:32 2000 +++ binutils-2.9.5.0.46/binutils/configure.in Tue May 30 09:57:08 2000 @@ -96,7 +96,7 @@ AC_SUBST(DEMANGLER_NAME) AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h fcntl.h sys/file.h dlfcn.h) AC_HEADER_SYS_WAIT AC_FUNC_ALLOCA -AC_CHECK_FUNCS(sbrk utimes) +AC_CHECK_FUNCS(sbrk utimes setmode) # Some systems have frexp only in -lm, not in -lc. AC_SEARCH_LIBS(frexp, m) diff -upr --new-file binutils-2.9.5.0.42/binutils/ieee.c binutils-2.9.5.0.46/binutils/ieee.c --- binutils-2.9.5.0.42/binutils/ieee.c Thu Jan 20 19:06:30 2000 +++ binutils-2.9.5.0.46/binutils/ieee.c Mon May 29 22:34:51 2000 @@ -1,5 +1,5 @@ /* ieee.c -- Read and write IEEE-695 debugging information. - Copyright (C) 1996, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1996, 1998, 1999, 2000 Free Software Foundation, Inc. Written by Ian Lance Taylor . This file is part of GNU Binutils. @@ -30,6 +30,7 @@ #include "libiberty.h" #include "debug.h" #include "budbg.h" +#include "filenames.h" /* This structure holds an entry on the block stack. */ @@ -4926,6 +4927,7 @@ ieee_start_compilation_unit (p, filename { struct ieee_handle *info = (struct ieee_handle *) p; const char *modname; + const char *backslash; char *c, *s; unsigned int nindx; @@ -4937,16 +4939,20 @@ ieee_start_compilation_unit (p, filename info->filename = filename; modname = strrchr (filename, '/'); + /* We could have a mixed forward/back slash case. */ + backslash = strrchr (modname, '\\'); + if (backslash > modname) + modname = backslash; + if (modname != NULL) ++modname; +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + else if (filename[0] && filename[1] == ':') + modname = filename + 2; +#endif else - { - modname = strrchr (filename, '\\'); - if (modname != NULL) - ++modname; - else - modname = filename; - } + modname = filename; + c = xstrdup (modname); s = strrchr (c, '.'); if (s != NULL) @@ -5194,22 +5200,25 @@ ieee_add_bb11 (info, sec, low, high) } else { - const char *filename, *modname; + const char *filename, *modname, *backslash; char *c, *s; /* Start the enclosing BB10 block. */ filename = bfd_get_filename (info->abfd); modname = strrchr (filename, '/'); + backslash = strrchr (modname, '\\'); + if (backslash > modname) + modname = backslash; + if (modname != NULL) ++modname; +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + else if (filename[0] && filename[1] == ':') + modname = filename + 2; +#endif else - { - modname = strrchr (filename, '\\'); - if (modname != NULL) - ++modname; - else - modname = filename; - } + modname = filename; + c = xstrdup (modname); s = strrchr (c, '.'); if (s != NULL) diff -upr --new-file binutils-2.9.5.0.42/binutils/objcopy.c binutils-2.9.5.0.46/binutils/objcopy.c --- binutils-2.9.5.0.42/binutils/objcopy.c Fri May 12 08:11:30 2000 +++ binutils-2.9.5.0.46/binutils/objcopy.c Tue May 30 09:57:08 2000 @@ -1,5 +1,5 @@ /* objcopy.c -- copy object file from input to output, optionally massaging it. - Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 1999 + Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -25,6 +25,7 @@ #include "getopt.h" #include "libiberty.h" #include "budbg.h" +#include "filenames.h" #include /* A list of symbols to explicitly strip out, or to keep. A linked @@ -556,6 +557,8 @@ filter_symbols (abfd, obfd, osyms, isyms { register asymbol **from = isyms, **to = osyms; long src_count = 0, dst_count = 0; + int relocatable = (abfd->flags & (HAS_RELOC | EXEC_P | DYNAMIC)) + == HAS_RELOC; for (; src_count < symcount; src_count++) { @@ -610,6 +613,9 @@ filter_symbols (abfd, obfd, osyms, isyms && ((*bfd_get_section (sym)->symbol_ptr_ptr)->flags & BSF_KEEP) != 0)) keep = 1; + else if (relocatable /* Relocatable file. */ + && (flags & (BSF_GLOBAL | BSF_WEAK)) != 0) + keep = 1; else if ((flags & BSF_GLOBAL) != 0 /* Global symbol. */ || (flags & BSF_WEAK) != 0 || bfd_is_und_section (bfd_get_section (sym)) @@ -2248,7 +2254,15 @@ main (argc, argv) if (is_strip < 0) { int i = strlen (program_name); - is_strip = (i >= 5 && strcmp (program_name + i - 5, "strip") == 0); +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + /* Drop the .exe suffix, if any. */ + if (i > 4 && FILENAME_CMP (program_name + i - 4, ".exe") == 0) + { + i -= 4; + program_name[i] = '\0'; + } +#endif + is_strip = (i >= 5 && FILENAME_CMP (program_name + i - 5, "strip") == 0); } if (is_strip) diff -upr --new-file binutils-2.9.5.0.42/binutils/objdump.c binutils-2.9.5.0.46/binutils/objdump.c --- binutils-2.9.5.0.42/binutils/objdump.c Fri May 12 08:11:30 2000 +++ binutils-2.9.5.0.46/binutils/objdump.c Tue May 30 09:57:08 2000 @@ -2660,6 +2660,7 @@ display_target_list () { if (bfd_get_error () != bfd_error_invalid_operation) nonfatal (p->name); + bfd_close_all_done (abfd); continue; } @@ -2667,6 +2668,7 @@ display_target_list () if (bfd_set_arch_mach (abfd, (enum bfd_architecture) a, 0)) printf (" %s\n", bfd_printable_arch_mach ((enum bfd_architecture) a, 0)); + bfd_close_all_done (abfd); } unlink (dummy_name); free (dummy_name); @@ -2734,6 +2736,8 @@ display_info_table (first, last) putchar ('-'); putchar (' '); } + if (abfd != NULL) + bfd_close_all_done (abfd); } putchar ('\n'); } diff -upr --new-file binutils-2.9.5.0.42/binutils/resrc.c binutils-2.9.5.0.46/binutils/resrc.c --- binutils-2.9.5.0.42/binutils/resrc.c Sat Feb 19 11:21:17 2000 +++ binutils-2.9.5.0.46/binutils/resrc.c Mon May 29 22:34:52 2000 @@ -499,7 +499,10 @@ static void close_input_stream () { if (cpp_pipe != NULL) - pclose (cpp_pipe); + { + pclose (cpp_pipe); + cpp_pipe = NULL; + } if (istream_type == ISTREAM_FILE) { diff -upr --new-file binutils-2.9.5.0.42/binutils/size.c binutils-2.9.5.0.46/binutils/size.c --- binutils-2.9.5.0.42/binutils/size.c Wed Apr 12 10:27:32 2000 +++ binutils-2.9.5.0.46/binutils/size.c Sun May 14 10:25:52 2000 @@ -77,8 +77,10 @@ usage (stream, status) int status; { fprintf (stream, _("\ -Usage: %s [-ABdoxV] [--format=berkeley|sysv] [--radix=8|10|16]\n\ - [--target=bfdname] [--version] [--help] [file...]\n"), program_name); +Usage: %s [-A | --format=sysv | -B | --format=berkeley]\n\ + [-o | --radix=8 | -d | --radix=10 | -h | --radix=16]\n\ + [-V | --version] [--target=bfdname] [--help] [file...]\n"), + program_name); #if BSD_DEFAULT fputs (_("default is --format=berkeley\n"), stream); #else @@ -120,7 +122,7 @@ main (argc, argv) bfd_init (); set_default_bfd_target (); - while ((c = getopt_long (argc, argv, "ABVdox", long_options, + while ((c = getopt_long (argc, argv, "ABVdfox", long_options, (int *) 0)) != EOF) switch (c) { @@ -185,6 +187,16 @@ main (argc, argv) break; case 'o': radix = octal; + break; + case 'f': /* FIXME : For sysv68, `-f' means `full format', i.e. + `[fname:] M(.text) + N(.data) + O(.bss) + P(.comment) = Q' + where `fname: ' appears only if there are >= 2 input files, + and M, N, O, P, Q are expressed in decimal by default, + hexa or octal if requested by `-x' or `-o'. + Just to make things interesting, Solaris also accepts -f, + which prints out the size of each allocatable section, the + name of the section, and the total of the section sizes. */ + /* For the moment, accept `-f' silently, and ignore it. */ break; case 0: break; diff -upr --new-file binutils-2.9.5.0.42/binutils/strings.c binutils-2.9.5.0.46/binutils/strings.c --- binutils-2.9.5.0.42/binutils/strings.c Wed Apr 12 10:27:32 2000 +++ binutils-2.9.5.0.46/binutils/strings.c Fri Jun 2 16:36:46 2000 @@ -59,10 +59,27 @@ #include "bucomm.h" #include "libiberty.h" +/* Some platforms need to put stdin into binary mode, to read + binary files. */ +#ifdef HAVE_SETMODE +#ifndef O_BINARY +#ifdef _O_BINARY +#define O_BINARY _O_BINARY +#define setmode _setmode +#else +#define O_BINARY 0 +#endif +#endif +#if O_BINARY +#include +#define SET_BINARY(f) do { if (!isatty(f)) setmode(f,O_BINARY); } while (0) +#endif +#endif + #ifdef isascii -#define isgraphic(c) (isascii (c) && isprint (c)) +#define isgraphic(c) (isascii (c) && (isprint (c) || (c) == '\t')) #else -#define isgraphic(c) (isprint (c)) +#define isgraphic(c) (isprint (c) || (c) == '\t') #endif #ifndef errno @@ -218,6 +235,9 @@ main (argc, argv) if (optind >= argc) { datasection_only = false; +#ifdef SET_BINARY + SET_BINARY (fileno (stdin)); +#endif print_strings ("{standard input}", stdin, 0, 0, 0, (char *) NULL); files_given = true; } diff -upr --new-file binutils-2.9.5.0.42/binutils.spec binutils-2.9.5.0.46/binutils.spec --- binutils-2.9.5.0.42/binutils.spec Fri May 12 08:21:28 2000 +++ binutils-2.9.5.0.46/binutils.spec Sat Jun 3 15:03:13 2000 @@ -1,6 +1,6 @@ Summary: GNU Binary Utility Development Utilities Name: binutils -Version: 2.9.5.0.42 +Version: 2.9.5.0.46 Release: 1 Copyright: GPL Group: Development/Tools diff -upr --new-file binutils-2.9.5.0.42/config.guess binutils-2.9.5.0.46/config.guess --- binutils-2.9.5.0.42/config.guess Thu Feb 24 11:10:37 2000 +++ binutils-2.9.5.0.46/config.guess Tue May 30 09:39:39 2000 @@ -2,7 +2,9 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 # Free Software Foundation, Inc. -# + +version='2000-05-30' + # This file 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 of the License, or @@ -36,6 +38,46 @@ # (but try to keep the structure clean). # +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of this system. + +Operation modes: + -h, --help print this help, then exit + -V, --version print version number, then exit" + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case "$1" in + --version | --vers* | -V ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + exec >&2 + echo "$me: invalid option $1" + echo "$help" + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + # Use $HOST_CC if defined. $CC may point to a cross-compiler if test x"$CC_FOR_BUILD" = x; then if test x"$HOST_CC" != x; then @@ -266,7 +308,7 @@ EOF exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor + # "atarist" or "atariste" at least should have a processor # > m68000). The system name ranges from "MiNT" over "FreeMiNT" # to the lowercase version "mint" (or "freemint"). Finally # the system name "TOS" denotes a system which is actually not @@ -360,7 +402,7 @@ EOF AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110] + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ [ ${TARGET_BINARY_INTERFACE}x = x ] @@ -458,6 +500,8 @@ EOF 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE #include #include @@ -588,7 +632,7 @@ EOF echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY-2:*:*:*) echo cray2-cray-unicos @@ -604,7 +648,7 @@ EOF hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - i?86:BSD/386:*:* | i?86:BSD/OS:*:*) + i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; sparc*:BSD/OS:*:*) @@ -614,12 +658,6 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) - if test -x /usr/bin/objformat; then - if test "elf" = "`/usr/bin/objformat`"; then - echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` - exit 0 - fi - fi echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; *:OpenBSD:*:*) @@ -670,6 +708,10 @@ EOF echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit 0 ;; + elf_i?86) + echo "${UNAME_MACHINE}-pc-linux" + exit 0 + ;; i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 @@ -721,11 +763,15 @@ EOF if test "$?" = 0 ; then LIBC="libc1" fi - fi + fi rm -f $dummy.c $dummy echo powerpc-unknown-linux-gnu${LIBC} exit 0 ;; + shelf_linux) + echo "${UNAME_MACHINE}-unknown-linux-gnu" + exit 0 + ;; esac if test "${UNAME_MACHINE}" = "alpha" ; then @@ -1018,14 +1064,26 @@ EOF *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; - Power*:Mac*OS:*:*) - echo powerpc-apple-macos${UNAME_RELEASE} + *:Darwin:*:*) + echo `uname -p`-apple-darwin${UNAME_RELEASE} exit 0 ;; - *:Mac*OS:*:*) - echo ${UNAME_MACHINE}-apple-macos${UNAME_RELEASE} + *:procnto*:*:* | *:QNX:[0123456789]*:*) + if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_MACHINE=pc + fi + echo `uname -p`-${UNAME_MACHINE}-nto-qnx exit 0 ;; *:QNX:*:4*) - echo i386-qnx-qnx${UNAME_VERSION} + echo i386-pc-qnx + exit 0 ;; + NSR-W:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit 0 ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit 0 ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} exit 0 ;; esac @@ -1166,6 +1224,47 @@ then esac fi -#echo '(Unable to guess system type)' 1>&2 +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess version = $version + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "version='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff -upr --new-file binutils-2.9.5.0.42/config.sub binutils-2.9.5.0.46/config.sub --- binutils-2.9.5.0.42/config.sub Sun Apr 23 09:48:00 2000 +++ binutils-2.9.5.0.46/config.sub Tue May 30 09:58:27 2000 @@ -2,7 +2,9 @@ # Configuration validation subroutine script, version 1.1. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 # Free Software Foundation, Inc. -# + +version='2000-05-30' + # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -50,30 +52,61 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -if [ x$1 = x ] -then - echo Configuration name missing. 1>&2 - echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 - echo "or $0 ALIAS" 1>&2 - echo where ALIAS is a recognized configuration type. 1>&2 - exit 1 -fi +me=`echo "$0" | sed -e 's,.*/,,'` -# First pass through any local machine types. -case $1 in - *local*) - echo $1 - exit 0 - ;; - *) - ;; +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -V, --version print version number, then exit" + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case "$1" in + --version | --vers* | -V ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + exec >&2 + echo "$me: invalid option $1" + echo "$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit 0;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - linux-gnu*) + nto-qnx* | linux-gnu*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -178,7 +211,9 @@ case $basic_machine in tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ | 580 | i960 | h8300 \ + | x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ + | hppa64 \ | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ | alphaev6[78] \ | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ @@ -187,7 +222,7 @@ case $basic_machine in | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ | mips64vr5000 | miprs64vr5000el | mcore \ | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ - | thumb | d10v | d30v | fr30 | avr) + | thumb | d10v | fr30 | avr) basic_machine=$basic_machine-unknown ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl) @@ -211,7 +246,9 @@ case $basic_machine in | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ | xmp-* | ymp-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \ + | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \ + | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ + | hppa2.0n-* | hppa64-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ | alphaev6[78]-* \ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ @@ -223,7 +260,8 @@ case $basic_machine in | mipstx39-* | mipstx39el-* | mcore-* \ | f301-* | armv*-* | s390-* | sv1-* | t3e-* \ | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ - | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* ) + | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \ + | bs2000-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -475,9 +513,6 @@ case $basic_machine in basic_machine=i386-unknown os=-mingw32 ;; - i386-qnx | qnx) - basic_machine=i386-qnx - ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -600,6 +635,9 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -937,9 +975,22 @@ case $os in | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*) + | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit*) # Remember, each alternative MUST END IN *, to match a version number. ;; + -qnx*) + case $basic_machine in + x86-* | i[34567]86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto*) + os=-nto-qnx + ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) @@ -986,6 +1037,9 @@ case $os in -ns2 ) os=-nextstep2 ;; + -nsk) + os=-nsk + ;; # Preserve the version number of sinix5. -sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` @@ -999,9 +1053,6 @@ case $os in -oss*) os=-sysv3 ;; - -qnx) - os=-qnx4 - ;; -svr4) os=-sysv4 ;; @@ -1252,3 +1303,11 @@ case $basic_machine in esac echo $basic_machine$os +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "version='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff -upr --new-file binutils-2.9.5.0.42/configure binutils-2.9.5.0.46/configure --- binutils-2.9.5.0.42/configure Wed Apr 12 10:04:42 2000 +++ binutils-2.9.5.0.46/configure Sun May 21 14:19:02 2000 @@ -86,7 +86,7 @@ subdirs= target_alias=NOTARGET target_makefile_frag= undefs=NOUNDEFS -version="$Revision: 1.6 $" +version="$Revision: 1.9 $" x11=default bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' diff -upr --new-file binutils-2.9.5.0.42/configure.in binutils-2.9.5.0.46/configure.in --- binutils-2.9.5.0.42/configure.in Fri May 12 08:11:26 2000 +++ binutils-2.9.5.0.46/configure.in Thu May 18 15:10:31 2000 @@ -656,7 +656,8 @@ case "${target}" in ;; hppa*-*-*elf* | \ hppa*-*-linux-gnu* | \ - hppa*-*-lites*) + hppa*-*-lites* | \ + hppa*64*-*-*) # Do configure ld/binutils/gas for the above cases. ;; hppa*-*-*) @@ -1050,6 +1051,9 @@ if [ x${shared} = xyes ]; then ;; i[3456]86-*) target_makefile_frag="${target_makefile_frag} config/mt-x86pic" + ;; + powerpc*-*-aix*) + # We don't want -fPIC on AIX. ;; powerpc*-*) target_makefile_frag="${target_makefile_frag} config/mt-ppcpic" diff -upr --new-file binutils-2.9.5.0.42/gas/ChangeLog binutils-2.9.5.0.46/gas/ChangeLog --- binutils-2.9.5.0.42/gas/ChangeLog Fri May 12 08:04:04 2000 +++ binutils-2.9.5.0.46/gas/ChangeLog Sun Jun 4 09:11:42 2000 @@ -1,3 +1,397 @@ +2000-06-04 Alan Modra + + * read.c (is_end_of_line): No ';' for TC_HPPA. Add missing + initializers too. + +2000-06-03 H.J. Lu + + * read.c (is_end_of_line): Put back `;'. + +2000-06-03 Alan Modra + + * config/tc-i386.c (md_shortopts): Remove 'm', add 'q' to non-elf. + +2000-06-01 Alan Modra + + * expr.c (operand): Test is_end_of_line outside switch to catch + line separator chars that are also operators. + (operator): Return O_illegal for line separator chars. + + * read.c (is_end_of_line): Use 1 instead of 99. Don't set `;' + entry (or `!' entry for TC_HPPA). + + * config/tc-arm.c (my_get_float_expression): Cast to unsigned char + before indexing is_end_of_line. Remove redundant check for '\0'. + (fp_op2): Likewise. + * config/tc-h8500.c (md_assemble): Likewise. + * config/tc-mcore.c (md_assemble): Likewise. + * config/tc-tic30.c (tic30_find_parallel_insn): Likewise. + (md_atof): Likewise + + * config/tc-m88k.c (s_bss): Cast to unsigned char before indexing + is_end_of_line. + * config/tc-mcore.c (mcore_cons): Likewise. + (mcore_float_cons): Likewise. + (mcore_stringer): Likewise. + * config/tc-tic30.c (tic30_find_parallel_insn): Likewise. + +2000-06-01 Scott Bambrough + + * config/tc-arm.c (do_mrs): Allow SPSR_BIT to be set correctly. + +2000-05-29 Nick Clifton + + * config/tc-sh.c: Fix compile time warning messages. + + * config/tc-mips.c: Fix compile time warning messages. + +2000-05-29 Philip Blundell + + * doc/as.texinfo: Update copyright dates. + (Local Labels): Delete misplaced mention of ARM. + * NEWS: Mention ARM ELF support. + +2000-05-27 Alexandre Oliva + + * config/tc-mn10300.c (md_assemble): Copy size to real_size before + it is modified, and use the real_size to compute the frag address + for dwarf2 line info. + +2000-05-27 Alan Modra + + * Makefile.am (DEP, DEP1, dep, dep-in, dep-am): Use a better sed + line-matching scheme to cope with automake moving variables around. + ($(TARG_CPU_O)): Remove dependency on TARG_CPU_DEP_@target_cpu_type@ + * Makefile.in: Regenerate. + +2000-05-26 Jakub Jelinek + + * config/tc-sparc.c (sparc_relax): New. + (md_longopts): Add -relax and -no-relax options. + (md_parse_options, md_show_usage): Likewise. + (md_apply_fix3): Optimize tail call into branch always if possible. + +Thu May 4 15:27:07 2000 Donald Lindsay + + * config/tc-d10v.c (write_2_short, parallel_ok, md_assemble, + d10v_cleanup) implement Mitsubishi's newly explained branch-packing + rules, with warning when a GAS statement specifies a packing that + will result in an instruction being squashed. + Added typdef packing_type and enumerals, changed various integer literals + to use the enumerals. + +2000-05-24 David Mosberger + + * config/tc-ia64.c (dot_restorereg_p): New function. + (md_pseudo_table): Add restorereg.p. + (output_X3_format): Fix typo: record type should be UNW_X3, not UNW_X1. + (output_X4_format): Fix typo: record type should be UNW_X4, not UNW_X2. + + * config/tc-ia64.h (unw_record_type): Add unwabi. + (unw_r_record): Rename member MASK to GRMASK. Add sub-structure + called MASK with members for imask, and the masks produced by + fr_mem, gr_mem, br_mem, and frgr_mem. + (unw_p_record): Add members ABI and CONTEXT. + (unw_x_record): Add member AB. + * config/tc-ia64.c (enum reg_symbol): Add REG_PSP and REG_PRIUNAT + as pseudo-register for use during unwind info generation. + (AR_PFS, AR_LC): New macros. + (enum pseudo_type): Add PSEUDO_FUNC_REG to permit declaring registers + whose names start with an at sign (as in "@priunat"). + (pseudo_func): Add "svr4", "hpux", "nt" constants and "priunat" + register. + (unwind_list, unwind_tail, current_unwind_entry, proc_start, + proc_end, unwind_info, personality_routine): Consolidate into + "unwind" structure to reduce offset-table use. Add member + NEXT_SLOT_NUMBER to track the slot number for the next instruction + to be emitted. + (output_R1_format, output_R3_format, output_P3_format, + output_P6_format): Initialize R with zero to reduce compiler warnings. + (output_P7_format): Ditto. Add `default' branch to switch + statement to reduce compiler warnings. + (output_P8_format, output_B1_format, output_B4_format): Ditto. + (output_P4_format): Rename 2nd & 3rd arg to IMASK and IMASK_SIZE. + (format_ab_reg): Rename from format_a_b_reg. Merge A and B args + into single argument. + (output_X1_format, output_X3_format): Initialize R with zero to reduce + compiler warnings. Merge A and B args into single argument. + (output_X2_format, output_X4_format): Remove unused variable R. Merge + A and B args into single argument. + (free_record): Removed (wasn't used). + (free_list_records): Also free imasks in prologue records. + (output_prologue, output_prologue_gr): Initialize mask bits to zero. + (output_spill_mask): Remove. + (output_unwabi): New function. + (output_epilogue, output_label_state, output_copy_state): Call + alloc_record. + (output_spill_psprel, output_spill_sprel, output_spill_psprel_p, + output_spill_sprel_p, output_spill_reg, output_spill_reg_p): Add AB + argument. + (process_one_record): New locals FR_MASK and GR_MASK. Ignore + gr_mem, fr_mem, br_mem, and frgr_mem records and instead emit them + as part of handling the prologue records. Emit region's imask if + we have one. Handle unwabi, epilogue, label_state, copy_state, + spill_psprel, spill_sprel, spill_reg, spill_psprel_p, + spill_sprel_p, and spill_reg_p records. + (set_imask, count_bits, slot_index): New function. + (fixup_unw_records): Fix region size computation. Handle + epilogue, spill_reg, spill_sprel, spill_psprel, spill_reg_p, + spill_sprel_p, and spill_psprel_p records. Merge mask bits of + frgr_mem, fr_mem, gr_mem, br_mem on a per-region basis and + set_imask accordingly. Update imask for gr_gr, and br_gr records. + (convert_expr_to_ab_reg, convert_expr_to_xy_reg): New function. + (dot_save): Use manifest constants for applicaton registers. + Handle REG_PR and REG_PRIUNAT. + (dot_restore): Don't just ignore it. + (dot_restorereg): New function.. + (generate_unwind_image): Ensure unwind info is a multiple of eight + bytes, not just four bytes. + (dot_handlerdata, dot_unwentry): Demand empty rest of line. + (dot_altrp): Don't just ignore it. + (dot_savemem): New function. Replaces dot_savesp() and + dot_savepsp(). Use manifest constants for applicaton registers. + Handle REG_PR and REG_PRIUNAT. + (dot_savef): Simplify. + (dot_saveb): Support generation of br_gr. + (dot_spillreg, dot_spillmem, dot_spillreg_p, dot_spillmem_p, + dot_label_state, dot_copy_state): New function. + (dot_unwabi): Don't just ignore it. + (md_pseudo_table): Add restorereg, spillreg, spillsp, spillpsp, + spillreg.p, spillsp.p, spillpsp, label_state, copy_state, + unwabi, vframesp, and vframepsp. Fix typo alprp->altrp. + (emit_one_bundle): Set slot number for prologue/body records + *before* emitting the first insn. + (emit_one_bundle): Set UNWIND.NEXT_SLOT_NUMBER. + (md_begin): Declare "psp" pseudo-register. + (md_operand): Handle PSEUDO_FUNC_REG. Fix printing of error message + so we don't get segfault. + (output_psp_sprel): Output sp/psp relative offsets as 4-byte word + counts as required per SW Conventions manual + (output_rp_psprel, output_rp_sprel, output_pfs_psprel,output_pfs_sprel, + output_preds_psprel, output_preds_sprel, output_spill_base, + output_unat_psprel, output_unat_sprel, output_lc_psprel, + output_lc_sprel, output_fpsr_psprel, output_fpsr_sprel, + output_priunat_psprel, output_priunat_sprel, output_bsp_psprel, + output_bsp_sprel, output_bspstore_psprel, output_bspstore_sprel, + output_rnat_psprel, output_rnat_sprel, output_spill_psprel, + output_spill_sprel, output_spill_psprel_p, output_spill_sprel_p):Ditto. + (dot_vframe): Implement. + (dot_vframesp, dot_vframepsp): New function. + +Tue May 23 00:57:05 2000 Hans-Peter Nilsson + + * configure.in (i386-*-freebsd a.out entry): Quote properly. + * configure: Regenerate. + +2000-05-23 Alan Modra + + * config/tc-i386.c (md_assemble): Pass jump reloc in fr_var... + (md_estimate_size_before_relax): so we can use it here instead of + old kludges. Localise vars to blocks. Comment. + + * frags.c (frag_new): Update fr_var comments. + * frags.h (struct frag): Ditto. + +2000-05-22 Richard Henderson + + * config/tc-ia64.c (FUNC_PC_RELATIVE): New. + (pseudo_func): Add pcrel. + (operand_match): Handle IA64_OPND_TGT64. + (build_insn): Likewise. + (md_begin): Initialize pseudo_func[FUNC_PC_RELATIVE]. + (ia64_gen_real_reloc_type): Handle FUNC_PC_RELATIVE. + (fix_insn): Handle all three 64-bit relocation types. + +Mon May 22 22:43:32 2000 Hans-Peter Nilsson + + * obj.h (struct format_ops): New members begin, app_file, + s_set_other, s_set_desc, s_get_type, s_set_type, + separate_stab_sections, init_stab_section. + + * config/obj-multi.h: Update GPL notice to v2. + (obj_begin): New. + (obj_app_file): New. + (S_SET_SIZE): Test s_set_size for NULL before calling. + (S_SET_ALIGN): Similar for s_set_align. + (S_SET_OTHER): New. + (S_SET_DESC): New. + (S_GET_TYPE): New. + (S_SET_TYPE): New. + (SEPARATE_STAB_SECTIONS): New. + (INIT_STAB_SECTION): New. + (EMIT_SECTION_SYMBOLS): New. + (AOUT_STABS) [OBJ_MAYBE_AOUT]: Define. + + * config/obj-elf.h: Update GPL notice to v2. + Mention that this file is included from obj-multi.h. + (obj_begin): Wrap definition in ifndef. + (elf_file_symbol): Constify declaration. + (obj_app_file): Ditto. + (SEPARATE_STAB_SECTIONS, INIT_STAB_SECTION, OBJ_PROCESS_STAB): + Wrap in ifndef SEPARATE_STAB_SECTIONS. + + * config/obj-elf.c (elf_s_set_other): New. + (elf_file_symbol): Constify argument. + (elf_separate_stab_sections): New. + (elf_init_stab_section): New. + (elf_format_ops): Add new members. Remove comma at end. + + * config/obj-ecoff.c (ecoff_separate_stab_sections): New. + (ecoff_format_ops): Add new fields. Remove comma at end. + Mention inconsistency for emit_section_symbols. + + * config/obj-coff.h (c_dot_file_symbol): Constify declaration. + + * config/obj-coff.c (c_dot_file_symbol): Constify argument. + (coff_separate_stab_sections): New. + (coff_format_ops): Add new members. + + * config/obj-aout.c (obj_aout_sec_sym_ok_for_reloc): New. + (obj_aout_s_set_other): New. + (obj_aout_s_set_desc): New. + (obj_aout_s_get_type): New. + (obj_aout_s_set_type): New. + (obj_aout_separate_stab_sections): New. + (aout_format_ops): New members added. Use obj_aout_process_stab, + not 0. Use obj_aout_sec_sym_ok_for_reloc, not 0. + (obj_aout_frob_symbol): Add ATTRIBUTE_UNUSED to args as + appropriate. + (obj_aout_line, obj_aout_weak, obj_aout_type): Ditto. + +2000-05-22 Alan Modra + + * config/tc-i386.c (tc_i386_fix_adjustable): Prevent adjustment + for OBJ_MAYBE_ELF too. Use S_IS_EXTERNAL instead of S_IS_EXTERN. + (md_estimate_size_before_relax): Ensure jumps to weak and + externally visible symbols are relocatable. + +Sat May 20 16:41:55 2000 Hans-Peter Nilsson + + * stabs.c (aout_process_stab): Make global. + (s_desc): Add ATTRIBUTE_UNUSED to args as appropriate. + * read.h (aout_process_stab): Declare. + + * configure.in (EMULATIONS) [i386aout, i386coff, i386elf]: + Generalize to *aout, *coff *elf. + * configure: Regenerated. + + * doc/internals.texi (Object format backend): Say + SEPARATE_STAB_SECTIONS needs to be nonzero, not just defined. + + * Makefile.am (TARG_ENV_HFILES): Delete te-multi.h. + * Makefile.in: Regenerated. + +2000-05-19 Catherine Moore + + * cgen.h (GAS_CGEN_MAX_FIXUPS): Check if already defined. + +2000-05-18 Alan Modra + + * config/tc-hppa.c (md_apply_fix): Mask out immediate bits of + instruction to reflect change in re_assemble_*. + +Thu May 18 10:52:14 2000 Jeffrey A Law (law@cygnus.com) + + * configure.in (hppa-*-hpux11*): If the cpu is hppa*64*, then + build PA64 ELF tools. + * configure: Rebuilt. + +2000-05-17 Alan Modra + + * Makefile.am: Regenerate dependencies. + * Makefile.in: Regenerate. + +2000-05-15 Nick Clifton + + * config/tc-arm.c (struct asm_psr): Add boolean field + distinguishing between CSPR and SPSR. Rename 'number' field + to 'field'. + (psrs): Rearrange contents to match new asm_psr structure. + (arm_psr_parse): Move next to psr_required_here. Make it + return an asm_psr structure. + (psr_required_here): Use asm_psr structure returned by + arm_psr_parse. + (do_msr): Reorganise to allow psr_required_here to be called + only once. + (md_undefined_name): Mark 'name' parameter as unused, since + the COFF target does not use it. + +2000-05-14 David O'Brien + + * config/te-386bsd.h: Clean up comments to adhere to the GNU coding + standards. + * config/te-aux.h: Likewise. + * config/te-dpx2.h: Likewise. + * config/te-go32.h: Likewise. + * config/te-hp300.h: Likewise. + * config/te-hppa.h: Likewise. + * config/te-i386aix.h: Likewise. + * config/te-ic960.h: Likewise. + * config/te-interix.h: Likewise. + * config/te-nbsd532.h: Likewise. + * config/te-pc532mach.h: Likewise. + * config/te-ppcnw.h: Likewise. + * config/te-psos.h: Likewise. + * config/te-sparcaout.h: Likewise. + * config/te-sun3.h: Likewise. + * config/te-sysv32.h: Likewise. + +2000-05-14 Alan Modra + + * config/tc-h8300.c (do_a_fix_imm): Don't rely on `short' being 16 + bits. Instead explicitly mask and sign extend. Do the 8 bit mask + and sign extend without an if statement. + (build_bytes): Likewise. + +2000-05-14 Kazu Hirata + + * config/tc-h8300.c (do_a_fix_imm): Output a reloc for no + X_add_symbol L_32 case. + +2000-05-14 David O'Brien + + * config/te-freebsd.h: New file. + +2000-05-13 Alan Modra + + * asintl.h (gettext, dgettext, dcgettext, textdomain, + bindtextdomain): Replace defines with those from intl/libgettext.h + to quieten gcc warnings. + + * NEWS: Mention x86 .arch and -q. + + * config/tc-i386.c (quiet_warnings): New. + (md_assemble): Use quiet_warnings. + (md_parse_option): Set quiet_warnings from -q. + (md_show_usage): Mention -q, delete -m. + (flag_do_long_jump): Delete. + (md_parse_option): Remove -m. + (md_show_usage): Remove -m. + (md_create_long_jump): Remove useless flag_do_long_jump code. + + * as.c (parse_args): In case OPTION_DEFSYM, use a valueT to hold + the symbol value, and use bfd_scan_vma if BFD_ASSEMBLER. + +2000-05-13 Alan Modra + Alexander Sokolov + + * doc/c-i386.texi (i386-Arch): New section. + (i386-Syntax): Mention .intel_syntax and .att_syntax. + + * config/tc-i386.c (cpu_arch_name, cpu_arch_flags): New. + (smallest_imm_type): Use smallest opcode for shift by one if cpu + architecture has been given and is not 486. + (set_cpu_arch): New. + (md_pseudo_table): Add .arch. + (md_assemble): Warn if cpu architecture has been given and an + unsupported instruction. + + * config/tc-i386.h (SMALLEST_DISP_TYPE): Delete. + Move operand_types bit defines after relevant template field. + (template): Add cpu_flags. + (Cpu*): Define. + (arch_entry): New. + 2000-05-12 Alexandre Oliva * config/tc-mn10300.h (md_end): Define. @@ -220,7 +614,7 @@ Tue Apr 25 11:02:02 2000 Jeffrey A Law Fri Apr 21 14:29:43 2000 Jeffrey A Law (law@cygnus.com) Jason Eckhardt - * config/tc-hppa.c (md_apply_fix): Handle new PA2.0 formats. + * config/tc-hppa.c (md_apply_fix): Handle new PA2.0 formats. * config/tc-hppa.c (CHECK_ALIGN): New macro. Added handling of new operand types l,y,&,fe,fE,fx. @@ -1865,7 +2259,7 @@ Tue Aug 10 12:58:31 1999 Jeffrey A Law Always Use subsegment zero for the unwinders. (pa_level): Handle "2.0w". -Mon Aug 9 20:02:22 1998 J"orn Rennecke +Mon Aug 9 20:02:22 1999 J"orn Rennecke * config/tc-d30v.c (write_2_short): Don't group repeat instructions with the following instruction unless this was specified. diff -upr --new-file binutils-2.9.5.0.42/gas/Makefile.am binutils-2.9.5.0.46/gas/Makefile.am --- binutils-2.9.5.0.42/gas/Makefile.am Sun Apr 23 09:48:02 2000 +++ binutils-2.9.5.0.46/gas/Makefile.am Tue May 30 09:53:56 2000 @@ -328,7 +328,6 @@ TARG_ENV_HFILES = \ config/te-lynx.h \ config/te-mach.h \ config/te-macos.h \ - config/te-multi.h \ config/te-nbsd.h \ config/te-nbsd532.h \ config/te-pc532mach.h \ @@ -491,7 +490,7 @@ check-DEJAGNU: site.exp # The implicit .c.o rule doesn't work for these, perhaps because of # the variables, or perhaps because the sources are not on vpath. -$(TARG_CPU_O): $(TARG_CPU_C) $(TARG_CPU_DEP_@target_cpu_type@) +$(TARG_CPU_O): $(TARG_CPU_C) $(COMPILE) -c $(TARG_CPU_C) $(ATOF_TARG_O): $(ATOF_TARG_C) $(COMPILE) -c $(ATOF_TARG_C) @@ -610,7 +609,7 @@ MOSTLYCLEANFILES = $(STAGESTUFF) core st testsuite/*.o testsuite/*.out testsuite/gas.log testsuite/gas.sum \ testsuite/site.exp site.bak site.exp stage stage1 stage2 -CLEANFILES = dep.sed DEPTC DEPTCA DEPOBJ DEPOBJA DEP2 DEP2a DEP1 DEPA DEP DEPDIR +CLEANFILES = dep.sed DEPTC DEPTCA DEPOBJ DEPOBJA DEP2 DEP2A DEP1 DEPA DEP DEPDIR .PHONY: install-exec-local install-data-local .PHONY: install-exec-bindir install-exec-tooldir @@ -714,26 +713,31 @@ de-stage3: - (cd stage3 ; rm -f as$(EXEEXT) ; mv -f * ..) - rmdir stage3 -# Automatic dependency computation. This is a real pain, because the -# dependencies change based on target_cpu_type and obj_format. We -# currently ignore any dependencies caused by emulation files. - DEP_FILE_DEPS = $(CFILES) $(HFILES) $(TARGET_CPU_CFILES) \ $(TARGET_CPU_HFILES) $(OBJ_FORMAT_CFILES) $(OBJ_FORMAT_HFILES) +# Automatic dependency computation. This is a real pain, because the +# dependencies change based on target_cpu_type and obj_format. +# Just to make things even more complicated, automake separates the +# dependency variable assignments from the dependency rules, and tacks +# on a .NOEXPORT at the end of Makefile.in. + DEP: dep.sed $(DEP_FILE_DEPS) DEPTC DEPOBJ DEP2 - rm -f DEP1 + rm -f DEP1 # delete because we use $? in DEP1 rule srcdir=`cd $(srcdir); pwd`; \ $(MAKE) MKDEP="$(MKDEP)" srcdir="$${srcdir}" VPATH="$${srcdir}" DEP1 rm -rf DEPDIR - sed -f dep.sed < DEP1 > DEPA + echo 'AMKDEP = #DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING BELOW.' > DEPA sed -f dep.sed < DEPTC >> DEPA sed -f dep.sed < DEPOBJ >> DEPA sed -f dep.sed < DEP2 >> DEPA + echo 'BMKDEP = #DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING ABOVE.' >> DEPA + echo '#MKDEP DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING BELOW.' >> DEPA + sed -f dep.sed < DEP1 >> DEPA echo '$$(OBJS): $$(DEP_@target''_cpu_type@_@obj''_format@)' >> DEPA echo '$$(TARG_CPU_O): $$(DEPTC_@target''_cpu_type@_@obj''_format@)' >> DEPA echo '$$(OBJ_FORMAT_O): $$(DEPOBJ_@target''_cpu_type@_@obj''_format@)' >> DEPA - echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA + echo '#MKDEP DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING ABOVE.' >> DEPA mv -f DEPA $@ DEP1: $(CFILES) $(MULTI_CFILES) @@ -745,9 +749,7 @@ DEP1: $(CFILES) $(MULTI_CFILES) echo '' > targ-env.h; \ echo '' > itbl-cpu.h; \ echo '' > itbl-parse.h; \ - echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP; \ - echo '# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.' >> DEP; \ - $(MKDEP) -DBFD_ASSEMBLER -I. -I.. -I$${srcdir} -I../../bfd $(DEP_INCLUDES) $? >> DEP + $(MKDEP) -DBFD_ASSEMBLER -I. -I.. -I$${srcdir} -I../../bfd $(DEP_INCLUDES) $? > DEP mv -f DEPDIR/DEP $@ # Work out the special dependencies for the tc-*.c files. @@ -778,7 +780,7 @@ DEPTC: $(TARGET_CPU_CFILES) echo ' $$(INCDIR)/obstack.h $$(BFDDIR)/libhppa.h \' >> DEPTCA echo ' $$(INCDIR)/opcode/hppa.h $$(BFDDIR)/som.h' >> DEPTCA for c in $(MULTI_CPU_TYPES); do \ - echo 'DEPTC_'"$${c}"'_multi = \' >> DEPTCA; \ + echo "DEPTC_$${c}"'_multi = \' >> DEPTCA; \ for o in $(OBJ_FORMATS); do \ $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ @@ -817,7 +819,7 @@ DEPOBJ: $(OBJ_FORMAT_CFILES) echo ' $$(BFDDIR)/som.h $$(INCDIR)/aout/stab_gnu.h \' >> DEPOBJA echo ' $$(INCDIR)/aout/stab.def' >> DEPOBJA for c in $(MULTI_CPU_TYPES); do \ - echo 'DEPOBJ_'"$${c}"'_multi = \' >> DEPOBJA; \ + echo "DEPOBJ_$${c}"'_multi = \' >> DEPOBJA; \ for o in $(OBJ_FORMATS); do \ $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ @@ -831,7 +833,7 @@ DEPOBJ: $(OBJ_FORMAT_CFILES) # Work out the dependencies for each CPU/OBJ combination. # Note that SOM is a special case, because it only works native. DEP2: $(TARGET_CPU_HFILES) $(OBJ_FORMAT_HFILES) - rm -f DEP2a + rm -f DEP2A if [ -d DEPDIR ]; then true; else mkdir DEPDIR; fi srcdir=`cd $(srcdir); pwd`; \ cd DEPDIR; \ @@ -842,22 +844,22 @@ DEP2: $(TARGET_CPU_HFILES) $(OBJ_FORMAT_ echo '#include "tc-'"$${c}"'.h"' > targ-cpu.h; \ echo '#include "obj-'"$${o}"'.h"' > dummy.c; \ $(MKDEP) -DBFD_ASSEMBLER -I. -I.. -I$${srcdir} -I../../bfd $(DEP_INCLUDES) dummy.c | \ - sed -e "s/dummy.o: dummy.c/DEP_$${c}_$${o} =/" >> ../DEP2a; \ + sed -e "s/dummy.o: dummy.c/DEP_$${c}_$${o} =/" >> ../DEP2A; \ else true; fi; \ done; \ done - echo 'DEP_hppa_som = $$(BFDDIR)/som.h' >> DEP2a + echo 'DEP_hppa_som = $$(BFDDIR)/som.h' >> DEP2A for c in $(MULTI_CPU_TYPES); do \ - echo 'DEP_'"$${c}"'_multi = \' >> DEP2a; \ + echo "DEP_$${c}"'_multi = \' >> DEP2A; \ for o in $(OBJ_FORMATS); do \ $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ - echo '$$(DEP_'"$${c}_$${o}"') \' >> DEP2a; \ + echo '$$(DEP_'"$${c}_$${o}"') \' >> DEP2A; \ else true; fi; \ done; \ - echo '' >> DEP2a; \ + echo '' >> DEP2A; \ done - mv -f DEP2a DEP2 + mv -f DEP2A DEP2 dep.sed: dep-in.sed config.status srcdir=`cd $(srcdir); pwd`; \ @@ -867,444 +869,446 @@ dep.sed: dep-in.sed config.status -e "s!@SRCDIR@!$${srcdir}!" dep: DEP - sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile + sed -e '/^.MKDEP.*WARNING BELOW./,/^.MKDEP.*WARNING ABOVE./d' \ + < Makefile > tmp-Makefile cat DEP >> tmp-Makefile $(SHELL) $(srcdir)/../move-if-change tmp-Makefile Makefile dep-in: DEP - sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.in > tmp-Makefile.in + sed -e '/^.MKDEP.*WARNING BELOW./,/^.MKDEP.*WARNING ABOVE./d' \ + < $(srcdir)/Makefile.in > tmp-Makefile.in cat DEP >> tmp-Makefile.in $(SHELL) $(srcdir)/../move-if-change tmp-Makefile.in $(srcdir)/Makefile.in dep-am: DEP - sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.am > tmp-Makefile.am + sed -e '/^.MKDEP.*WARNING BELOW./,/^.MKDEP.*WARNING ABOVE./d' \ + < $(srcdir)/Makefile.am > tmp-Makefile.am cat DEP >> tmp-Makefile.am $(SHELL) $(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am +# HEED THE MKDEP WARNINGS. +# ANYTHING CHANGED OR ADDED BETWEEN THE WARNING LINES MAY GO AWAY. .PHONY: dep dep-in dep-am -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -app.o: app.c $(INCDIR)/bin-bugs.h emul.h -as.o: as.c $(INCDIR)/bin-bugs.h emul.h subsegs.h $(INCDIR)/obstack.h \ - output-file.h sb.h macro.h -atof-generic.o: atof-generic.c $(INCDIR)/bin-bugs.h \ - emul.h -bignum-copy.o: bignum-copy.c $(INCDIR)/bin-bugs.h emul.h -cond.o: cond.c $(INCDIR)/bin-bugs.h emul.h macro.h \ - sb.h $(INCDIR)/obstack.h -depend.o: depend.c $(INCDIR)/bin-bugs.h emul.h -dwarf2dbg.o: dwarf2dbg.c $(INCDIR)/bin-bugs.h emul.h \ - dwarf2dbg.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h -ecoff.o: ecoff.c $(INCDIR)/bin-bugs.h emul.h ecoff.h -ehopt.o: ehopt.c $(INCDIR)/bin-bugs.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h -expr.o: expr.c $(INCDIR)/bin-bugs.h emul.h $(INCDIR)/obstack.h -flonum-copy.o: flonum-copy.c $(INCDIR)/bin-bugs.h emul.h -flonum-konst.o: flonum-konst.c -flonum-mult.o: flonum-mult.c -frags.o: frags.c $(INCDIR)/bin-bugs.h emul.h subsegs.h \ - $(INCDIR)/obstack.h -hash.o: hash.c $(INCDIR)/bin-bugs.h emul.h $(INCDIR)/obstack.h -input-file.o: input-file.c $(INCDIR)/bin-bugs.h emul.h \ - input-file.h -input-scrub.o: input-scrub.c $(INCDIR)/bin-bugs.h emul.h \ - input-file.h sb.h -listing.o: listing.c $(INCDIR)/bin-bugs.h emul.h input-file.h \ - subsegs.h -literal.o: literal.c $(INCDIR)/bin-bugs.h emul.h subsegs.h \ - $(INCDIR)/obstack.h -macro.o: macro.c sb.h macro.h -messages.o: messages.c $(INCDIR)/bin-bugs.h emul.h -output-file.o: output-file.c $(INCDIR)/bin-bugs.h emul.h \ - output-file.h -read.o: read.c $(INCDIR)/bin-bugs.h emul.h subsegs.h \ - $(INCDIR)/obstack.h sb.h macro.h ecoff.h -sb.o: sb.c sb.h -stabs.o: stabs.c $(INCDIR)/bin-bugs.h emul.h $(INCDIR)/obstack.h \ - subsegs.h ecoff.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def -subsegs.o: subsegs.c $(INCDIR)/bin-bugs.h emul.h subsegs.h \ - $(INCDIR)/obstack.h -symbols.o: symbols.c $(INCDIR)/bin-bugs.h emul.h $(INCDIR)/obstack.h \ - subsegs.h struc-symbol.h -write.o: write.c $(INCDIR)/bin-bugs.h emul.h subsegs.h \ - $(INCDIR)/obstack.h output-file.h -gasp.o: gasp.c $(INCDIR)/bin-bugs.h sb.h macro.h -itbl-ops.o: itbl-ops.c itbl-ops.h $(INCDIR)/bin-bugs.h \ - emul.h itbl-parse.h -e-i386aout.o: $(srcdir)/config/e-i386aout.c $(INCDIR)/bin-bugs.h \ - emul.h emul-target.h -e-i386coff.o: $(srcdir)/config/e-i386coff.c $(INCDIR)/bin-bugs.h \ - emul.h emul-target.h -e-i386elf.o: $(srcdir)/config/e-i386elf.c $(INCDIR)/bin-bugs.h \ - emul.h emul-target.h -e-mipsecoff.o: $(srcdir)/config/e-mipsecoff.c $(INCDIR)/bin-bugs.h \ - emul.h emul-target.h -e-mipself.o: $(srcdir)/config/e-mipself.c $(INCDIR)/bin-bugs.h \ - emul.h emul-target.h -DEPTC_a29k_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-a29k.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/opcode/a29k.h -DEPTC_a29k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-a29k.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/a29k.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/opcode/a29k.h -DEPTC_a29k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-a29k.h \ - emul.h $(INCDIR)/opcode/a29k.h -DEPTC_alpha_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-alpha.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h struc-symbol.h ecoff.h $(INCDIR)/opcode/alpha.h \ - $(srcdir)/config/atof-vax.c -DEPTC_alpha_ecoff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-ecoff.h \ - $(srcdir)/config/tc-alpha.h ecoff.h $(INCDIR)/coff/sym.h \ - $(INCDIR)/coff/ecoff.h emul.h subsegs.h $(INCDIR)/obstack.h \ - struc-symbol.h $(INCDIR)/opcode/alpha.h $(srcdir)/config/atof-vax.c -DEPTC_alpha_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-alpha.h \ +AMKDEP = #DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING BELOW. +DEPTC_a29k_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-a29k.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/a29k.h +DEPTC_a29k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-a29k.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/a29k.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/a29k.h +DEPTC_a29k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-a29k.h emul.h $(INCDIR)/opcode/a29k.h +DEPTC_alpha_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-alpha.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h struc-symbol.h \ + ecoff.h $(INCDIR)/opcode/alpha.h $(srcdir)/config/atof-vax.c +DEPTC_alpha_ecoff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-ecoff.h $(srcdir)/config/tc-alpha.h \ ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h \ + emul.h subsegs.h $(INCDIR)/obstack.h struc-symbol.h \ + $(INCDIR)/opcode/alpha.h $(srcdir)/config/atof-vax.c +DEPTC_alpha_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-alpha.h emul.h subsegs.h $(INCDIR)/obstack.h \ + struc-symbol.h ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h \ $(INCDIR)/opcode/alpha.h $(INCDIR)/elf/alpha.h $(INCDIR)/elf/reloc-macros.h \ $(srcdir)/config/atof-vax.c -DEPTC_alpha_evax = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-evax.h \ - $(srcdir)/config/tc-alpha.h emul.h subsegs.h $(INCDIR)/obstack.h \ - struc-symbol.h ecoff.h $(INCDIR)/opcode/alpha.h $(srcdir)/config/atof-vax.c -DEPTC_arc_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-arc.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/opcode/arc.h $(INCDIR)/elf/arc.h \ - $(INCDIR)/elf/reloc-macros.h -DEPTC_arc_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arc.h \ +DEPTC_alpha_evax = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-evax.h $(srcdir)/config/tc-alpha.h \ + emul.h subsegs.h $(INCDIR)/obstack.h struc-symbol.h \ + ecoff.h $(INCDIR)/opcode/alpha.h $(srcdir)/config/atof-vax.c +DEPTC_arc_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-arc.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/arc.h \ $(INCDIR)/elf/arc.h $(INCDIR)/elf/reloc-macros.h -DEPTC_arm_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-arm.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h -DEPTC_arm_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-arm.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/arm.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h -DEPTC_arm_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arm.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/arm.h \ - $(INCDIR)/elf/reloc-macros.h -DEPTC_avr_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-avr.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ +DEPTC_arc_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-arc.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/arc.h $(INCDIR)/elf/arc.h $(INCDIR)/elf/reloc-macros.h +DEPTC_arm_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-arm.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ $(INCDIR)/obstack.h -DEPTC_avr_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr.h \ +DEPTC_arm_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-arm.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/arm.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h +DEPTC_arm_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-arm.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h +DEPTC_avr_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-avr.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h -DEPTC_d10v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-d10v.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/opcode/d10v.h $(INCDIR)/elf/ppc.h \ - $(INCDIR)/elf/reloc-macros.h -DEPTC_d10v_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-d10v.h \ +DEPTC_avr_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-avr.h emul.h subsegs.h $(INCDIR)/obstack.h +DEPTC_d10v_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-d10v.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/d10v.h \ $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h -DEPTC_d30v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-d30v.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/opcode/d30v.h -DEPTC_d30v_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-d30v.h \ +DEPTC_d10v_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-d10v.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/d10v.h $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h +DEPTC_d30v_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-d30v.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/d30v.h -DEPTC_fr30_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-fr30.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/symcat.h $(srcdir)/../opcodes/fr30-desc.h \ - $(INCDIR)/opcode/cgen.h $(srcdir)/../opcodes/fr30-opc.h \ - cgen.h -DEPTC_fr30_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-fr30.h \ +DEPTC_d30v_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-d30v.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/d30v.h +DEPTC_fr30_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-fr30.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/symcat.h \ $(srcdir)/../opcodes/fr30-desc.h $(INCDIR)/opcode/cgen.h \ $(srcdir)/../opcodes/fr30-opc.h cgen.h -DEPTC_h8300_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-h8300.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/h8300.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/h8300.h -DEPTC_h8300_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-h8300.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/h8300.h -DEPTC_h8500_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-h8500.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/h8500.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/h8500-opc.h -DEPTC_h8500_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-h8500.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/h8500-opc.h -DEPTC_hppa_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-hppa.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h $(BFDDIR)/libbfd.h \ - $(INCDIR)/opcode/hppa.h -DEPTC_i370_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i370.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h struc-symbol.h $(INCDIR)/opcode/i370.h -DEPTC_i370_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i370.h \ +DEPTC_fr30_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-fr30.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/symcat.h $(srcdir)/../opcodes/fr30-desc.h \ + $(INCDIR)/opcode/cgen.h $(srcdir)/../opcodes/fr30-opc.h \ + cgen.h +DEPTC_h8300_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-h8300.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/h8300.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/h8300.h +DEPTC_h8300_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-h8300.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/h8300.h +DEPTC_h8500_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-h8500.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/h8500.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/h8500-opc.h +DEPTC_h8500_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-h8500.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/h8500-opc.h +DEPTC_hppa_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-hppa.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h subsegs.h $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h \ + $(BFDDIR)/libbfd.h $(INCDIR)/opcode/hppa.h +DEPTC_hppa_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-hppa.h $(BFDDIR)/elf32-hppa.h $(BFDDIR)/libhppa.h \ + $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h emul.h \ + subsegs.h $(INCDIR)/obstack.h $(BFDDIR)/libbfd.h $(INCDIR)/opcode/hppa.h \ + dwarf2dbg.h +DEPTC_ia64_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-ia64.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h dwarf2dbg.h subsegs.h $(INCDIR)/obstack.h +DEPTC_ia64_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-ia64.h emul.h dwarf2dbg.h subsegs.h \ + $(INCDIR)/obstack.h +DEPTC_i370_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i370.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h struc-symbol.h \ - $(INCDIR)/opcode/i370.h $(INCDIR)/elf/i370.h -DEPTC_i386_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-i386.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/i386.h -DEPTC_i386_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i386.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/i386.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/i386.h -DEPTC_i386_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i386.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/i386.h -DEPTC_i860_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-i860.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/opcode/i860.h -DEPTC_i860_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i860.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/i860.h -DEPTC_i860_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i860.h \ + $(INCDIR)/opcode/i370.h +DEPTC_i370_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i370.h emul.h subsegs.h $(INCDIR)/obstack.h \ + struc-symbol.h $(INCDIR)/opcode/i370.h $(INCDIR)/elf/i370.h +DEPTC_i386_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-i386.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ + $(INCDIR)/obstack.h $(INCDIR)/opcode/i386.h +DEPTC_i386_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i386.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/i386.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/i386.h +DEPTC_i386_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i386.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/i386.h +DEPTC_i860_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-i860.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/i860.h +DEPTC_i860_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i860.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/opcode/i860.h -DEPTC_i960_bout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-bout.h \ +DEPTC_i860_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i860.h emul.h $(INCDIR)/opcode/i860.h +DEPTC_i960_bout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-bout.h $(srcdir)/config/tc-i960.h \ + emul.h $(INCDIR)/obstack.h $(INCDIR)/opcode/i960.h +DEPTC_i960_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i960.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/i960.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h $(INCDIR)/opcode/i960.h +DEPTC_i960_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ $(srcdir)/config/tc-i960.h emul.h $(INCDIR)/obstack.h \ $(INCDIR)/opcode/i960.h -DEPTC_i960_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i960.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/i960.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/obstack.h $(INCDIR)/opcode/i960.h -DEPTC_i960_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i960.h \ - emul.h $(INCDIR)/obstack.h $(INCDIR)/opcode/i960.h -DEPTC_m32r_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-m32r.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/symcat.h $(srcdir)/../opcodes/m32r-desc.h \ - $(INCDIR)/opcode/cgen.h $(srcdir)/../opcodes/m32r-opc.h \ - cgen.h -DEPTC_m32r_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-m32r.h \ +DEPTC_m32r_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-m32r.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/symcat.h \ $(srcdir)/../opcodes/m32r-desc.h $(INCDIR)/opcode/cgen.h \ $(srcdir)/../opcodes/m32r-opc.h cgen.h -DEPTC_m68k_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ +DEPTC_m32r_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-m32r.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/symcat.h $(srcdir)/../opcodes/m32r-desc.h \ + $(INCDIR)/opcode/cgen.h $(srcdir)/../opcodes/m32r-opc.h \ + cgen.h +DEPTC_m68k_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-m68k.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ + subsegs.h $(INCDIR)/opcode/m68k.h $(srcdir)/config/m68k-parse.h +DEPTC_m68k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-m68k.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/m68k.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h \ + $(INCDIR)/opcode/m68k.h $(srcdir)/config/m68k-parse.h +DEPTC_m68k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-m68k.h emul.h $(INCDIR)/obstack.h \ + subsegs.h $(INCDIR)/opcode/m68k.h $(srcdir)/config/m68k-parse.h \ + $(INCDIR)/elf/m68k.h $(INCDIR)/elf/reloc-macros.h +DEPTC_m68k_hp300 = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-hp300.h $(srcdir)/config/obj-aout.h \ $(srcdir)/config/tc-m68k.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h $(INCDIR)/opcode/m68k.h \ $(srcdir)/config/m68k-parse.h -DEPTC_m68k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-m68k.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/m68k.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/obstack.h subsegs.h $(INCDIR)/opcode/m68k.h \ - $(srcdir)/config/m68k-parse.h -DEPTC_m68k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-m68k.h \ - emul.h $(INCDIR)/obstack.h subsegs.h $(INCDIR)/opcode/m68k.h \ - $(srcdir)/config/m68k-parse.h $(INCDIR)/elf/m68k.h \ +DEPTC_m88k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-m88k.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/m88k.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/config/m88k-opcode.h +DEPTC_m88k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-m88k.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/config/m88k-opcode.h +DEPTC_mcore_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mcore.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/mcore.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/mcore-opc.h +DEPTC_mcore_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mcore.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/mcore-opc.h $(INCDIR)/elf/mcore.h \ $(INCDIR)/elf/reloc-macros.h -DEPTC_m68k_hp300 = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-hp300.h \ - $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-m68k.h \ - $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h $(INCDIR)/opcode/m68k.h $(srcdir)/config/m68k-parse.h -DEPTC_m88k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-m88k.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/m88k.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/config/m88k-opcode.h -DEPTC_m88k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-m88k.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/config/m88k-opcode.h -DEPTC_mcore_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mcore.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/mcore.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/mcore-opc.h -DEPTC_mcore_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ +DEPTC_mips_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-mips.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ + $(INCDIR)/obstack.h $(INCDIR)/opcode/mips.h itbl-ops.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h \ + $(INCDIR)/elf/reloc-macros.h ecoff.h $(INCDIR)/coff/sym.h \ + $(INCDIR)/coff/ecoff.h +DEPTC_mips_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mips.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/mipspe.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/mips.h itbl-ops.h $(srcdir)/config/obj-elf.h \ $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mcore.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/mcore-opc.h \ - $(INCDIR)/elf/mcore.h $(INCDIR)/elf/reloc-macros.h -DEPTC_mips_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-mips.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/mips.h \ - itbl-ops.h $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h ecoff.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h -DEPTC_mips_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mips.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/mipspe.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h \ + ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h +DEPTC_mips_ecoff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-ecoff.h $(srcdir)/config/tc-mips.h \ + ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/mips.h \ itbl-ops.h $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h ecoff.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h -DEPTC_mips_ecoff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-ecoff.h \ - $(srcdir)/config/tc-mips.h ecoff.h $(INCDIR)/coff/sym.h \ - $(INCDIR)/coff/ecoff.h emul.h subsegs.h $(INCDIR)/obstack.h \ - $(INCDIR)/opcode/mips.h itbl-ops.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/mips.h \ - $(INCDIR)/elf/reloc-macros.h -DEPTC_mips_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mips.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/mips.h \ - itbl-ops.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h \ - ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h -DEPTC_mn10200_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mn10200.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/opcode/mn10200.h -DEPTC_mn10200_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mn10200.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h +DEPTC_mips_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mips.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/mips.h itbl-ops.h $(INCDIR)/elf/mips.h \ + $(INCDIR)/elf/reloc-macros.h ecoff.h $(INCDIR)/coff/sym.h \ + $(INCDIR)/coff/ecoff.h +DEPTC_mn10200_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mn10200.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/mn10200.h -DEPTC_mn10300_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mn10300.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/opcode/mn10300.h -DEPTC_mn10300_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mn10300.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/mn10300.h -DEPTC_ns32k_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-ns32k.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/opcode/ns32k.h $(INCDIR)/obstack.h -DEPTC_ns32k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-ns32k.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/ns32k.h \ +DEPTC_mn10200_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mn10200.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/mn10200.h +DEPTC_mn10300_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mn10300.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/mn10300.h \ + dwarf2dbg.h +DEPTC_mn10300_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mn10300.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/mn10300.h dwarf2dbg.h +DEPTC_ns32k_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-ns32k.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/ns32k.h \ $(INCDIR)/obstack.h -DEPTC_ns32k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-ns32k.h \ +DEPTC_ns32k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-ns32k.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/opcode/ns32k.h $(INCDIR)/obstack.h -DEPTC_pj_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-pj.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/pj.h -DEPTC_pj_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-pj.h \ +DEPTC_ns32k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-ns32k.h emul.h $(INCDIR)/opcode/ns32k.h \ + $(INCDIR)/obstack.h +DEPTC_pj_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-pj.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/opcode/pj.h -DEPTC_ppc_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-ppc.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/rs6000.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/ppc.h -DEPTC_ppc_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-ppc.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/ppc.h \ - $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h -DEPTC_sh_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-sh.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sh.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/sh-opc.h -DEPTC_sh_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sh.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/sh-opc.h \ - $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h -DEPTC_sparc_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-sparc.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/sparc.h -DEPTC_sparc_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-sparc.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sparc.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/sparc.h -DEPTC_sparc_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sparc.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/sparc.h \ - $(INCDIR)/elf/sparc.h $(INCDIR)/elf/reloc-macros.h -DEPTC_tahoe_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-tahoe.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/obstack.h $(INCDIR)/opcode/tahoe.h -DEPTC_tahoe_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-tahoe.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ +DEPTC_pj_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-pj.h emul.h $(INCDIR)/opcode/pj.h +DEPTC_ppc_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-ppc.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/rs6000.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/ppc.h +DEPTC_ppc_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-ppc.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/ppc.h $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h +DEPTC_sh_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-sh.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sh.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/sh-opc.h +DEPTC_sh_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-sh.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/sh-opc.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h +DEPTC_sparc_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-sparc.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ + $(INCDIR)/obstack.h $(INCDIR)/opcode/sparc.h +DEPTC_sparc_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-sparc.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sparc.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/sparc.h +DEPTC_sparc_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-sparc.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/sparc.h $(INCDIR)/elf/sparc.h $(INCDIR)/elf/reloc-macros.h +DEPTC_tahoe_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-tahoe.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ $(INCDIR)/opcode/tahoe.h -DEPTC_tahoe_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-tahoe.h \ +DEPTC_tahoe_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-tahoe.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h $(INCDIR)/opcode/tahoe.h -DEPTC_tic30_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-tic30.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/opcode/tic30.h -DEPTC_tic30_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-tic30.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/tic30.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/opcode/tic30.h -DEPTC_tic30_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-tic30.h \ - emul.h $(INCDIR)/opcode/tic30.h -DEPTC_tic80_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-tic80.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/tic80.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/opcode/tic80.h -DEPTC_tic80_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-tic80.h \ - emul.h $(INCDIR)/opcode/tic80.h -DEPTC_vax_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-vax.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(srcdir)/config/vax-inst.h $(INCDIR)/obstack.h \ - $(INCDIR)/opcode/vax.h -DEPTC_vax_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-vax.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(srcdir)/config/vax-inst.h \ +DEPTC_tahoe_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-tahoe.h emul.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/tahoe.h +DEPTC_tic30_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-tic30.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/tic30.h +DEPTC_tic30_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-tic30.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/tic30.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/tic30.h +DEPTC_tic30_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-tic30.h emul.h $(INCDIR)/opcode/tic30.h +DEPTC_tic80_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-tic80.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/tic80.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/tic80.h +DEPTC_tic80_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-tic80.h emul.h $(INCDIR)/opcode/tic80.h +DEPTC_vax_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-vax.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(srcdir)/config/vax-inst.h \ $(INCDIR)/obstack.h $(INCDIR)/opcode/vax.h -DEPTC_vax_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-vax.h \ +DEPTC_vax_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-vax.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(srcdir)/config/vax-inst.h $(INCDIR)/obstack.h \ $(INCDIR)/opcode/vax.h -DEPTC_vax_vms = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-vms.h \ - $(srcdir)/config/tc-vax.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def emul.h $(srcdir)/config/vax-inst.h \ +DEPTC_vax_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-vax.h emul.h $(srcdir)/config/vax-inst.h \ $(INCDIR)/obstack.h $(INCDIR)/opcode/vax.h -DEPTC_w65_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-w65.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/w65.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/w65-opc.h -DEPTC_w65_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-w65.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/w65-opc.h -DEPTC_v850_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-v850.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/opcode/v850.h -DEPTC_v850_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-v850.h \ +DEPTC_vax_vms = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-vms.h $(srcdir)/config/tc-vax.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def emul.h \ + $(srcdir)/config/vax-inst.h $(INCDIR)/obstack.h $(INCDIR)/opcode/vax.h +DEPTC_w65_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-w65.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/w65.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/w65-opc.h +DEPTC_w65_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-w65.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/w65-opc.h +DEPTC_v850_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-v850.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/v850.h +DEPTC_v850_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-v850.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/v850.h DEPTC_z8k_coff = $(srcdir)/../opcodes/z8k-opc.h $(INCDIR)/bin-bugs.h \ - $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-z8k.h \ + $(INCDIR)/progress.h $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-z8k.h \ $(INCDIR)/coff/internal.h $(INCDIR)/coff/z8k.h $(BFDDIR)/libcoff.h \ $(INCDIR)/bfdlink.h emul.h DEPTC_z8k_elf = $(srcdir)/../opcodes/z8k-opc.h $(INCDIR)/bin-bugs.h \ - $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(srcdir)/config/tc-z8k.h emul.h + $(INCDIR)/progress.h $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(srcdir)/config/tc-z8k.h emul.h DEPTC_hppa_som = $(srcdir)/config/tc-hppa.h subsegs.h \ $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h $(INCDIR)/opcode/hppa.h \ $(BFDDIR)/som.h @@ -1312,332 +1316,393 @@ DEPTC_i386_multi = $(DEPTC_i386_aout) $( $(DEPTC_i386_elf) DEPTC_mips_multi = $(DEPTC_mips_coff) $(DEPTC_mips_ecoff) \ $(DEPTC_mips_elf) -DEPOBJ_a29k_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-a29k.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h -DEPOBJ_a29k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-a29k.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/a29k.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_a29k_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-a29k.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h +DEPOBJ_a29k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-a29k.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/a29k.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_a29k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-a29k.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_alpha_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-alpha.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_a29k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-a29k.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_alpha_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-alpha.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_alpha_ecoff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-ecoff.h \ - $(srcdir)/config/tc-alpha.h ecoff.h $(INCDIR)/coff/sym.h \ - $(INCDIR)/coff/ecoff.h emul.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h $(BFDDIR)/libecoff.h -DEPOBJ_alpha_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-alpha.h \ - emul.h subsegs.h $(INCDIR)/obstack.h ecoff.h $(INCDIR)/coff/sym.h \ - $(INCDIR)/coff/ecoff.h $(INCDIR)/elf/alpha.h $(INCDIR)/elf/reloc-macros.h \ - $(INCDIR)/aout/aout64.h -DEPOBJ_alpha_evax = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-evax.h \ - $(srcdir)/config/tc-alpha.h emul.h -DEPOBJ_arc_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-arc.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_arc_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arc.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_arm_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-arm.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h -DEPOBJ_arm_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-arm.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/arm.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_alpha_ecoff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-ecoff.h $(srcdir)/config/tc-alpha.h \ + ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h \ + emul.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h $(BFDDIR)/libecoff.h +DEPOBJ_alpha_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-alpha.h emul.h subsegs.h $(INCDIR)/obstack.h \ + ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h \ + $(INCDIR)/elf/alpha.h $(INCDIR)/elf/reloc-macros.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_alpha_evax = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-evax.h $(srcdir)/config/tc-alpha.h \ + emul.h +DEPOBJ_arc_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-arc.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_arm_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arm.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_avr_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-avr.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_avr_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_d10v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-d10v.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_d10v_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-d10v.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_d30v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-d30v.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_d30v_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-d30v.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_fr30_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-fr30.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_fr30_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-fr30.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_h8300_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-h8300.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/h8300.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_arc_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-arc.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_arm_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-arm.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h +DEPOBJ_arm_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-arm.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/arm.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_arm_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-arm.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_avr_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-avr.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_h8300_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-h8300.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_h8500_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-h8500.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/h8500.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_avr_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-avr.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_d10v_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-d10v.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_h8500_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-h8500.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_hppa_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-hppa.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_i370_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i370.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_i370_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i370.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/i370.h \ +DEPOBJ_d10v_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-d10v.h emul.h subsegs.h $(INCDIR)/obstack.h \ $(INCDIR)/aout/aout64.h -DEPOBJ_i386_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-i386.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h -DEPOBJ_i386_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i386.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/i386.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_d30v_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-d30v.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_i386_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i386.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_i860_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-i860.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h -DEPOBJ_i860_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i860.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_i860_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i860.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_i960_bout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-bout.h \ - $(srcdir)/config/tc-i960.h emul.h $(INCDIR)/obstack.h -DEPOBJ_i960_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i960.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/i960.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_d30v_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-d30v.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_fr30_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-fr30.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_i960_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i960.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_m32r_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-m32r.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_m32r_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-m32r.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_m68k_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-m68k.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h -DEPOBJ_m68k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-m68k.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/m68k.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_fr30_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-fr30.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_h8300_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-h8300.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/h8300.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_h8300_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-h8300.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_h8500_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-h8500.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/h8500.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_h8500_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-h8500.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_hppa_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-hppa.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_m68k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-m68k.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_m68k_hp300 = $(srcdir)/config/obj-aout.c $(INCDIR)/bin-bugs.h \ - $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-m68k.h \ +DEPOBJ_hppa_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-hppa.h $(BFDDIR)/elf32-hppa.h $(BFDDIR)/libhppa.h \ + $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h emul.h \ + subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_ia64_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-ia64.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_ia64_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-ia64.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_i370_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i370.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_i370_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i370.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/elf/i370.h $(INCDIR)/aout/aout64.h +DEPOBJ_i386_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-i386.h \ $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ $(INCDIR)/obstack.h -DEPOBJ_m88k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-m88k.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/m88k.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_m88k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-m88k.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_mcore_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mcore.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/mcore.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_i386_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i386.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/i386.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_i386_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i386.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_i860_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-i860.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h +DEPOBJ_i860_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i860.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_mcore_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mcore.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_mips_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-mips.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h -DEPOBJ_mips_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mips.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/mipspe.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_i860_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i860.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_i960_bout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-bout.h $(srcdir)/config/tc-i960.h \ + emul.h $(INCDIR)/obstack.h +DEPOBJ_i960_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i960.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/i960.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_i960_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i960.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_m32r_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-m32r.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_mips_ecoff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-ecoff.h \ - $(srcdir)/config/tc-mips.h ecoff.h $(INCDIR)/coff/sym.h \ - $(INCDIR)/coff/ecoff.h emul.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h $(BFDDIR)/libecoff.h -DEPOBJ_mips_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mips.h \ - emul.h subsegs.h $(INCDIR)/obstack.h ecoff.h $(INCDIR)/coff/sym.h \ - $(INCDIR)/coff/ecoff.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h \ - $(INCDIR)/aout/aout64.h -DEPOBJ_mn10200_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mn10200.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_mn10200_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mn10200.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_mn10300_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mn10300.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_mn10300_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mn10300.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_ns32k_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-ns32k.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h -DEPOBJ_ns32k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-ns32k.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_ns32k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-ns32k.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_pj_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-pj.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_pj_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-pj.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_ppc_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-ppc.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/rs6000.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_m32r_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-m32r.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_m68k_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-m68k.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h +DEPOBJ_m68k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-m68k.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/m68k.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_m68k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-m68k.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_m68k_hp300 = $(srcdir)/config/obj-aout.c $(INCDIR)/bin-bugs.h \ + $(INCDIR)/progress.h $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-m68k.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h +DEPOBJ_m88k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-m88k.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/m88k.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_m88k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-m88k.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_mcore_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mcore.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/mcore.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_mcore_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mcore.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_mips_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-mips.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h +DEPOBJ_mips_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mips.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/mipspe.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_mips_ecoff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-ecoff.h $(srcdir)/config/tc-mips.h \ + ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h \ + emul.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h $(BFDDIR)/libecoff.h +DEPOBJ_mips_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mips.h emul.h subsegs.h $(INCDIR)/obstack.h \ + ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h \ + $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h $(INCDIR)/aout/aout64.h +DEPOBJ_mn10200_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mn10200.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_ppc_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-ppc.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/ppc.h \ - $(INCDIR)/elf/reloc-macros.h $(INCDIR)/aout/aout64.h -DEPOBJ_sh_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-sh.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sh.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_mn10200_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mn10200.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_mn10300_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mn10300.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_sh_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sh.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_sparc_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-sparc.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h -DEPOBJ_sparc_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-sparc.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sparc.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_mn10300_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mn10300.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_ns32k_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-ns32k.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h +DEPOBJ_ns32k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-ns32k.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_sparc_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sparc.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_tahoe_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-tahoe.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h -DEPOBJ_tahoe_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-tahoe.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_tahoe_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-tahoe.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_tic30_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-tic30.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h -DEPOBJ_tic30_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-tic30.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/tic30.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_ns32k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-ns32k.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_pj_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-pj.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_tic30_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-tic30.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_tic80_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-tic80.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/tic80.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_pj_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-pj.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_ppc_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-ppc.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/rs6000.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_ppc_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-ppc.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h $(INCDIR)/aout/aout64.h +DEPOBJ_sh_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-sh.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sh.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_sh_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-sh.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_sparc_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-sparc.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h +DEPOBJ_sparc_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-sparc.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sparc.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_sparc_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-sparc.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_tahoe_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-tahoe.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h +DEPOBJ_tahoe_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-tahoe.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_tic80_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-tic80.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_vax_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-vax.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h -DEPOBJ_vax_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-vax.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_vax_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-vax.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_vax_vms = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-vms.h \ - $(srcdir)/config/tc-vax.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def emul.h subsegs.h $(INCDIR)/obstack.h -DEPOBJ_w65_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-w65.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/w65.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_tahoe_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-tahoe.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_tic30_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-tic30.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h +DEPOBJ_tic30_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-tic30.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/tic30.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_tic30_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-tic30.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_tic80_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-tic80.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/tic80.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_tic80_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-tic80.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_vax_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-vax.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h +DEPOBJ_vax_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-vax.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_w65_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-w65.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_v850_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-v850.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h -DEPOBJ_v850_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-v850.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h -DEPOBJ_z8k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-z8k.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/z8k.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_vax_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-vax.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_vax_vms = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-vms.h $(srcdir)/config/tc-vax.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def emul.h \ + subsegs.h $(INCDIR)/obstack.h +DEPOBJ_w65_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-w65.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/w65.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_w65_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-w65.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_v850_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-v850.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_z8k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-z8k.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_v850_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-v850.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h +DEPOBJ_z8k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-z8k.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/z8k.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_z8k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-z8k.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h DEPOBJ_hppa_som = $(srcdir)/config/obj-som.h subsegs.h \ $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h $(BFDDIR)/som.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def @@ -1708,6 +1773,15 @@ DEP_h8500_elf = $(srcdir)/config/obj-elf $(INCDIR)/bfdlink.h $(srcdir)/config/tc-h8500.h DEP_hppa_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-hppa.h \ $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h +DEP_hppa_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(srcdir)/config/tc-hppa.h $(BFDDIR)/elf32-hppa.h \ + $(BFDDIR)/libhppa.h $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h +DEP_ia64_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-ia64.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h +DEP_ia64_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(srcdir)/config/tc-ia64.h DEP_i370_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i370.h \ $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h DEP_i370_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ @@ -1866,7 +1940,76 @@ DEP_i386_multi = $(DEP_i386_aout) $(DEP_ $(DEP_i386_elf) DEP_mips_multi = $(DEP_mips_coff) $(DEP_mips_ecoff) \ $(DEP_mips_elf) +BMKDEP = #DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING ABOVE. +#MKDEP DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING BELOW. +app.o: app.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h +as.o: as.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h subsegs.h $(INCDIR)/obstack.h output-file.h \ + sb.h macro.h +atof-generic.o: atof-generic.c $(INCDIR)/bin-bugs.h \ + $(INCDIR)/progress.h emul.h +bignum-copy.o: bignum-copy.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h +cond.o: cond.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h macro.h sb.h $(INCDIR)/obstack.h +depend.o: depend.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h +dwarf2dbg.o: dwarf2dbg.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h dwarf2dbg.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h +ecoff.o: ecoff.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h ecoff.h +ehopt.o: ehopt.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h +expr.o: expr.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h $(INCDIR)/obstack.h +flonum-copy.o: flonum-copy.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h +flonum-konst.o: flonum-konst.c +flonum-mult.o: flonum-mult.c +frags.o: frags.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h subsegs.h $(INCDIR)/obstack.h +hash.o: hash.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h $(INCDIR)/obstack.h +input-file.o: input-file.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h input-file.h +input-scrub.o: input-scrub.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h input-file.h sb.h +listing.o: listing.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h input-file.h subsegs.h +literal.o: literal.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h subsegs.h $(INCDIR)/obstack.h +macro.o: macro.c sb.h macro.h +messages.o: messages.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h +output-file.o: output-file.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h output-file.h +read.o: read.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h subsegs.h $(INCDIR)/obstack.h sb.h macro.h ecoff.h +sb.o: sb.c sb.h +stabs.o: stabs.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h $(INCDIR)/obstack.h subsegs.h ecoff.h $(INCDIR)/aout/stab_gnu.h \ + $(INCDIR)/aout/stab.def +subsegs.o: subsegs.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h subsegs.h $(INCDIR)/obstack.h +symbols.o: symbols.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h $(INCDIR)/obstack.h subsegs.h struc-symbol.h +write.o: write.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h subsegs.h $(INCDIR)/obstack.h output-file.h +gasp.o: gasp.c $(INCDIR)/bin-bugs.h sb.h macro.h +itbl-ops.o: itbl-ops.c itbl-ops.h $(INCDIR)/bin-bugs.h \ + $(INCDIR)/progress.h emul.h itbl-parse.h +e-i386aout.o: $(srcdir)/config/e-i386aout.c $(INCDIR)/bin-bugs.h \ + $(INCDIR)/progress.h emul.h emul-target.h +e-i386coff.o: $(srcdir)/config/e-i386coff.c $(INCDIR)/bin-bugs.h \ + $(INCDIR)/progress.h emul.h emul-target.h +e-i386elf.o: $(srcdir)/config/e-i386elf.c $(INCDIR)/bin-bugs.h \ + $(INCDIR)/progress.h emul.h emul-target.h +e-mipsecoff.o: $(srcdir)/config/e-mipsecoff.c $(INCDIR)/bin-bugs.h \ + $(INCDIR)/progress.h emul.h emul-target.h +e-mipself.o: $(srcdir)/config/e-mipself.c $(INCDIR)/bin-bugs.h \ + $(INCDIR)/progress.h emul.h emul-target.h $(OBJS): $(DEP_@target_cpu_type@_@obj_format@) $(TARG_CPU_O): $(DEPTC_@target_cpu_type@_@obj_format@) $(OBJ_FORMAT_O): $(DEPOBJ_@target_cpu_type@_@obj_format@) -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY +#MKDEP DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING ABOVE. diff -upr --new-file binutils-2.9.5.0.42/gas/Makefile.in binutils-2.9.5.0.46/gas/Makefile.in --- binutils-2.9.5.0.42/gas/Makefile.in Sun Apr 23 09:48:02 2000 +++ binutils-2.9.5.0.46/gas/Makefile.in Tue May 30 09:53:56 2000 @@ -442,7 +442,6 @@ TARG_ENV_HFILES = \ config/te-lynx.h \ config/te-mach.h \ config/te-macos.h \ - config/te-multi.h \ config/te-nbsd.h \ config/te-nbsd532.h \ config/te-pc532mach.h \ @@ -592,463 +591,519 @@ MOSTLYCLEANFILES = $(STAGESTUFF) core st testsuite/site.exp site.bak site.exp stage stage1 stage2 -CLEANFILES = dep.sed DEPTC DEPTCA DEPOBJ DEPOBJA DEP2 DEP2a DEP1 DEPA DEP DEPDIR +CLEANFILES = dep.sed DEPTC DEPTCA DEPOBJ DEPOBJA DEP2 DEP2A DEP1 DEPA DEP DEPDIR against = stage2 -# Automatic dependency computation. This is a real pain, because the -# dependencies change based on target_cpu_type and obj_format. We -# currently ignore any dependencies caused by emulation files. - DEP_FILE_DEPS = $(CFILES) $(HFILES) $(TARGET_CPU_CFILES) \ $(TARGET_CPU_HFILES) $(OBJ_FORMAT_CFILES) $(OBJ_FORMAT_HFILES) -DEPTC_a29k_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-a29k.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/opcode/a29k.h - -DEPTC_a29k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-a29k.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/a29k.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/opcode/a29k.h -DEPTC_a29k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-a29k.h \ - emul.h $(INCDIR)/opcode/a29k.h +AMKDEP = #DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING BELOW. +DEPTC_a29k_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-a29k.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/a29k.h -DEPTC_alpha_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-alpha.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h struc-symbol.h ecoff.h $(INCDIR)/opcode/alpha.h \ - $(srcdir)/config/atof-vax.c +DEPTC_a29k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-a29k.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/a29k.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/a29k.h -DEPTC_alpha_ecoff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-ecoff.h \ - $(srcdir)/config/tc-alpha.h ecoff.h $(INCDIR)/coff/sym.h \ - $(INCDIR)/coff/ecoff.h emul.h subsegs.h $(INCDIR)/obstack.h \ - struc-symbol.h $(INCDIR)/opcode/alpha.h $(srcdir)/config/atof-vax.c +DEPTC_a29k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-a29k.h emul.h $(INCDIR)/opcode/a29k.h -DEPTC_alpha_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-alpha.h \ +DEPTC_alpha_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-alpha.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h struc-symbol.h \ + ecoff.h $(INCDIR)/opcode/alpha.h $(srcdir)/config/atof-vax.c + +DEPTC_alpha_ecoff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-ecoff.h $(srcdir)/config/tc-alpha.h \ ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h \ - $(INCDIR)/opcode/alpha.h $(INCDIR)/elf/alpha.h $(INCDIR)/elf/reloc-macros.h \ - $(srcdir)/config/atof-vax.c + emul.h subsegs.h $(INCDIR)/obstack.h struc-symbol.h \ + $(INCDIR)/opcode/alpha.h $(srcdir)/config/atof-vax.c -DEPTC_alpha_evax = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-evax.h \ +DEPTC_alpha_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ $(srcdir)/config/tc-alpha.h emul.h subsegs.h $(INCDIR)/obstack.h \ - struc-symbol.h ecoff.h $(INCDIR)/opcode/alpha.h $(srcdir)/config/atof-vax.c + struc-symbol.h ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h \ + $(INCDIR)/opcode/alpha.h $(INCDIR)/elf/alpha.h $(INCDIR)/elf/reloc-macros.h \ + $(srcdir)/config/atof-vax.c -DEPTC_arc_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-arc.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/opcode/arc.h $(INCDIR)/elf/arc.h \ - $(INCDIR)/elf/reloc-macros.h +DEPTC_alpha_evax = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-evax.h $(srcdir)/config/tc-alpha.h \ + emul.h subsegs.h $(INCDIR)/obstack.h struc-symbol.h \ + ecoff.h $(INCDIR)/opcode/alpha.h $(srcdir)/config/atof-vax.c -DEPTC_arc_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arc.h \ +DEPTC_arc_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-arc.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/arc.h \ $(INCDIR)/elf/arc.h $(INCDIR)/elf/reloc-macros.h -DEPTC_arm_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-arm.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h +DEPTC_arc_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-arc.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/arc.h $(INCDIR)/elf/arc.h $(INCDIR)/elf/reloc-macros.h -DEPTC_arm_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-arm.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/arm.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h +DEPTC_arm_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-arm.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ + $(INCDIR)/obstack.h -DEPTC_arm_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arm.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/arm.h \ - $(INCDIR)/elf/reloc-macros.h +DEPTC_arm_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-arm.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/arm.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h -DEPTC_avr_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-avr.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h +DEPTC_arm_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-arm.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h -DEPTC_avr_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr.h \ +DEPTC_avr_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-avr.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h -DEPTC_d10v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-d10v.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/opcode/d10v.h $(INCDIR)/elf/ppc.h \ - $(INCDIR)/elf/reloc-macros.h +DEPTC_avr_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-avr.h emul.h subsegs.h $(INCDIR)/obstack.h -DEPTC_d10v_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-d10v.h \ +DEPTC_d10v_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-d10v.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/d10v.h \ $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h -DEPTC_d30v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-d30v.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/opcode/d30v.h +DEPTC_d10v_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-d10v.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/d10v.h $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h -DEPTC_d30v_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-d30v.h \ +DEPTC_d30v_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-d30v.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/d30v.h -DEPTC_fr30_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-fr30.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/symcat.h $(srcdir)/../opcodes/fr30-desc.h \ - $(INCDIR)/opcode/cgen.h $(srcdir)/../opcodes/fr30-opc.h \ - cgen.h +DEPTC_d30v_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-d30v.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/d30v.h -DEPTC_fr30_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-fr30.h \ +DEPTC_fr30_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-fr30.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/symcat.h \ $(srcdir)/../opcodes/fr30-desc.h $(INCDIR)/opcode/cgen.h \ $(srcdir)/../opcodes/fr30-opc.h cgen.h -DEPTC_h8300_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-h8300.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/h8300.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/h8300.h +DEPTC_fr30_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-fr30.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/symcat.h $(srcdir)/../opcodes/fr30-desc.h \ + $(INCDIR)/opcode/cgen.h $(srcdir)/../opcodes/fr30-opc.h \ + cgen.h -DEPTC_h8300_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-h8300.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/h8300.h +DEPTC_h8300_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-h8300.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/h8300.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/h8300.h -DEPTC_h8500_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-h8500.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/h8500.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/h8500-opc.h +DEPTC_h8300_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-h8300.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/h8300.h -DEPTC_h8500_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-h8500.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/h8500-opc.h +DEPTC_h8500_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-h8500.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/h8500.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/h8500-opc.h -DEPTC_hppa_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-hppa.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h $(BFDDIR)/libbfd.h \ - $(INCDIR)/opcode/hppa.h - -DEPTC_i370_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i370.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h struc-symbol.h $(INCDIR)/opcode/i370.h +DEPTC_h8500_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-h8500.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/h8500-opc.h -DEPTC_i370_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i370.h \ +DEPTC_hppa_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-hppa.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h subsegs.h $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h \ + $(BFDDIR)/libbfd.h $(INCDIR)/opcode/hppa.h + +DEPTC_hppa_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-hppa.h $(BFDDIR)/elf32-hppa.h $(BFDDIR)/libhppa.h \ + $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h emul.h \ + subsegs.h $(INCDIR)/obstack.h $(BFDDIR)/libbfd.h $(INCDIR)/opcode/hppa.h \ + dwarf2dbg.h + +DEPTC_ia64_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-ia64.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h dwarf2dbg.h subsegs.h $(INCDIR)/obstack.h + +DEPTC_ia64_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-ia64.h emul.h dwarf2dbg.h subsegs.h \ + $(INCDIR)/obstack.h + +DEPTC_i370_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i370.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h struc-symbol.h \ - $(INCDIR)/opcode/i370.h $(INCDIR)/elf/i370.h + $(INCDIR)/opcode/i370.h -DEPTC_i386_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-i386.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/i386.h - -DEPTC_i386_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i386.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/i386.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/i386.h +DEPTC_i370_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i370.h emul.h subsegs.h $(INCDIR)/obstack.h \ + struc-symbol.h $(INCDIR)/opcode/i370.h $(INCDIR)/elf/i370.h -DEPTC_i386_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i386.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/i386.h +DEPTC_i386_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-i386.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ + $(INCDIR)/obstack.h $(INCDIR)/opcode/i386.h -DEPTC_i860_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-i860.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/opcode/i860.h +DEPTC_i386_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i386.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/i386.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/i386.h -DEPTC_i860_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i860.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/i860.h +DEPTC_i386_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i386.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/i386.h -DEPTC_i860_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i860.h \ +DEPTC_i860_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-i860.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/i860.h + +DEPTC_i860_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i860.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/opcode/i860.h -DEPTC_i960_bout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-bout.h \ - $(srcdir)/config/tc-i960.h emul.h $(INCDIR)/obstack.h \ - $(INCDIR)/opcode/i960.h +DEPTC_i860_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i860.h emul.h $(INCDIR)/opcode/i860.h -DEPTC_i960_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i960.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/i960.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPTC_i960_bout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-bout.h $(srcdir)/config/tc-i960.h \ emul.h $(INCDIR)/obstack.h $(INCDIR)/opcode/i960.h -DEPTC_i960_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i960.h \ - emul.h $(INCDIR)/obstack.h $(INCDIR)/opcode/i960.h +DEPTC_i960_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i960.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/i960.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h $(INCDIR)/opcode/i960.h -DEPTC_m32r_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-m32r.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/symcat.h $(srcdir)/../opcodes/m32r-desc.h \ - $(INCDIR)/opcode/cgen.h $(srcdir)/../opcodes/m32r-opc.h \ - cgen.h +DEPTC_i960_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i960.h emul.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/i960.h -DEPTC_m32r_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-m32r.h \ +DEPTC_m32r_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-m32r.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/symcat.h \ $(srcdir)/../opcodes/m32r-desc.h $(INCDIR)/opcode/cgen.h \ $(srcdir)/../opcodes/m32r-opc.h cgen.h -DEPTC_m68k_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-m68k.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/obstack.h subsegs.h $(INCDIR)/opcode/m68k.h \ - $(srcdir)/config/m68k-parse.h - -DEPTC_m68k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-m68k.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/m68k.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/obstack.h subsegs.h $(INCDIR)/opcode/m68k.h \ - $(srcdir)/config/m68k-parse.h - -DEPTC_m68k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-m68k.h \ - emul.h $(INCDIR)/obstack.h subsegs.h $(INCDIR)/opcode/m68k.h \ - $(srcdir)/config/m68k-parse.h $(INCDIR)/elf/m68k.h \ - $(INCDIR)/elf/reloc-macros.h +DEPTC_m32r_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-m32r.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/symcat.h $(srcdir)/../opcodes/m32r-desc.h \ + $(INCDIR)/opcode/cgen.h $(srcdir)/../opcodes/m32r-opc.h \ + cgen.h -DEPTC_m68k_hp300 = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-hp300.h \ +DEPTC_m68k_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-m68k.h \ $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ subsegs.h $(INCDIR)/opcode/m68k.h $(srcdir)/config/m68k-parse.h -DEPTC_m88k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-m88k.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/m88k.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/config/m88k-opcode.h +DEPTC_m68k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-m68k.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/m68k.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h \ + $(INCDIR)/opcode/m68k.h $(srcdir)/config/m68k-parse.h -DEPTC_m88k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-m88k.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/config/m88k-opcode.h +DEPTC_m68k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-m68k.h emul.h $(INCDIR)/obstack.h \ + subsegs.h $(INCDIR)/opcode/m68k.h $(srcdir)/config/m68k-parse.h \ + $(INCDIR)/elf/m68k.h $(INCDIR)/elf/reloc-macros.h -DEPTC_mcore_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mcore.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/mcore.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/mcore-opc.h +DEPTC_m68k_hp300 = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-hp300.h $(srcdir)/config/obj-aout.h \ + $(srcdir)/config/tc-m68k.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ + emul.h $(INCDIR)/obstack.h subsegs.h $(INCDIR)/opcode/m68k.h \ + $(srcdir)/config/m68k-parse.h -DEPTC_mcore_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mcore.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/mcore-opc.h \ - $(INCDIR)/elf/mcore.h $(INCDIR)/elf/reloc-macros.h +DEPTC_m88k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-m88k.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/m88k.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/config/m88k-opcode.h -DEPTC_mips_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-mips.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/mips.h \ - itbl-ops.h $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h ecoff.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h +DEPTC_m88k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-m88k.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/config/m88k-opcode.h -DEPTC_mips_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mips.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/mipspe.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/mips.h \ - itbl-ops.h $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h ecoff.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h +DEPTC_mcore_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mcore.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/mcore.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/mcore-opc.h -DEPTC_mips_ecoff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-ecoff.h \ - $(srcdir)/config/tc-mips.h ecoff.h $(INCDIR)/coff/sym.h \ - $(INCDIR)/coff/ecoff.h emul.h subsegs.h $(INCDIR)/obstack.h \ - $(INCDIR)/opcode/mips.h itbl-ops.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/mips.h \ +DEPTC_mcore_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mcore.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/mcore-opc.h $(INCDIR)/elf/mcore.h \ $(INCDIR)/elf/reloc-macros.h -DEPTC_mips_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ +DEPTC_mips_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-mips.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ + $(INCDIR)/obstack.h $(INCDIR)/opcode/mips.h itbl-ops.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h \ + $(INCDIR)/elf/reloc-macros.h ecoff.h $(INCDIR)/coff/sym.h \ + $(INCDIR)/coff/ecoff.h + +DEPTC_mips_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mips.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/mipspe.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/mips.h itbl-ops.h $(srcdir)/config/obj-elf.h \ $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mips.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/mips.h \ - itbl-ops.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h \ ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h -DEPTC_mn10200_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mn10200.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/opcode/mn10200.h +DEPTC_mips_ecoff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-ecoff.h $(srcdir)/config/tc-mips.h \ + ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h \ + emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/mips.h \ + itbl-ops.h $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h -DEPTC_mn10200_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mn10200.h \ +DEPTC_mips_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mips.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/mips.h itbl-ops.h $(INCDIR)/elf/mips.h \ + $(INCDIR)/elf/reloc-macros.h ecoff.h $(INCDIR)/coff/sym.h \ + $(INCDIR)/coff/ecoff.h + +DEPTC_mn10200_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mn10200.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/mn10200.h -DEPTC_mn10300_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mn10300.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/opcode/mn10300.h +DEPTC_mn10200_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mn10200.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/mn10200.h -DEPTC_mn10300_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mn10300.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/mn10300.h +DEPTC_mn10300_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mn10300.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/mn10300.h \ + dwarf2dbg.h -DEPTC_ns32k_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-ns32k.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/opcode/ns32k.h $(INCDIR)/obstack.h +DEPTC_mn10300_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mn10300.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/mn10300.h dwarf2dbg.h -DEPTC_ns32k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-ns32k.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/ns32k.h \ +DEPTC_ns32k_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-ns32k.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/ns32k.h \ $(INCDIR)/obstack.h -DEPTC_ns32k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-ns32k.h \ +DEPTC_ns32k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-ns32k.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/opcode/ns32k.h $(INCDIR)/obstack.h -DEPTC_pj_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-pj.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/pj.h +DEPTC_ns32k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-ns32k.h emul.h $(INCDIR)/opcode/ns32k.h \ + $(INCDIR)/obstack.h -DEPTC_pj_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-pj.h \ +DEPTC_pj_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-pj.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/opcode/pj.h -DEPTC_ppc_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-ppc.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/rs6000.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/ppc.h +DEPTC_pj_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-pj.h emul.h $(INCDIR)/opcode/pj.h + +DEPTC_ppc_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-ppc.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/rs6000.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/ppc.h -DEPTC_ppc_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-ppc.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/ppc.h \ - $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h +DEPTC_ppc_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-ppc.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/ppc.h $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h -DEPTC_sh_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-sh.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sh.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/sh-opc.h +DEPTC_sh_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-sh.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sh.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/sh-opc.h -DEPTC_sh_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sh.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/sh-opc.h \ - $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h - -DEPTC_sparc_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-sparc.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/sparc.h - -DEPTC_sparc_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-sparc.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sparc.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/sparc.h +DEPTC_sh_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-sh.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/sh-opc.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h -DEPTC_sparc_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sparc.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/sparc.h \ - $(INCDIR)/elf/sparc.h $(INCDIR)/elf/reloc-macros.h +DEPTC_sparc_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-sparc.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ + $(INCDIR)/obstack.h $(INCDIR)/opcode/sparc.h -DEPTC_tahoe_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-tahoe.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/obstack.h $(INCDIR)/opcode/tahoe.h +DEPTC_sparc_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-sparc.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sparc.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/sparc.h -DEPTC_tahoe_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-tahoe.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ +DEPTC_sparc_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-sparc.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/sparc.h $(INCDIR)/elf/sparc.h $(INCDIR)/elf/reloc-macros.h + +DEPTC_tahoe_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-tahoe.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ $(INCDIR)/opcode/tahoe.h -DEPTC_tahoe_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-tahoe.h \ +DEPTC_tahoe_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-tahoe.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h $(INCDIR)/opcode/tahoe.h -DEPTC_tic30_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-tic30.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/opcode/tic30.h - -DEPTC_tic30_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-tic30.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/tic30.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/opcode/tic30.h +DEPTC_tahoe_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-tahoe.h emul.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/tahoe.h -DEPTC_tic30_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-tic30.h \ - emul.h $(INCDIR)/opcode/tic30.h +DEPTC_tic30_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-tic30.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/tic30.h -DEPTC_tic80_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-tic80.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/tic80.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/opcode/tic80.h +DEPTC_tic30_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-tic30.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/tic30.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/tic30.h -DEPTC_tic80_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-tic80.h \ - emul.h $(INCDIR)/opcode/tic80.h +DEPTC_tic30_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-tic30.h emul.h $(INCDIR)/opcode/tic30.h -DEPTC_vax_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-vax.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(srcdir)/config/vax-inst.h $(INCDIR)/obstack.h \ - $(INCDIR)/opcode/vax.h +DEPTC_tic80_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-tic80.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/tic80.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/opcode/tic80.h -DEPTC_vax_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-vax.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(srcdir)/config/vax-inst.h \ +DEPTC_tic80_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-tic80.h emul.h $(INCDIR)/opcode/tic80.h + +DEPTC_vax_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-vax.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(srcdir)/config/vax-inst.h \ $(INCDIR)/obstack.h $(INCDIR)/opcode/vax.h -DEPTC_vax_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-vax.h \ +DEPTC_vax_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-vax.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(srcdir)/config/vax-inst.h $(INCDIR)/obstack.h \ $(INCDIR)/opcode/vax.h -DEPTC_vax_vms = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-vms.h \ - $(srcdir)/config/tc-vax.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def emul.h $(srcdir)/config/vax-inst.h \ +DEPTC_vax_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-vax.h emul.h $(srcdir)/config/vax-inst.h \ $(INCDIR)/obstack.h $(INCDIR)/opcode/vax.h -DEPTC_w65_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-w65.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/w65.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/w65-opc.h +DEPTC_vax_vms = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-vms.h $(srcdir)/config/tc-vax.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def emul.h \ + $(srcdir)/config/vax-inst.h $(INCDIR)/obstack.h $(INCDIR)/opcode/vax.h -DEPTC_w65_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-w65.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/w65-opc.h +DEPTC_w65_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-w65.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/w65.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/w65-opc.h -DEPTC_v850_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-v850.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/opcode/v850.h +DEPTC_w65_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-w65.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(srcdir)/../opcodes/w65-opc.h -DEPTC_v850_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-v850.h \ +DEPTC_v850_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-v850.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/v850.h +DEPTC_v850_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-v850.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/opcode/v850.h + DEPTC_z8k_coff = $(srcdir)/../opcodes/z8k-opc.h $(INCDIR)/bin-bugs.h \ - $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-z8k.h \ + $(INCDIR)/progress.h $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-z8k.h \ $(INCDIR)/coff/internal.h $(INCDIR)/coff/z8k.h $(BFDDIR)/libcoff.h \ $(INCDIR)/bfdlink.h emul.h DEPTC_z8k_elf = $(srcdir)/../opcodes/z8k-opc.h $(INCDIR)/bin-bugs.h \ - $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(srcdir)/config/tc-z8k.h emul.h + $(INCDIR)/progress.h $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(srcdir)/config/tc-z8k.h emul.h DEPTC_hppa_som = $(srcdir)/config/tc-hppa.h subsegs.h \ $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h $(INCDIR)/opcode/hppa.h \ @@ -1060,415 +1115,479 @@ DEPTC_i386_multi = $(DEPTC_i386_aout) $( DEPTC_mips_multi = $(DEPTC_mips_coff) $(DEPTC_mips_ecoff) \ $(DEPTC_mips_elf) -DEPOBJ_a29k_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-a29k.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h - -DEPOBJ_a29k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-a29k.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/a29k.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/obstack.h subsegs.h - -DEPOBJ_a29k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-a29k.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_a29k_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-a29k.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h -DEPOBJ_alpha_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-alpha.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h - -DEPOBJ_alpha_ecoff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-ecoff.h \ - $(srcdir)/config/tc-alpha.h ecoff.h $(INCDIR)/coff/sym.h \ - $(INCDIR)/coff/ecoff.h emul.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h $(BFDDIR)/libecoff.h +DEPOBJ_a29k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-a29k.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/a29k.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_alpha_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-alpha.h \ - emul.h subsegs.h $(INCDIR)/obstack.h ecoff.h $(INCDIR)/coff/sym.h \ - $(INCDIR)/coff/ecoff.h $(INCDIR)/elf/alpha.h $(INCDIR)/elf/reloc-macros.h \ +DEPOBJ_a29k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-a29k.h emul.h subsegs.h $(INCDIR)/obstack.h \ $(INCDIR)/aout/aout64.h -DEPOBJ_alpha_evax = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-evax.h \ - $(srcdir)/config/tc-alpha.h emul.h +DEPOBJ_alpha_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-alpha.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_arc_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-arc.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_alpha_ecoff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-ecoff.h $(srcdir)/config/tc-alpha.h \ + ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h \ + emul.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h $(BFDDIR)/libecoff.h -DEPOBJ_arc_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arc.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_alpha_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-alpha.h emul.h subsegs.h $(INCDIR)/obstack.h \ + ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h \ + $(INCDIR)/elf/alpha.h $(INCDIR)/elf/reloc-macros.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_arm_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-arm.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h - -DEPOBJ_arm_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-arm.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/arm.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_alpha_evax = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-evax.h $(srcdir)/config/tc-alpha.h \ + emul.h -DEPOBJ_arm_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arm.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_arc_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-arc.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_avr_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-avr.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_arc_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-arc.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_avr_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_arm_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-arm.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h -DEPOBJ_d10v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-d10v.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_arm_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-arm.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/arm.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_d10v_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-d10v.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_arm_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-arm.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_d30v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-d30v.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_avr_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-avr.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_d30v_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-d30v.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_avr_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-avr.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_fr30_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-fr30.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_d10v_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-d10v.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_fr30_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-fr30.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_d10v_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-d10v.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_h8300_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-h8300.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/h8300.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_d30v_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-d30v.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_h8300_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-h8300.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_d30v_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-d30v.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_h8500_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-h8500.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/h8500.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_fr30_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-fr30.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_h8500_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-h8500.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_fr30_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-fr30.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_hppa_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-hppa.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h - -DEPOBJ_i370_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i370.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_h8300_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-h8300.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/h8300.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_i370_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i370.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/i370.h \ +DEPOBJ_h8300_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-h8300.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h + +DEPOBJ_h8500_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-h8500.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/h8500.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h + +DEPOBJ_h8500_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-h8500.h emul.h subsegs.h $(INCDIR)/obstack.h \ $(INCDIR)/aout/aout64.h -DEPOBJ_i386_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-i386.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h +DEPOBJ_hppa_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-hppa.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_i386_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i386.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/i386.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_hppa_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-hppa.h $(BFDDIR)/elf32-hppa.h $(BFDDIR)/libhppa.h \ + $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h emul.h \ + subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h + +DEPOBJ_ia64_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-ia64.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_i386_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i386.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_ia64_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-ia64.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_i860_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-i860.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h - -DEPOBJ_i860_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i860.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_i370_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i370.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_i860_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i860.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_i370_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i370.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/elf/i370.h $(INCDIR)/aout/aout64.h + +DEPOBJ_i386_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-i386.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h + +DEPOBJ_i386_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i386.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/i386.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h + +DEPOBJ_i386_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i386.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_i960_bout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-bout.h \ - $(srcdir)/config/tc-i960.h emul.h $(INCDIR)/obstack.h +DEPOBJ_i860_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-i860.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h -DEPOBJ_i960_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-i960.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/i960.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_i860_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i860.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_i960_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i960.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_i860_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i860.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_m32r_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-m32r.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_i960_bout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-bout.h $(srcdir)/config/tc-i960.h \ + emul.h $(INCDIR)/obstack.h -DEPOBJ_m32r_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-m32r.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_i960_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i960.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/i960.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_m68k_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-m68k.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h +DEPOBJ_i960_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-i960.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_m68k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-m68k.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/m68k.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_m32r_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-m32r.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_m68k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-m68k.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_m32r_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-m32r.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_m68k_hp300 = $(srcdir)/config/obj-aout.c $(INCDIR)/bin-bugs.h \ +DEPOBJ_m68k_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-m68k.h \ $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ $(INCDIR)/obstack.h -DEPOBJ_m88k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-m88k.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/m88k.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_m68k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-m68k.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/m68k.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_m88k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-m88k.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_m68k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-m68k.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_mcore_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mcore.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/mcore.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_m68k_hp300 = $(srcdir)/config/obj-aout.c $(INCDIR)/bin-bugs.h \ + $(INCDIR)/progress.h $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-m68k.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h -DEPOBJ_mcore_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mcore.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_m88k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-m88k.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/m88k.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_mips_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-mips.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h - -DEPOBJ_mips_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mips.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/mipspe.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_m88k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-m88k.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_mips_ecoff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-ecoff.h \ - $(srcdir)/config/tc-mips.h ecoff.h $(INCDIR)/coff/sym.h \ - $(INCDIR)/coff/ecoff.h emul.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h $(BFDDIR)/libecoff.h +DEPOBJ_mcore_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mcore.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/mcore.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_mips_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mips.h \ - emul.h subsegs.h $(INCDIR)/obstack.h ecoff.h $(INCDIR)/coff/sym.h \ - $(INCDIR)/coff/ecoff.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h \ +DEPOBJ_mcore_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mcore.h emul.h subsegs.h $(INCDIR)/obstack.h \ $(INCDIR)/aout/aout64.h -DEPOBJ_mn10200_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mn10200.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_mips_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-mips.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h -DEPOBJ_mn10200_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mn10200.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_mips_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mips.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/mipspe.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_mn10300_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-mn10300.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_mips_ecoff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-ecoff.h $(srcdir)/config/tc-mips.h \ + ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h \ + emul.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h $(BFDDIR)/libecoff.h -DEPOBJ_mn10300_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-mn10300.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_mips_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mips.h emul.h subsegs.h $(INCDIR)/obstack.h \ + ecoff.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h \ + $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h $(INCDIR)/aout/aout64.h -DEPOBJ_ns32k_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-ns32k.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h - -DEPOBJ_ns32k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-ns32k.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_mn10200_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mn10200.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_ns32k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-ns32k.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_mn10200_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mn10200.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_pj_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-pj.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_mn10300_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-mn10300.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ + emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_pj_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-pj.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_mn10300_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-mn10300.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_ppc_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-ppc.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/rs6000.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_ns32k_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-ns32k.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h -DEPOBJ_ppc_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-ppc.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/ppc.h \ - $(INCDIR)/elf/reloc-macros.h $(INCDIR)/aout/aout64.h - -DEPOBJ_sh_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-sh.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sh.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_ns32k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-ns32k.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_sh_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sh.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_ns32k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-ns32k.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_sparc_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-sparc.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h - -DEPOBJ_sparc_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-sparc.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sparc.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_pj_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-pj.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_sparc_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sparc.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_pj_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-pj.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_tahoe_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-tahoe.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h - -DEPOBJ_tahoe_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-tahoe.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_ppc_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-ppc.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/rs6000.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_tahoe_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-tahoe.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_ppc_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-ppc.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h $(INCDIR)/aout/aout64.h -DEPOBJ_tic30_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-tic30.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h - -DEPOBJ_tic30_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-tic30.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/tic30.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/obstack.h subsegs.h +DEPOBJ_sh_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-sh.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sh.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_tic30_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-tic30.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_sh_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-sh.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h + +DEPOBJ_sparc_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-sparc.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h + +DEPOBJ_sparc_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-sparc.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sparc.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h + +DEPOBJ_sparc_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-sparc.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_tic80_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-tic80.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/tic80.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_tahoe_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-tahoe.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h + +DEPOBJ_tahoe_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-tahoe.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_tic80_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-tic80.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_tahoe_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-tahoe.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_vax_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ - $(srcdir)/config/tc-vax.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \ - emul.h $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h - -DEPOBJ_vax_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-vax.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_tic30_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-tic30.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h -DEPOBJ_vax_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-vax.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_tic30_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-tic30.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/tic30.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_vax_vms = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-vms.h \ - $(srcdir)/config/tc-vax.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def emul.h subsegs.h $(INCDIR)/obstack.h - -DEPOBJ_w65_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-w65.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/w65.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_tic30_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-tic30.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h + +DEPOBJ_tic80_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-tic80.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/tic80.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h + +DEPOBJ_tic80_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-tic80.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h + +DEPOBJ_vax_aout = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-vax.h \ + $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/obstack.h + +DEPOBJ_vax_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-vax.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_w65_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-w65.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_vax_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-vax.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h -DEPOBJ_v850_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-v850.h $(INCDIR)/coff/internal.h \ - $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ - subsegs.h +DEPOBJ_vax_vms = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-vms.h $(srcdir)/config/tc-vax.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def emul.h \ + subsegs.h $(INCDIR)/obstack.h -DEPOBJ_v850_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-v850.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_w65_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-w65.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/w65.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_z8k_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ - $(srcdir)/config/tc-z8k.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/z8k.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ +DEPOBJ_w65_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-w65.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h + +DEPOBJ_v850_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-v850.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \ emul.h $(INCDIR)/obstack.h subsegs.h -DEPOBJ_z8k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ - $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-z8k.h \ - emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_v850_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-v850.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h + +DEPOBJ_z8k_coff = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-z8k.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/z8k.h $(BFDDIR)/libcoff.h \ + $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h subsegs.h + +DEPOBJ_z8k_elf = $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(srcdir)/config/tc-z8k.h emul.h subsegs.h $(INCDIR)/obstack.h \ + $(INCDIR)/aout/aout64.h DEPOBJ_hppa_som = $(srcdir)/config/obj-som.h subsegs.h \ $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h $(BFDDIR)/som.h \ @@ -1567,6 +1686,18 @@ DEP_h8500_elf = $(srcdir)/config/obj-elf DEP_hppa_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-hppa.h \ $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h +DEP_hppa_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(srcdir)/config/tc-hppa.h $(BFDDIR)/elf32-hppa.h \ + $(BFDDIR)/libhppa.h $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h + +DEP_ia64_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-ia64.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h + +DEP_ia64_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(srcdir)/config/tc-ia64.h + DEP_i370_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i370.h \ $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h @@ -1785,6 +1916,7 @@ DEP_i386_multi = $(DEP_i386_aout) $(DEP_ DEP_mips_multi = $(DEP_mips_coff) $(DEP_mips_ecoff) \ $(DEP_mips_elf) +BMKDEP = #DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING ABOVE. ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h @@ -2254,7 +2386,7 @@ check-DEJAGNU: site.exp # The implicit .c.o rule doesn't work for these, perhaps because of # the variables, or perhaps because the sources are not on vpath. -$(TARG_CPU_O): $(TARG_CPU_C) $(TARG_CPU_DEP_@target_cpu_type@) +$(TARG_CPU_O): $(TARG_CPU_C) $(COMPILE) -c $(TARG_CPU_C) $(ATOF_TARG_O): $(ATOF_TARG_C) $(COMPILE) -c $(ATOF_TARG_C) @@ -2453,19 +2585,28 @@ de-stage3: - (cd stage3 ; rm -f as$(EXEEXT) ; mv -f * ..) - rmdir stage3 +# Automatic dependency computation. This is a real pain, because the +# dependencies change based on target_cpu_type and obj_format. +# Just to make things even more complicated, automake separates the +# dependency variable assignments from the dependency rules, and tacks +# on a .NOEXPORT at the end of Makefile.in. + DEP: dep.sed $(DEP_FILE_DEPS) DEPTC DEPOBJ DEP2 - rm -f DEP1 + rm -f DEP1 # delete because we use $? in DEP1 rule srcdir=`cd $(srcdir); pwd`; \ $(MAKE) MKDEP="$(MKDEP)" srcdir="$${srcdir}" VPATH="$${srcdir}" DEP1 rm -rf DEPDIR - sed -f dep.sed < DEP1 > DEPA + echo 'AMKDEP = #DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING BELOW.' > DEPA sed -f dep.sed < DEPTC >> DEPA sed -f dep.sed < DEPOBJ >> DEPA sed -f dep.sed < DEP2 >> DEPA + echo 'BMKDEP = #DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING ABOVE.' >> DEPA + echo '#MKDEP DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING BELOW.' >> DEPA + sed -f dep.sed < DEP1 >> DEPA echo '$$(OBJS): $$(DEP_@target''_cpu_type@_@obj''_format@)' >> DEPA echo '$$(TARG_CPU_O): $$(DEPTC_@target''_cpu_type@_@obj''_format@)' >> DEPA echo '$$(OBJ_FORMAT_O): $$(DEPOBJ_@target''_cpu_type@_@obj''_format@)' >> DEPA - echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA + echo '#MKDEP DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING ABOVE.' >> DEPA mv -f DEPA $@ DEP1: $(CFILES) $(MULTI_CFILES) @@ -2477,9 +2618,7 @@ DEP1: $(CFILES) $(MULTI_CFILES) echo '' > targ-env.h; \ echo '' > itbl-cpu.h; \ echo '' > itbl-parse.h; \ - echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP; \ - echo '# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.' >> DEP; \ - $(MKDEP) -DBFD_ASSEMBLER -I. -I.. -I$${srcdir} -I../../bfd $(DEP_INCLUDES) $? >> DEP + $(MKDEP) -DBFD_ASSEMBLER -I. -I.. -I$${srcdir} -I../../bfd $(DEP_INCLUDES) $? > DEP mv -f DEPDIR/DEP $@ # Work out the special dependencies for the tc-*.c files. @@ -2510,7 +2649,7 @@ DEPTC: $(TARGET_CPU_CFILES) echo ' $$(INCDIR)/obstack.h $$(BFDDIR)/libhppa.h \' >> DEPTCA echo ' $$(INCDIR)/opcode/hppa.h $$(BFDDIR)/som.h' >> DEPTCA for c in $(MULTI_CPU_TYPES); do \ - echo 'DEPTC_'"$${c}"'_multi = \' >> DEPTCA; \ + echo "DEPTC_$${c}"'_multi = \' >> DEPTCA; \ for o in $(OBJ_FORMATS); do \ $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ @@ -2549,7 +2688,7 @@ DEPOBJ: $(OBJ_FORMAT_CFILES) echo ' $$(BFDDIR)/som.h $$(INCDIR)/aout/stab_gnu.h \' >> DEPOBJA echo ' $$(INCDIR)/aout/stab.def' >> DEPOBJA for c in $(MULTI_CPU_TYPES); do \ - echo 'DEPOBJ_'"$${c}"'_multi = \' >> DEPOBJA; \ + echo "DEPOBJ_$${c}"'_multi = \' >> DEPOBJA; \ for o in $(OBJ_FORMATS); do \ $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ @@ -2563,7 +2702,7 @@ DEPOBJ: $(OBJ_FORMAT_CFILES) # Work out the dependencies for each CPU/OBJ combination. # Note that SOM is a special case, because it only works native. DEP2: $(TARGET_CPU_HFILES) $(OBJ_FORMAT_HFILES) - rm -f DEP2a + rm -f DEP2A if [ -d DEPDIR ]; then true; else mkdir DEPDIR; fi srcdir=`cd $(srcdir); pwd`; \ cd DEPDIR; \ @@ -2574,22 +2713,22 @@ DEP2: $(TARGET_CPU_HFILES) $(OBJ_FORMAT_ echo '#include "tc-'"$${c}"'.h"' > targ-cpu.h; \ echo '#include "obj-'"$${o}"'.h"' > dummy.c; \ $(MKDEP) -DBFD_ASSEMBLER -I. -I.. -I$${srcdir} -I../../bfd $(DEP_INCLUDES) dummy.c | \ - sed -e "s/dummy.o: dummy.c/DEP_$${c}_$${o} =/" >> ../DEP2a; \ + sed -e "s/dummy.o: dummy.c/DEP_$${c}_$${o} =/" >> ../DEP2A; \ else true; fi; \ done; \ done - echo 'DEP_hppa_som = $$(BFDDIR)/som.h' >> DEP2a + echo 'DEP_hppa_som = $$(BFDDIR)/som.h' >> DEP2A for c in $(MULTI_CPU_TYPES); do \ - echo 'DEP_'"$${c}"'_multi = \' >> DEP2a; \ + echo "DEP_$${c}"'_multi = \' >> DEP2A; \ for o in $(OBJ_FORMATS); do \ $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ - echo '$$(DEP_'"$${c}_$${o}"') \' >> DEP2a; \ + echo '$$(DEP_'"$${c}_$${o}"') \' >> DEP2A; \ else true; fi; \ done; \ - echo '' >> DEP2a; \ + echo '' >> DEP2A; \ done - mv -f DEP2a DEP2 + mv -f DEP2A DEP2 dep.sed: dep-in.sed config.status srcdir=`cd $(srcdir); pwd`; \ @@ -2599,85 +2738,98 @@ dep.sed: dep-in.sed config.status -e "s!@SRCDIR@!$${srcdir}!" dep: DEP - sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile + sed -e '/^.MKDEP.*WARNING BELOW./,/^.MKDEP.*WARNING ABOVE./d' \ + < Makefile > tmp-Makefile cat DEP >> tmp-Makefile $(SHELL) $(srcdir)/../move-if-change tmp-Makefile Makefile dep-in: DEP - sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.in > tmp-Makefile.in + sed -e '/^.MKDEP.*WARNING BELOW./,/^.MKDEP.*WARNING ABOVE./d' \ + < $(srcdir)/Makefile.in > tmp-Makefile.in cat DEP >> tmp-Makefile.in $(SHELL) $(srcdir)/../move-if-change tmp-Makefile.in $(srcdir)/Makefile.in dep-am: DEP - sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.am > tmp-Makefile.am + sed -e '/^.MKDEP.*WARNING BELOW./,/^.MKDEP.*WARNING ABOVE./d' \ + < $(srcdir)/Makefile.am > tmp-Makefile.am cat DEP >> tmp-Makefile.am $(SHELL) $(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am +# HEED THE MKDEP WARNINGS. +# ANYTHING CHANGED OR ADDED BETWEEN THE WARNING LINES MAY GO AWAY. .PHONY: dep dep-in dep-am - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -app.o: app.c $(INCDIR)/bin-bugs.h emul.h -as.o: as.c $(INCDIR)/bin-bugs.h emul.h subsegs.h $(INCDIR)/obstack.h \ - output-file.h sb.h macro.h +#MKDEP DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING BELOW. +app.o: app.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h +as.o: as.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h subsegs.h $(INCDIR)/obstack.h output-file.h \ + sb.h macro.h atof-generic.o: atof-generic.c $(INCDIR)/bin-bugs.h \ + $(INCDIR)/progress.h emul.h +bignum-copy.o: bignum-copy.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h +cond.o: cond.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h macro.h sb.h $(INCDIR)/obstack.h +depend.o: depend.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h +dwarf2dbg.o: dwarf2dbg.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h dwarf2dbg.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h +ecoff.o: ecoff.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h ecoff.h +ehopt.o: ehopt.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h +expr.o: expr.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h $(INCDIR)/obstack.h +flonum-copy.o: flonum-copy.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ emul.h -bignum-copy.o: bignum-copy.c $(INCDIR)/bin-bugs.h emul.h -cond.o: cond.c $(INCDIR)/bin-bugs.h emul.h macro.h \ - sb.h $(INCDIR)/obstack.h -depend.o: depend.c $(INCDIR)/bin-bugs.h emul.h -dwarf2dbg.o: dwarf2dbg.c $(INCDIR)/bin-bugs.h emul.h \ - dwarf2dbg.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h -ecoff.o: ecoff.c $(INCDIR)/bin-bugs.h emul.h ecoff.h -ehopt.o: ehopt.c $(INCDIR)/bin-bugs.h emul.h subsegs.h \ - $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h -expr.o: expr.c $(INCDIR)/bin-bugs.h emul.h $(INCDIR)/obstack.h -flonum-copy.o: flonum-copy.c $(INCDIR)/bin-bugs.h emul.h flonum-konst.o: flonum-konst.c flonum-mult.o: flonum-mult.c -frags.o: frags.c $(INCDIR)/bin-bugs.h emul.h subsegs.h \ - $(INCDIR)/obstack.h -hash.o: hash.c $(INCDIR)/bin-bugs.h emul.h $(INCDIR)/obstack.h -input-file.o: input-file.c $(INCDIR)/bin-bugs.h emul.h \ - input-file.h -input-scrub.o: input-scrub.c $(INCDIR)/bin-bugs.h emul.h \ - input-file.h sb.h -listing.o: listing.c $(INCDIR)/bin-bugs.h emul.h input-file.h \ - subsegs.h -literal.o: literal.c $(INCDIR)/bin-bugs.h emul.h subsegs.h \ - $(INCDIR)/obstack.h +frags.o: frags.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h subsegs.h $(INCDIR)/obstack.h +hash.o: hash.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h $(INCDIR)/obstack.h +input-file.o: input-file.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h input-file.h +input-scrub.o: input-scrub.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h input-file.h sb.h +listing.o: listing.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h input-file.h subsegs.h +literal.o: literal.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h subsegs.h $(INCDIR)/obstack.h macro.o: macro.c sb.h macro.h -messages.o: messages.c $(INCDIR)/bin-bugs.h emul.h -output-file.o: output-file.c $(INCDIR)/bin-bugs.h emul.h \ - output-file.h -read.o: read.c $(INCDIR)/bin-bugs.h emul.h subsegs.h \ - $(INCDIR)/obstack.h sb.h macro.h ecoff.h +messages.o: messages.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h +output-file.o: output-file.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h output-file.h +read.o: read.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h subsegs.h $(INCDIR)/obstack.h sb.h macro.h ecoff.h sb.o: sb.c sb.h -stabs.o: stabs.c $(INCDIR)/bin-bugs.h emul.h $(INCDIR)/obstack.h \ - subsegs.h ecoff.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def -subsegs.o: subsegs.c $(INCDIR)/bin-bugs.h emul.h subsegs.h \ - $(INCDIR)/obstack.h -symbols.o: symbols.c $(INCDIR)/bin-bugs.h emul.h $(INCDIR)/obstack.h \ - subsegs.h struc-symbol.h -write.o: write.c $(INCDIR)/bin-bugs.h emul.h subsegs.h \ - $(INCDIR)/obstack.h output-file.h +stabs.o: stabs.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h $(INCDIR)/obstack.h subsegs.h ecoff.h $(INCDIR)/aout/stab_gnu.h \ + $(INCDIR)/aout/stab.def +subsegs.o: subsegs.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h subsegs.h $(INCDIR)/obstack.h +symbols.o: symbols.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h $(INCDIR)/obstack.h subsegs.h struc-symbol.h +write.o: write.c $(INCDIR)/bin-bugs.h $(INCDIR)/progress.h \ + emul.h subsegs.h $(INCDIR)/obstack.h output-file.h gasp.o: gasp.c $(INCDIR)/bin-bugs.h sb.h macro.h itbl-ops.o: itbl-ops.c itbl-ops.h $(INCDIR)/bin-bugs.h \ - emul.h itbl-parse.h + $(INCDIR)/progress.h emul.h itbl-parse.h e-i386aout.o: $(srcdir)/config/e-i386aout.c $(INCDIR)/bin-bugs.h \ - emul.h emul-target.h + $(INCDIR)/progress.h emul.h emul-target.h e-i386coff.o: $(srcdir)/config/e-i386coff.c $(INCDIR)/bin-bugs.h \ - emul.h emul-target.h + $(INCDIR)/progress.h emul.h emul-target.h e-i386elf.o: $(srcdir)/config/e-i386elf.c $(INCDIR)/bin-bugs.h \ - emul.h emul-target.h + $(INCDIR)/progress.h emul.h emul-target.h e-mipsecoff.o: $(srcdir)/config/e-mipsecoff.c $(INCDIR)/bin-bugs.h \ - emul.h emul-target.h + $(INCDIR)/progress.h emul.h emul-target.h e-mipself.o: $(srcdir)/config/e-mipself.c $(INCDIR)/bin-bugs.h \ - emul.h emul-target.h + $(INCDIR)/progress.h emul.h emul-target.h $(OBJS): $(DEP_@target_cpu_type@_@obj_format@) $(TARG_CPU_O): $(DEPTC_@target_cpu_type@_@obj_format@) $(OBJ_FORMAT_O): $(DEPOBJ_@target_cpu_type@_@obj_format@) -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY +#MKDEP DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING ABOVE. # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -upr --new-file binutils-2.9.5.0.42/gas/NEWS binutils-2.9.5.0.46/gas/NEWS --- binutils-2.9.5.0.42/gas/NEWS Tue May 2 10:08:04 2000 +++ binutils-2.9.5.0.46/gas/NEWS Mon May 29 22:36:01 2000 @@ -4,6 +4,12 @@ Changes in 2.11: Support for IA-64. +x86 gas has a new .arch pseudo op to specify the target CPU architecture. + +x86 gas -q command line option quietens warnings about register size changes +due to suffix, indirect jmp/call without `*', stand-alone prefixes, and +translating various deprecated floating point instructions. + Changes in 2.10: Support for ATMEL AVR. @@ -45,6 +51,8 @@ Mitsubishi D30V support added. Texas Instruments c80 (tms320c80) support added. i960 ELF support added. + +ARM ELF support added. Changes in 2.9: diff -upr --new-file binutils-2.9.5.0.42/gas/as.c binutils-2.9.5.0.46/gas/as.c --- binutils-2.9.5.0.42/gas/as.c Fri May 12 08:11:30 2000 +++ binutils-2.9.5.0.46/gas/as.c Sun May 14 10:25:52 2000 @@ -546,7 +546,7 @@ the GNU General Public License. This pr case OPTION_DEFSYM: { char *s; - long i; + valueT i; struct defsym_list *n; for (s = optarg; *s != '\0' && *s != '='; s++) @@ -554,7 +554,11 @@ the GNU General Public License. This pr if (*s == '\0') as_fatal (_("bad defsym; format is --defsym name=value")); *s++ = '\0'; +#ifdef BFD_ASSEMBLER + i = bfd_scan_vma (s, (const char **) NULL, 0); +#else i = strtol (s, (char **) NULL, 0); +#endif n = (struct defsym_list *) xmalloc (sizeof *n); n->next = defsyms; n->name = optarg; diff -upr --new-file binutils-2.9.5.0.42/gas/asintl.h binutils-2.9.5.0.46/gas/asintl.h --- binutils-2.9.5.0.42/gas/asintl.h Thu Jun 3 11:01:57 1999 +++ binutils-2.9.5.0.46/gas/asintl.h Sun May 14 10:22:17 2000 @@ -33,12 +33,11 @@ # define N_(String) (String) # endif #else -/* Stubs that do something close enough. */ -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) +# define gettext(Msgid) (Msgid) +# define dgettext(Domainname, Msgid) (Msgid) +# define dcgettext(Domainname, Msgid, Category) (Msgid) +# define textdomain(Domainname) while (0) /* nothing */ +# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */ # define _(String) (String) # define N_(String) (String) #endif diff -upr --new-file binutils-2.9.5.0.42/gas/cgen.h binutils-2.9.5.0.46/gas/cgen.h --- binutils-2.9.5.0.42/gas/cgen.h Thu Jun 3 11:01:57 1999 +++ binutils-2.9.5.0.46/gas/cgen.h Sun May 21 14:19:37 2000 @@ -26,7 +26,9 @@ extern CGEN_CPU_DESC gas_cgen_cpu_desc; /* Maximum number of fixups in an insn. If you need to change this, allow target to override and do so there. */ +#ifndef GAS_CGEN_MAX_FIXUPS #define GAS_CGEN_MAX_FIXUPS 3 +#endif /* Struct defining result of gas_cgen_finish_insn. */ typedef struct { diff -upr --new-file binutils-2.9.5.0.42/gas/config/obj-aout.c binutils-2.9.5.0.46/gas/config/obj-aout.c --- binutils-2.9.5.0.42/gas/config/obj-aout.c Fri Jan 28 08:33:33 2000 +++ binutils-2.9.5.0.46/gas/config/obj-aout.c Mon May 29 22:36:06 2000 @@ -105,7 +105,7 @@ const pseudo_typeS aout_pseudo_table[] = void obj_aout_frob_symbol (sym, punt) symbolS *sym; - int *punt; + int *punt ATTRIBUTE_UNUSED; { flagword flags; asection *sec; @@ -355,7 +355,7 @@ obj_emit_symbols (where, symbol_rootP) static void obj_aout_line (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { /* Assume delimiter is part of expression. BSD4.2 as fails with delightful bug, so we @@ -368,7 +368,7 @@ obj_aout_line (ignore) static void obj_aout_weak (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { char *name; int c; @@ -401,7 +401,7 @@ obj_aout_weak (ignore) static void obj_aout_type (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { char *name; int c; @@ -641,7 +641,14 @@ DEFUN_VOID (s_sect) static void aout_pop_insert PARAMS ((void)); static int obj_aout_s_get_other PARAMS ((symbolS *)); +static void obj_aout_s_set_other PARAMS ((symbolS *, int)); static int obj_aout_s_get_desc PARAMS ((symbolS *)); +static void obj_aout_s_set_desc PARAMS ((symbolS *, int)); +static int obj_aout_s_get_type PARAMS ((symbolS *)); +static void obj_aout_s_set_type PARAMS ((symbolS *, int)); +static int obj_aout_separate_stab_sections PARAMS ((void)); +static int obj_aout_sec_sym_ok_for_reloc PARAMS ((asection *)); +static void obj_aout_process_stab PARAMS ((segT, int, const char *, int, int, int)); static void aout_pop_insert () @@ -656,6 +663,33 @@ obj_aout_s_get_other (sym) return aout_symbol (symbol_get_bfdsym (sym))->other; } +static void +obj_aout_s_set_other (sym, o) + symbolS *sym; + int o; +{ + aout_symbol (symbol_get_bfdsym (sym))->other = o; +} + +static int +obj_aout_sec_sym_ok_for_reloc (sec) + asection *sec ATTRIBUTE_UNUSED; +{ + return obj_sec_sym_ok_for_reloc (sec); +} + +static void +obj_aout_process_stab (seg, w, s, t, o, d) + segT seg ATTRIBUTE_UNUSED; + int w; + const char *s; + int t; + int o; + int d; +{ + aout_process_stab (w, s, t, o, d); +} + static int obj_aout_s_get_desc (sym) symbolS *sym; @@ -663,12 +697,44 @@ obj_aout_s_get_desc (sym) return aout_symbol (symbol_get_bfdsym (sym))->desc; } +static void +obj_aout_s_set_desc (sym, d) + symbolS *sym; + int d; +{ + aout_symbol (symbol_get_bfdsym (sym))->desc = d; +} + +static int +obj_aout_s_get_type (sym) + symbolS *sym; +{ + return aout_symbol (symbol_get_bfdsym (sym))->type; +} + +static void +obj_aout_s_set_type (sym, t) + symbolS *sym; + int t; +{ + aout_symbol (symbol_get_bfdsym (sym))->type = t; +} + +static int +obj_aout_separate_stab_sections () +{ + return 0; +} +/* When changed, make sure these table entries match the single-format + definitions in obj-aout.h. */ const struct format_ops aout_format_ops = { bfd_target_aout_flavour, 1, /* dfl_leading_underscore */ 0, /* emit_section_symbols */ + 0, /* begin */ + 0, /* app_file */ obj_aout_frob_symbol, obj_aout_frob_file, 0, /* frob_file_after_relocs */ @@ -677,11 +743,17 @@ const struct format_ops aout_format_ops 0, /* s_get_align */ 0, /* s_set_align */ obj_aout_s_get_other, + obj_aout_s_set_other, obj_aout_s_get_desc, + obj_aout_s_set_desc, + obj_aout_s_get_type, + obj_aout_s_set_type, 0, /* copy_symbol_attributes */ 0, /* generate_asm_lineno */ - 0, /* process_stab */ - 0, /* sec_sym_ok_for_reloc */ + obj_aout_process_stab, + obj_aout_separate_stab_sections, + 0, /* init_stab_section */ + obj_aout_sec_sym_ok_for_reloc, aout_pop_insert, 0, /* ecoff_set_ext */ 0, /* read_begin_hook */ diff -upr --new-file binutils-2.9.5.0.42/gas/config/obj-coff.c binutils-2.9.5.0.46/gas/config/obj-coff.c --- binutils-2.9.5.0.42/gas/config/obj-coff.c Tue May 2 10:08:13 2000 +++ binutils-2.9.5.0.46/gas/config/obj-coff.c Mon May 29 22:36:06 2000 @@ -346,7 +346,7 @@ c_symbol_merge (debug, normal) void c_dot_file_symbol (filename) - char *filename; + const char *filename; { symbolS *symbolP; @@ -4582,6 +4582,7 @@ const pseudo_typeS coff_pseudo_table[] = /* Support for a COFF emulation. */ static void coff_pop_insert PARAMS ((void)); +static int coff_separate_stab_sections PARAMS ((void)); static void coff_pop_insert () @@ -4589,11 +4590,19 @@ coff_pop_insert () pop_insert (coff_pseudo_table); } +static int +coff_separate_stab_sections () +{ + return 1; +} + const struct format_ops coff_format_ops = { bfd_target_coff_flavour, 0, /* dfl_leading_underscore */ 1, /* emit_section_symbols */ + 0, /* begin */ + c_dot_file_symbol, coff_frob_symbol, 0, /* frob_file */ coff_frob_file_after_relocs, @@ -4602,10 +4611,16 @@ const struct format_ops coff_format_ops 0, /* s_get_align */ 0, /* s_set_align */ 0, /* s_get_other */ + 0, /* s_set_other */ 0, /* s_get_desc */ + 0, /* s_set_desc */ + 0, /* s_get_type */ + 0, /* s_set_type */ 0, /* copy_symbol_attributes */ 0, /* generate_asm_lineno */ 0, /* process_stab */ + coff_separate_stab_sections, + obj_coff_init_stab_section, 0, /* sec_sym_ok_for_reloc */ coff_pop_insert, 0, /* ecoff_set_ext */ diff -upr --new-file binutils-2.9.5.0.42/gas/config/obj-coff.h binutils-2.9.5.0.46/gas/config/obj-coff.h --- binutils-2.9.5.0.42/gas/config/obj-coff.h Fri Feb 25 14:34:52 2000 +++ binutils-2.9.5.0.46/gas/config/obj-coff.h Mon May 29 22:36:06 2000 @@ -369,7 +369,7 @@ extern int coff_n_line_nos; extern void coff_add_linesym PARAMS ((symbolS *)); -void c_dot_file_symbol PARAMS ((char *filename)); +void c_dot_file_symbol PARAMS ((const char *filename)); #define obj_app_file c_dot_file_symbol extern void coff_frob_symbol PARAMS ((symbolS *, int *)); diff -upr --new-file binutils-2.9.5.0.42/gas/config/obj-ecoff.c binutils-2.9.5.0.46/gas/config/obj-ecoff.c --- binutils-2.9.5.0.42/gas/config/obj-ecoff.c Fri Jan 28 08:33:34 2000 +++ binutils-2.9.5.0.46/gas/config/obj-ecoff.c Mon May 29 22:36:06 2000 @@ -34,6 +34,7 @@ static int ecoff_sec_sym_ok_for_reloc PARAMS ((asection *)); static void obj_ecoff_frob_symbol PARAMS ((symbolS *, int *)); static void ecoff_pop_insert PARAMS ((void)); +static int ecoff_separate_stab_sections PARAMS ((void)); /* These are the pseudo-ops we support in this file. Only those relating to debugging information are supported here. @@ -290,11 +291,22 @@ ecoff_pop_insert () pop_insert (obj_pseudo_table); } +static int +ecoff_separate_stab_sections () +{ + return 0; +} + const struct format_ops ecoff_format_ops = { bfd_target_ecoff_flavour, 0, /* dfl_leading_underscore */ + + /* FIXME: A comment why emit_section_symbols is different here (1) from + the single-format definition (0) would be in order. */ 1, /* emit_section_symbols */ + 0, /* begin */ + ecoff_new_file, obj_ecoff_frob_symbol, ecoff_frob_file, 0, /* frob_file_after_relocs */ @@ -303,13 +315,19 @@ const struct format_ops ecoff_format_ops 0, /* s_get_align */ 0, /* s_set_align */ 0, /* s_get_other */ + 0, /* s_set_other */ 0, /* s_get_desc */ + 0, /* s_set_desc */ + 0, /* s_get_type */ + 0, /* s_set_type */ 0, /* copy_symbol_attributes */ ecoff_generate_asm_lineno, ecoff_stab, + ecoff_separate_stab_sections, + 0, /* init_stab_section */ ecoff_sec_sym_ok_for_reloc, ecoff_pop_insert, ecoff_set_ext, ecoff_read_begin_hook, - ecoff_symbol_new_hook, + ecoff_symbol_new_hook }; diff -upr --new-file binutils-2.9.5.0.42/gas/config/obj-elf.c binutils-2.9.5.0.46/gas/config/obj-elf.c --- binutils-2.9.5.0.42/gas/config/obj-elf.c Thu Apr 20 15:25:49 2000 +++ binutils-2.9.5.0.46/gas/config/obj-elf.c Tue May 30 09:53:59 2000 @@ -54,9 +54,12 @@ static bfd_vma elf_s_get_size PARAMS ((s static void elf_s_set_size PARAMS ((symbolS *, bfd_vma)); static bfd_vma elf_s_get_align PARAMS ((symbolS *)); static void elf_s_set_align PARAMS ((symbolS *, bfd_vma)); +static void elf_s_set_other PARAMS ((symbolS *, int)); static void elf_copy_symbol_attributes PARAMS ((symbolS *, symbolS *)); static int elf_sec_sym_ok_for_reloc PARAMS ((asection *)); static void adjust_stab_sections PARAMS ((bfd *, asection *, PTR)); +static int elf_separate_stab_sections PARAMS ((void)); +static void elf_init_stab_section PARAMS ((segT)); #ifdef NEED_ECOFF_DEBUG static boolean elf_get_extr PARAMS ((asymbol *, EXTR *)); @@ -233,6 +236,14 @@ elf_s_get_other (sym) } static void +elf_s_set_other (sym, other) + symbolS *sym; + int other; +{ + S_SET_OTHER (sym, other); +} + +static void elf_copy_symbol_attributes (dest, src) symbolS *dest, *src; { @@ -248,7 +259,7 @@ elf_sec_sym_ok_for_reloc (sec) void elf_file_symbol (s) - char *s; + const char *s; { symbolS *sym; @@ -1909,18 +1920,44 @@ sco_id () #endif /* SCO_ELF */ +static int +elf_separate_stab_sections () +{ +#ifdef NEED_ECOFF_DEBUG + return (!ECOFF_DEBUGGING); +#else + return 1; +#endif +} + +static void +elf_init_stab_section (seg) + segT seg; +{ +#ifdef NEED_ECOFF_DEBUG + if (!ECOFF_DEBUGGING) +#endif + obj_elf_init_stab_section (seg); +} + const struct format_ops elf_format_ops = { bfd_target_elf_flavour, 0, /* dfl_leading_underscore */ 1, /* emit_section_symbols */ + elf_begin, + elf_file_symbol, elf_frob_symbol, elf_frob_file, elf_frob_file_after_relocs, elf_s_get_size, elf_s_set_size, elf_s_get_align, elf_s_set_align, elf_s_get_other, + elf_s_set_other, 0, /* s_get_desc */ + 0, /* s_set_desc */ + 0, /* s_get_type */ + 0, /* s_set_type */ elf_copy_symbol_attributes, #ifdef NEED_ECOFF_DEBUG ecoff_generate_asm_lineno, @@ -1929,6 +1966,8 @@ const struct format_ops elf_format_ops = 0, /* generate_asm_lineno */ 0, /* process_stab */ #endif + elf_separate_stab_sections, + elf_init_stab_section, elf_sec_sym_ok_for_reloc, elf_pop_insert, #ifdef NEED_ECOFF_DEBUG @@ -1937,5 +1976,5 @@ const struct format_ops elf_format_ops = 0, /* ecoff_set_ext */ #endif elf_obj_read_begin_hook, - elf_obj_symbol_new_hook, + elf_obj_symbol_new_hook }; diff -upr --new-file binutils-2.9.5.0.42/gas/config/obj-elf.h binutils-2.9.5.0.46/gas/config/obj-elf.h --- binutils-2.9.5.0.42/gas/config/obj-elf.h Tue May 2 10:23:24 2000 +++ binutils-2.9.5.0.46/gas/config/obj-elf.h Tue May 30 09:53:59 2000 @@ -6,7 +6,7 @@ GAS 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 1, or (at your option) + the Free Software Foundation; either version 2, or (at your option) any later version. GAS is distributed in the hope that it will be useful, @@ -28,6 +28,9 @@ #define OBJ_ELF 1 +/* Note that all macros in this file should be wrapped in #ifndef, for + sake of obj-multi.h which includes this file. */ + #ifndef OUTPUT_FLAVOR #define OUTPUT_FLAVOR bfd_target_elf_flavour #endif @@ -88,7 +91,9 @@ struct elf_obj_sy #define TRUE !FALSE #endif +#ifndef obj_begin #define obj_begin() elf_begin () +#endif extern void elf_begin PARAMS ((void)); /* should be conditional on address size! */ @@ -133,10 +138,10 @@ extern void elf_frob_file PARAMS ((void) #endif extern void elf_frob_file_after_relocs PARAMS ((void)); +#ifndef obj_app_file #define obj_app_file elf_file_symbol -extern void elf_file_symbol PARAMS ((char *)); - -extern void obj_elf_ident PARAMS ((int)); +#endif +extern void elf_file_symbol PARAMS ((const char *)); extern void obj_elf_section_change_hook PARAMS ((void)); @@ -146,6 +151,7 @@ extern void obj_elf_version PARAMS ((int extern void obj_elf_common PARAMS ((int)); extern void obj_elf_data PARAMS ((int)); extern void obj_elf_text PARAMS ((int)); +extern void obj_elf_ident PARAMS ((int)); /* BFD wants to write the udata field, which is a no-no for the globally defined sections. */ @@ -191,6 +197,12 @@ do \ while (0) #endif +#ifndef SEPARATE_STAB_SECTIONS +/* Avoid ifndef each separate macro setting by wrapping the whole of the + stab group on the assumption that whoever sets SEPARATE_STAB_SECTIONS + caters to ECOFF_DEBUGGING and the right setting of INIT_STAB_SECTIONS + and OBJ_PROCESS_STAB too, without needing the tweaks below. */ + /* Stabs go in a separate section. */ #define SEPARATE_STAB_SECTIONS 1 @@ -215,6 +227,8 @@ extern void obj_elf_init_stab_section PA if (ECOFF_DEBUGGING) \ ecoff_stab ((seg), (what), (string), (type), (other), (desc)) #endif /* ECOFF_DEBUGGING */ + +#endif /* SEPARATE_STAB_SECTIONS not defined. */ extern void elf_frob_symbol PARAMS ((symbolS *, int *)); #ifndef obj_frob_symbol diff -upr --new-file binutils-2.9.5.0.42/gas/config/obj-multi.h binutils-2.9.5.0.46/gas/config/obj-multi.h --- binutils-2.9.5.0.42/gas/config/obj-multi.h Fri Jan 28 08:33:34 2000 +++ binutils-2.9.5.0.46/gas/config/obj-multi.h Mon May 29 22:36:07 2000 @@ -6,7 +6,7 @@ GAS 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 1, or (at your option) + the Free Software Foundation; either version 2, or (at your option) any later version. GAS is distributed in the hope that it will be useful, @@ -32,6 +32,16 @@ #define OUTPUT_FLAVOR \ (this_format->flavor) +#define obj_begin() \ + (this_format->begin \ + ? (*this_format->begin) () \ + : (void) 0) + +#define obj_app_file(NAME) \ + (this_format->app_file \ + ? (*this_format->app_file) (NAME) \ + : (void) 0) + #define obj_frob_symbol(S,P) \ (*this_format->frob_symbol) (S, &(P)) @@ -69,21 +79,43 @@ #define S_GET_SIZE \ (*this_format->s_get_size) -#define S_SET_SIZE \ - (*this_format->s_set_size) +#define S_SET_SIZE(S, N) \ + (this_format->s_set_size \ + ? (*this_format->s_set_size) (S, N) \ + : (void) 0) #define S_GET_ALIGN \ (*this_format->s_get_align) -#define S_SET_ALIGN \ - (*this_format->s_set_align) +#define S_SET_ALIGN(S, N) \ + (this_format->s_set_align \ + ? (*this_format->s_set_align) (S, N) \ + : (void) 0) #define S_GET_OTHER \ (*this_format->s_get_other) +#define S_SET_OTHER(S, O) \ + (this_format->s_set_other \ + ? (*this_format->s_set_other) (S, O) \ + : (void) 0) + #define S_GET_DESC \ (*this_format->s_get_desc) +#define S_SET_DESC(S, D) \ + (this_format->s_set_desc \ + ? (*this_format->s_set_desc) (S, D) \ + : (void) 0) + +#define S_GET_TYPE \ + (*this_format->s_get_desc) + +#define S_SET_TYPE(S, T) \ + (this_format->s_set_type \ + ? (*this_format->s_set_type) (S, T) \ + : (void) 0) + #define OBJ_COPY_SYMBOL_ATTRIBUTES(d,s) \ (this_format->copy_symbol_attributes \ ? (*this_format->copy_symbol_attributes) (d, s) \ @@ -94,10 +126,26 @@ ? (*this_format->process_stab) (SEG,W,S,T,O,D) \ : (void) 0) +#define SEPARATE_STAB_SECTIONS \ + ((*this_format->separate_stab_sections) ()) + +#define INIT_STAB_SECTION(S) \ + (this_format->init_stab_section \ + ? (*this_format->init_stab_section) (S) \ + : (void) 0) + +#define EMIT_SECTION_SYMBOLS (this_format->emit_section_symbols) + #ifdef OBJ_MAYBE_ELF /* We need OBJ_SYMFIELD_TYPE so that symbol_get_obj is defined in symbol.c We also need various STAB defines for stab.c */ #include "obj-elf.h" +#endif + +#ifdef OBJ_MAYBE_AOUT +/* We want aout_process_stab in stabs.c for the aout table. Defining this + macro will have no other effect. */ +#define AOUT_STABS #endif #endif /* !OBJ_HEADER */ diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-arm.c binutils-2.9.5.0.46/gas/config/tc-arm.c --- binutils-2.9.5.0.42/gas/config/tc-arm.c Tue May 2 10:08:15 2000 +++ binutils-2.9.5.0.46/gas/config/tc-arm.c Fri Jun 2 16:27:02 2000 @@ -381,39 +381,50 @@ static CONST struct asm_flg cplong_flag[ struct asm_psr { CONST char * template; - unsigned long number; + boolean cpsr; + unsigned long field; }; -#define PSR_FIELD_MASK 0x000f0000 +#define SPSR_BIT (1 << 22) /* The bit that distnguishes CPSR and SPSR. */ +#define PSR_SHIFT 16 /* How many bits to shift the PSR_xxx bits up by. */ -#define PSR_FLAGS 0x00080000 -#define PSR_CONTROL 0x00010000 /* Undocumented instruction, its use is discouraged by ARM */ -#define PSR_ALL 0x00090000 - -#define CPSR_ALL 0 -#define SPSR_ALL 1 -#define CPSR_FLG 2 -#define SPSR_FLG 3 -#define CPSR_CTL 4 -#define SPSR_CTL 5 +#define PSR_c (1 << 0) +#define PSR_x (1 << 1) +#define PSR_s (1 << 2) +#define PSR_f (1 << 3) static CONST struct asm_psr psrs[] = { - /* Valid 's */ - {"cpsr", CPSR_ALL}, - {"cpsr_all", CPSR_ALL}, - {"spsr", SPSR_ALL}, - {"spsr_all", SPSR_ALL}, - - /* Valid 's */ - {"cpsr_flg", CPSR_FLG}, - {"spsr_flg", SPSR_FLG}, - - /* Valid 's */ - {"cpsr_c", CPSR_CTL}, - {"cpsr_ctl", CPSR_CTL}, - {"spsr_c", SPSR_CTL}, - {"spsr_ctl", SPSR_CTL} + {"CPSR", true, PSR_c | PSR_f}, + {"CPSR_all", true, PSR_c | PSR_f}, + {"SPSR", false, PSR_c | PSR_f}, + {"SPSR_all", false, PSR_c | PSR_f}, + {"CPSR_flg", true, PSR_f}, + {"CPSR_f", true, PSR_f}, + {"SPSR_flg", false, PSR_f}, + {"SPSR_f", false, PSR_f}, + {"CPSR_c", true, PSR_c}, + {"CPSR_ctl", true, PSR_c}, + {"SPSR_c", false, PSR_c}, + {"SPSR_ctl", false, PSR_c}, + {"CPSR_x", true, PSR_x}, + {"CPSR_s", true, PSR_s}, + {"SPSR_x", false, PSR_x}, + {"SPSR_s", false, PSR_s}, + /* For backwards compatability with older toolchain we also + support lower case versions of some of these flags. */ + {"cpsr", true, PSR_c | PSR_f}, + {"cpsr_all", true, PSR_c | PSR_f}, + {"spsr", false, PSR_c | PSR_f}, + {"spsr_all", false, PSR_c | PSR_f}, + {"cpsr_flg", true, PSR_f}, + {"cpsr_f", true, PSR_f}, + {"spsr_flg", false, PSR_f}, + {"spsr_f", false, PSR_f}, + {"cpsr_c", true, PSR_c}, + {"cpsr_ctl", true, PSR_c}, + {"spsr_c", false, PSR_c}, + {"spsr_ctl", false, PSR_c} }; /* Functions called by parser. */ @@ -458,7 +469,7 @@ static void do_fp_to_reg PARAMS ((char * static void fix_new_arm PARAMS ((fragS *, int, short, expressionS *, int, int)); static int arm_reg_parse PARAMS ((char **)); -static int arm_psr_parse PARAMS ((char **)); +static CONST struct asm_psr * arm_psr_parse PARAMS ((char **)); static void symbol_locate PARAMS ((symbolS *, CONST char *, segT, valueT, fragS *)); static int add_to_lit_pool PARAMS ((void)); static unsigned validate_immediate PARAMS ((unsigned)); @@ -467,7 +478,7 @@ static int validate_offset_imm PARAMS (( static void opcode_select PARAMS ((int)); static void end_of_line PARAMS ((char *)); static int reg_required_here PARAMS ((char **, int)); -static int psr_required_here PARAMS ((char **, int, int)); +static int psr_required_here PARAMS ((char **)); static int co_proc_number PARAMS ((char **)); static int cp_opc_expr PARAMS ((char **, int, int)); static int cp_reg_required_here PARAMS ((char **, int)); @@ -569,8 +580,8 @@ static CONST struct asm_opcode insns[] = {"mrs", 0x010f0000, NULL, NULL, ARM_6UP, do_mrs}, {"msr", 0x0120f000, NULL, NULL, ARM_6UP, do_msr}, /* ScottB: our code uses 0x0128f000 for msr. - NickC: but this is wrong because the bits 16 and 19 are handled - by the PSR_xxx defines above. */ + NickC: but this is wrong because the bits 16 through 19 are + handled by the PSR_xxx defines above. */ /* ARM 7M long multiplies - need signed/unsigned flags! */ {"smull", 0x00c00090, NULL, s_flag, ARM_LONGMUL, do_mull}, @@ -1562,27 +1573,65 @@ reg_required_here (str, shift) return FAIL; } +static CONST struct asm_psr * +arm_psr_parse (ccp) + register char ** ccp; +{ + char * start = * ccp; + char c; + char * p; + CONST struct asm_psr * psr; + + p = start; + + /* Skip to the end of the next word in the input stream. */ + do + { + c = *p++; + } + while (isalpha (c) || c == '_'); + + /* Terminate the word. */ + *--p = 0; + + /* Now locate the word in the psr hash table. */ + psr = (CONST struct asm_psr *) hash_find (arm_psr_hsh, start); + + /* Restore the input stream. */ + *p = c; + + /* If we found a valid match, advance the + stream pointer past the end of the word. */ + *ccp = p; + + return psr; +} + +/* Parse the input looking for a PSR flag. */ static int -psr_required_here (str, cpsr, spsr) +psr_required_here (str) char ** str; - int cpsr; - int spsr; { - int psr; char * start = *str; - psr = arm_psr_parse (str); + CONST struct asm_psr * psr; - if (psr == cpsr || psr == spsr) + psr = arm_psr_parse (str); + + if (psr) { - if (psr == spsr) - inst.instruction |= 1 << 22; + /* If this is the SPSR that is being modified, set the R bit. */ + if (! psr->cpsr) + inst.instruction |= SPSR_BIT; + + /* Set the psr flags in the MSR instruction. */ + inst.instruction |= psr->field << PSR_SHIFT; return SUCCESS; } - /* In the few cases where we might be able to accept something else - this error can be overridden. */ - inst.error = _(" expected"); + /* In the few cases where we might be able to accept + something else this error can be overridden. */ + inst.error = _("flag for {c}psr instruction expected"); /* Restore the start point. */ *str = start; @@ -1865,6 +1914,8 @@ do_mrs (str, flags) char *str; unsigned long flags; { + int skip = 0; + /* Only one syntax. */ skip_whitespace (str); @@ -1874,104 +1925,111 @@ do_mrs (str, flags) return; } - if (skip_past_comma (&str) == FAIL - || psr_required_here (& str, CPSR_ALL, SPSR_ALL) == FAIL) + if (skip_past_comma (&str) == FAIL) + { + inst.error = _("comma expected after register name"); + return; + } + + skip_whitespace (str); + + if ( strcmp (str, "CPSR") == 0 + || strcmp (str, "SPSR") == 0 + /* Lower case versions for backwards compatability. */ + || strcmp (str, "cpsr") == 0 + || strcmp (str, "spsr") == 0) + skip = 4; + /* This is for backwards compatability with older toolchains. */ + else if (strcmp (str, "cpsr_all") == 0 + || strcmp (str, "spsr_all") == 0) + skip = 7; + else { - inst.error = _(" expected"); + inst.error = _("{C|S}PSR expected"); return; } + if (* str == 's' || * str == 'S') + inst.instruction |= SPSR_BIT; + str += skip; + inst.instruction |= flags; end_of_line (str); - return; } -/* Three possible forms: ", Rm", ", Rm", ", #expression". */ +/* Two possible forms: + "{C|S}PSR_, Rm", + "{C|S}PSR_f, #expression". */ static void do_msr (str, flags) char * str; unsigned long flags; { - int reg; + skip_whitespace (str); + + if (psr_required_here (& str) == FAIL) + return; + + if (skip_past_comma (& str) == FAIL) + { + inst.error = _("comma missing after psr flags"); + return; + } skip_whitespace (str); - if (psr_required_here (&str, CPSR_ALL, SPSR_ALL) == SUCCESS) + if (reg_required_here (& str, 0) != FAIL) { - inst.instruction |= PSR_ALL; + inst.error = NULL; + inst.instruction |= flags; + end_of_line (str); + return; + } - /* Sytax should be ", Rm" */ - if (skip_past_comma (&str) == FAIL - || (reg = reg_required_here (&str, 0)) == FAIL) - { - inst.error = BAD_ARGS; - return; - } + if (! is_immediate_prefix (* str)) + { + inst.error = _("only a register or immediate value can follow a psr flag"); + return; + } + + str ++; + inst.error = NULL; + + if (my_get_expression (& inst.reloc.exp, & str)) + { + inst.error = _("only a register or immediate value can follow a psr flag"); + return; + } + + if (inst.instruction & ((PSR_c | PSR_x | PSR_s) << PSR_SHIFT)) + { + inst.error = _("can only set flag field with immediate value"); + return; + } + + flags |= INST_IMMEDIATE; + + if (inst.reloc.exp.X_add_symbol) + { + inst.reloc.type = BFD_RELOC_ARM_IMMEDIATE; + inst.reloc.pc_rel = 0; } else { - if (psr_required_here (& str, CPSR_FLG, SPSR_FLG) == SUCCESS) - inst.instruction |= PSR_FLAGS; - else if (psr_required_here (& str, CPSR_CTL, SPSR_CTL) == SUCCESS) - inst.instruction |= PSR_CONTROL; - else - { - inst.error = BAD_ARGS; - return; - } + unsigned value = validate_immediate (inst.reloc.exp.X_add_number); - if (skip_past_comma (&str) == FAIL) + if (value == (unsigned) FAIL) { - inst.error = BAD_ARGS; + inst.error = _("Invalid constant"); return; } - /* Syntax could be ", rm", ", #expression" */ - - if ((reg = reg_required_here (& str, 0)) != FAIL) - ; - /* Immediate expression. */ - else if (is_immediate_prefix (* str)) - { - str ++; - inst.error = NULL; - - if (my_get_expression (& inst.reloc.exp, & str)) - { - inst.error = _("Register or shift expression expected"); - return; - } - - if (inst.reloc.exp.X_add_symbol) - { - inst.reloc.type = BFD_RELOC_ARM_IMMEDIATE; - inst.reloc.pc_rel = 0; - } - else - { - unsigned value = validate_immediate (inst.reloc.exp.X_add_number); - if (value == (unsigned) FAIL) - { - inst.error = _("Invalid constant"); - return; - } - - inst.instruction |= value; - } - - flags |= INST_IMMEDIATE; - } - else - { - inst.error = _("Error: unrecognised syntax for second argument to msr instruction"); - return; - } + inst.instruction |= value; } inst.error = NULL; inst.instruction |= flags; end_of_line (str); - return; } /* Long Multiply Parser @@ -2161,7 +2219,7 @@ my_get_float_expression (str) memset (words, 0, MAX_LITTLENUMS * sizeof (LITTLENUM_TYPE)); /* Look for a raw floating point number */ if ((save_in = atof_ieee (*str, 'x', words)) != NULL - && (is_end_of_line [(int)(*save_in)] || *save_in == '\0')) + && is_end_of_line [(unsigned char) *save_in]) { for (i = 0; i < NUM_FLOAT_VALS; i++) { @@ -2586,7 +2644,7 @@ fp_op2 (str) char *start = *str; *str += strlen (fp_const[i]); - if (is_end_of_line[(int)**str] || **str == '\0') + if (is_end_of_line[(unsigned char) **str]) { inst.instruction |= i + 8; return SUCCESS; @@ -5241,7 +5299,7 @@ md_section_align (segment, size) /* ARGSUSED */ symbolS * md_undefined_symbol (name) - char * name; + char * name ATTRIBUTE_UNUSED; { #ifdef OBJ_ELF if (name[0] == '_' && name[1] == 'G' @@ -5306,33 +5364,6 @@ arm_reg_parse (ccp) return FAIL; } -static int -arm_psr_parse (ccp) - register char ** ccp; -{ - char * start = * ccp; - char c; - char * p; - CONST struct asm_psr * psr; - - p = start; - c = *p++; - while (isalpha (c) || c == '_') - c = *p++; - - *--p = 0; - psr = (CONST struct asm_psr *) hash_find (arm_psr_hsh, start); - *p = c; - - if (psr) - { - *ccp = p; - return psr->number; - } - - return FAIL; -} - int md_apply_fix3 (fixP, val, seg) fixS * fixP; @@ -6411,7 +6442,7 @@ _("Warning: Use of the 'nv' conditional * -m[arm]8[10] Arm 8 processors * -m[arm]9[20][tdmi] Arm 9 processors * -mstrongarm[110[0]] StrongARM processors - * -m[arm]v[2345] Arm architectures + * -m[arm]v[2345[t]] Arm architectures * -mall All (except the ARM1) * FP variants: * -mfpa10, -mfpa11 FPA10 and 11 co-processor instructions diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-d10v.c binutils-2.9.5.0.46/gas/config/tc-d10v.c --- binutils-2.9.5.0.42/gas/config/tc-d10v.c Sun Apr 16 10:08:31 2000 +++ binutils-2.9.5.0.46/gas/config/tc-d10v.c Mon May 29 22:36:07 2000 @@ -64,6 +64,13 @@ static Fixups *fixups; static int do_not_ignore_hash = 0; +typedef int packing_type; +#define PACK_UNSPEC (0) /* packing order not specified */ +#define PACK_PARALLEL (1) /* "||" */ +#define PACK_LEFT_RIGHT (2) /* "->" */ +#define PACK_RIGHT_LEFT (3) /* "<-" */ +static packing_type etype = PACK_UNSPEC; /* used by d10v_cleanup */ + /* True if instruction swapping warnings should be inhibited. */ static unsigned char flag_warn_suppress_instructionswap; /* --nowarnswap */ @@ -79,13 +86,13 @@ static unsigned long build_insn PARAMS ( static void write_long PARAMS ((struct d10v_opcode *opcode, unsigned long insn, Fixups *fx)); static void write_1_short PARAMS ((struct d10v_opcode *opcode, unsigned long insn, Fixups *fx)); static int write_2_short PARAMS ((struct d10v_opcode *opcode1, unsigned long insn1, - struct d10v_opcode *opcode2, unsigned long insn2, int exec_type, Fixups *fx)); + struct d10v_opcode *opcode2, unsigned long insn2, packing_type exec_type, Fixups *fx)); static unsigned long do_assemble PARAMS ((char *str, struct d10v_opcode **opcode)); static unsigned long d10v_insert_operand PARAMS (( unsigned long insn, int op_type, offsetT value, int left, fixS *fix)); static int parallel_ok PARAMS ((struct d10v_opcode *opcode1, unsigned long insn1, struct d10v_opcode *opcode2, unsigned long insn2, - int exec_type)); + packing_type exec_type)); static symbolS * find_symbol_matching_register PARAMS ((expressionS *)); struct option md_longopts[] = @@ -724,38 +731,40 @@ write_1_short (opcode, insn, fx) fx->fc = 0; } -/* write out a short form instruction if possible */ -/* return number of instructions not written out */ +/* Expects two short instructions. + If possible, writes out both as a single packed instruction. + Otherwise, writes out the first one, packed with a NOP. + Returns number of instructions not written out. */ + static int write_2_short (opcode1, insn1, opcode2, insn2, exec_type, fx) struct d10v_opcode *opcode1, *opcode2; unsigned long insn1, insn2; - int exec_type; + packing_type exec_type; Fixups *fx; { unsigned long insn; char *f; int i,j, where; - if ( (exec_type != 1) && ((opcode1->exec_type & PARONLY) + if ( (exec_type != PACK_PARALLEL) && ((opcode1->exec_type & PARONLY) || (opcode2->exec_type & PARONLY))) as_fatal (_("Instruction must be executed in parallel")); if ( (opcode1->format & LONG_OPCODE) || (opcode2->format & LONG_OPCODE)) as_fatal (_("Long instructions may not be combined.")); - if(opcode1->exec_type & BRANCH_LINK && exec_type == 0) - { - /* Instructions paired with a subroutine call are executed before the - subroutine, so don't do these pairings unless explicitly requested. */ - write_1_short (opcode1, insn1, fx->next); - return (1); - } switch (exec_type) { - case 0: /* order not specified */ - if ( Optimizing && parallel_ok (opcode1, insn1, opcode2, insn2, exec_type)) + case PACK_UNSPEC: /* order not specified */ + if (opcode1->exec_type & ALONE) + { + /* Case of a short branch on a separate GAS line. Pack with NOP. */ + write_1_short (opcode1, insn1, fx->next); + return 1; + } + if (Optimizing && parallel_ok (opcode1, insn1, opcode2, insn2, exec_type)) { /* parallel */ if (opcode1->unit == IU) @@ -765,25 +774,27 @@ write_2_short (opcode1, insn1, opcode2, else { insn = FM00 | (insn1 << 15) | insn2; + /* Advance over dummy fixup since packed insn1 in L */ fx = fx->next; } } else if (opcode1->unit == IU) - { - /* reverse sequential */ - insn = FM10 | (insn2 << 15) | insn1; - } + /* reverse sequential with IU opcode1 on right and done first */ + insn = FM10 | (insn2 << 15) | insn1; else { - /* sequential */ + /* sequential with non-IU opcode1 on left and done first */ insn = FM01 | (insn1 << 15) | insn2; - fx = fx->next; + /* Advance over dummy fixup since packed insn1 in L */ + fx = fx->next; } break; - case 1: /* parallel */ - if (opcode1->exec_type & SEQ || opcode2->exec_type & SEQ) - as_fatal (_("One of these instructions may not be executed in parallel.")); + + case PACK_PARALLEL: + if (opcode1->exec_type & SEQ || opcode2->exec_type & SEQ) + as_fatal + (_("One of these instructions may not be executed in parallel.")); if (opcode1->unit == IU) { if (opcode2->unit == IU) @@ -803,23 +814,31 @@ write_2_short (opcode1, insn1, opcode2, else { insn = FM00 | (insn1 << 15) | insn2; + /* Advance over dummy fixup since packed insn1 in L */ fx = fx->next; } break; - case 2: /* sequential */ + + + case PACK_LEFT_RIGHT: if (opcode1->unit != IU) insn = FM01 | (insn1 << 15) | insn2; else if (opcode2->unit == MU || opcode2->unit == EITHER) { if (!flag_warn_suppress_instructionswap) as_warn (_("Swapping instruction order")); - insn = FM10 | (insn2 << 15) | insn1; + insn = FM10 | (insn2 << 15) | insn1; } else as_fatal (_("IU instruction may not be in the left container")); + if (opcode1->exec_type & ALONE) + as_warn (_("Instruction in R container is squashed by flow control instruction in L container.")); + /* Advance over dummy fixup */ fx = fx->next; break; - case 3: /* reverse sequential */ + + + case PACK_RIGHT_LEFT: if (opcode2->unit != MU) insn = FM10 | (insn1 << 15) | insn2; else if (opcode1->unit == IU || opcode1->unit == EITHER) @@ -830,15 +849,29 @@ write_2_short (opcode1, insn1, opcode2, } else as_fatal (_("MU instruction may not be in the right container")); + if (opcode2->exec_type & ALONE) + as_warn (_("Instruction in R container is squashed by flow control instruction in L container.")); + /* Advance over dummy fixup */ fx = fx->next; break; + + default: as_fatal (_("unknown execution type passed to write_2_short()")); } + f = frag_more(4); number_to_chars_bigendian (f, insn, 4); + /* Process fixup chains. + Note that the packing code above advanced fx conditionally. + dlindsay@cygnus.com: There's something subtle going on here involving + _dummy_first_bfd_reloc_code_real. This is related to the + difference between BFD_RELOC_D10V_10_PCREL_R and _L, ie whether + a fixup is done in the L or R container. A bug in this code + can pass Plum Hall fine, yet still affect hand-written assembler. */ + for (j=0; j<2; j++) { for (i=0; i < fx->fc; i++) @@ -876,7 +909,7 @@ static int parallel_ok (op1, insn1, op2, insn2, exec_type) struct d10v_opcode *op1, *op2; unsigned long insn1, insn2; - int exec_type; + packing_type exec_type; { int i, j, flags, mask, shift, regno; unsigned long ins, mod[2], used[2]; @@ -889,9 +922,10 @@ parallel_ok (op1, insn1, op2, insn2, exe || (op1->unit == MU && op2->unit == MU)) return 0; - /* If the first instruction is a branch and this is auto parallazation, - don't combine with any second instruction. */ - if (exec_type == 0 && (op1->exec_type & BRANCH) != 0) + /* If this is auto parallization, and either instruction is a branch, + don't parallel. */ + if (exec_type == PACK_UNSPEC + && (op1->exec_type & ALONE || op2->exec_type & ALONE)) return 0; /* The idea here is to create two sets of bitmasks (mod and used) @@ -1005,33 +1039,35 @@ static unsigned long prev_insn; static struct d10v_opcode *prev_opcode = 0; static subsegT prev_subseg; static segT prev_seg = 0;; -static int etype = 0; /* saved extype. used for multiline instructions */ void md_assemble (str) char *str; { + /* etype is saved extype. for multiline instructions */ + + packing_type extype = PACK_UNSPEC; /* parallel, etc */ + struct d10v_opcode * opcode; unsigned long insn; - int extype = 0; /* execution type; parallel, etc */ char * str2; - if (etype == 0) + if (etype == PACK_UNSPEC) { /* look for the special multiple instruction separators */ str2 = strstr (str, "||"); if (str2) - extype = 1; + extype = PACK_PARALLEL; else { str2 = strstr (str, "->"); if (str2) - extype = 2; + extype = PACK_LEFT_RIGHT; else { str2 = strstr (str, "<-"); if (str2) - extype = 3; + extype = PACK_RIGHT_LEFT; } } /* str2 points to the separator, if one */ @@ -1040,7 +1076,7 @@ md_assemble (str) *str2 = 0; /* if two instructions are present and we already have one saved - then first write it out */ + then first write out the save one */ d10v_cleanup (); /* assemble first instruction and save it */ @@ -1055,7 +1091,7 @@ md_assemble (str) insn = do_assemble (str, &opcode); if (insn == -1) { - if (extype) + if (extype != PACK_UNSPEC) { etype = extype; return; @@ -1063,16 +1099,16 @@ md_assemble (str) as_fatal (_("can't find opcode ")); } - if (etype) + if (etype != PACK_UNSPEC) { extype = etype; - etype = 0; + etype = PACK_UNSPEC; } /* if this is a long instruction, write it and any previous short instruction */ if (opcode->format & LONG_OPCODE) { - if (extype) + if (extype != PACK_UNSPEC) as_fatal (_("Unable to mix instructions as specified")); d10v_cleanup (); write_long (opcode, insn, fixups); @@ -1081,7 +1117,7 @@ md_assemble (str) } if (prev_opcode && prev_seg && ((prev_seg != now_seg) || (prev_subseg != now_subseg))) - d10v_cleanup(); + d10v_cleanup (); if (prev_opcode && (write_2_short (prev_opcode, prev_insn, opcode, insn, extype, fixups) == 0)) { @@ -1090,7 +1126,7 @@ md_assemble (str) } else { - if (extype) + if (extype != PACK_UNSPEC) as_fatal (_("Unable to mix instructions as specified")); /* save off last instruction so it may be packed on next pass */ prev_opcode = opcode; @@ -1570,14 +1606,16 @@ md_apply_fix3 (fixp, valuep, seg) /* d10v_cleanup() is called after the assembler has finished parsing the input file or after a label is defined. Because the D10V assembler sometimes saves short instructions to see if it can package them with the next instruction, there may - be a short instruction that still needs written. */ + be a short instruction that still needs written. + NOTE: accesses a global, etype. + NOTE: invoked by various macros such as md_cleanup: see. */ int d10v_cleanup () { segT seg; subsegT subseg; - if (prev_opcode && etype == 0) + if (prev_opcode && etype == PACK_UNSPEC) { seg = now_seg; subseg = now_subseg; diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-h8300.c binutils-2.9.5.0.46/gas/config/tc-h8300.c --- binutils-2.9.5.0.42/gas/config/tc-h8300.c Sun Mar 19 11:55:07 2000 +++ binutils-2.9.5.0.46/gas/config/tc-h8300.c Sun May 14 10:22:23 2000 @@ -1,5 +1,6 @@ /* tc-h8300.c -- Assemble code for the Hitachi H8/300 - Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 1998 Free Software Foundation. + Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 2000 + Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -886,6 +887,11 @@ do_a_fix_imm (offset, operand, relaxmode bytes[1] = operand->exp.X_add_number >> 16; bytes[2] = operand->exp.X_add_number >> 8; bytes[3] = operand->exp.X_add_number >> 0; + if (relaxmode != 0) + { + idx = (relaxmode == 2) ? R_MOV24B1 : R_MOVL1; + fix_new_exp (frag_now, offset, 4, &operand->exp, 0, idx); + } break; } @@ -915,19 +921,15 @@ do_a_fix_imm (offset, operand, relaxmode idx = R_MOV16B1; else idx = R_RELWORD; - operand->exp.X_add_number = (short)operand->exp.X_add_number; + operand->exp.X_add_number = + ((operand->exp.X_add_number & 0xffff) ^ 0x8000) - 0x8000; break; case L_8: size = 1; where = 0; idx = R_RELBYTE; - /* This used to use a cast to char, but that fails if char is an - unsigned type. We can't use `signed char', as that isn't valid - K&R C. */ - if (operand->exp.X_add_number & 0x80) - operand->exp.X_add_number |= ((offsetT) -1 << 8); - else - operand->exp.X_add_number &= 0xff; + operand->exp.X_add_number = + ((operand->exp.X_add_number & 0xff) ^ 0x80) - 0x80; } fix_new_exp (frag_now, @@ -1114,13 +1116,8 @@ build_bytes (this_try, operand) } operand[i].exp.X_add_number -= 1; - /* This used to use a cast to char, but that fails if char is an - unsigned type. We can't use `signed char', as that isn't valid - K&R C. */ - if (operand[i].exp.X_add_number & 0x80) - operand[i].exp.X_add_number |= ((offsetT) -1 << 8); - else - operand[i].exp.X_add_number &= 0xff; + operand[i].exp.X_add_number = + ((operand[i].exp.X_add_number & 0xff) ^ 0x80) - 0x80; fix_new_exp (frag_now, output - frag_now->fr_literal + where, @@ -1151,7 +1148,8 @@ build_bytes (this_try, operand) (unsigned long) operand->exp.X_add_number); } if (!Hmode) - operand[i].exp.X_add_number = (short) operand[i].exp.X_add_number; + operand[i].exp.X_add_number = + ((operand[i].exp.X_add_number & 0xffff) ^ 0x8000) - 0x8000; fix_new_exp (frag_now, output - frag_now->fr_literal, 4, diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-h8500.c binutils-2.9.5.0.46/gas/config/tc-h8500.c --- binutils-2.9.5.0.42/gas/config/tc-h8500.c Thu Jun 3 11:02:01 1999 +++ binutils-2.9.5.0.46/gas/config/tc-h8500.c Fri Jun 2 16:27:03 2000 @@ -1104,8 +1104,7 @@ DEFUN (md_assemble, (str), /* find the op code end */ for (op_start = op_end = str; - *op_end && - !is_end_of_line[*op_end] && *op_end != ' '; + !is_end_of_line[(unsigned char) *op_end] && *op_end != ' '; op_end++) { if ( /**op_end != '.' diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-hppa.c binutils-2.9.5.0.46/gas/config/tc-hppa.c --- binutils-2.9.5.0.42/gas/config/tc-hppa.c Tue May 2 10:08:17 2000 +++ binutils-2.9.5.0.46/gas/config/tc-hppa.c Sun May 21 14:19:43 2000 @@ -4422,7 +4422,7 @@ md_apply_fix (fixP, valp) CHECK_FIELD (new_val, 1048576, -1048576, 0); val = new_val; - insn = re_assemble_21 (insn, val); + insn = re_assemble_21 (insn & ~ 0x1fffff, val); break; /* Handle all the opcodes with the 'i' operand type. */ @@ -4438,7 +4438,7 @@ md_apply_fix (fixP, valp) CHECK_FIELD (new_val, 8199, -8184, 0); val = new_val; - insn = re_assemble_12 (insn, (val - 8) >> 2); + insn = re_assemble_12 (insn & ~ 0x1ffd, (val - 8) >> 2); break; /* Handle some of the opcodes with the 'W' operand type. */ @@ -4455,7 +4455,7 @@ md_apply_fix (fixP, valp) CHECK_FIELD (new_val, 262143, -262144, 0); val = new_val; - insn = re_assemble_17 (insn, (val - 8) >> 2); + insn = re_assemble_17 (insn & ~ 0x1f1ffd, (val - 8) >> 2); break; } @@ -4472,7 +4472,7 @@ md_apply_fix (fixP, valp) CHECK_FIELD (new_val, 8388607, -8388608, 0); val = new_val; - insn = re_assemble_22 (insn, (val - 8) >> 2); + insn = re_assemble_22 (insn & ~ 0x3ff1ffd, (val - 8) >> 2); break; } diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-i386.c binutils-2.9.5.0.46/gas/config/tc-i386.c --- binutils-2.9.5.0.42/gas/config/tc-i386.c Tue May 2 10:23:24 2000 +++ binutils-2.9.5.0.46/gas/config/tc-i386.c Sat Jun 3 14:38:12 2000 @@ -62,6 +62,7 @@ static int add_prefix PARAMS ((unsigned static void set_16bit_code_flag PARAMS ((int)); static void set_16bit_gcc_code_flag PARAMS((int)); static void set_intel_syntax PARAMS ((int)); +static void set_cpu_arch PARAMS ((int)); #ifdef BFD_ASSEMBLER static bfd_reloc_code_real_type reloc @@ -216,21 +217,26 @@ static const templates *current_template /* Per instruction expressionS buffers: 2 displacements & 2 immediate max. */ static expressionS disp_expressions[2], im_expressions[2]; -static int this_operand; /* current operand we are working on */ +static int this_operand; /* Current operand we are working on. */ -static int flag_do_long_jump; /* FIXME what does this do? */ +static int flag_16bit_code; /* 1 if we're writing 16-bit code, + 0 if 32-bit. */ -static int flag_16bit_code; /* 1 if we're writing 16-bit code, 0 if 32-bit */ +static int intel_syntax = 0; /* 1 for intel syntax, 0 if att syntax. */ -static int intel_syntax = 0; /* 1 for intel syntax, 0 if att syntax */ - -static int allow_naked_reg = 0; /* 1 if register prefix % not required */ +static int allow_naked_reg = 0; /* 1 if register prefix % not required */ static char stackop_size = '\0'; /* Used in 16 bit gcc mode to add an l suffix to call, ret, enter, leave, push, and pop instructions so that gcc has the same stack frame as in 32 bit mode. */ +static int quiet_warnings = 0; /* Non-zero to quieten some warnings. */ + +static const char *cpu_arch_name = NULL; /* cpu name */ + +static unsigned int cpu_arch_flags = 0; /* cpu feature flags */ + /* Interface to relax_segment. There are 2 relax states for 386 jump insns: one for conditional & one for unconditional jumps. This is because these two types of @@ -301,6 +307,21 @@ const relax_typeS md_relax_table[] = }; +static const arch_entry cpu_arch[] = { + {"i8086", Cpu086 }, + {"i186", Cpu086|Cpu186 }, + {"i286", Cpu086|Cpu186|Cpu286 }, + {"i386", Cpu086|Cpu186|Cpu286|Cpu386 }, + {"i486", Cpu086|Cpu186|Cpu286|Cpu386|Cpu486 }, + {"i586", Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuMMX }, + {"i686", Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuMMX|CpuSSE }, + {"pentium", Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuMMX }, + {"pentiumpro",Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuMMX|CpuSSE }, + {"k6", Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuMMX|Cpu3dnow }, + {"athlon", Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuMMX|Cpu3dnow }, + {NULL, 0 } +}; + void i386_align_code (fragP, count) @@ -441,16 +462,17 @@ static int smallest_imm_type (num) offsetT num; { -#if 0 - /* This code is disabled because all the Imm1 forms in the opcode table - are slower on the i486, and they're the versions with the implicitly - specified single-position displacement, which has another syntax if - you really want to use that form. If you really prefer to have the - one-byte-shorter Imm1 form despite these problems, re-enable this - code. */ - if (num == 1) - return Imm1 | Imm8 | Imm8S | Imm16 | Imm32; -#endif + if (cpu_arch_flags != 0 + && cpu_arch_flags != (Cpu086|Cpu186|Cpu286|Cpu386|Cpu486)) + { + /* This code is disabled on the 486 because all the Imm1 forms + in the opcode table are slower on the i486. They're the + versions with the implicitly specified single-position + displacement, which has another syntax if you really want to + use that form. */ + if (num == 1) + return Imm1 | Imm8 | Imm8S | Imm16 | Imm32; + } return (fits_in_signed_byte (num) ? (Imm8S | Imm8 | Imm16 | Imm32) : fits_in_unsigned_byte (num) @@ -600,16 +622,49 @@ set_intel_syntax (syntax_flag) allow_naked_reg = (ask_naked_reg < 0); } +static void +set_cpu_arch (dummy) + int dummy ATTRIBUTE_UNUSED; +{ + SKIP_WHITESPACE(); + + if (! is_end_of_line[(unsigned char) *input_line_pointer]) + { + char *string = input_line_pointer; + int e = get_symbol_end (); + int i; + + for (i = 0; cpu_arch[i].name; i++) + { + if (strcmp (string, cpu_arch[i].name) == 0) + { + cpu_arch_name = cpu_arch[i].name; + cpu_arch_flags = cpu_arch[i].flags; + break; + } + } + if (!cpu_arch[i].name) + as_bad (_("no such architecture: `%s'"), string); + + *input_line_pointer = e; + } + else + as_bad (_("missing cpu architecture")); + + demand_empty_rest_of_line (); +} + const pseudo_typeS md_pseudo_table[] = { -#ifndef I386COFF - {"bss", s_bss, 0}, -#endif #if !defined(OBJ_AOUT) && !defined(USE_ALIGN_PTWO) {"align", s_align_bytes, 0}, #else {"align", s_align_ptwo, 0}, #endif + {"arch", set_cpu_arch, 0}, +#ifndef I386COFF + {"bss", s_bss, 0}, +#endif {"ffloat", float_cons, 'f'}, {"dfloat", float_cons, 'd'}, {"tfloat", float_cons, 'x'}, @@ -968,12 +1023,11 @@ int tc_i386_fix_adjustable (fixP) fixS *fixP; { -#if defined (OBJ_ELF) || defined (TE_PE) +#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) || defined (TE_PE) /* Prevent all adjustments to global symbols, or else dynamic linking will not work correctly. */ - if (S_IS_EXTERN (fixP->fx_addsy)) - return 0; - if (S_IS_WEAK (fixP->fx_addsy)) + if (S_IS_EXTERNAL (fixP->fx_addsy) + || S_IS_WEAK (fixP->fx_addsy)) return 0; #endif /* adjust_reloc_syms doesn't know about the GOT */ @@ -1058,7 +1112,7 @@ md_assemble (line) mnem_p++; if (mnem_p >= mnemonic + sizeof (mnemonic)) { - as_bad (_("no such 386 instruction: `%s'"), token_start); + as_bad (_("no such instruction: `%s'"), token_start); return; } l++; @@ -1141,11 +1195,25 @@ md_assemble (line) } if (!current_templates) { - as_bad (_("no such 386 instruction: `%s'"), token_start); + as_bad (_("no such instruction: `%s'"), token_start); return; } } + /* Check if instruction is supported on specified architecture. */ + if (cpu_arch_flags != 0) + { + if (current_templates->start->cpu_flags & ~ cpu_arch_flags) + { + as_warn (_("`%s' is not supported on `%s'"), + current_templates->start->name, cpu_arch_name); + } + else if ((Cpu386 & ~ cpu_arch_flags) && !flag_16bit_code) + { + as_warn (_("use .code16 to ensure correct addressing mode")); + } + } + /* check for rep/repne without a string instruction */ if (expecting_string_instruction && !(current_templates->start->opcode_modifier & IsString)) @@ -1497,17 +1565,22 @@ md_assemble (line) return; } - if (!intel_syntax - && (i.types[0] & JumpAbsolute) != (t->operand_types[0] & JumpAbsolute)) + if (!quiet_warnings) { - as_warn (_("indirect %s without `*'"), t->name); - } + if (!intel_syntax + && ((i.types[0] & JumpAbsolute) + != (t->operand_types[0] & JumpAbsolute))) + { + as_warn (_("indirect %s without `*'"), t->name); + } - if ((t->opcode_modifier & (IsPrefix|IgnoreSize)) == (IsPrefix|IgnoreSize)) - { - /* Warn them that a data or address size prefix doesn't affect - assembly of the next line of code. */ - as_warn (_("stand-alone `%s' prefix"), t->name); + if ((t->opcode_modifier & (IsPrefix|IgnoreSize)) + == (IsPrefix|IgnoreSize)) + { + /* Warn them that a data or address size prefix doesn't + affect assembly of the next line of code. */ + as_warn (_("stand-alone `%s' prefix"), t->name); + } } /* Copy the template we found. */ @@ -1623,7 +1696,8 @@ md_assemble (line) ) { #if REGISTER_WARNINGS - if ((i.tm.operand_types[op] & InOutPortReg) == 0) + if (!quiet_warnings + && (i.tm.operand_types[op] & InOutPortReg) == 0) as_warn (_("using `%%%s' instead of `%%%s' due to `%c' suffix"), (i.op[op].regs - (i.types[op] & Reg16 ? 8 : 16))->reg_name, i.op[op].regs->reg_name, @@ -1662,7 +1736,8 @@ md_assemble (line) } #if REGISTER_WARNINGS /* Warn if the e prefix on a general reg is missing. */ - else if ((i.types[op] & Reg16) != 0 + else if (!quiet_warnings + && (i.types[op] & Reg16) != 0 && (i.tm.operand_types[op] & (Reg32|Acc)) != 0) { as_warn (_("using `%%%s' instead of `%%%s' due to `%c' suffix"), @@ -1689,7 +1764,8 @@ md_assemble (line) } #if REGISTER_WARNINGS /* Warn if the e prefix on a general reg is present. */ - else if ((i.types[op] & Reg32) != 0 + else if (!quiet_warnings + && (i.types[op] & Reg32) != 0 && (i.tm.operand_types[op] & (Reg16|Acc)) != 0) { as_warn (_("using `%%%s' instead of `%%%s' due to `%c' suffix"), @@ -1865,7 +1941,7 @@ md_assemble (line) unsigned int op = (i.types[0] & (Reg | FloatReg)) ? 0 : 1; /* Register goes in low 3 bits of opcode. */ i.tm.base_opcode |= i.op[op].regs->reg_num; - if ((i.tm.opcode_modifier & Ugh) != 0) + if (!quiet_warnings && (i.tm.opcode_modifier & Ugh) != 0) { /* Warn about some common errors, but press on regardless. The first case can be generated by gcc (<= 2.8.1). */ @@ -2122,7 +2198,7 @@ md_assemble (line) return; } } - else if ((i.tm.opcode_modifier & Ugh) != 0) + else if (!quiet_warnings && (i.tm.opcode_modifier & Ugh) != 0) { /* UnixWare fsub no args is alias for fsubp, fadd -> faddp, etc. */ as_warn (_("translating to `%sp'"), i.tm.name); @@ -2188,10 +2264,11 @@ md_assemble (line) if (prefix) *p++ = DATA_PREFIX_OPCODE; *p = i.tm.base_opcode; - /* 1 possible extra opcode + displacement go in fr_var. */ + /* 1 possible extra opcode + displacement go in var part. + Pass reloc in fr_var. */ frag_var (rs_machine_dependent, 1 + size, - 1, + i.disp_reloc[0], ((unsigned char) *p == JUMP_PC_RELATIVE ? ENCODE_RELAX_STATE (UNCOND_JUMP, SMALL) | code16 : ENCODE_RELAX_STATE (COND_JUMP, SMALL) | code16), @@ -3665,54 +3742,56 @@ i386_operand (operand_string) return 1; /* normal return */ } -/* - * md_estimate_size_before_relax() - * - * Called just before relax(). - * Any symbol that is now undefined will not become defined. - * Return the correct fr_subtype in the frag. - * Return the initial "guess for fr_var" to caller. - * The guess for fr_var is ACTUALLY the growth beyond fr_fix. - * Whatever we do to grow fr_fix or fr_var contributes to our returned value. - * Although it may not be explicit in the frag, pretend fr_var starts with a - * 0 value. - */ +/* md_estimate_size_before_relax() + + Called just before relax() for rs_machine_dependent frags. The x86 + assembler uses these frags to handle variable size jump + instructions. + + Any symbol that is now undefined will not become defined. + Return the correct fr_subtype in the frag. + Return the initial "guess for variable size of frag" to caller. + The guess is actually the growth beyond the fixed part. Whatever + we do to grow the fixed or variable part contributes to our + returned value. */ + int md_estimate_size_before_relax (fragP, segment) register fragS *fragP; register segT segment; { - register unsigned char *opcode; - register int old_fr_fix; - - old_fr_fix = fragP->fr_fix; - opcode = (unsigned char *) fragP->fr_opcode; /* We've already got fragP->fr_subtype right; all we have to do is - check for un-relaxable symbols. */ - if (S_GET_SEGMENT (fragP->fr_symbol) != segment) - { - /* symbol is undefined in this segment */ - int code16 = fragP->fr_subtype & CODE16; - int size = code16 ? 2 : 4; + check for un-relaxable symbols. On an ELF system, we can't relax + an externally visible symbol, because it may be overridden by a + shared library. */ + if (S_GET_SEGMENT (fragP->fr_symbol) != segment +#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) || defined (TE_PE) + || S_IS_EXTERNAL (fragP->fr_symbol) + || S_IS_WEAK (fragP->fr_symbol) +#endif + ) + { + /* Symbol is undefined in this segment, or we need to keep a + reloc so that weak symbols can be overridden. */ + int size = (fragP->fr_subtype & CODE16) ? 2 : 4; #ifdef BFD_ASSEMBLER enum bfd_reloc_code_real reloc_type; #else int reloc_type; #endif + unsigned char *opcode; + int old_fr_fix; - if (GOT_symbol /* Not quite right - we should switch on presence of - @PLT, but I cannot see how to get to that from - here. We should have done this in md_assemble to - really get it right all of the time, but I think it - does not matter that much, as this will be right - most of the time. ERY */ - && S_GET_SEGMENT(fragP->fr_symbol) == undefined_section) - reloc_type = BFD_RELOC_386_PLT32; - else if (code16) + if (fragP->fr_var != NO_RELOC) + reloc_type = fragP->fr_var; + else if (size == 2) reloc_type = BFD_RELOC_16_PCREL; else reloc_type = BFD_RELOC_32_PCREL; + old_fr_fix = fragP->fr_fix; + opcode = (unsigned char *) fragP->fr_opcode; + switch (opcode[0]) { case JUMP_PC_RELATIVE: /* make jmp (0xeb) a dword displacement jump */ @@ -3737,10 +3816,11 @@ md_estimate_size_before_relax (fragP, se break; } frag_wane (fragP); + return fragP->fr_fix - old_fr_fix; } - return (fragP->fr_var + fragP->fr_fix - old_fr_fix); -} /* md_estimate_size_before_relax() */ - + return 1; /* Guess a short jump. */ +} + /* * md_convert_frag(); * @@ -3858,25 +3938,14 @@ void md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol) char *ptr; addressT from_addr, to_addr; - fragS *frag; - symbolS *to_symbol; + fragS *frag ATTRIBUTE_UNUSED; + symbolS *to_symbol ATTRIBUTE_UNUSED; { offsetT offset; - if (flag_do_long_jump) - { - offset = to_addr - S_GET_VALUE (to_symbol); - md_number_to_chars (ptr, (valueT) 0xe9, 1);/* opcode for long jmp */ - md_number_to_chars (ptr + 1, (valueT) offset, 4); - fix_new (frag, (ptr + 1) - frag->fr_literal, 4, - to_symbol, (offsetT) 0, 0, BFD_RELOC_32); - } - else - { - offset = to_addr - (from_addr + 5); - md_number_to_chars (ptr, (valueT) 0xe9, 1); - md_number_to_chars (ptr + 1, (valueT) offset, 4); - } + offset = to_addr - (from_addr + 5); + md_number_to_chars (ptr, (valueT) 0xe9, 1); + md_number_to_chars (ptr + 1, (valueT) offset, 4); } /* Apply a fixup (fixS) to segment data, once it has been determined @@ -4190,9 +4259,9 @@ parse_register (reg_string, end_op) } #if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) -CONST char *md_shortopts = "kmVQ:sq"; +const char *md_shortopts = "kVQ:sq"; #else -CONST char *md_shortopts = "m"; +const char *md_shortopts = "q"; #endif struct option md_longopts[] = { {NULL, no_argument, NULL, 0} @@ -4206,13 +4275,14 @@ md_parse_option (c, arg) { switch (c) { - case 'm': - flag_do_long_jump = 1; + case 'q': + quiet_warnings = 1; break; #if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) - /* -k: Ignore for FreeBSD compatibility. */ - case 'k': + /* -Qy, -Qn: SVR4 arguments controlling whether a .comment section + should be emitted or not. FIXME: Not implemented. */ + case 'Q': break; /* -V: SVR4 argument to print version ID. */ @@ -4220,20 +4290,14 @@ md_parse_option (c, arg) print_version_id (); break; - /* -Qy, -Qn: SVR4 arguments controlling whether a .comment section - should be emitted or not. FIXME: Not implemented. */ - case 'Q': + /* -k: Ignore for FreeBSD compatibility. */ + case 'k': break; case 's': /* -s: On i386 Solaris, this tells the native assembler to use .stab instead of .stab.excl. We always use .stab anyhow. */ break; - - case 'q': - /* -q: On i386 Solaris, this tells the native assembler to do - fewer checks. */ - break; #endif default: @@ -4246,15 +4310,16 @@ void md_show_usage (stream) FILE *stream; { - fprintf (stream, _("\ - -m do long jump\n")); #if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) fprintf (stream, _("\ - -V print assembler version number\n\ - -k ignored\n\ - -Qy, -Qn ignored\n\ - -q ignored\n\ - -s ignored\n")); + -Q ignored\n\ + -V print assembler version number\n\ + -k ignored\n\ + -q quieten some warnings\n\ + -s ignored\n")); +#else + fprintf (stream, _("\ + -q quieten some warnings\n")); #endif } diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-i386.h binutils-2.9.5.0.46/gas/config/tc-i386.h --- binutils-2.9.5.0.42/gas/config/tc-i386.h Fri May 12 08:04:13 2000 +++ binutils-2.9.5.0.46/gas/config/tc-i386.h Sun May 14 10:22:23 2000 @@ -239,77 +239,7 @@ extern const char extra_symbol_chars[]; #define OFFSET_FLAT 6 #define FLAT 7 #define NONE_FOUND 8 -/* - When an operand is read in it is classified by its type. This type includes - all the possible ways an operand can be used. Thus, '%eax' is both 'register - # 0' and 'The Accumulator'. In our language this is expressed by OR'ing - 'Reg32' (any 32 bit register) and 'Acc' (the accumulator). - Operands are classified so that we can match given operand types with - the opcode table in opcode/i386.h. - */ -/* register */ -#define Reg8 0x1 /* 8 bit reg */ -#define Reg16 0x2 /* 16 bit reg */ -#define Reg32 0x4 /* 32 bit reg */ -/* immediate */ -#define Imm8 0x8 /* 8 bit immediate */ -#define Imm8S 0x10 /* 8 bit immediate sign extended */ -#define Imm16 0x20 /* 16 bit immediate */ -#define Imm32 0x40 /* 32 bit immediate */ -#define Imm1 0x80 /* 1 bit immediate */ -/* memory */ -#define BaseIndex 0x100 -/* Disp8,16,32 are used in different ways, depending on the - instruction. For jumps, they specify the size of the PC relative - displacement, for baseindex type instructions, they specify the - size of the offset relative to the base register, and for memory - offset instructions such as `mov 1234,%al' they specify the size of - the offset relative to the segment base. */ -#define Disp8 0x200 /* 8 bit displacement */ -#define Disp16 0x400 /* 16 bit displacement */ -#define Disp32 0x800 /* 32 bit displacement */ -/* specials */ -#define InOutPortReg 0x1000 /* register to hold in/out port addr = dx */ -#define ShiftCount 0x2000 /* register to hold shift cound = cl */ -#define Control 0x4000 /* Control register */ -#define Debug 0x8000 /* Debug register */ -#define Test 0x10000 /* Test register */ -#define FloatReg 0x20000 /* Float register */ -#define FloatAcc 0x40000 /* Float stack top %st(0) */ -#define SReg2 0x80000 /* 2 bit segment register */ -#define SReg3 0x100000 /* 3 bit segment register */ -#define Acc 0x200000 /* Accumulator %al or %ax or %eax */ -#define JumpAbsolute 0x400000 -#define RegMMX 0x800000 /* MMX register */ -#define RegXMM 0x1000000 /* XMM registers in PIII */ -#define EsSeg 0x2000000 /* String insn operand with fixed es segment */ -/* InvMem is for instructions with a modrm byte that only allow a - general register encoding in the i.tm.mode and i.tm.regmem fields, - eg. control reg moves. They really ought to support a memory form, - but don't, so we add an InvMem flag to the register operand to - indicate that it should be encoded in the i.tm.regmem field. */ -#define InvMem 0x4000000 - -#define Reg (Reg8|Reg16|Reg32) /* gen'l register */ -#define WordReg (Reg16|Reg32) -#define ImplicitRegister (InOutPortReg|ShiftCount|Acc|FloatAcc) -#define Imm (Imm8|Imm8S|Imm16|Imm32) /* gen'l immediate */ -#define Disp (Disp8|Disp16|Disp32) /* General displacement */ -#define AnyMem (Disp|BaseIndex|InvMem) /* General memory */ -/* The following aliases are defined because the opcode table - carefully specifies the allowed memory types for each instruction. - At the moment we can only tell a memory reference size by the - instruction suffix, so there's not much point in defining Mem8, - Mem16, Mem32 and Mem64 opcode modifiers - We might as well just use - the suffix directly to check memory operands. */ -#define LLongMem AnyMem /* 64 bits (or more) */ -#define LongMem AnyMem /* 32 bit memory ref */ -#define ShortMem AnyMem /* 16 bit memory ref */ -#define WordMem AnyMem /* 16 or 32 bit memory ref */ -#define ByteMem AnyMem /* 8 bit memory ref */ -#define SMALLEST_DISP_TYPE(num) \ - (fits_in_signed_byte(num) ? (Disp8|Disp32) : Disp32) typedef struct { @@ -330,6 +260,19 @@ typedef struct unsigned int extension_opcode; #define None 0xffff /* If no extension_opcode is possible. */ + /* cpu feature flags */ + unsigned int cpu_flags; +#define Cpu086 0x1 /* Any old cpu will do, 0 does the same */ +#define Cpu186 0x2 /* i186 or better required */ +#define Cpu286 0x4 /* i286 or better required */ +#define Cpu386 0x8 /* i386 or better required */ +#define Cpu486 0x10 /* i486 or better required */ +#define Cpu586 0x20 /* i585 or better required */ +#define Cpu686 0x40 /* i686 or better required */ +#define CpuMMX 0x80 /* MMX support required */ +#define CpuSSE 0x100 /* Streaming SIMD extensions required */ +#define Cpu3dnow 0x200 /* 3dnow! support required */ + /* the bits in opcode_modifier are used to generate the final opcode from the base_opcode. These bits also are used to detect alternate forms of the same instruction */ @@ -371,8 +314,70 @@ typedef struct /* operand_types[i] describes the type of operand i. This is made by OR'ing together all of the possible type masks. (e.g. 'operand_types[i] = Reg|Imm' specifies that operand i can be - either a register or an immediate operand */ + either a register or an immediate operand. */ unsigned int operand_types[3]; + + /* operand_types[i] bits */ + /* register */ +#define Reg8 0x1 /* 8 bit reg */ +#define Reg16 0x2 /* 16 bit reg */ +#define Reg32 0x4 /* 32 bit reg */ + /* immediate */ +#define Imm8 0x8 /* 8 bit immediate */ +#define Imm8S 0x10 /* 8 bit immediate sign extended */ +#define Imm16 0x20 /* 16 bit immediate */ +#define Imm32 0x40 /* 32 bit immediate */ +#define Imm1 0x80 /* 1 bit immediate */ + /* memory */ +#define BaseIndex 0x100 + /* Disp8,16,32 are used in different ways, depending on the + instruction. For jumps, they specify the size of the PC relative + displacement, for baseindex type instructions, they specify the + size of the offset relative to the base register, and for memory + offset instructions such as `mov 1234,%al' they specify the size of + the offset relative to the segment base. */ +#define Disp8 0x200 /* 8 bit displacement */ +#define Disp16 0x400 /* 16 bit displacement */ +#define Disp32 0x800 /* 32 bit displacement */ + /* specials */ +#define InOutPortReg 0x1000 /* register to hold in/out port addr = dx */ +#define ShiftCount 0x2000 /* register to hold shift cound = cl */ +#define Control 0x4000 /* Control register */ +#define Debug 0x8000 /* Debug register */ +#define Test 0x10000 /* Test register */ +#define FloatReg 0x20000 /* Float register */ +#define FloatAcc 0x40000 /* Float stack top %st(0) */ +#define SReg2 0x80000 /* 2 bit segment register */ +#define SReg3 0x100000 /* 3 bit segment register */ +#define Acc 0x200000 /* Accumulator %al or %ax or %eax */ +#define JumpAbsolute 0x400000 +#define RegMMX 0x800000 /* MMX register */ +#define RegXMM 0x1000000 /* XMM registers in PIII */ +#define EsSeg 0x2000000 /* String insn operand with fixed es segment */ + /* InvMem is for instructions with a modrm byte that only allow a + general register encoding in the i.tm.mode and i.tm.regmem fields, + eg. control reg moves. They really ought to support a memory form, + but don't, so we add an InvMem flag to the register operand to + indicate that it should be encoded in the i.tm.regmem field. */ +#define InvMem 0x4000000 + +#define Reg (Reg8|Reg16|Reg32) /* gen'l register */ +#define WordReg (Reg16|Reg32) +#define ImplicitRegister (InOutPortReg|ShiftCount|Acc|FloatAcc) +#define Imm (Imm8|Imm8S|Imm16|Imm32) /* gen'l immediate */ +#define Disp (Disp8|Disp16|Disp32) /* General displacement */ +#define AnyMem (Disp|BaseIndex|InvMem) /* General memory */ + /* The following aliases are defined because the opcode table + carefully specifies the allowed memory types for each instruction. + At the moment we can only tell a memory reference size by the + instruction suffix, so there's not much point in defining Mem8, + Mem16, Mem32 and Mem64 opcode modifiers - We might as well just use + the suffix directly to check memory operands. */ +#define LLongMem AnyMem /* 64 bits (or more) */ +#define LongMem AnyMem /* 32 bit memory ref */ +#define ShortMem AnyMem /* 16 bit memory ref */ +#define WordMem AnyMem /* 16 or 32 bit memory ref */ +#define ByteMem AnyMem /* 8 bit memory ref */ } template; @@ -384,44 +389,53 @@ template; END. */ typedef struct - { - const template *start; - const template *end; - } templates; +{ + const template *start; + const template *end; +} +templates; /* these are for register name --> number & type hash lookup */ typedef struct - { - char *reg_name; - unsigned int reg_type; - unsigned int reg_num; - } +{ + char *reg_name; + unsigned int reg_type; + unsigned int reg_num; +} reg_entry; typedef struct - { - char *seg_name; - unsigned int seg_prefix; - } +{ + char *seg_name; + unsigned int seg_prefix; +} seg_entry; /* 386 operand encoding bytes: see 386 book for details of this. */ typedef struct - { - unsigned int regmem; /* codes register or memory operand */ - unsigned int reg; /* codes register operand (or extended opcode) */ - unsigned int mode; /* how to interpret regmem & reg */ - } +{ + unsigned int regmem; /* codes register or memory operand */ + unsigned int reg; /* codes register operand (or extended opcode) */ + unsigned int mode; /* how to interpret regmem & reg */ +} modrm_byte; /* 386 opcode byte to code indirect addressing. */ typedef struct - { - unsigned base; - unsigned index; - unsigned scale; - } +{ + unsigned base; + unsigned index; + unsigned scale; +} sib_byte; + +/* x86 arch names and features */ +typedef struct +{ + const char *name; /* arch name */ + unsigned int flags; /* cpu feature flags */ +} +arch_entry; /* The name of the global offset table generated by the compiler. Allow this to be overridden if need be. */ diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-ia64.c binutils-2.9.5.0.46/gas/config/tc-ia64.c --- binutils-2.9.5.0.42/gas/config/tc-ia64.c Fri May 12 08:04:17 2000 +++ binutils-2.9.5.0.46/gas/config/tc-ia64.c Mon May 29 22:36:13 2000 @@ -1,5 +1,5 @@ /* tc-ia64.c -- Assembler for the HP/Intel IA-64 architecture. - Copyright (C) 1998, 1999 Free Software Foundation. + Copyright (C) 1998, 1999, 2000 Free Software Foundation. Contributed by David Mosberger-Tang This file is part of GAS, the GNU Assembler. @@ -32,8 +32,6 @@ .previous .psr .pushsection - .save - .vframe - labels are wrong if automatic alignment is introduced (e.g., checkout the second real10 definition in test-data.s) - DV-related stuff: @@ -77,6 +75,7 @@ enum reloc_func FUNC_FPTR_RELATIVE, FUNC_GP_RELATIVE, FUNC_LT_RELATIVE, + FUNC_PC_RELATIVE, FUNC_PLT_RELATIVE, FUNC_SEC_RELATIVE, FUNC_SEG_RELATIVE, @@ -111,6 +110,9 @@ enum reg_symbol IND_PMC, IND_PMD, IND_RR, + /* The following pseudo-registers are used for unwind directives only: */ + REG_PSP, + REG_PRIUNAT, REG_NUM }; @@ -251,15 +253,17 @@ md; /* application registers: */ -#define AR_K0 0 -#define AR_K7 7 -#define AR_RSC 16 -#define AR_BSP 17 -#define AR_BSPSTORE 18 -#define AR_RNAT 19 -#define AR_UNAT 36 -#define AR_FPSR 40 -#define AR_ITC 44 +#define AR_K0 0 +#define AR_K7 7 +#define AR_RSC 16 +#define AR_BSP 17 +#define AR_BSPSTORE 18 +#define AR_RNAT 19 +#define AR_UNAT 36 +#define AR_FPSR 40 +#define AR_ITC 44 +#define AR_PFS 64 +#define AR_LC 65 static const struct { @@ -418,6 +422,7 @@ static struct PSEUDO_FUNC_NONE, PSEUDO_FUNC_RELOC, PSEUDO_FUNC_CONST, + PSEUDO_FUNC_REG, PSEUDO_FUNC_FLOAT } type; @@ -434,6 +439,7 @@ pseudo_func[] = { "fptr", PSEUDO_FUNC_RELOC }, { "gprel", PSEUDO_FUNC_RELOC }, { "ltoff", PSEUDO_FUNC_RELOC }, + { "pcrel", PSEUDO_FUNC_RELOC }, { "pltoff", PSEUDO_FUNC_RELOC }, { "secrel", PSEUDO_FUNC_RELOC }, { "segrel", PSEUDO_FUNC_RELOC }, @@ -459,6 +465,14 @@ pseudo_func[] = { "inf", PSEUDO_FUNC_CONST, { 0x020 } }, { "natval", PSEUDO_FUNC_CONST, { 0x100 } }, /* old usage */ + + /* unwind-related constants: */ + { "svr4", PSEUDO_FUNC_CONST, { 0 } }, + { "hpux", PSEUDO_FUNC_CONST, { 1 } }, + { "nt", PSEUDO_FUNC_CONST, { 2 } }, + + /* unwind-related registers: */ + { "priunat",PSEUDO_FUNC_REG, { REG_PRIUNAT } } }; /* 41-bit nop opcodes (one per unit): */ @@ -544,28 +558,33 @@ static struct gr { typedef struct unw_rec_list { unwind_record r; - unsigned long slot_number; + unsigned long slot_number; struct unw_rec_list *next; } unw_rec_list; #define SLOT_NUM_NOT_SET -1 -/* TRUE if processing unwind directives in a prologue region. */ -static int unwind_prologue = 0; +static struct +{ + unsigned long next_slot_number; -/* Maintain a list of unwind entries for the current function. */ -static unw_rec_list *unwind_list = 0; -static unw_rec_list *unwind_tail = 0; - -/* Any unwind entires that should be attached to the current - slot that an insn is being constructed for. */ -static unw_rec_list *current_unwind_entry = 0; - -/* These are used to create the unwind table entry for this function. */ -static symbolS *proc_start = 0; -static symbolS *proc_end = 0; -static symbolS *unwind_info = 0; -static symbolS *personality_routine = 0; + /* Maintain a list of unwind entries for the current function. */ + unw_rec_list *list; + unw_rec_list *tail; + + /* Any unwind entires that should be attached to the current slot + that an insn is being constructed for. */ + unw_rec_list *current_entry; + + /* These are used to create the unwind table entry for this function. */ + symbolS *proc_start; + symbolS *proc_end; + symbolS *info; /* pointer to unwind info */ + symbolS *personality_routine; + + /* TRUE if processing unwind directives in a prologue region. */ + int prologue; +} unwind; typedef void (*vbyte_func) PARAMS ((int, char *, char *)); @@ -584,8 +603,7 @@ static void dot_restore PARAMS ((int)); static void dot_handlerdata PARAMS ((int)); static void dot_unwentry PARAMS ((int)); static void dot_altrp PARAMS ((int)); -static void dot_savesp PARAMS ((int)); -static void dot_savepsp PARAMS ((int)); +static void dot_savemem PARAMS ((int)); static void dot_saveg PARAMS ((int)); static void dot_savef PARAMS ((int)); static void dot_saveb PARAMS ((int)); @@ -616,6 +634,7 @@ static void dot_reg_val PARAMS ((int)); static void dot_dv_mode PARAMS ((int)); static void dot_entry PARAMS ((int)); static void dot_mem_offset PARAMS ((int)); +static void add_unwind_entry PARAMS((unw_rec_list *ptr)); static symbolS* declare_register PARAMS ((const char *name, int regnum)); static void declare_register_set PARAMS ((const char *, int, int)); static unsigned int operand_width PARAMS ((enum ia64_opnd)); @@ -808,21 +827,19 @@ output_R1_format (f, rtype, rlen) unw_record_type rtype; int rlen; { - int r; + int r = 0; char byte; if (rlen > 0x1f) { output_R3_format (f, rtype, rlen); return; } - if (rtype == prologue) - r = 0; - else - if (rtype == body) - r = 1; - else - as_bad ("record type is not valid"); + if (rtype == body) + r = 1; + else if (rtype != prologue) + as_bad ("record type is not valid"); + byte = UNW_R1 | (r << 5) | (rlen & 0x1f); (*f) (1, &byte, NULL); } @@ -850,20 +867,18 @@ output_R3_format (f, rtype, rlen) unw_record_type rtype; unsigned long rlen; { - int r, count; + int r = 0, count; char bytes[20]; if (rlen <= 0x1f) { output_R1_format (f, rtype, rlen); return; } - if (rtype == prologue) - r = 0; - else - if (rtype == body) - r = 1; - else - as_bad ("record type is not valid"); + + if (rtype == body) + r = 1; + else if (rtype != prologue) + as_bad ("record type is not valid"); bytes[0] = (UNW_R3 | r); count = output_leb128 (bytes + 1, rlen, 0); (*f) (count + 1, bytes, NULL); @@ -899,7 +914,7 @@ output_P3_format (f, rtype, reg) int reg; { char bytes[2]; - int r; + int r = 0; reg = (reg & 0x7f); switch (rtype) { @@ -949,16 +964,13 @@ output_P3_format (f, rtype, reg) static void -output_P4_format (f, count, imask) +output_P4_format (f, imask, imask_size) vbyte_func f; - int count; - char *imask; + unsigned char *imask; + unsigned long imask_size; { - char *bytes; - bytes = alloca (count + 1); - bytes[0] = UNW_P4; - memcpy (bytes + 1, imask, count); - (*f) (count + 1, bytes, NULL); + imask[0] = UNW_P4; + (*f) (imask_size, imask, NULL); } static void @@ -984,14 +996,12 @@ output_P6_format (f, rtype, rmask) int rmask; { char byte; - int r; - if (rtype == fr_mem) - r = 0; - else - if (rtype == gr_mem) - r = 1; - else - as_bad ("Invalid record type for format P6"); + int r = 0; + + if (rtype == gr_mem) + r = 1; + else if (rtype != fr_mem) + as_bad ("Invalid record type for format P6"); byte = (UNW_P6 | (r << 4) | (rmask & 0x0f)); (*f) (1, &byte, NULL); } @@ -1005,7 +1015,7 @@ output_P7_format (f, rtype, w1, w2) { char bytes[20]; int count = 1; - int r; + int r = 0; count += output_leb128 (bytes + 1, w1, 0); switch (rtype) { @@ -1058,6 +1068,8 @@ output_P7_format (f, rtype, w1, w2) case fpsr_psprel: r = 15; break; + default: + break; } bytes[0] = (UNW_P7 | r); (*f) (count, bytes, NULL); @@ -1070,7 +1082,7 @@ output_P8_format (f, rtype, t) unsigned long t; { char bytes[20]; - int r; + int r = 0; int count = 2; bytes[0] = UNW_P8; switch (rtype) @@ -1132,6 +1144,8 @@ output_P8_format (f, rtype, t) case priunat_when_mem: r = 19; break; + default: + break; } bytes[1] = r; count += output_leb128 (bytes + 2, t, 0); @@ -1171,19 +1185,16 @@ output_B1_format (f, rtype, label) unsigned long label; { char byte; - int r; + int r = 0; if (label > 0x1f) { output_B4_format (f, rtype, label); return; } - if (rtype == label_state) - r = 0; - else - if (rtype == copy_state) - r = 1; - else - as_bad ("Invalid record type for format B1"); + if (rtype == copy_state) + r = 1; + else if (rtype != label_state) + as_bad ("Invalid record type for format B1"); byte = (UNW_B1 | (r << 5) | (label & 0x1f)); (*f) (1, &byte, NULL); @@ -1233,20 +1244,18 @@ output_B4_format (f, rtype, label) unsigned long label; { char bytes[20]; - int r; + int r = 0; int count = 1; if (label <= 0x1f) { output_B1_format (f, rtype, label); return; } - if (rtype == label_state) - r = 0; - else - if (rtype == copy_state) - r = 1; - else - as_bad ("Invalid record type for format B1"); + + if (rtype == copy_state) + r = 1; + else if (rtype != label_state) + as_bad ("Invalid record type for format B1"); bytes[0] = (UNW_B4 | (r << 3)); count += output_leb128 (bytes + 1, label, 0); @@ -1254,101 +1263,94 @@ output_B4_format (f, rtype, label) } static char -format_a_b_reg (a, b, reg) - int a, b; +format_ab_reg (ab, reg) + int ab; int reg; { int ret; - a = (a & 1); - b = (b & 1); + ab = (ab & 3); reg = (reg & 0x1f); - ret = (a << 6) | (a << 5) | reg; + ret = (ab << 5) | reg; return ret; } static void -output_X1_format (f, rtype, a, b, reg, t, w1) +output_X1_format (f, rtype, ab, reg, t, w1) vbyte_func f; unw_record_type rtype; - int a, b, reg; + int ab, reg; unsigned long t; unsigned long w1; { char bytes[20]; - int r; + int r = 0; int count = 2; bytes[0] = UNW_X1; - if (rtype == spill_psprel) - r = 0; - else - if (rtype = spill_sprel) - r = 1; - else - as_bad ("Invalid record type for format X1"); - bytes[1] = ((r << 7) | format_a_b_reg (a, b, reg)); + + if (rtype == spill_sprel) + r = 1; + else if (rtype != spill_psprel) + as_bad ("Invalid record type for format X1"); + bytes[1] = ((r << 7) | format_ab_reg (ab, reg)); count += output_leb128 (bytes + 2, t, 0); count += output_leb128 (bytes + count, w1, 0); (*f) (count, bytes, NULL); } static void -output_X2_format (f, a, b, reg, x, y, treg, t) +output_X2_format (f, ab, reg, x, y, treg, t) vbyte_func f; - int a, b, reg; + int ab, reg; int x, y, treg; unsigned long t; { char bytes[20]; - int r; int count = 3; bytes[0] = UNW_X2; - bytes[1] = (((x & 1) << 7) | format_a_b_reg (a, b, reg)); + bytes[1] = (((x & 1) << 7) | format_ab_reg (ab, reg)); bytes[2] = (((y & 1) << 7) | (treg & 0x7f)); count += output_leb128 (bytes + 3, t, 0); (*f) (count, bytes, NULL); } static void -output_X3_format (f, rtype, qp, a, b, reg, t, w1) +output_X3_format (f, rtype, qp, ab, reg, t, w1) vbyte_func f; unw_record_type rtype; int qp; - int a, b, reg; + int ab, reg; unsigned long t; unsigned long w1; { char bytes[20]; - int r; + int r = 0; int count = 3; - bytes[0] = UNW_X1; - if (rtype == spill_psprel_p) - r = 0; - else - if (rtype = spill_sprel_p) - r = 1; - else - as_bad ("Invalid record type for format X1"); + bytes[0] = UNW_X3; + + if (rtype == spill_sprel_p) + r = 1; + else if (rtype != spill_psprel_p) + as_bad ("Invalid record type for format X3"); bytes[1] = ((r << 7) | (qp & 0x3f)); - bytes[2] = format_a_b_reg (a, b, reg); + bytes[2] = format_ab_reg (ab, reg); count += output_leb128 (bytes + 3, t, 0); count += output_leb128 (bytes + count, w1, 0); (*f) (count, bytes, NULL); } static void -output_X4_format (f, qp, a, b, reg, x, y, treg, t) +output_X4_format (f, qp, ab, reg, x, y, treg, t) vbyte_func f; int qp; - int a, b, reg; + int ab, reg; int x, y, treg; unsigned long t; { char bytes[20]; - int r; int count = 4; - bytes[0] = UNW_X2; + bytes[0] = UNW_X4; bytes[1] = (qp & 0x3f); - bytes[2] = (((x & 1) << 7) | format_a_b_reg (a, b, reg)); + bytes[2] = (((x & 1) << 7) | format_ab_reg (ab, reg)); bytes[3] = (((y & 1) << 7) | (treg & 0x7f)); count += output_leb128 (bytes + 4, t, 0); (*f) (count, bytes, NULL); @@ -1366,13 +1368,6 @@ alloc_record (unw_record_type t) return ptr; } -/* This function frees a record list structure. */ -static void -free_record (unw_rec_list *ptr) -{ - free (ptr); -} - /* This function frees an entire list of record structures. */ void free_list_records (unw_rec_list *first) @@ -1381,6 +1376,11 @@ free_list_records (unw_rec_list *first) for (ptr = first; ptr != NULL; ) { unw_rec_list *tmp = ptr; + + if ((tmp->r.type == prologue || tmp->r.type == prologue_gr) + && tmp->r.record.r.mask.i) + free (tmp->r.record.r.mask.i); + ptr = ptr->next; free (tmp); } @@ -1390,6 +1390,7 @@ static unw_rec_list * output_prologue () { unw_rec_list *ptr = alloc_record (prologue); + memset (&ptr->r.record.r.mask, 0, sizeof (ptr->r.record.r.mask)); return ptr; } @@ -1399,7 +1400,8 @@ output_prologue_gr (saved_mask, reg) unsigned int reg; { unw_rec_list *ptr = alloc_record (prologue_gr); - ptr->r.record.r.mask = saved_mask; + memset (&ptr->r.record.r.mask, 0, sizeof (ptr->r.record.r.mask)); + ptr->r.record.r.grmask = saved_mask; ptr->r.record.r.grsave = reg; return ptr; } @@ -1441,7 +1443,7 @@ output_psp_sprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (psp_sprel); - ptr->r.record.p.spoff = offset; + ptr->r.record.p.spoff = offset/4; return ptr; } @@ -1475,7 +1477,7 @@ output_rp_psprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (rp_psprel); - ptr->r.record.p.pspoff = offset; + ptr->r.record.p.pspoff = offset/4; return ptr; } @@ -1484,7 +1486,7 @@ output_rp_sprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (rp_sprel); - ptr->r.record.p.spoff = offset; + ptr->r.record.p.spoff = offset/4; return ptr; } @@ -1509,7 +1511,7 @@ output_pfs_psprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (pfs_psprel); - ptr->r.record.p.pspoff = offset; + ptr->r.record.p.pspoff = offset/4; return ptr; } @@ -1518,7 +1520,7 @@ output_pfs_sprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (pfs_sprel); - ptr->r.record.p.spoff = offset; + ptr->r.record.p.spoff = offset/4; return ptr; } @@ -1543,7 +1545,7 @@ output_preds_psprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (preds_psprel); - ptr->r.record.p.pspoff = offset; + ptr->r.record.p.pspoff = offset/4; return ptr; } @@ -1552,7 +1554,7 @@ output_preds_sprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (preds_sprel); - ptr->r.record.p.spoff = offset; + ptr->r.record.p.spoff = offset/4; return ptr; } @@ -1620,18 +1622,7 @@ output_spill_base (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (spill_base); - ptr->r.record.p.pspoff = offset; - return ptr; -} - -static unw_rec_list * -output_spill_mask () -{ -/* TODO - how to implement this record.... I guess GAS could fill in the - correct fields from the record list and construct one of these - after the symbols have been resolved and we know how big the - region is. This could be done in fixup_unw_records. */ - unw_rec_list *ptr = NULL; + ptr->r.record.p.pspoff = offset/4; return ptr; } @@ -1656,7 +1647,7 @@ output_unat_psprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (unat_psprel); - ptr->r.record.p.pspoff = offset; + ptr->r.record.p.pspoff = offset/4; return ptr; } @@ -1665,7 +1656,7 @@ output_unat_sprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (unat_sprel); - ptr->r.record.p.spoff = offset; + ptr->r.record.p.spoff = offset/4; return ptr; } @@ -1690,7 +1681,7 @@ output_lc_psprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (lc_psprel); - ptr->r.record.p.pspoff = offset; + ptr->r.record.p.pspoff = offset/4; return ptr; } @@ -1699,7 +1690,7 @@ output_lc_sprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (lc_sprel); - ptr->r.record.p.spoff = offset; + ptr->r.record.p.spoff = offset/4; return ptr; } @@ -1724,7 +1715,7 @@ output_fpsr_psprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (fpsr_psprel); - ptr->r.record.p.pspoff = offset; + ptr->r.record.p.pspoff = offset/4; return ptr; } @@ -1733,7 +1724,7 @@ output_fpsr_sprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (fpsr_sprel); - ptr->r.record.p.spoff = offset; + ptr->r.record.p.spoff = offset/4; return ptr; } @@ -1765,7 +1756,7 @@ output_priunat_psprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (priunat_psprel); - ptr->r.record.p.pspoff = offset; + ptr->r.record.p.pspoff = offset/4; return ptr; } @@ -1774,7 +1765,7 @@ output_priunat_sprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (priunat_sprel); - ptr->r.record.p.spoff = offset; + ptr->r.record.p.spoff = offset/4; return ptr; } @@ -1799,7 +1790,7 @@ output_bsp_psprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (bsp_psprel); - ptr->r.record.p.pspoff = offset; + ptr->r.record.p.pspoff = offset/4; return ptr; } @@ -1808,7 +1799,7 @@ output_bsp_sprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (bsp_sprel); - ptr->r.record.p.spoff = offset; + ptr->r.record.p.spoff = offset/4; return ptr; } @@ -1833,7 +1824,7 @@ output_bspstore_psprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (bspstore_psprel); - ptr->r.record.p.pspoff = offset; + ptr->r.record.p.pspoff = offset/4; return ptr; } @@ -1842,7 +1833,7 @@ output_bspstore_sprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (bspstore_sprel); - ptr->r.record.p.spoff = offset; + ptr->r.record.p.spoff = offset/4; return ptr; } @@ -1867,7 +1858,7 @@ output_rnat_psprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (rnat_psprel); - ptr->r.record.p.pspoff = offset; + ptr->r.record.p.pspoff = offset/4; return ptr; } @@ -1876,86 +1867,110 @@ output_rnat_sprel (offset) unsigned int offset; { unw_rec_list *ptr = alloc_record (rnat_sprel); - ptr->r.record.p.spoff = offset; + ptr->r.record.p.spoff = offset/4; + return ptr; +} + +static unw_rec_list * +output_unwabi (abi, context) + unsigned long abi; + unsigned long context; +{ + unw_rec_list *ptr = alloc_record (unwabi); + ptr->r.record.p.abi = abi; + ptr->r.record.p.context = context; return ptr; } static unw_rec_list * -output_epilogue () +output_epilogue (unsigned long ecount) { - unw_rec_list *ptr = NULL; + unw_rec_list *ptr = alloc_record (epilogue); + ptr->r.record.b.ecount = ecount; return ptr; } static unw_rec_list * -output_label_state () +output_label_state (unsigned long label) { - unw_rec_list *ptr = NULL; + unw_rec_list *ptr = alloc_record (label_state); + ptr->r.record.b.label = label; return ptr; } static unw_rec_list * -output_copy_state () +output_copy_state (unsigned long label) { - unw_rec_list *ptr = NULL; + unw_rec_list *ptr = alloc_record (copy_state); + ptr->r.record.b.label = label; return ptr; } static unw_rec_list * -output_spill_psprel (reg, offset) +output_spill_psprel (ab, reg, offset) + unsigned int ab; unsigned int reg; unsigned int offset; { unw_rec_list *ptr = alloc_record (spill_psprel); + ptr->r.record.x.ab = ab; ptr->r.record.x.reg = reg; - ptr->r.record.x.pspoff = offset; + ptr->r.record.x.pspoff = offset/4; return ptr; } static unw_rec_list * -output_spill_sprel (reg, offset) +output_spill_sprel (ab, reg, offset) + unsigned int ab; unsigned int reg; unsigned int offset; { unw_rec_list *ptr = alloc_record (spill_sprel); + ptr->r.record.x.ab = ab; ptr->r.record.x.reg = reg; - ptr->r.record.x.spoff = offset; + ptr->r.record.x.spoff = offset/4; return ptr; } static unw_rec_list * -output_spill_psprel_p (reg, offset, predicate) +output_spill_psprel_p (ab, reg, offset, predicate) + unsigned int ab; unsigned int reg; unsigned int offset; unsigned int predicate; { unw_rec_list *ptr = alloc_record (spill_psprel_p); + ptr->r.record.x.ab = ab; ptr->r.record.x.reg = reg; - ptr->r.record.x.pspoff = offset; + ptr->r.record.x.pspoff = offset/4; ptr->r.record.x.qp = predicate; return ptr; } static unw_rec_list * -output_spill_sprel_p (reg, offset, predicate) +output_spill_sprel_p (ab, reg, offset, predicate) + unsigned int ab; unsigned int reg; unsigned int offset; unsigned int predicate; { unw_rec_list *ptr = alloc_record (spill_sprel_p); + ptr->r.record.x.ab = ab; ptr->r.record.x.reg = reg; - ptr->r.record.x.spoff = offset; + ptr->r.record.x.spoff = offset/4; ptr->r.record.x.qp = predicate; return ptr; } static unw_rec_list * -output_spill_reg (reg, targ_reg, xy) +output_spill_reg (ab, reg, targ_reg, xy) + unsigned int ab; unsigned int reg; unsigned int targ_reg; unsigned int xy; { unw_rec_list *ptr = alloc_record (spill_reg); + ptr->r.record.x.ab = ab; ptr->r.record.x.reg = reg; ptr->r.record.x.treg = targ_reg; ptr->r.record.x.xy = xy; @@ -1963,13 +1978,15 @@ output_spill_reg (reg, targ_reg, xy) } static unw_rec_list * -output_spill_reg_p (reg, targ_reg, xy, predicate) +output_spill_reg_p (ab, reg, targ_reg, xy, predicate) + unsigned int ab; unsigned int reg; unsigned int targ_reg; unsigned int xy; unsigned int predicate; { unw_rec_list *ptr = alloc_record (spill_reg_p); + ptr->r.record.x.ab = ab; ptr->r.record.x.reg = reg; ptr->r.record.x.treg = targ_reg; ptr->r.record.x.xy = xy; @@ -1984,16 +2001,52 @@ process_one_record (ptr, f) unw_rec_list *ptr; vbyte_func f; { + unsigned long fr_mask, gr_mask; + switch (ptr->r.type) { + case gr_mem: + case fr_mem: + case br_mem: + case frgr_mem: + /* these are taken care of by prologue/prologue_gr */ + break; + + case prologue_gr: case prologue: + if (ptr->r.type == prologue_gr) + output_R2_format (f, ptr->r.record.r.grmask, + ptr->r.record.r.grsave, ptr->r.record.r.rlen); + else + output_R1_format (f, ptr->r.type, ptr->r.record.r.rlen); + + /* output descriptor(s) for union of register spills (if any): */ + gr_mask = ptr->r.record.r.mask.gr_mem; + fr_mask = ptr->r.record.r.mask.fr_mem; + if (fr_mask) + { + if ((fr_mask & ~0xfUL) == 0) + output_P6_format (f, fr_mem, fr_mask); + else + { + output_P5_format (f, gr_mask, fr_mask); + gr_mask = 0; + } + } + if (gr_mask) + output_P6_format (f, gr_mem, gr_mask); + if (ptr->r.record.r.mask.br_mem) + output_P1_format (f, ptr->r.record.r.mask.br_mem); + + /* output imask descriptor if necessary: */ + if (ptr->r.record.r.mask.i) + output_P4_format (f, ptr->r.record.r.mask.i, + ptr->r.record.r.imask_size); + break; + case body: output_R1_format (f, ptr->r.type, ptr->r.record.r.rlen); break; - case prologue_gr: - output_R2_format (f, ptr->r.record.r.mask, - ptr->r.record.r.grsave, ptr->r.record.r.rlen); - break; case mem_stack_f: case mem_stack_v: output_P7_format (f, ptr->r.type, ptr->r.record.p.t, @@ -2047,19 +2100,9 @@ process_one_record (ptr, f) case rnat_sprel: output_P8_format (f, ptr->r.type, ptr->r.record.p.spoff); break; - case fr_mem: - case gr_mem: - output_P6_format (f, ptr->r.type, ptr->r.record.p.rmask); - break; - case frgr_mem: - output_P5_format (f, ptr->r.record.p.grmask, ptr->r.record.p.frmask); - break; case gr_gr: output_P9_format (f, ptr->r.record.p.grmask, ptr->r.record.p.gr); break; - case br_mem: - output_P1_format (f, ptr->r.record.p.brmask); - break; case br_gr: output_P2_format (f, ptr->r.record.p.brmask, ptr->r.record.p.gr); break; @@ -2079,22 +2122,46 @@ process_one_record (ptr, f) case rnat_psprel: output_P8_format (f, ptr->r.type, ptr->r.record.p.pspoff); break; + case unwabi: + output_P10_format (f, ptr->r.record.p.abi, ptr->r.record.p.context); + break; case epilogue: - as_bad ("epilogue record unimplemented."); + output_B3_format (f, ptr->r.record.b.ecount, ptr->r.record.b.t); break; case label_state: - as_bad ("label_state record unimplemented."); - break; case copy_state: - as_bad ("copy_state record unimplemented."); + output_B4_format (f, ptr->r.type, ptr->r.record.b.label); break; case spill_psprel: + output_X1_format (f, ptr->r.type, ptr->r.record.x.ab, + ptr->r.record.x.reg, ptr->r.record.x.t, + ptr->r.record.x.pspoff); + break; case spill_sprel: + output_X1_format (f, ptr->r.type, ptr->r.record.x.ab, + ptr->r.record.x.reg, ptr->r.record.x.t, + ptr->r.record.x.spoff); + break; case spill_reg: + output_X2_format (f, ptr->r.record.x.ab, ptr->r.record.x.reg, + ptr->r.record.x.xy >> 1, ptr->r.record.x.xy, + ptr->r.record.x.treg, ptr->r.record.x.t); + break; case spill_psprel_p: + output_X3_format (f, ptr->r.type, ptr->r.record.x.qp, + ptr->r.record.x.ab, ptr->r.record.x.reg, + ptr->r.record.x.t, ptr->r.record.x.pspoff); + break; case spill_sprel_p: + output_X3_format (f, ptr->r.type, ptr->r.record.x.qp, + ptr->r.record.x.ab, ptr->r.record.x.reg, + ptr->r.record.x.t, ptr->r.record.x.spoff); + break; case spill_reg_p: - as_bad ("spill_* record unimplemented."); + output_X4_format (f, ptr->r.record.x.qp, ptr->r.record.x.ab, + ptr->r.record.x.reg, ptr->r.record.x.xy >> 1, + ptr->r.record.x.xy, ptr->r.record.x.treg, + ptr->r.record.x.t); break; default: as_bad ("record_type_not_valid"); @@ -2124,6 +2191,82 @@ calc_record_size (list) return vbyte_count; } +/* Update IMASK bitmask to reflect the fact that one or more registers + of type TYPE are saved starting at instruction with index T. If N + bits are set in REGMASK, it is assumed that instructions T through + T+N-1 save these registers. + + TYPE values: + 0: no save + 1: instruction saves next fp reg + 2: instruction saves next general reg + 3: instruction saves next branch reg */ +static void +set_imask (region, regmask, t, type) + unw_rec_list *region; + unsigned long regmask; + unsigned long t; + unsigned int type; +{ + unsigned char *imask; + unsigned long imask_size; + unsigned int i; + int pos; + + imask = region->r.record.r.mask.i; + imask_size = region->r.record.r.imask_size; + if (!imask) + { + imask_size = (region->r.record.r.rlen*2 + 7)/8 + 1; + imask = xmalloc (imask_size); + memset (imask, 0, imask_size); + + region->r.record.r.imask_size = imask_size; + region->r.record.r.mask.i = imask; + } + + i = (t/4) + 1; + pos = 2*(3 - t%4); + while (regmask) + { + if (i >= imask_size) + { + as_bad ("Ignoring attempt to spill beyond end of region"); + return; + } + + imask[i] |= (type & 0x3) << pos; + + regmask &= (regmask - 1); + pos -= 2; + if (pos < 0) + { + pos = 0; + ++i; + } + } +} + +static int +count_bits (unsigned long mask) +{ + int n = 0; + + while (mask) + { + mask &= mask - 1; + ++n; + } + return n; +} + +unsigned long +slot_index (unsigned long slot_addr, unsigned long first_addr) +{ + return (3*((slot_addr >> 4) - (first_addr >> 4)) + + ((slot_addr & 0x3) - (first_addr & 0x3))); +} + /* Given a complete record list, process any records which have unresolved fields, (ie length counts for a prologue). After this has been run, all neccessary information should be available @@ -2132,12 +2275,14 @@ static void fixup_unw_records (list) unw_rec_list *list; { - unw_rec_list *ptr; - unsigned long first_addr = 0; + unw_rec_list *ptr, *region = 0; + unsigned long first_addr = 0, rlen = 0, t; + for (ptr = list; ptr; ptr = ptr->next) { if (ptr->slot_number == SLOT_NUM_NOT_SET) as_bad (" Insn slot not set in unwind record."); + t = slot_index (ptr->slot_number, first_addr); switch (ptr->r.type) { case prologue: @@ -2145,24 +2290,62 @@ fixup_unw_records (list) case body: { unw_rec_list *last; - int size; + int size, dir_len = 0; unsigned long last_addr; + first_addr = ptr->slot_number; ptr->slot_number = 0; /* Find either the next body/prologue start, or the end of the list, and determine the size of the region. */ - for (last = ptr; last->next != NULL; last = last->next) - if (last->next->r.type == prologue - || last->next->r.type == prologue_gr - || last->next->r.type == body) + last_addr = unwind.next_slot_number; + for (last = ptr->next; last != NULL; last = last->next) + if (last->r.type == prologue || last->r.type == prologue_gr + || last->r.type == body) + { + last_addr = last->slot_number; + break; + } + else if (!last->next) { + /* In the absence of an explicit .body directive, + the prologue ends after the last instruction + covered by an unwind directive. */ + if (ptr->r.type != body) + { + last_addr = last->slot_number; + switch (last->r.type) + { + case frgr_mem: + dir_len = (count_bits (last->r.record.p.frmask) + + count_bits (last->r.record.p.grmask)); + break; + case fr_mem: + case gr_mem: + dir_len += count_bits (last->r.record.p.rmask); + break; + case br_mem: + case br_gr: + dir_len += count_bits (last->r.record.p.brmask); + break; + case gr_gr: + dir_len += count_bits (last->r.record.p.grmask); + break; + default: + dir_len = 1; + break; + } + } break; } - last_addr = last->slot_number; - size = ((last_addr - first_addr) / 16) * 3 + last_addr % 4; - ptr->r.record.r.rlen = size; + size = slot_index (last_addr, first_addr) + dir_len; + rlen = ptr->r.record.r.rlen = size; + region = ptr; break; } + case epilogue: + ptr->r.record.b.t = rlen - 1 - t; + break; + case mem_stack_f: case mem_stack_v: case rp_when: @@ -2176,14 +2359,76 @@ fixup_unw_records (list) case bsp_when: case bspstore_when: case rnat_when: - { - /* All the time fields. */ - int x = ptr->slot_number - first_addr; - ptr->r.record.p.t = (x / 16) * 3 + (ptr->slot_number % 4); - break; - } - /* TODO. We also need to combine all the register masks into a single - record. (Ie, all the save.g save.gf, save.f and save.br's) */ + ptr->r.record.p.t = t; + break; + + case spill_reg: + case spill_sprel: + case spill_psprel: + case spill_reg_p: + case spill_sprel_p: + case spill_psprel_p: + ptr->r.record.x.t = t; + break; + + case frgr_mem: + if (!region) + { + as_bad ("frgr_mem record before region record!\n"); + return; + } + region->r.record.r.mask.fr_mem |= ptr->r.record.p.frmask; + region->r.record.r.mask.gr_mem |= ptr->r.record.p.grmask; + set_imask (region, ptr->r.record.p.frmask, t, 1); + set_imask (region, ptr->r.record.p.grmask, t, 2); + break; + case fr_mem: + if (!region) + { + as_bad ("fr_mem record before region record!\n"); + return; + } + region->r.record.r.mask.fr_mem |= ptr->r.record.p.rmask; + set_imask (region, ptr->r.record.p.rmask, t, 1); + break; + case gr_mem: + if (!region) + { + as_bad ("gr_mem record before region record!\n"); + return; + } + region->r.record.r.mask.gr_mem |= ptr->r.record.p.rmask; + set_imask (region, ptr->r.record.p.rmask, t, 2); + break; + case br_mem: + if (!region) + { + as_bad ("br_mem record before region record!\n"); + return; + } + region->r.record.r.mask.br_mem |= ptr->r.record.p.brmask; + set_imask (region, ptr->r.record.p.brmask, t, 3); + break; + + case gr_gr: + if (!region) + { + as_bad ("gr_gr record before region record!\n"); + return; + } + set_imask (region, ptr->r.record.p.grmask, t, 2); + break; + case br_gr: + if (!region) + { + as_bad ("br_gr record before region record!\n"); + return; + } + set_imask (region, ptr->r.record.p.brmask, t, 3); + break; + + default: + break; } } } @@ -2224,6 +2469,91 @@ output_unw_records (list, ptr) return size + extra + 16; } +static int +convert_expr_to_ab_reg (e, ab, regp) + expressionS *e; + unsigned int *ab; + unsigned int *regp; +{ + unsigned int reg; + + if (e->X_op != O_register) + return 0; + + reg = e->X_add_number; + if (reg >= REG_GR + 4 && reg <= REG_GR + 7) + { + *ab = 0; + *regp = reg - REG_GR; + } + else if ((reg >= REG_FR + 2 && reg <= REG_FR + 5) + || (reg >= REG_FR + 16 && reg <= REG_FR + 31)) + { + *ab = 1; + *regp = reg - REG_FR; + } + else if (reg >= REG_BR + 1 && reg <= REG_BR + 5) + { + *ab = 2; + *regp = reg - REG_BR; + } + else + { + *ab = 3; + switch (reg) + { + case REG_PR: *regp = 0; break; + case REG_PSP: *regp = 1; break; + case REG_PRIUNAT: *regp = 2; break; + case REG_BR + 0: *regp = 3; break; + case REG_AR + AR_BSP: *regp = 4; break; + case REG_AR + AR_BSPSTORE: *regp = 5; break; + case REG_AR + AR_RNAT: *regp = 6; break; + case REG_AR + AR_UNAT: *regp = 7; break; + case REG_AR + AR_FPSR: *regp = 8; break; + case REG_AR + AR_PFS: *regp = 9; break; + case REG_AR + AR_LC: *regp = 10; break; + + default: + return 0; + } + } + return 1; +} + +static int +convert_expr_to_xy_reg (e, xy, regp) + expressionS *e; + unsigned int *xy; + unsigned int *regp; +{ + unsigned int reg; + + if (e->X_op != O_register) + return 0; + + reg = e->X_add_number; + + if (reg >= REG_GR && reg <= REG_GR + 127) + { + *xy = 0; + *regp = reg - REG_GR; + } + else if (reg >= REG_FR && reg <= REG_FR + 127) + { + *xy = 1; + *regp = reg - REG_FR; + } + else if (reg >= REG_BR && reg <= REG_BR + 7) + { + *xy = 2; + *regp = reg - REG_BR; + } + else + return -1; + return 1; +} + static void dot_radix (dummy) int dummy; @@ -2253,15 +2583,15 @@ static void add_unwind_entry (ptr) unw_rec_list *ptr; { - if (unwind_tail) - unwind_tail->next = ptr; + if (unwind.tail) + unwind.tail->next = ptr; else - unwind_list = ptr; - unwind_tail = ptr; + unwind.list = ptr; + unwind.tail = ptr; /* The current entry can in fact be a chain of unwind entries. */ - if (current_unwind_entry == NULL) - current_unwind_entry = ptr; + if (unwind.current_entry == NULL) + unwind.current_entry = ptr; } static void @@ -2269,21 +2599,63 @@ dot_fframe (dummy) int dummy; { expressionS e; + parse_operand (&e); if (e.X_op != O_constant) as_bad ("Operand to .fframe must be a constant"); else + add_unwind_entry (output_mem_stack_f (e.X_add_number)); +} + +static void +dot_vframe (dummy) + int dummy; +{ + expressionS e; + unsigned reg; + + parse_operand (&e); + reg = e.X_add_number - REG_GR; + if (e.X_op == O_register && reg < 128) { - add_unwind_entry (output_mem_stack_f (e.X_add_number)); + add_unwind_entry (output_mem_stack_v ()); + add_unwind_entry (output_psp_gr (reg)); } + else + as_bad ("First operand to .vframe must be a general register"); } static void -dot_vframe (dummy) +dot_vframesp (dummy) + int dummy; +{ + expressionS e; + + parse_operand (&e); + if (e.X_op == O_constant) + { + add_unwind_entry (output_mem_stack_v ()); + add_unwind_entry (output_psp_sprel (e.X_add_number)); + } + else + as_bad ("First operand to .vframesp must be a general register"); +} + +static void +dot_vframepsp (dummy) int dummy; { - discard_rest_of_line (); + expressionS e; + + parse_operand (&e); + if (e.X_op == O_constant) + { + add_unwind_entry (output_mem_stack_v ()); + add_unwind_entry (output_psp_sprel (e.X_add_number)); + } + else + as_bad ("First operand to .vframepsp must be a general register"); } static void @@ -2299,65 +2671,142 @@ dot_save (dummy) as_bad ("No second operand to .save"); sep = parse_operand (&e2); - reg1 = e1.X_add_number - REG_AR; + reg1 = e1.X_add_number; reg2 = e2.X_add_number - REG_GR; /* Make sure its a valid ar.xxx reg, OR its br0, aka 'rp'. */ - if (e1.X_op == O_register - && ((reg1 >=0 && reg1 < 128) || reg1 == REG_BR - REG_AR)) + if (e1.X_op == O_register) { if (e2.X_op == O_register && reg2 >=0 && reg2 < 128) { switch (reg1) { - case 17: /* ar.bsp */ + case REG_AR + AR_BSP: add_unwind_entry (output_bsp_when ()); add_unwind_entry (output_bsp_gr (reg2)); break; - case 18: /* ar.bspstore */ + case REG_AR + AR_BSPSTORE: add_unwind_entry (output_bspstore_when ()); add_unwind_entry (output_bspstore_gr (reg2)); break; - case 19: /* ar.rnat */ + case REG_AR + AR_RNAT: add_unwind_entry (output_rnat_when ()); add_unwind_entry (output_rnat_gr (reg2)); break; - case 36: /* ar.unat */ + case REG_AR+AR_UNAT: add_unwind_entry (output_unat_when ()); add_unwind_entry (output_unat_gr (reg2)); break; - case 40: /* ar.fpsr */ + case REG_AR+AR_FPSR: add_unwind_entry (output_fpsr_when ()); add_unwind_entry (output_fpsr_gr (reg2)); break; - case 64: /* ar.pfs */ + case REG_AR+AR_PFS: add_unwind_entry (output_pfs_when ()); add_unwind_entry (output_pfs_gr (reg2)); break; - case 65: /* ar.lc */ + case REG_AR+AR_LC: add_unwind_entry (output_lc_when ()); add_unwind_entry (output_lc_gr (reg2)); break; - case REG_BR - REG_AR: /* rp */ + case REG_BR: add_unwind_entry (output_rp_when ()); add_unwind_entry (output_rp_gr (reg2)); break; + case REG_PR: + add_unwind_entry (output_preds_when ()); + add_unwind_entry (output_preds_gr (reg2)); + break; + case REG_PRIUNAT: + add_unwind_entry (output_priunat_when_gr ()); + add_unwind_entry (output_priunat_gr (reg2)); + break; default: - as_bad ("first operand is unknown application register"); + as_bad ("First operand not a valid register"); } } else as_bad (" Second operand not a valid register"); } else - as_bad ("First operand not a valid register"); + as_bad ("First operand not a register"); } static void dot_restore (dummy) int dummy; { - discard_rest_of_line (); + expressionS e1, e2; + unsigned long ecount = 0; + int sep; + + sep = parse_operand (&e1); + if (e1.X_op != O_register || e1.X_add_number != REG_GR + 12) + { + as_bad ("First operand to .restore must be stack pointer (sp)"); + return; + } + + if (sep == ',') + { + parse_operand (&e2); + if (e1.X_op != O_constant) + { + as_bad ("Second operand to .restore must be constant"); + return; + } + ecount = e1.X_op; + } + add_unwind_entry (output_epilogue (ecount)); +} + +static void +dot_restorereg (dummy) + int dummy; +{ + unsigned int ab, reg; + expressionS e; + + parse_operand (&e); + + if (!convert_expr_to_ab_reg (&e, &ab, ®)) + { + as_bad ("First operand to .restorereg must be a preserved register"); + return; + } + add_unwind_entry (output_spill_reg (ab, reg, 0, 0)); +} + +static void +dot_restorereg_p (dummy) + int dummy; +{ + unsigned int qp, ab, reg; + expressionS e1, e2; + int sep; + + sep = parse_operand (&e1); + if (sep != ',') + { + as_bad ("No second operand to .restorereg.p"); + return; + } + + parse_operand (&e2); + + qp = e1.X_add_number - REG_P; + if (e1.X_op != O_register || qp > 63) + { + as_bad ("First operand to .restorereg.p must be a predicate"); + return; + } + + if (!convert_expr_to_ab_reg (&e2, &ab, ®)) + { + as_bad ("Second operand to .restorereg.p must be a preserved register"); + return; + } + add_unwind_entry (output_spill_reg_p (ab, reg, 0, 0, qp)); } static int @@ -2365,25 +2814,21 @@ generate_unwind_image () { int size; unsigned char *unw_rec; - int x; /* Generate the unwind record. */ - size = output_unw_records (unwind_list, &unw_rec); - if (size % 4 != 0) - as_bad ("Unwind record is ont a multiple of 4 bytes."); + size = output_unw_records (unwind.list, &unw_rec); + if (size % 8 != 0) + as_bad ("Unwind record is not a multiple of 8 bytes."); /* If there are unwind records, switch sections, and output the info. */ if (size != 0) { - int x; unsigned char *where; - unsigned char *personality; expressionS exp; - char *save; set_section ((char *) special_section_name[SPECIAL_SECTION_UNWIND_INFO]); /* Set expression which points to start of unwind descriptor area. */ - unwind_info = expr_build_dot (); + unwind.info = expr_build_dot (); where = (unsigned char *)frag_more (size); @@ -2394,20 +2839,20 @@ generate_unwind_image () data is already in the correct byte order. */ memcpy (where, unw_rec, size); /* Add the personality address to the image. */ - if (personality_routine != 0) + if (unwind.personality_routine != 0) { exp.X_op = O_symbol; - exp.X_add_symbol = personality_routine; + exp.X_add_symbol = unwind.personality_routine; exp.X_add_number = 0; fix_new_exp (frag_now, frag_now_fix () - 8, 8, &exp, 0, BFD_RELOC_IA64_LTOFF_FPTR64LSB); - personality_routine = 0; + unwind.personality_routine = 0; } obj_elf_previous (0); } - free_list_records (unwind_list); - unwind_list = unwind_tail = current_unwind_entry = NULL; + free_list_records (unwind.list); + unwind.list = unwind.tail = unwind.current_entry = NULL; return size; } @@ -2417,25 +2862,34 @@ dot_handlerdata (dummy) int dummy; { generate_unwind_image (); + demand_empty_rest_of_line (); } static void dot_unwentry (dummy) int dummy; { - discard_rest_of_line (); + demand_empty_rest_of_line (); } static void dot_altrp (dummy) int dummy; { - discard_rest_of_line (); + expressionS e; + unsigned reg; + + parse_operand (&e); + reg = e.X_add_number - REG_BR; + if (e.X_op == O_register && reg < 8) + add_unwind_entry (output_rp_br (reg)); + else + as_bad ("First operand not a valid branch register"); } static void -dot_savesp (dummy) - int dummy; +dot_savemem (psprel) + int psprel; { expressionS e1, e2; int sep; @@ -2443,72 +2897,88 @@ dot_savesp (dummy) sep = parse_operand (&e1); if (sep != ',') - as_bad ("No second operand to .savesp"); + as_bad ("No second operand to .save%ssp", psprel ? "p" : ""); sep = parse_operand (&e2); - reg1 = e1.X_add_number - REG_AR; + reg1 = e1.X_add_number; val = e2.X_add_number; /* Make sure its a valid ar.xxx reg, OR its br0, aka 'rp'. */ - if (e1.X_op == O_register - && ((reg1 >=0 && reg1 < 128) || reg1 == REG_BR - REG_AR || reg1 == REG_PR - REG_AR)) + if (e1.X_op == O_register) { if (e2.X_op == O_constant) { switch (reg1) { - case 17: /* ar.bsp */ + case REG_AR + AR_BSP: add_unwind_entry (output_bsp_when ()); - add_unwind_entry (output_bsp_sprel (val)); + add_unwind_entry ((psprel + ? output_bsp_psprel + : output_bsp_sprel) (val)); break; - case 18: /* ar.bspstore */ + case REG_AR + AR_BSPSTORE: add_unwind_entry (output_bspstore_when ()); - add_unwind_entry (output_bspstore_sprel (val)); + add_unwind_entry ((psprel + ? output_bspstore_psprel + : output_bspstore_sprel) (val)); break; - case 19: /* ar.rnat */ + case REG_AR + AR_RNAT: add_unwind_entry (output_rnat_when ()); - add_unwind_entry (output_rnat_sprel (val)); + add_unwind_entry ((psprel + ? output_rnat_psprel + : output_rnat_sprel) (val)); break; - case 36: /* ar.unat */ + case REG_AR + AR_UNAT: add_unwind_entry (output_unat_when ()); - add_unwind_entry (output_unat_sprel (val)); + add_unwind_entry ((psprel + ? output_unat_psprel + : output_unat_sprel) (val)); break; - case 40: /* ar.fpsr */ + case REG_AR + AR_FPSR: add_unwind_entry (output_fpsr_when ()); - add_unwind_entry (output_fpsr_sprel (val)); + add_unwind_entry ((psprel + ? output_fpsr_psprel + : output_fpsr_sprel) (val)); break; - case 64: /* ar.pfs */ + case REG_AR + AR_PFS: add_unwind_entry (output_pfs_when ()); - add_unwind_entry (output_pfs_sprel (val)); + add_unwind_entry ((psprel + ? output_pfs_psprel + : output_pfs_sprel) (val)); break; - case 65: /* ar.lc */ + case REG_AR + AR_LC: add_unwind_entry (output_lc_when ()); - add_unwind_entry (output_lc_sprel (val)); + add_unwind_entry ((psprel + ? output_lc_psprel + : output_lc_sprel) (val)); break; - case REG_BR - REG_AR: /* rp */ + case REG_BR: add_unwind_entry (output_rp_when ()); - add_unwind_entry (output_rp_sprel (val)); + add_unwind_entry ((psprel + ? output_rp_psprel + : output_rp_sprel) (val)); break; - case REG_PR - REG_AR: /* Predicate registers. */ + case REG_PR: add_unwind_entry (output_preds_when ()); - add_unwind_entry (output_preds_sprel (val)); + add_unwind_entry ((psprel + ? output_preds_psprel + : output_preds_sprel) (val)); + break; + case REG_PRIUNAT: + add_unwind_entry (output_priunat_when_mem ()); + add_unwind_entry ((psprel + ? output_priunat_psprel + : output_priunat_sprel) (val)); break; default: - as_bad ("first operand is unknown application register"); + as_bad ("First operand not a valid register"); } } else as_bad (" Second operand not a valid constant"); } else - as_bad ("First operand not a valid register"); -} - -static void -dot_savepsp (dummy) - int dummy; -{ - discard_rest_of_line (); + as_bad ("First operand not a register"); } static void @@ -2543,34 +3013,49 @@ static void dot_savef (dummy) int dummy; { - expressionS e1, e2; + expressionS e1; int sep; sep = parse_operand (&e1); if (e1.X_op != O_constant) as_bad ("Operand to .save.f must be a constant."); else - { - int frmask = e1.X_add_number; - add_unwind_entry (output_fr_mem (e1.X_add_number)); - } + add_unwind_entry (output_fr_mem (e1.X_add_number)); } static void dot_saveb (dummy) int dummy; { - expressionS e1; - int sep; + expressionS e1, e2; + unsigned int reg; + unsigned char sep; + int brmask; + sep = parse_operand (&e1); - if (e1.X_op != O_constant) - as_bad ("Operand to .save.b must be a constant."); - else { - int brmask = e1.X_add_number; - add_unwind_entry (output_br_mem (brmask)); + as_bad ("First operand to .save.b must be a constant."); + return; + } + brmask = e1.X_add_number; + + if (sep == ',') + { + sep = parse_operand (&e2); + reg = e2.X_add_number - REG_GR; + if (e2.X_op != O_register || reg > 127) + { + as_bad ("Second operand to .save.b must be a general register."); + return; + } + add_unwind_entry (output_br_gr (brmask, e2.X_add_number)); } + else + add_unwind_entry (output_br_mem (brmask)); + + if (!is_end_of_line[sep] && !is_it_end_of_statement ()) + ignore_rest_of_line (); } static void @@ -2598,21 +3083,244 @@ dot_spill (dummy) int dummy; { expressionS e; - parse_operand (&e); + unsigned char sep; + + sep = parse_operand (&e); + if (!is_end_of_line[sep] && !is_it_end_of_statement ()) + ignore_rest_of_line (); if (e.X_op != O_constant) as_bad ("Operand to .spill must be a constant"); else + add_unwind_entry (output_spill_base (e.X_add_number)); +} + +static void +dot_spillreg (dummy) + int dummy; +{ + int sep, ab, xy, reg, treg; + expressionS e1, e2; + + sep = parse_operand (&e1); + if (sep != ',') + { + as_bad ("No second operand to .spillreg"); + return; + } + + parse_operand (&e2); + + if (!convert_expr_to_ab_reg (&e1, &ab, ®)) + { + as_bad ("First operand to .spillreg must be a preserved register"); + return; + } + + if (!convert_expr_to_xy_reg (&e2, &xy, &treg)) + { + as_bad ("Second operand to .spillreg must be a register"); + return; + } + + add_unwind_entry (output_spill_reg (ab, reg, treg, xy)); +} + +static void +dot_spillmem (psprel) + int psprel; +{ + expressionS e1, e2; + int sep, ab, reg; + + sep = parse_operand (&e1); + if (sep != ',') + { + as_bad ("Second operand missing"); + return; + } + + parse_operand (&e2); + + if (!convert_expr_to_ab_reg (&e1, &ab, ®)) + { + as_bad ("First operand to .spill%s must be a preserved register", + psprel ? "psp" : "sp"); + return; + } + + if (e2.X_op != O_constant) + { + as_bad ("Second operand to .spill%s must be a constant", + psprel ? "psp" : "sp"); + return; + } + + if (psprel) + add_unwind_entry (output_spill_psprel (ab, reg, e2.X_add_number)); + else + add_unwind_entry (output_spill_sprel (ab, reg, e2.X_add_number)); +} + +static void +dot_spillreg_p (dummy) + int dummy; +{ + int sep, ab, xy, reg, treg; + expressionS e1, e2, e3; + unsigned int qp; + + sep = parse_operand (&e1); + if (sep != ',') + { + as_bad ("No second and third operand to .spillreg.p"); + return; + } + + sep = parse_operand (&e2); + if (sep != ',') + { + as_bad ("No third operand to .spillreg.p"); + return; + } + + parse_operand (&e3); + + qp = e1.X_add_number - REG_P; + + if (e1.X_op != O_register || qp > 63) + { + as_bad ("First operand to .spillreg.p must be a predicate"); + return; + } + + if (!convert_expr_to_ab_reg (&e2, &ab, ®)) + { + as_bad ("Second operand to .spillreg.p must be a preserved register"); + return; + } + + if (!convert_expr_to_xy_reg (&e3, &xy, &treg)) + { + as_bad ("Third operand to .spillreg.p must be a register"); + return; + } + + add_unwind_entry (output_spill_reg_p (ab, reg, treg, xy, qp)); +} + +static void +dot_spillmem_p (psprel) + int psprel; +{ + expressionS e1, e2, e3; + int sep, ab, reg; + unsigned int qp; + + sep = parse_operand (&e1); + if (sep != ',') + { + as_bad ("Second operand missing"); + return; + } + + parse_operand (&e2); + if (sep != ',') + { + as_bad ("Second operand missing"); + return; + } + + parse_operand (&e3); + + qp = e1.X_add_number - REG_P; + if (e1.X_op != O_register || qp > 63) + { + as_bad ("First operand to .spill%s_p must be a predicate", + psprel ? "psp" : "sp"); + return; + } + + if (!convert_expr_to_ab_reg (&e2, &ab, ®)) + { + as_bad ("Second operand to .spill%s_p must be a preserved register", + psprel ? "psp" : "sp"); + return; + } + + if (e3.X_op != O_constant) + { + as_bad ("Third operand to .spill%s_p must be a constant", + psprel ? "psp" : "sp"); + return; + } + + if (psprel) + add_unwind_entry (output_spill_psprel_p (qp, ab, reg, e3.X_add_number)); + else + add_unwind_entry (output_spill_sprel_p (qp, ab, reg, e3.X_add_number)); +} + +static void +dot_label_state (dummy) + int dummy; +{ + expressionS e; + + parse_operand (&e); + if (e.X_op != O_constant) + { + as_bad ("Operand to .label_state must be a constant"); + return; + } + add_unwind_entry (output_label_state (e.X_add_number)); +} + +static void +dot_copy_state (dummy) + int dummy; +{ + expressionS e; + + parse_operand (&e); + if (e.X_op != O_constant) { - add_unwind_entry (output_spill_base (e.X_add_number)); + as_bad ("Operand to .copy_state must be a constant"); + return; } + add_unwind_entry (output_copy_state (e.X_add_number)); } static void dot_unwabi (dummy) int dummy; { - discard_rest_of_line (); + expressionS e1, e2; + unsigned char sep; + + sep = parse_operand (&e1); + if (sep != ',') + { + as_bad ("Second operand to .unwabi missing"); + return; + } + sep = parse_operand (&e2); + if (!is_end_of_line[sep] && !is_it_end_of_statement ()) + ignore_rest_of_line (); + + if (e1.X_op != O_constant) + { + as_bad ("First operand to .unwabi must be a constant"); + return; + } + + if (e2.X_op != O_constant) + { + as_bad ("Second operand to .unwabi must be a constant"); + return; + } + + add_unwind_entry (output_unwabi (e1.X_add_number, e2.X_add_number)); } static void @@ -2624,7 +3332,7 @@ dot_personality (dummy) name = input_line_pointer; c = get_symbol_end (); p = input_line_pointer; - personality_routine = symbol_find_or_make (name); + unwind.personality_routine = symbol_find_or_make (name); *p = c; SKIP_WHITESPACE (); demand_empty_rest_of_line (); @@ -2637,8 +3345,8 @@ dot_proc (dummy) char *name, *p, c; symbolS *sym; - proc_start = expr_build_dot (); - /* Parse names of main and alternate entry points and mark them s + unwind.proc_start = expr_build_dot (); + /* Parse names of main and alternate entry points and mark them as function symbols: */ while (1) { @@ -2647,9 +3355,9 @@ dot_proc (dummy) c = get_symbol_end (); p = input_line_pointer; sym = symbol_find_or_make (name); - if (proc_start == 0) + if (unwind.proc_start == 0) { - proc_start = sym; + unwind.proc_start = sym; } symbol_get_bfdsym (sym)->flags |= BSF_FUNCTION; *p = c; @@ -2661,32 +3369,35 @@ dot_proc (dummy) demand_empty_rest_of_line (); ia64_do_align (16); - unwind_list = unwind_tail = current_unwind_entry = NULL; - personality_routine = 0; + unwind.list = unwind.tail = unwind.current_entry = NULL; + unwind.personality_routine = 0; } static void dot_body (dummy) int dummy; { - unwind_prologue = 0; + unwind.prologue = 0; add_unwind_entry (output_body ()); + demand_empty_rest_of_line (); } static void dot_prologue (dummy) int dummy; { - unwind_prologue = 1; - SKIP_WHITESPACE (); - if (! is_end_of_line[(unsigned char) *input_line_pointer]) + unsigned char sep; + + unwind.prologue = 1; + if (!is_it_end_of_statement ()) { expressionS e1, e2; - char sep; sep = parse_operand (&e1); if (sep != ',') as_bad ("No second operand to .prologue"); sep = parse_operand (&e2); + if (!is_end_of_line[sep] && !is_it_end_of_statement ()) + ignore_rest_of_line (); if (e1.X_op == O_constant) { @@ -2712,7 +3423,6 @@ dot_endp (dummy) { expressionS e; unsigned char *ptr; - int size; long where; segT saved_seg; subsegT saved_subseg; @@ -2727,13 +3437,13 @@ dot_endp (dummy) ia64_flush_insns (); /* If there was a .handlerdata, we haven't generated an image yet. */ - if (unwind_info == 0) + if (unwind.info == 0) { generate_unwind_image (); } subseg_set (md.last_text_seg, 0); - proc_end = expr_build_dot (); + unwind.proc_end = expr_build_dot (); set_section ((char *) special_section_name[SPECIAL_SECTION_UNWIND]); ptr = frag_more (24); @@ -2743,28 +3453,28 @@ dot_endp (dummy) e.X_op = O_pseudo_fixup; e.X_op_symbol = pseudo_func[FUNC_SEG_RELATIVE].u.sym; e.X_add_number = 0; - e.X_add_symbol = proc_start; + e.X_add_symbol = unwind.proc_start; ia64_cons_fix_new (frag_now, where, 8, &e); e.X_op = O_pseudo_fixup; e.X_op_symbol = pseudo_func[FUNC_SEG_RELATIVE].u.sym; e.X_add_number = 0; - e.X_add_symbol = proc_end; + e.X_add_symbol = unwind.proc_end; ia64_cons_fix_new (frag_now, where + 8, 8, &e); - if (unwind_info != 0) + if (unwind.info != 0) { e.X_op = O_pseudo_fixup; e.X_op_symbol = pseudo_func[FUNC_SEG_RELATIVE].u.sym; e.X_add_number = 0; - e.X_add_symbol = unwind_info; + e.X_add_symbol = unwind.info; ia64_cons_fix_new (frag_now, where + 16, 8, &e); } else md_number_to_chars (ptr + 16, 0, 8); subseg_set (saved_seg, saved_subseg); - proc_start = proc_end = unwind_info = 0; + unwind.proc_start = unwind.proc_end = unwind.info = 0; } static void @@ -3433,18 +4143,30 @@ const pseudo_typeS md_pseudo_table[] = { "fframe", dot_fframe }, { "vframe", dot_vframe }, + { "vframesp", dot_vframesp }, + { "vframepsp", dot_vframepsp }, { "save", dot_save }, { "restore", dot_restore }, + { "restorereg", dot_restorereg }, + { "restorereg.p", dot_restorereg_p }, { "handlerdata", dot_handlerdata }, { "unwentry", dot_unwentry }, - { "alprp", dot_altrp }, - { "savesp", dot_savesp }, - { "savepsp", dot_savepsp }, + { "altrp", dot_altrp }, + { "savesp", dot_savemem, 0 }, + { "savepsp", dot_savemem, 1 }, { "save.g", dot_saveg }, { "save.f", dot_savef }, { "save.b", dot_saveb }, { "save.gf", dot_savegf }, { "spill", dot_spill }, + { "spillreg", dot_spillreg }, + { "spillsp", dot_spillmem, 0 }, + { "spillpsp", dot_spillmem, 1 }, + { "spillreg.p", dot_spillreg_p }, + { "spillsp.p", dot_spillmem_p, 0 }, + { "spillpsp.p", dot_spillmem_p, 1 }, + { "label_state", dot_label_state }, + { "copy_state", dot_copy_state }, { "unwabi", dot_unwabi }, { "personality", dot_personality }, #if 0 @@ -4003,9 +4725,11 @@ operand_match (idesc, index, e) fix->code = BFD_RELOC_IA64_PCREL21M; else if (opnd == IA64_OPND_TGT25c) fix->code = BFD_RELOC_IA64_PCREL21B; - else - /* FIXME -- use appropriate relocation type */ - as_bad (_("long branch targets not implemented")); + else if (opnd == IA64_OPND_TGT64) + fix->code = BFD_RELOC_IA64_PCREL60B; + else + abort (); + fix->code = ia64_gen_real_reloc_type (e->X_op_symbol, fix->code); fix->opnd = idesc->operands[index]; fix->expr = *e; @@ -4222,86 +4946,109 @@ build_insn (slot, insnp) for (i = 0; i < NELEMS (idesc->operands) && idesc->operands[i]; ++i) { - if (idesc->operands[i] == IA64_OPND_IMMU64) + if (slot->opnd[i].X_op == O_register + || slot->opnd[i].X_op == O_constant + || slot->opnd[i].X_op == O_index) + val = slot->opnd[i].X_add_number; + else if (slot->opnd[i].X_op == O_big) + { + /* This must be the value 0x10000000000000000. */ + assert (idesc->operands[i] == IA64_OPND_IMM8M1U8); + val = 0; + } + else + val = 0; + + switch (idesc->operands[i]) { - val = slot->opnd[i].X_add_number; + case IA64_OPND_IMMU64: *insnp++ = (val >> 22) & 0x1ffffffffffLL; insn |= (((val & 0x7f) << 13) | (((val >> 7) & 0x1ff) << 27) | (((val >> 16) & 0x1f) << 22) | (((val >> 21) & 0x1) << 21) | (((val >> 63) & 0x1) << 36)); - } - else if (idesc->operands[i] == IA64_OPND_IMMU62) - { - val = slot->opnd[i].X_add_number & 0x3fffffffffffffffULL; + continue; + + case IA64_OPND_IMMU62: + val &= 0x3fffffffffffffffULL; if (val != slot->opnd[i].X_add_number) as_warn (_("Value truncated to 62 bits")); *insnp++ = (val >> 21) & 0x1ffffffffffLL; insn |= (((val & 0xfffff) << 6) | (((val >> 20) & 0x1) << 36)); - } - else if (idesc->operands[i] == IA64_OPND_TGT64) - { - // FIXME -- need to implement the target address encoding properly - as_bad (_("long branch target encoding not implemented")); - *insnp++ = 0; - } - else if (slot->opnd[i].X_op == O_register - || slot->opnd[i].X_op == O_constant - || slot->opnd[i].X_op == O_index - || slot->opnd[i].X_op == O_big) - { - if (slot->opnd[i].X_op == O_big) - { - /* This must be the value 0x10000000000000000. */ - assert (idesc->operands[i] == IA64_OPND_IMM8M1U8); - val = 0; - } - else - val = slot->opnd[i].X_add_number; + continue; - switch (idesc->operands[i]) - { - case IA64_OPND_AR3: val -= REG_AR; break; - case IA64_OPND_B1: case IA64_OPND_B2: val -= REG_BR; break; - case IA64_OPND_CR3: val -= REG_CR; break; - case IA64_OPND_F1: case IA64_OPND_F2: - case IA64_OPND_F3: case IA64_OPND_F4: val -= REG_FR; break; - case IA64_OPND_P1: case IA64_OPND_P2: val -= REG_P; break; - - case IA64_OPND_R1: case IA64_OPND_R2: - case IA64_OPND_R3: case IA64_OPND_R3_2: - case IA64_OPND_CPUID_R3: case IA64_OPND_DBR_R3: - case IA64_OPND_DTR_R3: case IA64_OPND_ITR_R3: - case IA64_OPND_IBR_R3: case IA64_OPND_MR3: - case IA64_OPND_MSR_R3: case IA64_OPND_PKR_R3: - case IA64_OPND_PMC_R3: case IA64_OPND_PMD_R3: - case IA64_OPND_RR_R3: - val -= REG_GR; - break; + case IA64_OPND_TGT64: + val >>= 4; + *insnp++ = ((val >> 20) & 0x7fffffffffLL) << 2; + insn |= ((((val >> 59) & 0x1) << 36) + | (((val >> 0) & 0xfffff) << 13)); + continue; - default: - break; + case IA64_OPND_AR3: + val -= REG_AR; + break; + + case IA64_OPND_B1: + case IA64_OPND_B2: + val -= REG_BR; + break; + + case IA64_OPND_CR3: + val -= REG_CR; + break; + + case IA64_OPND_F1: + case IA64_OPND_F2: + case IA64_OPND_F3: + case IA64_OPND_F4: + val -= REG_FR; + break; + + case IA64_OPND_P1: + case IA64_OPND_P2: + val -= REG_P; + break; + + case IA64_OPND_R1: + case IA64_OPND_R2: + case IA64_OPND_R3: + case IA64_OPND_R3_2: + case IA64_OPND_CPUID_R3: + case IA64_OPND_DBR_R3: + case IA64_OPND_DTR_R3: + case IA64_OPND_ITR_R3: + case IA64_OPND_IBR_R3: + case IA64_OPND_MR3: + case IA64_OPND_MSR_R3: + case IA64_OPND_PKR_R3: + case IA64_OPND_PMC_R3: + case IA64_OPND_PMD_R3: + case IA64_OPND_RR_R3: + val -= REG_GR; + break; + + default: + break; + } + + odesc = elf64_ia64_operands + idesc->operands[i]; + err = (*odesc->insert) (odesc, val, &insn); + if (err) + as_bad_where (slot->src_file, slot->src_line, + "Bad operand value: %s", err); + if (idesc->flags & IA64_OPCODE_PSEUDO) + { + if ((idesc->flags & IA64_OPCODE_F2_EQ_F3) + && odesc == elf64_ia64_operands + IA64_OPND_F3) + { + o2desc = elf64_ia64_operands + IA64_OPND_F2; + (*o2desc->insert) (o2desc, val, &insn); } - odesc = elf64_ia64_operands + idesc->operands[i]; - err = (*odesc->insert) (odesc, val, &insn); - if (err) - as_bad_where (slot->src_file, slot->src_line, - "Bad operand value: %s", err); - if (idesc->flags & IA64_OPCODE_PSEUDO) + if ((idesc->flags & IA64_OPCODE_LEN_EQ_64MCNT) + && (odesc == elf64_ia64_operands + IA64_OPND_CPOS6a + || odesc == elf64_ia64_operands + IA64_OPND_POS6)) { - if ((idesc->flags & IA64_OPCODE_F2_EQ_F3) - && odesc == elf64_ia64_operands + IA64_OPND_F3) - { - o2desc = elf64_ia64_operands + IA64_OPND_F2; - (*o2desc->insert) (o2desc, val, &insn); - - } - if ((idesc->flags & IA64_OPCODE_LEN_EQ_64MCNT) - && (odesc == elf64_ia64_operands + IA64_OPND_CPOS6a - || odesc == elf64_ia64_operands + IA64_OPND_POS6)) - { - o2desc = elf64_ia64_operands + IA64_OPND_LEN6; - (*o2desc->insert) (o2desc, 64 - val, &insn); - } + o2desc = elf64_ia64_operands + IA64_OPND_LEN6; + (*o2desc->insert) (o2desc, 64 - val, &insn); } } } @@ -4320,6 +5067,7 @@ emit_one_bundle () struct ia64_opcode *idesc; int end_of_insn_group = 0, user_template = -1; int n, i, j, first, curr; + unw_rec_list *ptr, *prev; bfd_vma t0 = 0, t1 = 0; struct label_fix *lfix; struct insn_fix *ifix; @@ -4361,6 +5109,25 @@ emit_one_bundle () end_of_insn_group = 0; for (i = 0; i < 3 && md.num_slots_in_use > 0; ++i) { + /* Set the slot number for prologue/body records now as those + refer to the current point, not the point after the + instruction has been issued: */ + prev = 0; + for (ptr = md.slot[curr].unwind_record; ptr; ptr = ptr->next) + { + if (ptr->r.type == prologue || ptr->r.type == prologue_gr + || ptr->r.type == body) + { + ptr->slot_number = (unsigned long) f + i; + if (prev) + prev->next = ptr->next; + else + md.slot[curr].unwind_record = ptr->next; + } + else + prev = ptr; + } + if (idesc->flags & IA64_OPCODE_SLOT2) { if (manual_bundling && i != 2) @@ -4562,9 +5329,10 @@ emit_one_bundle () /* Set slot counts for unwind records. */ while (md.slot[curr].unwind_record) { - md.slot[curr].unwind_record->slot_number = (unsigned long) (f + i); + md.slot[curr].unwind_record->slot_number = (unsigned long) f + i; md.slot[curr].unwind_record = md.slot[curr].unwind_record->next; } + unwind.next_slot_number = (unsigned long) f + i + ((i == 2)?(0x10-2):1); if (required_unit == IA64_UNIT_L) { know (i == 1); @@ -4797,6 +5565,10 @@ md_begin () symbol_new (".", undefined_section, FUNC_LT_RELATIVE, &zero_address_frag); + pseudo_func[FUNC_PC_RELATIVE].u.sym = + symbol_new (".", undefined_section, FUNC_PC_RELATIVE, + &zero_address_frag); + pseudo_func[FUNC_PLT_RELATIVE].u.sym = symbol_new (".", undefined_section, FUNC_PLT_RELATIVE, &zero_address_frag); @@ -4955,6 +5727,9 @@ md_begin () declare_register ("sp", REG_GR + 12); declare_register ("rp", REG_BR + 0); + /* pseudo-registers used to specify unwind info: */ + declare_register ("psp", REG_PSP); + declare_register_set ("ret", 4, REG_GR + 8); declare_register_set ("farg", 8, REG_FR + 8); declare_register_set ("fret", 8, REG_FR + 8); @@ -7646,10 +8421,10 @@ md_assemble (str) dwarf2_where (&CURR_SLOT.debug_line); /* Add unwind entry, if there is one. */ - if (current_unwind_entry) + if (unwind.current_entry) { - CURR_SLOT.unwind_record = current_unwind_entry; - current_unwind_entry = NULL; + CURR_SLOT.unwind_record = unwind.current_entry; + unwind.current_entry = NULL; } /* check for dependency violations */ @@ -7686,6 +8461,7 @@ md_operand (e) expressionS *e; { enum pseudo_type pseudo_type; + const char *name; size_t len; int ch, i; @@ -7751,8 +8527,15 @@ md_operand (e) e->X_add_number = pseudo_func[i].u.ival; break; + case PSEUDO_FUNC_REG: + e->X_op = O_register; + e->X_add_number = pseudo_func[i].u.ival; + break; + default: - as_bad ("Unknown pseudo function `%s'", input_line_pointer - 1); + name = input_line_pointer - 1; + get_symbol_end (); + as_bad ("Unknown pseudo function `%s'", name); goto err; } break; @@ -7960,6 +8743,19 @@ ia64_gen_real_reloc_type (sym, r_type) } break; + case FUNC_PC_RELATIVE: + switch (r_type) + { + case BFD_RELOC_IA64_IMM22: new = BFD_RELOC_IA64_PCREL22; break; + case BFD_RELOC_IA64_IMM64: new = BFD_RELOC_IA64_PCREL64I; break; + case BFD_RELOC_IA64_DIR32MSB: new = BFD_RELOC_IA64_PCREL32MSB; break; + case BFD_RELOC_IA64_DIR32LSB: new = BFD_RELOC_IA64_PCREL32LSB; break; + case BFD_RELOC_IA64_DIR64MSB: new = BFD_RELOC_IA64_PCREL64MSB; break; + case BFD_RELOC_IA64_DIR64LSB: new = BFD_RELOC_IA64_PCREL64LSB; break; + default: break; + } + break; + case FUNC_PLT_RELATIVE: switch (r_type) { @@ -8063,7 +8859,7 @@ fix_insn (fix, odesc, value) slot = fix->fx_where & 0x3; fixpos = fix->fx_frag->fr_literal + (fix->fx_where - slot); - /* bundles are always in little-endian byte order */ + /* Bundles are always in little-endian byte order */ t0 = bfd_getl64 (fixpos); t1 = bfd_getl64 (fixpos + 8); control_bits = t0 & 0x1f; @@ -8071,18 +8867,40 @@ fix_insn (fix, odesc, value) insn[1] = ((t0 >> 46) & 0x3ffff) | ((t1 & 0x7fffff) << 18); insn[2] = (t1 >> 23) & 0x1ffffffffffLL; - err = (*odesc->insert) (odesc, value, insn + slot); - if (err) + err = NULL; + if (odesc - elf64_ia64_operands == IA64_OPND_IMMU64) { - as_bad_where (fix->fx_file, fix->fx_line, err); - return; + insn[1] = (value >> 22) & 0x1ffffffffffLL; + insn[2] |= (((value & 0x7f) << 13) + | (((value >> 7) & 0x1ff) << 27) + | (((value >> 16) & 0x1f) << 22) + | (((value >> 21) & 0x1) << 21) + | (((value >> 63) & 0x1) << 36)); + } + else if (odesc - elf64_ia64_operands == IA64_OPND_IMMU62) + { + if (value & ~0x3fffffffffffffffULL) + err = "integer operand out of range"; + insn[1] = (value >> 21) & 0x1ffffffffffLL; + insn[2] |= (((value & 0xfffff) << 6) | (((value >> 20) & 0x1) << 36)); + } + else if (odesc - elf64_ia64_operands == IA64_OPND_TGT64) + { + value >>= 4; + insn[1] = ((value >> 20) & 0x7fffffffffLL) << 2; + insn[2] |= ((((value >> 59) & 0x1) << 36) + | (((value >> 0) & 0xfffff) << 13)); } + else + err = (*odesc->insert) (odesc, value, insn + slot); + + if (err) + as_bad_where (fix->fx_file, fix->fx_line, err); t0 = control_bits | (insn[0] << 5) | (insn[1] << 46); t1 = ((insn[1] >> 18) & 0x7fffff) | (insn[2] << 23); md_number_to_chars (fixpos + 0, t0, 8); md_number_to_chars (fixpos + 8, t1, 8); - } /* Attempt to simplify or even eliminate a fixup. The return value is diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-ia64.h binutils-2.9.5.0.46/gas/config/tc-ia64.h --- binutils-2.9.5.0.42/gas/config/tc-ia64.h Sun Apr 23 09:40:59 2000 +++ binutils-2.9.5.0.46/gas/config/tc-ia64.h Mon May 29 22:36:13 2000 @@ -1,5 +1,5 @@ /* tc-ia64.h -- Header file for tc-ia64.c. - Copyright (C) 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. Contributed by David Mosberger-Tang This file is part of GAS, the GNU Assembler. @@ -157,7 +157,7 @@ typedef enum bspstore_gr, bspstore_psprel, bspstore_sprel, rnat_when, rnat_gr, rnat_psprel, rnat_sprel, epilogue, label_state, copy_state, spill_psprel, spill_sprel, spill_reg, spill_psprel_p, spill_sprel_p, - spill_reg_p + spill_reg_p, unwabi } unw_record_type; @@ -167,8 +167,18 @@ typedef enum typedef struct unw_r_record { unsigned long rlen; - unsigned short mask; + unsigned short grmask; unsigned short grsave; + /* masks to represent the union of save.g, save.f, save.b, and + save.gf: */ + unsigned long imask_size; + struct + { + unsigned char *i; + unsigned long fr_mem; + unsigned char gr_mem; + unsigned char br_mem; + } mask; } unw_r_record; typedef struct unw_p_record @@ -184,6 +194,8 @@ typedef struct unw_p_record unsigned short grmask; unsigned long frmask; unsigned short brmask; + unsigned char abi; + unsigned char context; } unw_p_record; typedef struct unw_b_record @@ -201,7 +213,8 @@ typedef struct unw_x_record unsigned short reg; unsigned short treg; unsigned short qp; - unsigned short xy; /* Value of the XY field.. */ + unsigned short ab; /* Value of the AB field.. */ + unsigned short xy; /* Value of the XY field.. */ } unw_x_record; /* This structure is used to determine the specific record type and diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-m88k.c binutils-2.9.5.0.46/gas/config/tc-m88k.c --- binutils-2.9.5.0.42/gas/config/tc-m88k.c Sat Jun 26 18:02:45 1999 +++ binutils-2.9.5.0.46/gas/config/tc-m88k.c Fri Jun 2 16:27:04 2000 @@ -1311,7 +1311,7 @@ s_bss () as_warn (_("Ignoring attempt to re-define symbol %s."), name); } - while (!is_end_of_line[*input_line_pointer]) + while (!is_end_of_line[(unsigned char) *input_line_pointer]) { input_line_pointer++; } diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-mcore.c binutils-2.9.5.0.46/gas/config/tc-mcore.c --- binutils-2.9.5.0.42/gas/config/tc-mcore.c Fri May 12 08:04:14 2000 +++ binutils-2.9.5.0.46/gas/config/tc-mcore.c Fri Jun 2 16:27:04 2000 @@ -239,7 +239,7 @@ mcore_cons (nbytes) int commas = 1; /* Count the number of commas on the line. */ - while (! is_end_of_line [* ptr]) + while (! is_end_of_line [(unsigned char) * ptr]) commas += * ptr ++ == ','; poolspan += nbytes * commas; @@ -268,7 +268,7 @@ mcore_float_cons (float_type) #endif /* Count the number of commas on the line. */ - while (! is_end_of_line [* ptr]) + while (! is_end_of_line [(unsigned char) * ptr]) commas += * ptr ++ == ','; /* We would like to compute "hex_float (float_type) * commas" @@ -301,7 +301,7 @@ mcore_stringer (append_zero) estimate, which is OK, and automatically allows for the appending a zero byte, since the real string(s) is/are required to be enclosed in double quotes. */ - while (! is_end_of_line [* ptr]) + while (! is_end_of_line [(unsigned char) * ptr]) ptr ++; poolspan += ptr - input_line_pointer; @@ -975,7 +975,7 @@ md_assemble (str) /* Find the op code end. */ for (op_start = op_end = str; - * op_end && nlen < 20 && !is_end_of_line [*op_end] && *op_end != ' '; + nlen < 20 && !is_end_of_line [(unsigned char) *op_end] && *op_end != ' '; op_end++) { name[nlen] = op_start[nlen]; diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-mips.c binutils-2.9.5.0.46/gas/config/tc-mips.c --- binutils-2.9.5.0.42/gas/config/tc-mips.c Fri May 12 08:11:30 2000 +++ binutils-2.9.5.0.46/gas/config/tc-mips.c Tue May 30 09:53:59 2000 @@ -183,7 +183,7 @@ struct mips_set_options that we must set the isa and mips16 fields to -1 to indicate that they have not been initialized. */ -static struct mips_set_options mips_opts = { -1, -1 }; +static struct mips_set_options mips_opts = { -1, -1, 0, 0, 0, 0, 0, 0 }; /* These variables are filled in with the masks of registers used. The object format code reads them and puts them in the appropriate @@ -407,7 +407,7 @@ static struct mips_cl_insn prev_prev_ins /* If we don't want information for prev_insn or prev_prev_insn, we point the insn_mo field at this dummy integer. */ -static const struct mips_opcode dummy_opcode = { 0 }; +static const struct mips_opcode dummy_opcode = { NULL, NULL, 0, 0, 0, 0 }; /* Non-zero if prev_insn is valid. */ static int prev_insn_valid; @@ -758,7 +758,7 @@ static const pseudo_typeS mips_pseudo_ta {"stabn", s_mips_stab, 'n'}, {"text", s_change_sec, 't'}, {"word", s_cons, 2}, - { 0 }, + { NULL, NULL, 0 }, }; static const pseudo_typeS mips_nonecoff_pseudo_table[] = { @@ -775,7 +775,7 @@ static const pseudo_typeS mips_nonecoff_ {"loc", s_ignore, 0}, {"mask", s_mips_mask, 'R'}, {"verstamp", s_ignore, 0}, - { 0 }, + { NULL, NULL, 0 }, }; extern void pop_insert PARAMS ((const pseudo_typeS *)); @@ -2662,7 +2662,7 @@ macro_build (place, counter, ep, name, f static void mips16_macro_build (place, counter, ep, name, fmt, args) char *place; - int *counter; + int *counter ATTRIBUTE_UNUSED; expressionS *ep; const char *name; const char *fmt; @@ -3445,7 +3445,7 @@ macro (ip) int tempreg; int mask; int icnt = 0; - int used_at; + int used_at = 0; expressionS expr1; const char *s; const char *s2; @@ -6410,8 +6410,8 @@ macro2 (ip) macro_build ((char *) NULL, &icnt, NULL, s, "s,t", sreg, AT); break; - case M_TRUNCWD: case M_TRUNCWS: + case M_TRUNCWD: assert (mips_opts.isa == 1); sreg = (ip->insn_opcode >> 11) & 0x1f; /* floating reg */ dreg = (ip->insn_opcode >> 06) & 0x1f; /* floating reg */ @@ -6999,7 +6999,7 @@ mips_ip (str, ip) { char *s; const char *args; - char c; + char c = 0; struct mips_opcode *insn; char *argsStart; unsigned int regno; @@ -7085,7 +7085,7 @@ mips_ip (str, ip) continue; } else - { + { static char buf[100]; sprintf (buf, _("opcode not supported on this processor: %d (MIPS%d)"), @@ -9365,7 +9365,7 @@ md_pcrel_from (fixP) void cons_fix_new_mips (frag, where, nbytes, exp) - fragS *frag; + fragS *frag ATTRIBUTE_UNUSED; int where; unsigned int nbytes; expressionS *exp; @@ -9942,7 +9942,7 @@ mips_align (to, fill, label) static void s_align (x) - int x; + int x ATTRIBUTE_UNUSED; { register int temp; register long temp_fill; @@ -10144,7 +10144,7 @@ s_float_cons (type) static void s_mips_globl (x) - int x; + int x ATTRIBUTE_UNUSED; { char *name; int c; @@ -10185,7 +10185,7 @@ s_mips_globl (x) static void s_option (x) - int x; + int x ATTRIBUTE_UNUSED; { char *opt; char c; @@ -10238,7 +10238,7 @@ static struct mips_option_stack *mips_op static void s_mipsset (x) - int x; + int x ATTRIBUTE_UNUSED; { char *name = input_line_pointer, ch; @@ -10374,7 +10374,7 @@ s_mipsset (x) static void s_abicalls (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { mips_pic = SVR4_PIC; if (USE_GLOBAL_POINTER_OPT) @@ -10399,7 +10399,7 @@ s_abicalls (ignore) static void s_cpload (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { expressionS ex; int icnt = 0; @@ -10439,7 +10439,7 @@ s_cpload (ignore) static void s_cprestore (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { expressionS ex; int icnt = 0; @@ -10472,7 +10472,7 @@ s_cprestore (ignore) static void s_gpword (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { symbolS *label; expressionS ex; @@ -10512,7 +10512,7 @@ s_gpword (ignore) static void s_cpadd (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { int icnt = 0; int reg; @@ -10546,7 +10546,7 @@ s_cpadd (ignore) static void s_insn (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { if (mips_opts.mips16) mips16_mark_labels (); @@ -10575,7 +10575,7 @@ s_mips_stab (type) static void s_mips_weakext (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { char *name; int c; @@ -10985,7 +10985,7 @@ md_estimate_size_before_relax (fragp, se fragS *fragp; asection *segtype; { - int change; + int change = 0; if (RELAX_MIPS16_P (fragp->fr_subtype)) { @@ -11093,7 +11093,7 @@ mips_fix_adjustable (fixp) arelent ** tc_gen_reloc (section, fixp) - asection *section; + asection *section ATTRIBUTE_UNUSED; fixS *fixp; { static arelent *retval[4]; @@ -11334,7 +11334,7 @@ mips_relax_frag (fragp, stretch) void md_convert_frag (abfd, asec, fragp) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; segT asec; fragS *fragp; { @@ -11594,7 +11594,7 @@ int mips_do_align (n, fill, len, max) int n; const char *fill; - int len; + int len ATTRIBUTE_UNUSED; int max; { if (fill == NULL @@ -11686,7 +11686,7 @@ get_number () static void s_file (x) - int x; + int x ATTRIBUTE_UNUSED; { int line; @@ -11699,7 +11699,7 @@ s_file (x) static void s_mips_end (x) - int x; + int x ATTRIBUTE_UNUSED; { symbolS *p; int maybe_text; diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-mn10300.c binutils-2.9.5.0.46/gas/config/tc-mn10300.c --- binutils-2.9.5.0.42/gas/config/tc-mn10300.c Fri May 12 08:04:15 2000 +++ binutils-2.9.5.0.46/gas/config/tc-mn10300.c Mon May 29 22:36:10 2000 @@ -902,7 +902,7 @@ md_assemble (str) struct mn10300_opcode *next_opcode; const unsigned char *opindex_ptr; int next_opindex, relaxable; - unsigned long insn, extension, size = 0; + unsigned long insn, extension, size = 0, real_size; char *f; int i; int match; @@ -1480,6 +1480,8 @@ keep_going: if (opcode->format == FMT_D4) size = 6; + real_size = size; + if (relaxable && fc > 0) { int type; @@ -1760,7 +1762,7 @@ keep_going: /* We want the offset of the start of this instruction within the the current frag. */ - addr = frag_now->fr_address + frag_now_fix () - size; + addr = frag_now->fr_address + frag_now_fix () - real_size; /* And record the information. */ dwarf2_gen_line_info (addr, &debug_line); diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-sh.c binutils-2.9.5.0.46/gas/config/tc-sh.c --- binutils-2.9.5.0.42/gas/config/tc-sh.c Wed Apr 5 17:07:25 2000 +++ binutils-2.9.5.0.46/gas/config/tc-sh.c Mon May 29 22:36:11 2000 @@ -30,6 +30,7 @@ #define DEFINE_TABLE #include "opcodes/sh-opc.h" #include +#include "struc-symbol.h" #ifdef OBJ_ELF #include "elf/sh.h" @@ -54,7 +55,7 @@ int shl = 0; static void little (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { shl = 1; target_big_endian = 0; @@ -159,39 +160,43 @@ const char FLT_CHARS[] = "rRsSfFdDxXpP"; #define UNCOND32_M -(1<<30) #define UNCOND32_LENGTH 14 +#define EMPTY { 0, 0, 0, 0 } + const relax_typeS md_relax_table[C (END, 0)] = { - { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, - { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, + EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, + EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - { 0 }, + EMPTY, /* C (COND_JUMP, COND8) */ { COND8_F, COND8_M, COND8_LENGTH, C (COND_JUMP, COND12) }, /* C (COND_JUMP, COND12) */ { COND12_F, COND12_M, COND12_LENGTH, C (COND_JUMP, COND32), }, /* C (COND_JUMP, COND32) */ { COND32_F, COND32_M, COND32_LENGTH, 0, }, - { 0 }, { 0 }, { 0 }, { 0 }, - { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, + EMPTY, EMPTY, EMPTY, EMPTY, + EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - { 0 }, + EMPTY, /* C (COND_JUMP_DELAY, COND8) */ { COND8_F, COND8_M, COND8_LENGTH, C (COND_JUMP_DELAY, COND12) }, /* C (COND_JUMP_DELAY, COND12) */ { COND12_F, COND12_M, COND12_DELAY_LENGTH, C (COND_JUMP_DELAY, COND32), }, /* C (COND_JUMP_DELAY, COND32) */ { COND32_F, COND32_M, COND32_LENGTH, 0, }, - { 0 }, { 0 }, { 0 }, { 0 }, - { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, + EMPTY, EMPTY, EMPTY, EMPTY, + EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, - { 0 }, + EMPTY, /* C (UNCOND_JUMP, UNCOND12) */ { UNCOND12_F, UNCOND12_M, UNCOND12_LENGTH, C (UNCOND_JUMP, UNCOND32), }, /* C (UNCOND_JUMP, UNCOND32) */ { UNCOND32_F, UNCOND32_M, UNCOND32_LENGTH, 0, }, - { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, - { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, + EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, + EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, }; +#undef EMPTY + static struct hash_control *opcode_hash_control; /* Opcode mnemonics */ /* @@ -828,7 +833,6 @@ get_operands (info, args, operand) sh_opcode_info *info; char *args; sh_operand_info *operand; - { char *ptr = args; if (info->arg[0]) @@ -1853,7 +1857,7 @@ md_atof (type, litP, sizeP) static void s_uses (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { expressionS ex; @@ -1893,7 +1897,7 @@ size_t md_longopts_size = sizeof(md_long int md_parse_option (c, arg) int c; - char *arg; + char *arg ATTRIBUTE_UNUSED; { switch (c) { @@ -1958,7 +1962,7 @@ struct sh_count_relocs /*ARGSUSED*/ static void sh_count_relocs (abfd, sec, data) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; segT sec; PTR data; { @@ -1988,9 +1992,9 @@ sh_count_relocs (abfd, sec, data) /*ARGSUSED*/ static void sh_frob_section (abfd, sec, ignore) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; segT sec; - PTR ignore; + PTR ignore ATTRIBUTE_UNUSED; { segment_info_type *seginfo; fixS *fix; @@ -2130,7 +2134,7 @@ sh_frob_file () void md_convert_frag (headers, seg, fragP) #ifdef BFD_ASSEMBLER - bfd *headers; + bfd *headers ATTRIBUTE_UNUSED; #else object_headers *headers; #endif @@ -2860,7 +2864,7 @@ int sh_do_align (n, fill, len, max) int n; const char *fill; - int len; + int len ATTRIBUTE_UNUSED; int max; { if (fill == NULL @@ -3042,7 +3046,7 @@ sh_coff_reloc_mangle (seg, fix, intr, pa arelent * tc_gen_reloc (section, fixp) - asection *section; + asection *section ATTRIBUTE_UNUSED; fixS *fixp; { arelent *rel; diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-sparc.c binutils-2.9.5.0.46/gas/config/tc-sparc.c --- binutils-2.9.5.0.42/gas/config/tc-sparc.c Wed Apr 5 17:15:17 2000 +++ binutils-2.9.5.0.46/gas/config/tc-sparc.c Tue May 30 09:53:59 2000 @@ -91,6 +91,9 @@ static enum sparc_opcode_arch_val warn_a has been used in -64. */ static int no_undeclared_regs; +/* Non-zero if we should try to relax jumps and calls. */ +static int sparc_relax; + /* Non-zero if we are generating PIC code. */ int sparc_pic_code; @@ -415,6 +418,10 @@ struct option md_longopts[] = { #define OPTION_UNDECLARED_REGS (OPTION_MD_BASE + 13) {"undeclared-regs", no_argument, NULL, OPTION_UNDECLARED_REGS}, #endif +#define OPTION_RELAX (OPTION_MD_BASE + 14) + {"relax", no_argument, NULL, OPTION_RELAX}, +#define OPTION_NO_RELAX (OPTION_MD_BASE + 15) + {"no-relax", no_argument, NULL, OPTION_NO_RELAX}, {NULL, no_argument, NULL, 0} }; size_t md_longopts_size = sizeof(md_longopts); @@ -574,6 +581,14 @@ md_parse_option (c, arg) break; #endif + case OPTION_RELAX: + sparc_relax = 1; + break; + + case OPTION_NO_RELAX: + sparc_relax = 0; + break; + default: return 0; } @@ -605,7 +620,9 @@ md_show_usage (stream) specify variant of SPARC architecture\n\ -bump warn when assembler switches architectures\n\ -sparc ignored\n\ ---enforce-aligned-data force .long, etc., to be aligned correctly\n")); +--enforce-aligned-data force .long, etc., to be aligned correctly\n\ +-relax relax jumps and branches (default)\n\ +-no-relax avoid changing any jumps and branches\n")); #ifdef OBJ_AOUT fprintf (stream, _("\ -k generate PIC\n")); @@ -2915,7 +2932,91 @@ md_apply_fix3 (fixP, value, segment) || fixP->fx_addsy == NULL || symbol_section_p (fixP->fx_addsy)) ++val; + insn |= val & 0x3fffffff; + + /* See if we have a delay slot */ + if (sparc_relax && fixP->fx_where + 8 <= fixP->fx_frag->fr_fix) + { +#define G0 0 +#define O7 15 +#define XCC (2 << 20) +#define COND(x) (((x)&0xf)<<25) +#define CONDA COND(0x8) +#define INSN_BPA (F2(0,1) | CONDA | BPRED | XCC) +#define INSN_BA (F2(0,2) | CONDA) +#define INSN_OR F3(2, 0x2, 0) +#define INSN_NOP F2(0,4) + + long delay; + + /* If the instruction is a call with either: + restore + arithmetic instruction with rd == %o7 + where rs1 != %o7 and rs2 if it is register != %o7 + then we can optimize if the call destination is near + by changing the call into a branch always. */ + if (INSN_BIG_ENDIAN) + delay = bfd_getb32 ((unsigned char *) buf + 4); + else + delay = bfd_getl32 ((unsigned char *) buf + 4); + if ((insn & OP(~0)) != OP(1) || (delay & OP(~0)) != OP(2)) + break; + if ((delay & OP3(~0)) != OP3(0x3d) /* restore */ + && ((delay & OP3(0x28)) != 0 /* arithmetic */ + || ((delay & RD(~0)) != RD(O7)))) + break; + if ((delay & RS1(~0)) == RS1(O7) + || ((delay & F3I(~0)) == 0 + && (delay & RS2(~0)) == RS2(O7))) + break; + /* Ensure the branch will fit into simm22. */ + if ((val & 0x3fe00000) + && (val & 0x3fe00000) != 0x3fe00000) + break; + /* Check if the arch is v9 and branch will fit + into simm19. */ + if (((val & 0x3c0000) == 0 + || (val & 0x3c0000) == 0x3c0000) + && (sparc_arch_size == 64 + || current_architecture >= SPARC_OPCODE_ARCH_V9)) + /* ba,pt %xcc */ + insn = INSN_BPA | (val & 0x7ffff); + else + /* ba */ + insn = INSN_BA | (val & 0x3fffff); + if (fixP->fx_where >= 4 + && ((delay & (0xffffffff ^ RS1(~0))) + == (INSN_OR | RD(O7) | RS2(G0)))) + { + long setter; + int reg; + + if (INSN_BIG_ENDIAN) + setter = bfd_getb32 ((unsigned char *) buf - 4); + else + setter = bfd_getl32 ((unsigned char *) buf - 4); + if ((setter & (0xffffffff ^ RD(~0))) + != (INSN_OR | RS1(O7) | RS2(G0))) + break; + /* The sequence was + or %o7, %g0, %rN + call foo + or %rN, %g0, %o7 + + If call foo was replaced with ba, replace + or %rN, %g0, %o7 with nop. */ + reg = (delay & RS1(~0)) >> 14; + if (reg != ((setter & RD(~0)) >> 25) + || reg == G0 || reg == O7) + break; + + if (INSN_BIG_ENDIAN) + bfd_putb32 (INSN_NOP, (unsigned char *) buf + 4); + else + bfd_putl32 (INSN_NOP, (unsigned char *) buf + 4); + } + } break; case BFD_RELOC_SPARC_11: diff -upr --new-file binutils-2.9.5.0.42/gas/config/tc-tic30.c binutils-2.9.5.0.46/gas/config/tc-tic30.c --- binutils-2.9.5.0.42/gas/config/tc-tic30.c Sat Jun 26 18:02:46 1999 +++ binutils-2.9.5.0.46/gas/config/tc-tic30.c Fri Jun 2 16:27:06 2000 @@ -1459,7 +1459,7 @@ tic30_find_parallel_insn (current_line, char *parallel_insn; debug ("In tic30_find_parallel_insn()\n"); - while (!is_end_of_line[(int) *next_line]) + while (!is_end_of_line[(unsigned char) *next_line]) { if (*next_line == PARALLEL_SEPARATOR && *(next_line + 1) == PARALLEL_SEPARATOR) { @@ -1495,7 +1495,7 @@ tic30_find_parallel_insn (current_line, int char_ptr = 0; char c; - while (!is_end_of_line[(int) (c = *line)] && *line) + while (!is_end_of_line[(unsigned char) (c = *line)]) { if (is_opcode_char (c) && search_status == NONE) { @@ -1682,7 +1682,8 @@ md_atof (what_statement_type, literalP, debug ("literal = %s\n", literalP); debug ("line = "); token = input_line_pointer; - while (!is_end_of_line[(unsigned) *input_line_pointer] && (*input_line_pointer) && (*input_line_pointer != ',')) + while (!is_end_of_line[(unsigned char) *input_line_pointer] + && (*input_line_pointer != ',')) { debug ("%c", *input_line_pointer); input_line_pointer++; diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-386bsd.h binutils-2.9.5.0.46/gas/config/te-386bsd.h --- binutils-2.9.5.0.42/gas/config/te-386bsd.h Thu Jun 3 11:02:01 1999 +++ binutils-2.9.5.0.46/gas/config/te-386bsd.h Thu May 18 14:21:45 2000 @@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to - the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #define TE_386BSD 1 @@ -28,4 +29,4 @@ * End: */ -/* end of te-sun3.h */ +/* end of te-386bsd.h */ diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-aux.h binutils-2.9.5.0.46/gas/config/te-aux.h --- binutils-2.9.5.0.42/gas/config/te-aux.h Thu Jun 3 11:02:01 1999 +++ binutils-2.9.5.0.46/gas/config/te-aux.h Thu May 18 14:21:45 2000 @@ -2,7 +2,7 @@ /* From obj-coff.h: This internal_lineno crap is to stop namespace pollution from the - bfd internal coff headerfile. */ + bfd internal coff headerfile. */ #define internal_lineno bfd_internal_lineno #include "coff/aux-coff.h" /* override bits in coff/internal.h */ #undef internal_lineno diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-dpx2.h binutils-2.9.5.0.46/gas/config/te-dpx2.h --- binutils-2.9.5.0.42/gas/config/te-dpx2.h Thu Jun 3 11:02:01 1999 +++ binutils-2.9.5.0.46/gas/config/te-dpx2.h Thu May 18 14:21:45 2000 @@ -1,6 +1,6 @@ -/* Machine specific defines for the dpx2 machine */ +/* Machine specific defines for the dpx2 machine. */ -/* The magic number is not the usual MC68MAGIC. */ +/* The magic number is not the usual MC68MAGIC. */ #define COFF_MAGIC MC68KBCSMAGIC #define REGISTER_PREFIX_OPTIONAL 1 diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-freebsd.h binutils-2.9.5.0.46/gas/config/te-freebsd.h --- binutils-2.9.5.0.42/gas/config/te-freebsd.h Wed Dec 31 16:00:00 1969 +++ binutils-2.9.5.0.46/gas/config/te-freebsd.h Sun May 14 10:22:27 2000 @@ -0,0 +1,30 @@ +/* te-freebsd.h -- FreeBSD target environment declarations. + Copyright (C) 2000 Free Software Foundation, Inc. + + This file is part of GAS, the GNU Assembler. + + GAS 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. + + GAS 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 GAS; see the file COPYING. If not, write to the Free + Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ + +/* Target environment for FreeBSD. It is the same as the generic + target, except that it arranges via the TE_FreeBSD define to + suppress the use of "/" as a comment character. Some code in the + FreeBSD kernel uses "/" to mean division. (What a concept!) */ +#define TE_FreeBSD 1 + +#define LOCAL_LABELS_DOLLAR 1 +#define LOCAL_LABELS_FB 1 + +#include "obj-format.h" diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-go32.h binutils-2.9.5.0.46/gas/config/te-go32.h --- binutils-2.9.5.0.42/gas/config/te-go32.h Wed Jul 28 11:19:03 1999 +++ binutils-2.9.5.0.46/gas/config/te-go32.h Thu May 18 14:21:45 2000 @@ -1,6 +1,4 @@ -/* - * This file is te-go32.h - */ +/* This file is te-go32.h */ #define TE_GO32 @@ -9,7 +7,7 @@ #define TARGET_FORMAT "coff-go32" -/* GAS should treat '.align value' as an alignment of 2**value */ +/* GAS should treat '.align value' as an alignment of 2**value. */ #define USE_ALIGN_PTWO #define COFF_LONG_SECTION_NAMES diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-hp300.h binutils-2.9.5.0.46/gas/config/te-hp300.h --- binutils-2.9.5.0.42/gas/config/te-hp300.h Thu Jun 3 11:02:01 1999 +++ binutils-2.9.5.0.46/gas/config/te-hp300.h Thu May 18 14:21:45 2000 @@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to - the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #define LOCAL_LABELS_DOLLAR 1 #define LOCAL_LABELS_FB 1 diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-hppa.h binutils-2.9.5.0.46/gas/config/te-hppa.h --- binutils-2.9.5.0.42/gas/config/te-hppa.h Thu Jun 3 11:02:01 1999 +++ binutils-2.9.5.0.46/gas/config/te-hppa.h Thu May 18 14:21:45 2000 @@ -15,12 +15,11 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to - the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ -/* - HP PA-RISC and OSF/1 support was contributed by the Center for - Software Science at the University of Utah. - */ +/* HP PA-RISC and OSF/1 support was contributed by the Center for + Software Science at the University of Utah. */ -/* these define interfaces */ +/* These define interfaces. */ #include "obj-format.h" diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-i386aix.h binutils-2.9.5.0.46/gas/config/te-i386aix.h --- binutils-2.9.5.0.42/gas/config/te-i386aix.h Thu Jun 3 11:02:01 1999 +++ binutils-2.9.5.0.46/gas/config/te-i386aix.h Thu May 18 14:21:45 2000 @@ -1,22 +1,16 @@ -/* - * This file is te-i386aix.h and is built from pieces of code from Minh Tran-Le - * by rich@cygnus.com. - */ +/* This file is te-i386aix.h and is built from pieces of code from + Minh Tran-Le by rich@cygnus.com. */ #define TE_I386AIX 1 #include "obj-format.h" -/* - * Undefine REVERSE_SORT_RELOCS to keep the relocation entries sorted - * in ascending vaddr. - */ +/* Undefine REVERSE_SORT_RELOCS to keep the relocation entries sorted + in ascending vaddr. */ #undef REVERSE_SORT_RELOCS -/* - * Define KEEP_RELOC_INFO so that the strip reloc info flag F_RELFLG - * is not used in the filehdr for COFF output. - */ +/* Define KEEP_RELOC_INFO so that the strip reloc info flag F_RELFLG is + not used in the filehdr for COFF output. */ #define KEEP_RELOC_INFO /* diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-ic960.h binutils-2.9.5.0.46/gas/config/te-ic960.h --- binutils-2.9.5.0.42/gas/config/te-ic960.h Thu Jun 3 11:02:01 1999 +++ binutils-2.9.5.0.46/gas/config/te-ic960.h Thu May 18 14:21:45 2000 @@ -18,10 +18,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - * This file is te-ic960.h and is intended to define ic960 environment - * specific differences. - */ +/* This file is te-ic960.h and is intended to define ic960 environment + specific differences. */ #define OBJ_COFF_OMIT_OPTIONAL_HEADER diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-interix.h binutils-2.9.5.0.46/gas/config/te-interix.h --- binutils-2.9.5.0.42/gas/config/te-interix.h Wed Sep 22 14:50:40 1999 +++ binutils-2.9.5.0.46/gas/config/te-interix.h Thu May 18 14:21:45 2000 @@ -8,7 +8,7 @@ #define GLOBAL_OFFSET_TABLE_NAME "__GLOBAL_OFFSET_TABLE_" -/* Both architectures use these */ +/* Both architectures use these. */ #ifndef LOCAL_LABELS_FB #define LOCAL_LABELS_FB 1 #endif diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-nbsd532.h binutils-2.9.5.0.46/gas/config/te-nbsd532.h --- binutils-2.9.5.0.42/gas/config/te-nbsd532.h Thu Jun 3 11:02:01 1999 +++ binutils-2.9.5.0.46/gas/config/te-nbsd532.h Thu May 18 14:21:45 2000 @@ -1,19 +1,13 @@ -/* - * This file is te-netbsd532.h - * - * Written by Ian Dall - * - * 19-Jun-94 - * - */ +/* This file is te-netbsd532.h + Written by Ian Dall + 19-Jun-94. */ #define TARGET_FORMAT "a.out-ns32k-netbsd" #include "obj-format.h" /* Maybe these should be more like TC_NS32532 and TC_NS32381 in case - * of conflicts. NS32381 is used in opcode/ns32k.h and that is also - * used by GDB. Need to check. - */ + of conflicts. NS32381 is used in opcode/ns32k.h and that is also + used by GDB. Need to check. */ #define NS32532 #define NS32381 diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-pc532mach.h binutils-2.9.5.0.46/gas/config/te-pc532mach.h --- binutils-2.9.5.0.42/gas/config/te-pc532mach.h Thu Jun 3 11:02:02 1999 +++ binutils-2.9.5.0.46/gas/config/te-pc532mach.h Thu May 18 14:21:45 2000 @@ -1,19 +1,13 @@ -/* - * This file is te-pc532.h - * - * Written by Ian Dall - * - * 24-May-94 - * - */ +/* This file is te-pc532.h + Written by Ian Dall + 24-May-94. */ #define TARGET_FORMAT "a.out-pc532-mach" #include "obj-format.h" /* Maybe these should be more like TC_NS32532 and TC_NS32381 in case - * of conflicts. NS32381 is used in opcode/ns32k.h and that is also - * used by GDB. Need to check. - */ + of conflicts. NS32381 is used in opcode/ns32k.h and that is also + used by GDB. Need to check. */ #define NS32532 #define NS32381 diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-ppcnw.h binutils-2.9.5.0.46/gas/config/te-ppcnw.h --- binutils-2.9.5.0.42/gas/config/te-ppcnw.h Thu Jun 3 11:02:02 1999 +++ binutils-2.9.5.0.46/gas/config/te-ppcnw.h Thu May 18 14:21:45 2000 @@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to - the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* Added these, because if we don't know what we're targetting we may need an assembler version of libgcc, and that will use local @@ -26,6 +27,6 @@ /* these define interfaces */ #include "obj-format.h" -/* gcc uses escape sequences for ppc/netware */ +/* gcc uses escape sequences for ppc/netware. */ #undef NO_STRING_ESCAPES diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-psos.h binutils-2.9.5.0.46/gas/config/te-psos.h --- binutils-2.9.5.0.42/gas/config/te-psos.h Thu Jun 3 11:02:02 1999 +++ binutils-2.9.5.0.46/gas/config/te-psos.h Thu May 18 14:21:45 2000 @@ -1,20 +1,16 @@ -/* - * This file is te-psos.h for embedded systems running pSOS. - * Contributed by Martin Anantharaman (martin@mail.imech.uni-duisburg.de) - */ +/* This file is te-psos.h for embedded systems running pSOS. + Contributed by Martin Anantharaman (martin@mail.imech.uni-duisburg.de). */ #define TE_PSOS /* Added these, because if we don't know what we're targetting we may need an assembler version of libgcc, and that will use local labels. */ - #define LOCAL_LABELS_DOLLAR 1 #define LOCAL_LABELS_FB 1 /* This makes GAS more versatile and blocks some ELF'isms in - tc-m68k.h. */ - + tc-m68k.h. */ #define REGISTER_PREFIX_OPTIONAL 1 #include "obj-format.h" diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-sparcaout.h binutils-2.9.5.0.46/gas/config/te-sparcaout.h --- binutils-2.9.5.0.42/gas/config/te-sparcaout.h Thu Jun 3 11:02:02 1999 +++ binutils-2.9.5.0.46/gas/config/te-sparcaout.h Thu May 18 14:21:45 2000 @@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to - the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #define TE_SPARCAOUT 1 #include "obj-format.h" diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-sun3.h binutils-2.9.5.0.46/gas/config/te-sun3.h --- binutils-2.9.5.0.42/gas/config/te-sun3.h Thu Jun 3 11:02:02 1999 +++ binutils-2.9.5.0.46/gas/config/te-sun3.h Thu May 18 14:21:45 2000 @@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to - the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* This header file contains the #defines specific to SUN computer SUN 3 series computers. (The only kind @@ -23,7 +24,6 @@ Rumor has it that this file will work on the Sun-2 if the assembler is called with -m68010 This is not tested. */ - #define TE_SUN3 1 diff -upr --new-file binutils-2.9.5.0.42/gas/config/te-sysv32.h binutils-2.9.5.0.46/gas/config/te-sysv32.h --- binutils-2.9.5.0.42/gas/config/te-sysv32.h Thu Jun 3 11:02:02 1999 +++ binutils-2.9.5.0.46/gas/config/te-sysv32.h Thu May 18 14:21:45 2000 @@ -1,4 +1,4 @@ -/* Remove leading underscore from the gcc generated symbol names */ +/* Remove leading underscore from the gcc generated symbol names. */ #define STRIP_UNDERSCORE #include "obj-format.h" diff -upr --new-file binutils-2.9.5.0.42/gas/configure binutils-2.9.5.0.46/gas/configure --- binutils-2.9.5.0.42/gas/configure Tue May 2 10:23:22 2000 +++ binutils-2.9.5.0.46/gas/configure Tue May 30 09:53:56 2000 @@ -1736,16 +1736,14 @@ for this_target in $target $canon_target hppa-*-lites*) fmt=elf em=hppa ;; hppa-*-osf*) fmt=som em=hppa ;; hppa-*-rtems*) fmt=elf em=hppa ;; -# Disabled until configury issues are sorted out across the various -# projects -# hppa-*-hpux11*) em=hppa -# case ${cpu} in -# hppa*w) -# fmt=elf;; -# hppa*) -# fmt=som;; -# esac -# ;; + hppa-*-hpux11*) em=hppa + case ${cpu} in + hppa*64*) + fmt=elf;; + hppa*) + fmt=som;; + esac + ;; hppa-*-hpux*) fmt=som em=hppa ;; hppa-*-mpeix*) fmt=som em=hppa ;; hppa-*-bsd*) fmt=som em=hppa ;; @@ -1768,7 +1766,7 @@ for this_target in $target $canon_target i386-*-lynxos*) fmt=coff em=lynx ;; i386-*-sysv4* | i386-*-solaris* | i386-*-elf) fmt=elf bfd_gas=yes ;; - i386-*-freebsdaout* | i386-*-freebsd12.* | i386-*-freebsd12) + i386-*-freebsdaout* | i386-*-freebsd[12].* | i386-*-freebsd[12]) fmt=aout em=386bsd ;; i386-*-freebsd*) fmt=elf bfd_gas=yes ;; i386-*-coff | i386-*-sysv* | i386-*-sco3.2v5*coff | i386-*-isc*) @@ -2247,12 +2245,12 @@ for em in . $emulations ; do fmt=elf file=mipself ;; mipsbecoff | mipslecoff) fmt=ecoff file=mipsecoff ;; - i386aout) - fmt=aout file=i386aout ;; - i386coff) - fmt=coff file=i386coff ;; - i386elf) - fmt=elf file=i386elf ;; + *coff) + fmt=coff file=$em ;; + *aout) + fmt=aout file=$em ;; + *elf) + fmt=elf file=$em ;; esac formats="$formats $fmt" emfiles="$emfiles e-$file.o" @@ -2430,7 +2428,7 @@ EOF # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2434: checking for $ac_word" >&5 +echo "configure:2432: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2460,7 +2458,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2464: checking for $ac_word" >&5 +echo "configure:2462: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2511,7 +2509,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2515: checking for $ac_word" >&5 +echo "configure:2513: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2543,7 +2541,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2547: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2545: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2554,12 +2552,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2558 "configure" +#line 2556 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2585,12 +2583,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2589: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2587: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2594: checking whether we are using GNU C" >&5 +echo "configure:2592: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2599,7 +2597,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2618,7 +2616,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2622: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2620: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2655,7 +2653,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2659: checking for $ac_word" >&5 +echo "configure:2657: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2686,7 +2684,7 @@ done test -n "$YACC" || YACC="yacc" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2690: checking how to run the C preprocessor" >&5 +echo "configure:2688: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2701,13 +2699,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2718,13 +2716,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2735,13 +2733,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2771,7 +2769,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2775: checking for $ac_word" >&5 +echo "configure:2773: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2804,7 +2802,7 @@ test -n "$LEX" || LEX=""$missing_dir/mis # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2808: checking for $ac_word" >&5 +echo "configure:2806: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2838,7 +2836,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:2842: checking for yywrap in -l$ac_lib" >&5 +echo "configure:2840: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2846,7 +2844,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2880,7 +2878,7 @@ fi fi echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:2884: checking lex output file root" >&5 +echo "configure:2882: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2901,7 +2899,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:2905: checking whether yytext is a pointer" >&5 +echo "configure:2903: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2913,14 +2911,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPU ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -2944,7 +2942,7 @@ fi ALL_LINGUAS= echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:2948: checking for POSIXized ISC" >&5 +echo "configure:2946: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -2965,12 +2963,12 @@ else fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2969: checking for ANSI C header files" >&5 +echo "configure:2967: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2978,7 +2976,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2995,7 +2993,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3013,7 +3011,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3034,7 +3032,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3045,7 +3043,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:3049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3069,12 +3067,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3073: checking for working const" >&5 +echo "configure:3071: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3144,21 +3142,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3148: checking for inline" >&5 +echo "configure:3146: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3184,12 +3182,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3188: checking for off_t" >&5 +echo "configure:3186: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3217,12 +3215,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3221: checking for size_t" >&5 +echo "configure:3219: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3252,19 +3250,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:3256: checking for working alloca.h" >&5 +echo "configure:3254: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:3268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -3285,12 +3283,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:3289: checking for alloca" >&5 +echo "configure:3287: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -3350,12 +3348,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:3354: checking whether alloca needs Cray hooks" >&5 +echo "configure:3352: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3384: checking for $ac_func" >&5 +echo "configure:3382: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3435,7 +3433,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:3439: checking stack direction for C alloca" >&5 +echo "configure:3437: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3443,7 +3441,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -3487,17 +3485,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3491: checking for $ac_hdr" >&5 +echo "configure:3489: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3526,12 +3524,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3530: checking for $ac_func" >&5 +echo "configure:3528: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3579,7 +3577,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3583: checking for working mmap" >&5 +echo "configure:3581: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3587,7 +3585,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -3755,17 +3753,17 @@ unistd.h values.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3759: checking for $ac_hdr" >&5 +echo "configure:3757: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3795,12 +3793,12 @@ done __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3799: checking for $ac_func" >&5 +echo "configure:3797: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3852,12 +3850,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3856: checking for $ac_func" >&5 +echo "configure:3854: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3914,19 +3912,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3918: checking for LC_MESSAGES" >&5 +echo "configure:3916: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:3930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -3947,7 +3945,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3951: checking whether NLS is requested" >&5 +echo "configure:3949: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -3967,7 +3965,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3971: checking whether included gettext is requested" >&5 +echo "configure:3969: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -3986,17 +3984,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3990: checking for libintl.h" >&5 +echo "configure:3988: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4013,19 +4011,19 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:4017: checking for gettext in libc" >&5 +echo "configure:4015: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:4029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -4041,7 +4039,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:4045: checking for bindtextdomain in -lintl" >&5 +echo "configure:4043: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4049,7 +4047,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4076,19 +4074,19 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:4080: checking for gettext in libintl" >&5 +echo "configure:4078: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libintl=yes else @@ -4116,7 +4114,7 @@ EOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4120: checking for $ac_word" >&5 +echo "configure:4118: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4150,12 +4148,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4154: checking for $ac_func" >&5 +echo "configure:4152: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4205,7 +4203,7 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4209: checking for $ac_word" >&5 +echo "configure:4207: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4241,7 +4239,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4245: checking for $ac_word" >&5 +echo "configure:4243: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4273,7 +4271,7 @@ else fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -4313,7 +4311,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4317: checking for $ac_word" >&5 +echo "configure:4315: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4347,7 +4345,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4351: checking for $ac_word" >&5 +echo "configure:4349: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4383,7 +4381,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4387: checking for $ac_word" >&5 +echo "configure:4385: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4473,7 +4471,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:4477: checking for catalogs to be installed" >&5 +echo "configure:4475: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -4501,17 +4499,17 @@ echo "configure:4477: checking for catal if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:4505: checking for linux/version.h" >&5 +echo "configure:4503: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4574,7 +4572,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:4578: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:4576: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -4597,12 +4595,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:4601: checking for Cygwin environment" >&5 +echo "configure:4599: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -4630,19 +4628,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:4634: checking for mingw32 environment" >&5 +echo "configure:4632: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -4661,7 +4659,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:4665: checking for executable suffix" >&5 +echo "configure:4663: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4671,7 +4669,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:4675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:4673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj | *.ilk | *.pdb) ;; @@ -4696,17 +4694,17 @@ for ac_hdr in string.h stdlib.h memory.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4700: checking for $ac_hdr" >&5 +echo "configure:4698: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4736,7 +4734,7 @@ done # Put this here so that autoconf's "cross-compiling" message doesn't confuse # people who are not cross-compiling but are compiling cross-assemblers. echo $ac_n "checking whether compiling a cross-assembler""... $ac_c" 1>&6 -echo "configure:4740: checking whether compiling a cross-assembler" >&5 +echo "configure:4738: checking whether compiling a cross-assembler" >&5 if test "${host}" = "${target}"; then cross_gas=no else @@ -4751,19 +4749,19 @@ echo "$ac_t""$cross_gas" 1>&6 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:4755: checking for working alloca.h" >&5 +echo "configure:4753: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:4767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -4784,12 +4782,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:4788: checking for alloca" >&5 +echo "configure:4786: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -4849,12 +4847,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:4853: checking whether alloca needs Cray hooks" >&5 +echo "configure:4851: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4883: checking for $ac_func" >&5 +echo "configure:4881: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4934,7 +4932,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:4938: checking stack direction for C alloca" >&5 +echo "configure:4936: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4942,7 +4940,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -4983,21 +4981,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:4987: checking for inline" >&5 +echo "configure:4985: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5027,12 +5025,12 @@ esac for ac_func in unlink remove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5031: checking for $ac_func" >&5 +echo "configure:5029: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5084,12 +5082,12 @@ done for ac_func in sbrk do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5088: checking for $ac_func" >&5 +echo "configure:5086: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5141,12 +5139,12 @@ done # enough, but on some of those systems, the assert macro relies on requoting # working properly! echo $ac_n "checking for working assert macro""... $ac_c" 1>&6 -echo "configure:5145: checking for working assert macro" >&5 +echo "configure:5143: checking for working assert macro" >&5 if eval "test \"`echo '$''{'gas_cv_assert_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5162,7 +5160,7 @@ assert (a == b ; return 0; } EOF -if { (eval echo configure:5166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_assert_ok=yes else @@ -5203,12 +5201,12 @@ gas_test_headers=" " echo $ac_n "checking whether declaration is required for strstr""... $ac_c" 1>&6 -echo "configure:5207: checking whether declaration is required for strstr" >&5 +echo "configure:5205: checking whether declaration is required for strstr" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_strstr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_strstr=no else @@ -5240,12 +5238,12 @@ fi echo $ac_n "checking whether declaration is required for malloc""... $ac_c" 1>&6 -echo "configure:5244: checking whether declaration is required for malloc" >&5 +echo "configure:5242: checking whether declaration is required for malloc" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_malloc=no else @@ -5277,12 +5275,12 @@ fi echo $ac_n "checking whether declaration is required for free""... $ac_c" 1>&6 -echo "configure:5281: checking whether declaration is required for free" >&5 +echo "configure:5279: checking whether declaration is required for free" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_free'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_free=no else @@ -5314,12 +5312,12 @@ fi echo $ac_n "checking whether declaration is required for sbrk""... $ac_c" 1>&6 -echo "configure:5318: checking whether declaration is required for sbrk" >&5 +echo "configure:5316: checking whether declaration is required for sbrk" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_sbrk'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_sbrk=no else @@ -5351,12 +5349,12 @@ fi echo $ac_n "checking whether declaration is required for environ""... $ac_c" 1>&6 -echo "configure:5355: checking whether declaration is required for environ" >&5 +echo "configure:5353: checking whether declaration is required for environ" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_environ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_environ=no else @@ -5391,12 +5389,12 @@ fi # for it? echo $ac_n "checking whether declaration is required for errno""... $ac_c" 1>&6 -echo "configure:5395: checking whether declaration is required for errno" >&5 +echo "configure:5393: checking whether declaration is required for errno" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_errno=no else diff -upr --new-file binutils-2.9.5.0.42/gas/configure.in binutils-2.9.5.0.46/gas/configure.in --- binutils-2.9.5.0.42/gas/configure.in Tue May 2 10:23:22 2000 +++ binutils-2.9.5.0.46/gas/configure.in Tue May 30 09:53:56 2000 @@ -199,16 +199,14 @@ changequote([,])dnl hppa-*-lites*) fmt=elf em=hppa ;; hppa-*-osf*) fmt=som em=hppa ;; hppa-*-rtems*) fmt=elf em=hppa ;; -# Disabled until configury issues are sorted out across the various -# projects -# hppa-*-hpux11*) em=hppa -# case ${cpu} in -# hppa*w) -# fmt=elf;; -# hppa*) -# fmt=som;; -# esac -# ;; + hppa-*-hpux11*) em=hppa + case ${cpu} in + hppa*64*) + fmt=elf;; + hppa*) + fmt=som;; + esac + ;; hppa-*-hpux*) fmt=som em=hppa ;; hppa-*-mpeix*) fmt=som em=hppa ;; hppa-*-bsd*) fmt=som em=hppa ;; @@ -231,8 +229,10 @@ changequote([,])dnl i386-*-lynxos*) fmt=coff em=lynx ;; i386-*-sysv4* | i386-*-solaris* | i386-*-elf) fmt=elf bfd_gas=yes ;; +changequote(,)dnl i386-*-freebsdaout* | i386-*-freebsd[12].* | i386-*-freebsd[12]) fmt=aout em=386bsd ;; +changequote([,])dnl i386-*-freebsd*) fmt=elf bfd_gas=yes ;; i386-*-coff | i386-*-sysv* | i386-*-sco3.2v5*coff | i386-*-isc*) fmt=coff ;; @@ -678,12 +678,12 @@ for em in . $emulations ; do fmt=elf file=mipself ;; mipsbecoff | mipslecoff) fmt=ecoff file=mipsecoff ;; - i386aout) - fmt=aout file=i386aout ;; - i386coff) - fmt=coff file=i386coff ;; - i386elf) - fmt=elf file=i386elf ;; + *coff) + fmt=coff file=$em ;; + *aout) + fmt=aout file=$em ;; + *elf) + fmt=elf file=$em ;; esac formats="$formats $fmt" emfiles="$emfiles e-$file.o" diff -upr --new-file binutils-2.9.5.0.42/gas/doc/as.texinfo binutils-2.9.5.0.46/gas/doc/as.texinfo --- binutils-2.9.5.0.42/gas/doc/as.texinfo Tue May 2 10:23:25 2000 +++ binutils-2.9.5.0.46/gas/doc/as.texinfo Tue May 30 09:54:01 2000 @@ -87,7 +87,7 @@ END-INFO-DIR-ENTRY @ifinfo This file documents the GNU Assembler "@value{AS}". -Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. +Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -142,7 +142,7 @@ done. @end tex @vskip 0pt plus 1filll -Copyright @copyright{} 1991, 92, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. +Copyright @copyright{} 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -1193,9 +1193,6 @@ By default, a local label is any label b target is allowed to redefine the local label prefix. @ifset HPPA On the HPPA local labels begin with @samp{L$}. -@end ifset -@ifset ARM -@samp{;} for the ARM family; @end ifset @node M diff -upr --new-file binutils-2.9.5.0.42/gas/doc/c-i386.texi binutils-2.9.5.0.46/gas/doc/c-i386.texi --- binutils-2.9.5.0.42/gas/doc/c-i386.texi Thu Aug 5 17:14:26 1999 +++ binutils-2.9.5.0.46/gas/doc/c-i386.texi Sun May 14 10:22:28 2000 @@ -24,6 +24,7 @@ * i386-Float:: Floating Point * i386-SIMD:: Intel's MMX and AMD's 3DNow! SIMD Operations * i386-16bit:: Writing 16-bit Code +* i386-Arch:: Specifying an x86 CPU architecture * i386-Bugs:: AT&T Syntax bugs * i386-Notes:: Notes @end menu @@ -35,13 +36,23 @@ @cindex i386 options (none) The 80386 has no machine dependent options. + @node i386-Syntax @section AT&T Syntax versus Intel Syntax +@cindex i386 intel_syntax pseudo op +@cindex intel_syntax pseudo op, i386 +@cindex i386 att_syntax pseudo op +@cindex att_syntax pseudo op, i386 @cindex i386 syntax compatibility @cindex syntax compatibility, i386 -In order to maintain compatibility with the output of @code{@value{GCC}}, -@code{@value{AS}} supports AT&T System V/386 assembler syntax. This is quite + +@code{@value{AS}} now supports assembly using Intel assembler syntax. +@code{.intel_syntax} selects Intel mode, and @code{.att_syntax} switches +back to the usual AT&T mode for compatibility with the output of +@code{@value{GCC}}. Either of these directives may have an optional +argument, @code{prefix}, or @code{noprefix} specifying whether registers +require a @samp{%} prefix. AT&T System V/386 assembler syntax is quite different from Intel syntax. We mention these differences because almost all 80386 documents use Intel syntax. Notable differences between the two syntaxes are: @@ -505,6 +516,31 @@ than the expected @samp{%st(3) - %st}. non-commutative arithmetic floating point operations with two register operands where the source register is @samp{%st} and the destination register is @samp{%st(i)}. + +@node i386-Arch +@section Specifying CPU Architecture + +@cindex arch directive, i386 +@cindex i386 arch directive + +@code{@value{AS}} may be told to assemble for a particular CPU +architecture with the @code{.arch @var{cpu_type}} directive. This +directive enables a warning when gas detects an instruction that is not +supported on the CPU specified. The choices for @var{cpu_type} are: + +@multitable @columnfractions .20 .20 .20 .20 +@item @samp{i8086} @tab @samp{i186} @tab @samp{i286} @tab @samp{i386} +@item @samp{i486} @tab @samp{i586} @tab @samp{i686} @tab @samp{pentium} +@item @samp{pentiumpro} @tab @samp{k6} @tab @samp{athlon} +@end multitable + +Apart from the warning, there is only one other effect on +@code{@value{AS}} operation; If you specify a CPU other than +@samp{i486}, then shift by one instructions such as @samp{sarl $1, %eax} +will automatically use a two byte opcode sequence. The larger three +byte opcode sequence is used on the 486 (and when no architecture is +specified) because it executes faster on the 486. Note that you can +explicitly request the two byte opcode by writing @samp{sarl %eax}. @node i386-Notes @section Notes diff -upr --new-file binutils-2.9.5.0.42/gas/doc/internals.texi binutils-2.9.5.0.46/gas/doc/internals.texi --- binutils-2.9.5.0.42/gas/doc/internals.texi Wed Apr 5 17:07:29 2000 +++ binutils-2.9.5.0.46/gas/doc/internals.texi Mon May 29 22:36:14 2000 @@ -8,8 +8,7 @@ This chapter describes the internals of the assembler. It is incomplete, but it may help a bit. -This chapter was last modified on $Date: 2000/04/04 20:39:36 $. It is not updated regularly, and it -may be out of date. +This chapter is not updated regularly, and it may be out of date. @menu * GAS versions:: GAS versions @@ -1406,8 +1405,8 @@ generate a @code{.file} symbol if none w @item SEPARATE_STAB_SECTIONS @cindex SEPARATE_STAB_SECTIONS -You may define this macro to indicate that stabs should be placed in separate -sections, as in ELF. +You may define this macro to a nonzero value to indicate that stabs should be +placed in separate sections, as in ELF. @item INIT_STAB_SECTION @cindex INIT_STAB_SECTION diff -upr --new-file binutils-2.9.5.0.42/gas/expr.c binutils-2.9.5.0.46/gas/expr.c --- binutils-2.9.5.0.42/gas/expr.c Sun Apr 23 09:40:49 2000 +++ binutils-2.9.5.0.46/gas/expr.c Fri Jun 2 16:26:58 2000 @@ -799,6 +799,9 @@ operand (expressionP) SKIP_WHITESPACE (); /* leading whitespace is part of operand. */ c = *input_line_pointer++; /* input_line_pointer->past char in c. */ + if (is_end_of_line[(unsigned char) c]) + goto eol; + switch (c) { case '1': @@ -1166,9 +1169,8 @@ operand (expressionP) { goto isname; } + case ',': - case '\n': - case '\0': eol: /* can't imagine any other kind of operand */ expressionP->X_op = O_absent; @@ -1211,8 +1213,6 @@ operand (expressionP) #ifdef TC_M68K de_fault: #endif - if (is_end_of_line[(unsigned char) c]) - goto eol; if (is_name_beginner (c)) /* here if did not begin with a digit */ { /* @@ -1570,6 +1570,9 @@ operator () operatorT ret; c = *input_line_pointer & 0xff; + + if (is_end_of_line[c]) + return O_illegal; switch (c) { diff -upr --new-file binutils-2.9.5.0.42/gas/frags.c binutils-2.9.5.0.46/gas/frags.c --- binutils-2.9.5.0.42/gas/frags.c Tue May 2 10:08:09 2000 +++ binutils-2.9.5.0.46/gas/frags.c Mon May 29 22:36:03 2000 @@ -1,5 +1,5 @@ /* frags.c - manage frags - - Copyright (C) 1987, 90, 91, 92, 93, 94, 95, 96, 97, 1998 + Copyright (C) 1987, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -95,11 +95,14 @@ frag_grow (nchars) * [frchain_now remains the same but frag_now is updated.] * Because this calculates the correct value of fr_fix by * looking at the obstack 'frags', it needs to know how many - * characters at the end of the old frag belong to (the maximal) - * fr_var: the rest must belong to fr_fix. - * It doesn't actually set up the old frag's fr_var: you may have - * set fr_var == 1, but allocated 10 chars to the end of the frag: - * in this case you pass old_frags_var_max_size == 10. + * characters at the end of the old frag belong to the maximal + * variable part; The rest must belong to fr_fix. + * It doesn't actually set up the old frag's fr_var. You may have + * set fr_var == 1, but allocated 10 chars to the end of the frag; + * In this case you pass old_frags_var_max_size == 10. + * In fact, you may use fr_var for something totally unrelated to the + * size of the variable part of the frag; None of the generic frag + * handling code makes use of fr_var. * * Make a new frag, initialising some components. Link new frag at end * of frchain_now. diff -upr --new-file binutils-2.9.5.0.42/gas/frags.h binutils-2.9.5.0.46/gas/frags.h --- binutils-2.9.5.0.42/gas/frags.h Thu Feb 3 15:24:46 2000 +++ binutils-2.9.5.0.46/gas/frags.h Mon May 29 22:36:03 2000 @@ -1,5 +1,5 @@ /* frags.h - Header file for the frag concept. - Copyright (C) 1987, 92, 93, 94, 95, 97, 98, 1999 + Copyright (C) 1987, 92, 93, 94, 95, 97, 98, 99, 2000 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -51,7 +51,8 @@ struct frag /* (Fixed) number of octets we know we have. May be 0. */ offsetT fr_fix; - /* (Variable) number of octets after above. May be 0. */ + /* May be used for (Variable) number of octets after above. + The generic frag handling code no longer makes any use of fr_var. */ offsetT fr_var; /* For variable-length tail. */ symbolS *fr_symbol; diff -upr --new-file binutils-2.9.5.0.42/gas/input-scrub.c binutils-2.9.5.0.46/gas/input-scrub.c --- binutils-2.9.5.0.42/gas/input-scrub.c Fri Mar 31 09:17:01 2000 +++ binutils-2.9.5.0.46/gas/input-scrub.c Mon May 29 22:36:04 2000 @@ -267,7 +267,7 @@ input_scrub_include_sb (from, position, int is_expansion; { if (macro_nest > max_macro_nest) - as_fatal (_("buffers nested too deeply")); + as_fatal (_("macros nested too deeply")); ++macro_nest; #ifdef md_macro_start @@ -312,7 +312,8 @@ input_scrub_next_buffer (bufp) if (sb_index >= from_sb.len) { sb_kill (&from_sb); - if (from_sb_is_expansion) + if (from_sb_is_expansion + ) { cond_finish_check (macro_nest); #ifdef md_macro_end diff -upr --new-file binutils-2.9.5.0.42/gas/obj.h binutils-2.9.5.0.46/gas/obj.h --- binutils-2.9.5.0.42/gas/obj.h Fri Jan 28 08:33:32 2000 +++ binutils-2.9.5.0.46/gas/obj.h Mon May 29 22:36:04 2000 @@ -50,6 +50,8 @@ struct format_ops { int flavor; unsigned dfl_leading_underscore : 1; unsigned emit_section_symbols : 1; + void (*begin) PARAMS ((void)); + void (*app_file) PARAMS ((const char *)); void (*frob_symbol) PARAMS ((symbolS *, int *)); void (*frob_file) PARAMS ((void)); void (*frob_file_after_relocs) PARAMS ((void)); @@ -58,10 +60,16 @@ struct format_ops { bfd_vma (*s_get_align) PARAMS ((symbolS *)); void (*s_set_align) PARAMS ((symbolS *, bfd_vma)); int (*s_get_other) PARAMS ((symbolS *)); + void (*s_set_other) PARAMS ((symbolS *, int)); int (*s_get_desc) PARAMS ((symbolS *)); + void (*s_set_desc) PARAMS ((symbolS *, int)); + int (*s_get_type) PARAMS ((symbolS *)); + void (*s_set_type) PARAMS ((symbolS *, int)); void (*copy_symbol_attributes) PARAMS ((symbolS *, symbolS *)); void (*generate_asm_lineno) PARAMS ((void)); void (*process_stab) PARAMS ((segT, int, const char *, int, int, int)); + int (*separate_stab_sections) PARAMS ((void)); + void (*init_stab_section) PARAMS ((segT)); int (*sec_sym_ok_for_reloc) PARAMS ((asection *)); void (*pop_insert) PARAMS ((void)); /* For configurations using ECOFF_DEBUGGING, this callback is used. */ diff -upr --new-file binutils-2.9.5.0.42/gas/read.c binutils-2.9.5.0.46/gas/read.c --- binutils-2.9.5.0.42/gas/read.c Sun Apr 23 09:48:02 2000 +++ binutils-2.9.5.0.46/gas/read.c Sun Jun 4 09:18:04 2000 @@ -146,33 +146,33 @@ char lex_type[256] = * In: a character. * Out: 1 if this character ends a line. */ -#define Z_ (0) char is_end_of_line[256] = { #ifdef CR_EOL - 99, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, 99, Z_, Z_, 99, Z_, Z_, /* @abcdefghijklmno */ + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, /* @abcdefghijklmno */ #else - 99, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, 99, Z_, Z_, Z_, Z_, Z_, /* @abcdefghijklmno */ + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, /* @abcdefghijklmno */ #endif - Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, /* */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* _!"#$%&'()*+,-./ */ #ifdef TC_HPPA - Z_,99, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, /* _!"#$%&'()*+,-./ */ - Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, /* 0123456789:;<=>? */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0123456789:;<=>? */ #else - Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, /* */ - Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, 99, Z_, Z_, Z_, Z_, /* 0123456789:;<=>? */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, /* 0123456789:;<=>? */ #endif - Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, /* */ - Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, /* */ - Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, /* */ - Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, /* */ - Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, /* */ - Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, /* */ - Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, /* */ - Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, /* */ - Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, Z_, /* */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 /* */ }; -#undef Z_ /* Functions private to this file. */ diff -upr --new-file binutils-2.9.5.0.42/gas/read.h binutils-2.9.5.0.46/gas/read.h --- binutils-2.9.5.0.42/gas/read.h Sat Feb 19 11:22:03 2000 +++ binutils-2.9.5.0.46/gas/read.h Sun May 21 14:19:42 2000 @@ -89,6 +89,7 @@ enum linkonce_type extern void pop_insert PARAMS ((const pseudo_typeS *)); extern unsigned int get_stab_string_offset PARAMS ((const char *string, const char *stabstr_secname)); +extern void aout_process_stab PARAMS ((int, const char *, int, int, int)); extern char *demand_copy_C_string PARAMS ((int *len_pointer)); extern char get_absolute_expression_and_terminator PARAMS ((long *val_pointer)); diff -upr --new-file binutils-2.9.5.0.42/gas/stabs.c binutils-2.9.5.0.46/gas/stabs.c --- binutils-2.9.5.0.42/gas/stabs.c Thu Feb 3 15:24:47 2000 +++ binutils-2.9.5.0.46/gas/stabs.c Sun May 21 14:19:42 2000 @@ -131,9 +131,8 @@ get_stab_string_offset (string, stabstr_ #define OBJ_PROCESS_STAB(SEG,W,S,T,O,D) aout_process_stab(W,S,T,O,D) #endif -static void aout_process_stab PARAMS ((int, const char *, int, int, int)); - -static void +/* Here instead of obj-aout.c because other formats use it too. */ +void aout_process_stab (what, string, type, other, desc) int what; const char *string; @@ -441,7 +440,7 @@ s_xstab (what) void s_desc (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { char *name; char c; diff -upr --new-file binutils-2.9.5.0.42/gas/testsuite/ChangeLog binutils-2.9.5.0.46/gas/testsuite/ChangeLog --- binutils-2.9.5.0.42/gas/testsuite/ChangeLog Fri May 12 08:04:19 2000 +++ binutils-2.9.5.0.46/gas/testsuite/ChangeLog Sun May 21 14:19:48 2000 @@ -1,3 +1,11 @@ +Sun May 21 10:08:08 2000 Hans-Peter Nilsson + + * gas/elf/elf.exp: Exclude *-*-linux*coff* as non-elf. + +2000-05-15 Nick Clifton + + * gas/arm/arch4t.s: Add tests of new fields to msr instruction. + 2000-05-11 Ulf Carlsson * gas/mips/mips.exp: Include *-*-linux* in svr4pic. diff -upr --new-file binutils-2.9.5.0.42/gas/testsuite/gas/arm/arch4t.s binutils-2.9.5.0.46/gas/testsuite/gas/arm/arch4t.s --- binutils-2.9.5.0.42/gas/testsuite/gas/arm/arch4t.s Thu Jun 3 11:02:02 1999 +++ binutils-2.9.5.0.46/gas/testsuite/gas/arm/arch4t.s Thu May 18 14:21:49 2000 @@ -18,4 +18,18 @@ foo: strh r2, bar strneh r3, [r3] + + msr CPSR_f, #2 + msr CPSR_c, r3 + msr CPSR_x, r4 + msr CPSR_s, r5 + msr CPSR_f, r6 + msr CPSR_all, r7 + + msr SPSR_f, #4 + msr SPSR_c, r8 + msr SPSR_x, r9 + msr SPSR_s, r10 + msr SPSR_f, r11 + msr SPSR_all, r12 bar: diff -upr --new-file binutils-2.9.5.0.42/gas/testsuite/gas/elf/elf.exp binutils-2.9.5.0.46/gas/testsuite/gas/elf/elf.exp --- binutils-2.9.5.0.42/gas/testsuite/gas/elf/elf.exp Tue Oct 12 09:04:51 1999 +++ binutils-2.9.5.0.46/gas/testsuite/gas/elf/elf.exp Sun May 21 14:51:06 2000 @@ -8,6 +8,7 @@ if { ([istarget "*-*-elf*"] || [istarget "sparc*-*-solaris*"] || [istarget "mips*-*-irix6*"]) && ![istarget *-*-linux*aout*] + && ![istarget *-*-linux*coff*] && ![istarget *-*-linux*oldld*] } then { run_dump_test "section0" diff -upr --new-file binutils-2.9.5.0.42/gas/testsuite/gas/ieee-fp/x930509a.exp binutils-2.9.5.0.46/gas/testsuite/gas/ieee-fp/x930509a.exp --- binutils-2.9.5.0.42/gas/testsuite/gas/ieee-fp/x930509a.exp Fri Mar 31 09:17:19 2000 +++ binutils-2.9.5.0.46/gas/testsuite/gas/ieee-fp/x930509a.exp Mon May 29 22:36:23 2000 @@ -19,6 +19,8 @@ proc dotest {} { if !$x then { fail "$testname (listing didn't match)" } } -if ![istarget vax*-*-*] then { +# C54x alignment/addressing is different, so the listing looks different +# float encoding is tested in c54x-specific tests +if { ![istarget vax*-*-*] && ![istarget *c54x*-*-*] } then { dotest } diff -upr --new-file binutils-2.9.5.0.42/gas/testsuite/gas/mn10300/basic.exp binutils-2.9.5.0.46/gas/testsuite/gas/mn10300/basic.exp --- binutils-2.9.5.0.42/gas/testsuite/gas/mn10300/basic.exp Mon Apr 3 09:46:48 2000 +++ binutils-2.9.5.0.46/gas/testsuite/gas/mn10300/basic.exp Mon May 29 22:36:29 2000 @@ -1,4 +1,4 @@ -# Copyright (C) 1996 Free Software Foundation, Inc. +# Copyright (C) 1996, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -upr --new-file binutils-2.9.5.0.42/gprof/ChangeLog binutils-2.9.5.0.46/gprof/ChangeLog --- binutils-2.9.5.0.42/gprof/ChangeLog Wed Apr 12 10:06:50 2000 +++ binutils-2.9.5.0.46/gprof/ChangeLog Thu Jun 1 11:10:55 2000 @@ -1,3 +1,58 @@ +2000-05-31 Nick Clifton + + * gprof.h (_): Revert previous delta. We want to use gettext, + not dgettext in the _ macro. + +2000-05-29 Alan Modra + + * gprof.h (_): Use BFD version. + +2000-05-26 Nick Clifton + + * gprof.c (main): When calling getopt_long indicate that the 'd' + switch takes an optional argument, whereas the 'D' switch takes no + argument at all. + +2000-05-26 Alan Modra + + * dep-in.sed: Copy from ../binutils. + * Makefile.am: Update dependencies with "make dep-am" + * Makefile.in: Regenerate. + + * gprof.h: Remove most nls defines. They are pulled in by + bfd/sysdep.h. #include "ansidecl.h" not + +2000-05-26 Eli Zaretskii + + * gprof.texi: Fix numerous typos. Mention some DOS/Windows related + issues. + + * configure.in: Check for setmode function. + * configure: Regenerate. + + * gmon_io.h (SET_BINARY) [HAVE_SETMODE]: Define. + + * gmon_io.c (gmon_out_read) [SET_BINARY]: Switch stdin into binary + mode. + + * source.c: Include filenames.h and sys/stat.h. + (source_file_lookup_path, source_file_lookup_name): Use + FILENAME_CMP to compare file names. + (annotate_source) [__MSDOS__]: If "filename-ann" would overwrite + "filename", replace the extension with ".ann". + [HAVE_DOS_BASED_FILE_SYSTEM]: Support file names with + backslashes and drive letters. + Use IS_ABSOLUTE_PATH. + + * search_list.h (PATH_SEP_CHAR): Define. + + * search_list.c (search_list_append): Use PATH_SEP_CHAR. + + * hertz.c (HERTZ) [__MSDOS__]: Don't define unless they have + neither HAVE_SETITIMER nor HAVE_SYSCONF. + [HAVE_SETITIMER]: If they define both HAVE_SETITIMER and + HAVE_SYSCONF, try setitimer and fall back on sysconf. + Fri Apr 7 15:56:57 2000 Andrew Cagney * configure.in (WARN_CFLAGS): Set to -W -Wall by default. Add diff -upr --new-file binutils-2.9.5.0.42/gprof/Makefile.am binutils-2.9.5.0.46/gprof/Makefile.am --- binutils-2.9.5.0.42/gprof/Makefile.am Wed Apr 12 10:27:34 2000 +++ binutils-2.9.5.0.46/gprof/Makefile.am Tue May 30 09:55:34 2000 @@ -96,89 +96,97 @@ CLEANFILES = dep.sed DEP DEP1 DEP2 # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. basic_blocks.o: basic_blocks.c basic_blocks.h gprof.h \ - $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ - gconfig.h $(INCDIR)/bin-bugs.h source.h search_list.h \ - symtab.h ../bfd/bfd.h corefile.h gmon_io.h gmon.h gmon_out.h \ + $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \ + $(INCDIR)/bin-bugs.h source.h search_list.h symtab.h \ + ../bfd/bfd.h corefile.h gmon_io.h gmon.h gmon_out.h \ $(INCDIR)/libiberty.h sym_ids.h -call_graph.o: call_graph.c cg_arcs.h gprof.h $(BFDDIR)/sysdep.h \ - ../bfd/config.h $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ +call_graph.o: call_graph.c cg_arcs.h gprof.h $(INCDIR)/ansidecl.h \ + $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \ symtab.h ../bfd/bfd.h source.h search_list.h call_graph.h \ corefile.h gmon_io.h gmon.h gmon_out.h sym_ids.h cg_arcs.o: cg_arcs.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ - gconfig.h $(INCDIR)/bin-bugs.h call_graph.h symtab.h \ - ../bfd/bfd.h source.h search_list.h cg_arcs.h cg_dfn.h \ - cg_print.h utils.h sym_ids.h + $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \ + call_graph.h symtab.h ../bfd/bfd.h source.h search_list.h \ + cg_arcs.h cg_dfn.h cg_print.h utils.h sym_ids.h cg_dfn.o: cg_dfn.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ - gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ - source.h search_list.h cg_dfn.h utils.h + $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \ + cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \ + cg_dfn.h utils.h cg_print.o: cg_print.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ cg_arcs.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - symtab.h ../bfd/bfd.h source.h search_list.h cg_print.h \ - hist.h utils.h + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \ + $(INCDIR)/bin-bugs.h symtab.h ../bfd/bfd.h source.h \ + search_list.h cg_print.h hist.h utils.h corefile.o: corefile.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ - gconfig.h $(INCDIR)/bin-bugs.h corefile.h ../bfd/bfd.h \ - symtab.h source.h search_list.h -gmon_io.o: gmon_io.c cg_arcs.h gprof.h $(BFDDIR)/sysdep.h \ - ../bfd/config.h $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ + $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \ + corefile.h ../bfd/bfd.h symtab.h source.h search_list.h +gmon_io.o: gmon_io.c cg_arcs.h gprof.h $(INCDIR)/ansidecl.h \ + $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \ symtab.h ../bfd/bfd.h source.h search_list.h basic_blocks.h \ corefile.h call_graph.h gmon_io.h gmon.h gmon_out.h \ hertz.h hist.h $(INCDIR)/libiberty.h gprof.o: gprof.c $(INCDIR)/getopt.h $(INCDIR)/libiberty.h \ $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \ + $(INCDIR)/bin-bugs.h basic_blocks.h source.h search_list.h \ $(INCDIR)/demangle.h \ - basic_blocks.h source.h search_list.h symtab.h ../bfd/bfd.h \ - call_graph.h cg_arcs.h cg_print.h corefile.h gmon_io.h \ - gmon.h hertz.h hist.h sym_ids.h -hertz.o: hertz.c hertz.h gprof.h $(BFDDIR)/sysdep.h \ - ../bfd/config.h $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h + symtab.h ../bfd/bfd.h call_graph.h cg_arcs.h cg_print.h \ + corefile.h gmon_io.h gmon.h hertz.h hist.h sym_ids.h +hertz.o: hertz.c hertz.h gprof.h $(INCDIR)/ansidecl.h \ + $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h hist.o: hist.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ - gconfig.h $(INCDIR)/bin-bugs.h corefile.h ../bfd/bfd.h \ - gmon_io.h gmon.h gmon_out.h hist.h symtab.h source.h \ - search_list.h sym_ids.h utils.h -source.o: source.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - $(INCDIR)/libiberty.h search_list.h source.h + $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \ + corefile.h ../bfd/bfd.h gmon_io.h gmon.h gmon_out.h \ + hist.h symtab.h source.h search_list.h sym_ids.h utils.h +source.o: source.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h $(INCDIR)/libiberty.h \ + search_list.h source.h search_list.o: search_list.c $(INCDIR)/libiberty.h \ $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - search_list.h -symtab.o: symtab.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \ - corefile.h + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \ + $(INCDIR)/bin-bugs.h search_list.h +symtab.o: symtab.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + source.h search_list.h corefile.h sym_ids.o: sym_ids.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ cg_arcs.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - symtab.h ../bfd/bfd.h source.h search_list.h sym_ids.h + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \ + $(INCDIR)/bin-bugs.h symtab.h ../bfd/bfd.h source.h \ + search_list.h sym_ids.h utils.o: utils.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h -i386.o: i386.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \ - corefile.h hist.h -alpha.o: alpha.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \ - corefile.h hist.h -vax.o: vax.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \ - corefile.h hist.h -tahoe.o: tahoe.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \ - corefile.h hist.h -sparc.o: sparc.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \ - corefile.h hist.h + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \ + $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + source.h search_list.h +i386.o: i386.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + source.h search_list.h corefile.h hist.h +alpha.o: alpha.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + source.h search_list.h corefile.h hist.h +vax.o: vax.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + source.h search_list.h corefile.h hist.h +tahoe.o: tahoe.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + source.h search_list.h corefile.h hist.h +sparc.o: sparc.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + source.h search_list.h corefile.h hist.h flat_bl.o: flat_bl.c bsd_callg_bl.o: bsd_callg_bl.c fsf_callg_bl.o: fsf_callg_bl.c diff -upr --new-file binutils-2.9.5.0.42/gprof/Makefile.in binutils-2.9.5.0.46/gprof/Makefile.in --- binutils-2.9.5.0.42/gprof/Makefile.in Wed Apr 12 10:27:34 2000 +++ binutils-2.9.5.0.46/gprof/Makefile.in Tue May 30 09:55:34 2000 @@ -743,89 +743,97 @@ dep-am: DEP # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. basic_blocks.o: basic_blocks.c basic_blocks.h gprof.h \ - $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ - gconfig.h $(INCDIR)/bin-bugs.h source.h search_list.h \ - symtab.h ../bfd/bfd.h corefile.h gmon_io.h gmon.h gmon_out.h \ + $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \ + $(INCDIR)/bin-bugs.h source.h search_list.h symtab.h \ + ../bfd/bfd.h corefile.h gmon_io.h gmon.h gmon_out.h \ $(INCDIR)/libiberty.h sym_ids.h -call_graph.o: call_graph.c cg_arcs.h gprof.h $(BFDDIR)/sysdep.h \ - ../bfd/config.h $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ +call_graph.o: call_graph.c cg_arcs.h gprof.h $(INCDIR)/ansidecl.h \ + $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \ symtab.h ../bfd/bfd.h source.h search_list.h call_graph.h \ corefile.h gmon_io.h gmon.h gmon_out.h sym_ids.h cg_arcs.o: cg_arcs.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ - gconfig.h $(INCDIR)/bin-bugs.h call_graph.h symtab.h \ - ../bfd/bfd.h source.h search_list.h cg_arcs.h cg_dfn.h \ - cg_print.h utils.h sym_ids.h + $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \ + call_graph.h symtab.h ../bfd/bfd.h source.h search_list.h \ + cg_arcs.h cg_dfn.h cg_print.h utils.h sym_ids.h cg_dfn.o: cg_dfn.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ - gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ - source.h search_list.h cg_dfn.h utils.h + $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \ + cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \ + cg_dfn.h utils.h cg_print.o: cg_print.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ cg_arcs.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - symtab.h ../bfd/bfd.h source.h search_list.h cg_print.h \ - hist.h utils.h + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \ + $(INCDIR)/bin-bugs.h symtab.h ../bfd/bfd.h source.h \ + search_list.h cg_print.h hist.h utils.h corefile.o: corefile.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ - gconfig.h $(INCDIR)/bin-bugs.h corefile.h ../bfd/bfd.h \ - symtab.h source.h search_list.h -gmon_io.o: gmon_io.c cg_arcs.h gprof.h $(BFDDIR)/sysdep.h \ - ../bfd/config.h $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ + $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \ + corefile.h ../bfd/bfd.h symtab.h source.h search_list.h +gmon_io.o: gmon_io.c cg_arcs.h gprof.h $(INCDIR)/ansidecl.h \ + $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \ symtab.h ../bfd/bfd.h source.h search_list.h basic_blocks.h \ corefile.h call_graph.h gmon_io.h gmon.h gmon_out.h \ hertz.h hist.h $(INCDIR)/libiberty.h gprof.o: gprof.c $(INCDIR)/getopt.h $(INCDIR)/libiberty.h \ $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \ + $(INCDIR)/bin-bugs.h basic_blocks.h source.h search_list.h \ $(INCDIR)/demangle.h \ - basic_blocks.h source.h search_list.h symtab.h ../bfd/bfd.h \ - call_graph.h cg_arcs.h cg_print.h corefile.h gmon_io.h \ - gmon.h hertz.h hist.h sym_ids.h -hertz.o: hertz.c hertz.h gprof.h $(BFDDIR)/sysdep.h \ - ../bfd/config.h $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h + symtab.h ../bfd/bfd.h call_graph.h cg_arcs.h cg_print.h \ + corefile.h gmon_io.h gmon.h hertz.h hist.h sym_ids.h +hertz.o: hertz.c hertz.h gprof.h $(INCDIR)/ansidecl.h \ + $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h hist.o: hist.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \ - gconfig.h $(INCDIR)/bin-bugs.h corefile.h ../bfd/bfd.h \ - gmon_io.h gmon.h gmon_out.h hist.h symtab.h source.h \ - search_list.h sym_ids.h utils.h -source.o: source.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - $(INCDIR)/libiberty.h search_list.h source.h + $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \ + corefile.h ../bfd/bfd.h gmon_io.h gmon.h gmon_out.h \ + hist.h symtab.h source.h search_list.h sym_ids.h utils.h +source.o: source.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h $(INCDIR)/libiberty.h \ + search_list.h source.h search_list.o: search_list.c $(INCDIR)/libiberty.h \ $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - search_list.h -symtab.o: symtab.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \ - corefile.h + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \ + $(INCDIR)/bin-bugs.h search_list.h +symtab.o: symtab.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + source.h search_list.h corefile.h sym_ids.o: sym_ids.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ cg_arcs.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - symtab.h ../bfd/bfd.h source.h search_list.h sym_ids.h + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \ + $(INCDIR)/bin-bugs.h symtab.h ../bfd/bfd.h source.h \ + search_list.h sym_ids.h utils.o: utils.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h -i386.o: i386.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \ - corefile.h hist.h -alpha.o: alpha.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \ - corefile.h hist.h -vax.o: vax.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \ - corefile.h hist.h -tahoe.o: tahoe.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \ - corefile.h hist.h -sparc.o: sparc.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/fopen-same.h gconfig.h $(INCDIR)/bin-bugs.h \ - cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \ - corefile.h hist.h + $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \ + $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + source.h search_list.h +i386.o: i386.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + source.h search_list.h corefile.h hist.h +alpha.o: alpha.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + source.h search_list.h corefile.h hist.h +vax.o: vax.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + source.h search_list.h corefile.h hist.h +tahoe.o: tahoe.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + source.h search_list.h corefile.h hist.h +sparc.o: sparc.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \ + source.h search_list.h corefile.h hist.h flat_bl.o: flat_bl.c bsd_callg_bl.o: bsd_callg_bl.c fsf_callg_bl.o: fsf_callg_bl.c diff -upr --new-file binutils-2.9.5.0.42/gprof/configure binutils-2.9.5.0.46/gprof/configure --- binutils-2.9.5.0.42/gprof/configure Wed Apr 12 10:27:34 2000 +++ binutils-2.9.5.0.46/gprof/configure Tue May 30 09:55:34 2000 @@ -1839,10 +1839,65 @@ else ISC= fi +for ac_func in setmode +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1846: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + ALL_LINGUAS= echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1846: checking how to run the C preprocessor" >&5 +echo "configure:1901: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1857,13 +1912,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1874,13 +1929,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1891,13 +1946,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1922,12 +1977,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1926: checking for ANSI C header files" >&5 +echo "configure:1981: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1935,7 +1990,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1952,7 +2007,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1970,7 +2025,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1991,7 +2046,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2002,7 +2057,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:2006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2026,12 +2081,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2030: checking for working const" >&5 +echo "configure:2085: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2101,21 +2156,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2105: checking for inline" >&5 +echo "configure:2160: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2141,12 +2196,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2145: checking for off_t" >&5 +echo "configure:2200: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2174,12 +2229,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2178: checking for size_t" >&5 +echo "configure:2233: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2209,19 +2264,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2213: checking for working alloca.h" >&5 +echo "configure:2268: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2242,12 +2297,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2246: checking for alloca" >&5 +echo "configure:2301: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2307,12 +2362,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2311: checking whether alloca needs Cray hooks" >&5 +echo "configure:2366: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2341: checking for $ac_func" >&5 +echo "configure:2396: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2392,7 +2447,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2396: checking stack direction for C alloca" >&5 +echo "configure:2451: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2400,7 +2455,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2444,17 +2499,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2448: checking for $ac_hdr" >&5 +echo "configure:2503: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2483,12 +2538,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2487: checking for $ac_func" >&5 +echo "configure:2542: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2536,7 +2591,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2540: checking for working mmap" >&5 +echo "configure:2595: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2544,7 +2599,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2712,17 +2767,17 @@ unistd.h values.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2716: checking for $ac_hdr" >&5 +echo "configure:2771: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2752,12 +2807,12 @@ done __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2756: checking for $ac_func" >&5 +echo "configure:2811: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2809,12 +2864,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2813: checking for $ac_func" >&5 +echo "configure:2868: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2871,19 +2926,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2875: checking for LC_MESSAGES" >&5 +echo "configure:2930: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -2904,7 +2959,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2908: checking whether NLS is requested" >&5 +echo "configure:2963: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -2924,7 +2979,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2928: checking whether included gettext is requested" >&5 +echo "configure:2983: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -2943,17 +2998,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2947: checking for libintl.h" >&5 +echo "configure:3002: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2970,19 +3025,19 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:2974: checking for gettext in libc" >&5 +echo "configure:3029: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:2986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -2998,7 +3053,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3002: checking for bindtextdomain in -lintl" >&5 +echo "configure:3057: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3006,7 +3061,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3033,19 +3088,19 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:3037: checking for gettext in libintl" >&5 +echo "configure:3092: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libintl=yes else @@ -3073,7 +3128,7 @@ EOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3077: checking for $ac_word" >&5 +echo "configure:3132: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3107,12 +3162,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3111: checking for $ac_func" >&5 +echo "configure:3166: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3162,7 +3217,7 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3166: checking for $ac_word" >&5 +echo "configure:3221: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3198,7 +3253,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3202: checking for $ac_word" >&5 +echo "configure:3257: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3230,7 +3285,7 @@ else fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -3270,7 +3325,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3274: checking for $ac_word" >&5 +echo "configure:3329: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3304,7 +3359,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3308: checking for $ac_word" >&5 +echo "configure:3363: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3340,7 +3395,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3344: checking for $ac_word" >&5 +echo "configure:3399: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3430,7 +3485,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3434: checking for catalogs to be installed" >&5 +echo "configure:3489: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -3458,17 +3513,17 @@ echo "configure:3434: checking for catal if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:3462: checking for linux/version.h" >&5 +echo "configure:3517: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3531,12 +3586,12 @@ fi echo $ac_n "checking whether weak symbol works""... $ac_c" 1>&6 -echo "configure:3535: checking whether weak symbol works" >&5 +echo "configure:3590: checking whether weak symbol works" >&5 if eval "test \"`echo '$''{'libiberty_cv_have_weak_symbol'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libiberty_cv_have_weak_symbol=no else @@ -3569,14 +3624,14 @@ if test $libiberty_cv_have_weak_symbol = # demangler may use dlopen. echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6 -echo "configure:3573: checking for library containing dlopen" >&5 +echo "configure:3628: checking for library containing dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_dlopen="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_dlopen="none required" else @@ -3598,7 +3653,7 @@ rm -f conftest* test "$ac_cv_search_dlopen" = "no" && for i in dl; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_dlopen="-l$i" break @@ -3632,7 +3687,7 @@ fi fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:3636: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:3691: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -3655,12 +3710,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:3659: checking for Cygwin environment" >&5 +echo "configure:3714: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -3688,19 +3743,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:3692: checking for mingw32 environment" >&5 +echo "configure:3747: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -3719,7 +3774,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:3723: checking for executable suffix" >&5 +echo "configure:3778: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3729,7 +3784,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:3733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:3788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj | *.ilk | *.pdb) ;; diff -upr --new-file binutils-2.9.5.0.42/gprof/configure.in binutils-2.9.5.0.46/gprof/configure.in --- binutils-2.9.5.0.42/gprof/configure.in Wed Apr 12 10:27:34 2000 +++ binutils-2.9.5.0.46/gprof/configure.in Tue May 30 09:55:35 2000 @@ -18,6 +18,7 @@ AC_PROG_CC AC_PROG_INSTALL AC_ISC_POSIX +AC_CHECK_FUNCS(setmode) ALL_LINGUAS= CY_GNU_GETTEXT diff -upr --new-file binutils-2.9.5.0.42/gprof/dep-in.sed binutils-2.9.5.0.46/gprof/dep-in.sed --- binutils-2.9.5.0.42/gprof/dep-in.sed Wed Dec 31 16:00:00 1969 +++ binutils-2.9.5.0.46/gprof/dep-in.sed Mon May 29 22:36:39 2000 @@ -0,0 +1,17 @@ +:loop +/\\$/N +/\\$/b loop + +s!@INCDIR@!$(INCDIR)!g +s!@BFDDIR@!$(BFDDIR)!g +s!@SRCDIR@/!!g +s!@OBJDIR@/!!g + +s/\\\n */ /g + +s/ *$// +s/ */ /g +/:$/d + +s/\(.\{50\}[^ ]*\) /\1 \\\ + /g diff -upr --new-file binutils-2.9.5.0.42/gprof/gconfig.in binutils-2.9.5.0.46/gprof/gconfig.in --- binutils-2.9.5.0.42/gprof/gconfig.in Thu Jun 3 11:02:08 1999 +++ binutils-2.9.5.0.46/gprof/gconfig.in Mon May 29 22:36:39 2000 @@ -73,6 +73,9 @@ /* Define if you have the setlocale function. */ #undef HAVE_SETLOCALE +/* Define if you have the setmode function. */ +#undef HAVE_SETMODE + /* Define if you have the stpcpy function. */ #undef HAVE_STPCPY diff -upr --new-file binutils-2.9.5.0.42/gprof/gmon_io.c binutils-2.9.5.0.46/gprof/gmon_io.c --- binutils-2.9.5.0.42/gprof/gmon_io.c Mon Sep 27 11:11:23 1999 +++ binutils-2.9.5.0.46/gprof/gmon_io.c Mon May 29 22:36:39 2000 @@ -72,6 +72,9 @@ DEFUN (gmon_out_read, (filename), const if (strcmp (filename, "-") == 0) { ifp = stdin; +#ifdef SET_BINARY + SET_BINARY (fileno (stdin)); +#endif } else { diff -upr --new-file binutils-2.9.5.0.42/gprof/gmon_io.h binutils-2.9.5.0.46/gprof/gmon_io.h --- binutils-2.9.5.0.42/gprof/gmon_io.h Thu Jun 3 11:02:08 1999 +++ binutils-2.9.5.0.46/gprof/gmon_io.h Mon May 29 22:36:39 2000 @@ -4,6 +4,24 @@ #include "bfd.h" #include "gmon.h" +/* Some platforms need to put stdin into binary mode, to read + binary files. */ +#include "sysdep.h" +#ifdef HAVE_SETMODE +#ifndef O_BINARY +#ifdef _O_BINARY +#define O_BINARY _O_BINARY +#define setmode _setmode +#else +#define O_BINARY 0 +#endif +#endif +#if O_BINARY +#include +#define SET_BINARY(f) do { if (!isatty(f)) setmode(f,O_BINARY); } while (0) +#endif +#endif + #define INPUT_HISTOGRAM (1<<0) #define INPUT_CALL_GRAPH (1<<1) #define INPUT_BB_COUNTS (1<<2) diff -upr --new-file binutils-2.9.5.0.42/gprof/gprof.c binutils-2.9.5.0.46/gprof/gprof.c --- binutils-2.9.5.0.42/gprof/gprof.c Wed Apr 5 17:15:19 2000 +++ binutils-2.9.5.0.46/gprof/gprof.c Tue May 30 09:55:35 2000 @@ -185,7 +185,7 @@ DEFUN (main, (argc, argv), int argc AND xmalloc_set_program_name (whoami); while ((ch = getopt_long (argc, argv, - "aA::bBcCdD::e:E:f:F:hiI:J::k:lLm:n::N::O:p::P::q::Q::st:Tvw:xyzZ::", + "aA::bBcCd::De:E:f:F:hiI:J::k:lLm:n::N::O:p::P::q::Q::st:Tvw:xyzZ::", long_options, 0)) != EOF) { diff -upr --new-file binutils-2.9.5.0.42/gprof/gprof.h binutils-2.9.5.0.46/gprof/gprof.h --- binutils-2.9.5.0.42/gprof/gprof.h Mon Apr 3 09:46:57 2000 +++ binutils-2.9.5.0.46/gprof/gprof.h Thu Jun 1 11:10:56 2000 @@ -21,7 +21,7 @@ #ifndef gprof_h #define gprof_h -#include +#include "ansidecl.h" /* Include the BFD sysdep.h file. */ #include "sysdep.h" @@ -30,8 +30,6 @@ gprof config.h file. */ #undef PACKAGE #undef VERSION -/* Also undefine BFD's `_' macro; we have our own definition. */ -#undef _ #include "gconfig.h" @@ -49,7 +47,7 @@ #define PATH_MAX 1024 #endif -#define A_OUTNAME "a.out" /* default core filename */ +#define A_OUTNAME "a.out" /* default core filename */ #define GMONNAME "gmon.out" /* default profile filename */ #define GMONSUM "gmon.sum" /* profile summary filename */ @@ -58,22 +56,9 @@ #endif #ifdef ENABLE_NLS -# include -# define _(String) gettext (String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -/* Stubs that do something close enough. */ -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) +/* Undefine BFD's `_' macro - it uses dgetext() and we want to use gettext(). */ +#undef _ +#define _(String) gettext (String) #endif #include "bin-bugs.h" diff -upr --new-file binutils-2.9.5.0.42/gprof/gprof.texi binutils-2.9.5.0.46/gprof/gprof.texi --- binutils-2.9.5.0.42/gprof/gprof.texi Sun Jun 20 10:04:59 1999 +++ binutils-2.9.5.0.46/gprof/gprof.texi Mon May 29 22:36:39 2000 @@ -16,7 +16,7 @@ END-INFO-DIR-ENTRY @ifinfo This file documents the gprof profiler of the GNU system. -Copyright (C) 1988, 1992, 1997, 1998, 1999 Free Software Foundation, Inc. +Copyright (C) 1988, 92, 97, 98, 99, 2000 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -53,11 +53,8 @@ can use it to determine which parts of a execution time. We assume that you know how to write, compile, and execute programs. @sc{gnu} @code{gprof} was written by Jay Fenlason. -This manual was edited January 1993 by Jeffrey Osier -and updated September 1997 by Brent Baccala. - @vskip 0pt plus 1filll -Copyright @copyright{} 1988, 1992, 1997, 1998 Free Software Foundation, Inc. +Copyright @copyright{} 1988, 92, 97, 98, 99, 2000 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -89,8 +86,6 @@ can use it to determine which parts of a execution time. We assume that you know how to write, compile, and execute programs. @sc{gnu} @code{gprof} was written by Jay Fenlason. -This manual was updated August 1997 by Brent Baccala. - @menu * Introduction:: What profiling means, and why it is useful. @@ -303,7 +298,7 @@ The order of these options does not matt * Output Options:: Controlling @code{gprof}'s output style * Analysis Options:: Controlling how @code{gprof} analyses its data * Miscellaneous Options:: -* Depricated Options:: Options you no longer need to use, but which +* Deprecated Options:: Options you no longer need to use, but which have been retained for compatibility * Symspecs:: Specifying functions to include or exclude @end menu @@ -344,7 +339,7 @@ The @samp{-C} option causes @code{gprof} print a tally of functions and the number of times each was called. If @var{symspec} is specified, print tally only for matching symbols. -If the profile data file contains basic-block count records, specifing +If the profile data file contains basic-block count records, specifying the @samp{-l} option, along with @samp{-C}, will cause basic-block execution counts to be tallied and displayed. @@ -358,7 +353,7 @@ call graph, and basic-block count record @itemx --directory-path=@var{dirs} The @samp{-I} option specifies a list of search directories in which to find source files. Environment variable @var{GPROF_PATH} -can also be used to convery this information. +can also be used to convey this information. Used mostly for annotated source output. @item -J[@var{symspec}] @@ -407,10 +402,15 @@ but excludes matching symbols. @item -y @itemx --separate-files This option affects annotated source output only. -Normally, gprof prints annotated source files +Normally, @code{gprof} prints annotated source files to standard-output. If this option is specified, -annotated source for a file named @file{path/filename} -is generated in the file @file{filename-ann}. +annotated source for a file named @file{path/@var{filename}} +is generated in the file @file{@var{filename}-ann}. If the underlying +filesystem would truncate @file{@var{filename}-ann} so that it +overwrites the original @file{@var{filename}}, @code{gprof} generates +annotated source in the file @file{@var{filename}.ann} instead (if the +original file name has an extension, that extension is @emph{replaced} +with @file{.ann}). @item -Z[@var{symspec}] @itemx --no-exec-counts[=@var{symspec}] @@ -456,7 +456,8 @@ c-decl.o:00000000 T print_lang_type @end group @end smallexample -GNU @code{nm} @samp{--extern-only} @samp{--defined-only} @samp{-v} @samp{--print-file-name} can be used to create @var{map_file}. +To create a @var{map_file} with @sc{gnu} @code{nm}, type a command like +@kbd{nm --extern-only --defined-only -v --print-file-name program-name}. @item -T @itemx --traditional @@ -565,7 +566,7 @@ that had no time spent in them. This is @end table -@node Miscellaneous Options,Depricated Options,Analysis Options,Invoking +@node Miscellaneous Options,Deprecated Options,Analysis Options,Invoking @section Miscellaneous Options @table @code @@ -601,8 +602,8 @@ number, and then exit. @end table -@node Depricated Options,Symspecs,Miscellaneous Options,Invoking -@section Depricated Options +@node Deprecated Options,Symspecs,Miscellaneous Options,Invoking +@section Deprecated Options @table @code @@ -653,7 +654,7 @@ gprof -e boring -f foo -f bar myprogram lists in the call graph all functions that were reached from either @code{foo} or @code{bar} and were not reachable from @code{boring}. -@node Symspecs,,Depricated Options,Invoking +@node Symspecs,,Deprecated Options,Invoking @section Symspecs Many of the output options allow functions to be included or excluded @@ -672,7 +673,7 @@ Here are some sample symspecs: @table @samp @item main.c Selects everything in file @file{main.c}---the -dot in the string tells gprof to interpret +dot in the string tells @code{gprof} to interpret the string as a filename, rather than as a function name. To select a file whose name does not contain a dot, a trailing colon @@ -691,11 +692,13 @@ Sometimes, function names contain dots. to add a leading colon to the name. For example, @samp{:.mul} selects function @samp{.mul}. -In some object file formats, symbols have a leading underscore. gprof -will normally not print these underscores. However, you must use the -underscore when you name a symbol in a symspec. You can use the -@code{nm} program to see whether symbols have underscores for the object -file format you are using. +In some object file formats, symbols have a leading underscore. +@code{gprof} will normally not print these underscores. When you name a +symbol in a symspec, you should type it exactly as @code{gprof} prints +it in its output. For example, if the compiler produces a symbol +@samp{_main} from your @code{main} function, @code{gprof} still prints +it as @samp{main} in its output, so you should use @samp{main} in +symspecs. @item main.c:main Selects function @samp{main} in file @file{main.c}. @@ -769,7 +772,7 @@ Each sample counts as 0.01 seconds. The functions are sorted by first by decreasing run-time spent in them, then by decreasing number of calls, then alphabetically by name. The functions @samp{mcount} and @samp{profil} are part of the profiling -aparatus and appear in every flat profile; their time gives a measure of +apparatus and appear in every flat profile; their time gives a measure of the amount of overhead due to profiling. Just before the column headers, a statement appears indicating @@ -781,10 +784,10 @@ suggesting a 100 Hz sampling rate. The program's total execution time was 0.06 seconds, as indicated by the @samp{cumulative seconds} field. Since each sample counted for 0.01 seconds, this means only six samples -were taken during the run. Two of the samples occured while the +were taken during the run. Two of the samples occurred while the program was in the @samp{open} function, as indicated by the @samp{self seconds} field. Each of the other four samples -occured one each in @samp{offtime}, @samp{memccpy}, @samp{write}, +occurred one each in @samp{offtime}, @samp{memccpy}, @samp{write}, and @samp{mcount}. Since only six samples were taken, none of these values can be regarded as particularly reliable. @@ -1019,7 +1022,7 @@ of the amount of time spent within calls @item called Two numbers: the number of times @code{report} was called from @code{main}, -followed by the total number of nonrecursive calls to @code{report} from +followed by the total number of non-recursive calls to @code{report} from all its callers. @item name and index number @@ -1078,7 +1081,7 @@ of the total time spent in calls to @cod @item called Two numbers, the number of calls to @code{report} from @code{main} -followed by the total number of nonrecursive calls to @code{report}. +followed by the total number of non-recursive calls to @code{report}. This ratio is used to determine how much of @code{report}'s @code{self} and @code{children} time gets credited to @code{main}. @xref{Assumptions}. @@ -1211,7 +1214,7 @@ The @code{calls} field in the primary li first, the number of times functions in the cycle were called by functions outside the cycle; second, the number of times they were called by functions in the cycle (including times when a function in the cycle calls -itself). This is a generalization of the usual split into nonrecursive and +itself). This is a generalization of the usual split into non-recursive and recursive calls. The @code{calls} field of a subroutine-line for a cycle member in the @@ -1275,7 +1278,7 @@ index % time self children called Now let's look at some of @code{gprof}'s output from the same program run, this time with line-by-line profiling enabled. Note that @code{ct_init}'s four histogram hits are broken down into four lines of source code - one hit -occured on each of lines 349, 351, 382 and 385. In the call graph, +occurred on each of lines 349, 351, 382 and 385. In the call graph, note how @code{ct_init}'s 13327 calls to @code{init_block} are broken down into one call from line 396, 3071 calls from line 384, 3730 calls @@ -1328,7 +1331,7 @@ number of times it was called. You may Compiling with @samp{gcc @dots{} -g -pg -a} augments your program with basic-block counting code, in addition to function counting code. This enables @code{gprof} to determine how many times each line -of code was exeucted. +of code was executed. For example, consider the following function, taken from gzip, with line numbers added: @@ -1364,7 +1367,7 @@ the fifth basic-block. The compiler may basic-blocks to handle various special cases. A program augmented for basic-block counting can be analyzed with -@code{gprof -l -A}. I also suggest use of the @samp{-x} option, +@samp{gprof -l -A}. I also suggest use of the @samp{-x} option, which ensures that each line of code is labeled at least once. Here is @code{updcrc}'s annotated source listing for a sample @code{gzip} run: @@ -1526,7 +1529,7 @@ but not necessarily those that consumed @item How do I find which lines in my program called a particular function? -Use @code{gprof -l} and lookup the function in the call graph. +Use @samp{gprof -l} and lookup the function in the call graph. The callers will be broken down by function and line number. @item How do I analyze a program that runs for less than a second? @@ -1582,7 +1585,7 @@ in the form @samp{from/to}, instead of @ @item In the annotated source listing, if there are multiple basic blocks on the same line, -@sc{gnu} @code{gprof} prints all of their counts, seperated by commas. +@sc{gnu} @code{gprof} prints all of their counts, separated by commas. @ignore - it does this now @item @@ -1601,7 +1604,7 @@ tables without skipping the blurbs. @chapter Details of Profiling @menu -* Implementation:: How a program collets profiling information +* Implementation:: How a program collects profiling information * File Format:: Format of @samp{gmon.out} files * Internals:: @code{gprof}'s internal operation * Debugging:: Using @code{gprof}'s @samp{-d} option @@ -1624,14 +1627,14 @@ is responsible for recording in an in-me both its parent routine (the child) and its parent's parent. This is typically done by examining the stack frame to find both the address of the child, and the return address in the original parent. -Since this is a very machine-dependant operation, @code{mcount} +Since this is a very machine-dependent operation, @code{mcount} itself is typically a short assembly-language stub routine that extracts the required information, and then calls @code{__mcount_internal} (a normal C function) with two arguments - @code{frompc} and @code{selfpc}. @code{__mcount_internal} is responsible for maintaining the in-memory call graph, which records @code{frompc}, @code{selfpc}, -and the number of times each of these call arcs was transversed. +and the number of times each of these call arcs was traversed. GCC Version 2 provides a magical function (@code{__builtin_return_address}), which allows a generic @code{mcount} function to extract the @@ -1724,7 +1727,7 @@ load due to other users won't directly a The old BSD-derived file format used for profile data does not contain a magic cookie that allows to check whether a data file really is a -gprof file. Furthermore, it does not provide a version number, thus +@code{gprof} file. Furthermore, it does not provide a version number, thus rendering changes to the file format almost impossible. @sc{gnu} @code{gprof} uses a new file format that provides these features. For backward compatibility, @sc{gnu} @code{gprof} continues to support the old BSD-derived @@ -1827,7 +1830,7 @@ Next, the BFD library is called to open verify that it is an object file, and read its symbol table (@code{core.c:core_init}), using @code{bfd_canonicalize_symtab} after mallocing -an appropiate sized array of asymbols. At this point, +an appropriately sized array of symbols. At this point, function mappings are read (if the @samp{--file-ordering} option has been specified), and the core text space is read into memory (if the @samp{-c} option was given). @@ -1845,7 +1848,7 @@ In either case, two passes are made thro table - one to count the size of the symbol table required, and the other to actually read the symbols. In between the two passes, a single array of type @code{Sym} is created of -the appropiate length. +the appropriate length. Finally, @code{symtab.c:symtab_finalize} is called to sort the symbol table and remove duplicate entries (entries with the same memory address). @@ -1931,7 +1934,7 @@ cause each of two adjacent lines to be c a hit, for example. If call graph data is present, @code{cg_arcs.c:cg_assemble} is called. -First, if @samp{-c} was specified, a machine-dependant +First, if @samp{-c} was specified, a machine-dependent routine (@code{find_call}) scans through each symbol's machine code, looking for subroutine call instructions, and adding them to the call graph with a zero call count. @@ -1945,14 +1948,14 @@ Cycles are also detected at this point, of which are assigned the same topological number. Two passes are now made through this sorted array of symbol pointers. The first pass, from end to beginning (parents to children), -computes the fraction of child time to propogate to each parent +computes the fraction of child time to propagate to each parent and a print flag. The print flag reflects symspec handling of INCL_GRAPH/EXCL_GRAPH, with a parent's include or exclude (print or no print) property being propagated to its children, unless they themselves explicitly appear in INCL_GRAPH or EXCL_GRAPH. A second pass, from beginning to end (children to parents) actually -propogates the timings along the call graph, subject +propagates the timings along the call graph, subject to a check against INCL_TIME/EXCL_TIME. With the print flag, fractions, and timings now stored in the symbol structures, the topological sort array is now discarded, and a diff -upr --new-file binutils-2.9.5.0.42/gprof/hertz.c binutils-2.9.5.0.46/gprof/hertz.c --- binutils-2.9.5.0.42/gprof/hertz.c Thu Jun 3 11:02:08 1999 +++ binutils-2.9.5.0.46/gprof/hertz.c Mon May 29 22:36:39 2000 @@ -19,10 +19,6 @@ #include "hertz.h" -#ifdef __MSDOS__ -#define HERTZ 18 -#endif - int hertz () { @@ -38,17 +34,19 @@ hertz () tim.it_value.tv_usec = 0; setitimer (ITIMER_REAL, &tim, 0); setitimer (ITIMER_REAL, 0, &tim); - if (tim.it_interval.tv_usec < 2) + if (tim.it_interval.tv_usec >= 2) { - return HZ_WRONG; + return 1000000 / tim.it_interval.tv_usec; } - return 1000000 / tim.it_interval.tv_usec; -#else /* ! defined (HAVE_SETITIMER) */ +#endif /* ! defined (HAVE_SETITIMER) */ #if defined (HAVE_SYSCONF) && defined (_SC_CLK_TCK) return sysconf (_SC_CLK_TCK); #else /* ! defined (HAVE_SYSCONF) || ! defined (_SC_CLK_TCK) */ +#ifdef __MSDOS__ + return 18; +#else /* ! defined (__MSDOS__) */ return HZ_WRONG; +#endif /* ! defined (__MSDOS__) */ #endif /* ! defined (HAVE_SYSCONF) || ! defined (_SC_CLK_TCK) */ -#endif /* ! defined (HAVE_SETITIMER) */ #endif /* ! defined (HERTZ) */ } diff -upr --new-file binutils-2.9.5.0.42/gprof/search_list.c binutils-2.9.5.0.46/gprof/search_list.c --- binutils-2.9.5.0.42/gprof/search_list.c Thu Jun 3 11:02:08 1999 +++ binutils-2.9.5.0.46/gprof/search_list.c Mon May 29 22:36:39 2000 @@ -15,7 +15,7 @@ DEFUN (search_list_append, (list, paths) do { beg = colon + 1; - colon = strchr (beg, ':'); + colon = strchr (beg, PATH_SEP_CHAR); if (colon) { len = colon - beg; diff -upr --new-file binutils-2.9.5.0.42/gprof/search_list.h binutils-2.9.5.0.46/gprof/search_list.h --- binutils-2.9.5.0.42/gprof/search_list.h Thu Jun 3 11:02:08 1999 +++ binutils-2.9.5.0.46/gprof/search_list.h Mon May 29 22:36:39 2000 @@ -1,6 +1,14 @@ #ifndef search_list_h #define search_list_h +/* Non-Posix systems use semi-colon as directory separator in lists, + since colon is part of drive letter spec. */ +#if defined (__MSDOS__) || defined (_WIN32) +#define PATH_SEP_CHAR ';' +#else +#define PATH_SEP_CHAR ':' +#endif + typedef struct search_list_elem { struct search_list_elem *next; diff -upr --new-file binutils-2.9.5.0.42/gprof/source.c binutils-2.9.5.0.46/gprof/source.c --- binutils-2.9.5.0.42/gprof/source.c Thu Jun 3 11:02:08 1999 +++ binutils-2.9.5.0.46/gprof/source.c Mon May 29 22:36:39 2000 @@ -1,8 +1,11 @@ /* * Keeps track of source files. */ +#include + #include "gprof.h" #include "libiberty.h" +#include "filenames.h" #include "search_list.h" #include "source.h" @@ -25,7 +28,7 @@ DEFUN (source_file_lookup_path, (path), for (sf = first_src_file; sf; sf = sf->next) { - if (strcmp (path, sf->name) == 0) + if (FILENAME_CMP (path, sf->name) == 0) { break; } @@ -66,7 +69,7 @@ DEFUN (source_file_lookup_name, (filenam { fname = sf->name; } - if (strcmp (filename, fname) == 0) + if (FILENAME_CMP (filename, fname) == 0) { break; } @@ -95,7 +98,7 @@ DEFUN (annotate_source, (sf, max_width, * open succeeds or reaching end of list: */ strcpy (fname, sf->name); - if (sf->name[0] == '/') + if (IS_ABSOLUTE_PATH (sf->name)) { sle = 0; /* don't use search list for absolute paths */ } @@ -112,6 +115,15 @@ DEFUN (annotate_source, (sf, max_width, if (!sle && !name_only) { name_only = strrchr (sf->name, '/'); +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + { + char *bslash = strrchr (sf->name, '\\'); + if (bslash > name_only) + name_only = bslash; + if (name_only == NULL && sf->name[0] != '\0' && sf->name[1] == ':') + name_only = (char *)sf->name + 1; + } +#endif if (name_only) { /* try search-list again, but this time with name only: */ @@ -122,6 +134,11 @@ DEFUN (annotate_source, (sf, max_width, if (sle) { strcpy (fname, sle->path); +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + /* d:foo is not the same thing as d:/foo! */ + if (fname[strlen (fname) - 1] == ':') + strcat (fname, "."); +#endif strcat (fname, "/"); if (name_only) { @@ -156,6 +173,15 @@ DEFUN (annotate_source, (sf, max_width, /* create annotation files in the current working directory: */ filename = strrchr (sf->name, '/'); +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + { + char *bslash = strrchr (sf->name, '\\'); + if (bslash > filename) + filename = bslash; + if (filename == NULL && sf->name[0] != '\0' && sf->name[1] == ':') + filename = sf->name + 1; + } +#endif if (filename) { ++filename; @@ -167,6 +193,24 @@ DEFUN (annotate_source, (sf, max_width, strcpy (fname, filename); strcat (fname, EXT_ANNO); +#ifdef __MSDOS__ + { + /* foo.cpp-ann can overwrite foo.cpp due to silent truncation of + file names on 8+3 filesystems. Their `stat' better be good... */ + struct stat buf1, buf2; + + if (stat (filename, &buf1) == 0 + && stat (fname, &buf2) == 0 + && buf1.st_ino == buf2.st_ino) + { + char *dot = strrchr (fname, '.'); + + if (dot) + *dot = '\0'; + strcat (fname, ".ann"); + } + } +#endif ofp = fopen (fname, "w"); if (!ofp) { diff -upr --new-file binutils-2.9.5.0.42/gprof/sym_ids.c binutils-2.9.5.0.46/gprof/sym_ids.c --- binutils-2.9.5.0.42/gprof/sym_ids.c Mon Jul 12 10:14:13 1999 +++ binutils-2.9.5.0.46/gprof/sym_ids.c Mon May 29 22:36:39 2000 @@ -201,7 +201,10 @@ DEFUN (match, (pattern, sym), Sym * patt { return (pattern->file ? pattern->file == sym->file : TRUE) && (pattern->line_num ? pattern->line_num == sym->line_num : TRUE) - && (pattern->name ? strcmp (pattern->name, sym->name) == 0 : TRUE); + && (pattern->name + ? strcmp (pattern->name, + sym->name+(discard_underscores && sym->name[0] == '_')) == 0 + : TRUE); } diff -upr --new-file binutils-2.9.5.0.42/include/ChangeLog binutils-2.9.5.0.46/include/ChangeLog --- binutils-2.9.5.0.42/include/ChangeLog Fri May 12 08:03:58 2000 +++ binutils-2.9.5.0.46/include/ChangeLog Thu Jun 1 11:10:05 2000 @@ -1,3 +1,18 @@ +Tue May 30 16:53:34 2000 Andrew Cagney + + * floatformat.h (struct floatformat): Add field name. + +2000-05-26 Eli Zaretskii + + * filenames.h: New file. + (HAVE_DOS_BASED_FILE_SYSTEM, IS_DIR_SEPARATOR) + (IS_ABSOLUTE_PATH, FILENAME_CMP): New macros. + +2000-05-17 S. Bharadwaj Yadavalli + Rick Gorton + + * bfdlink.h (struct bfd_link_info): Add emitrelocations flag. + 2000-05-08 Alan Modra * dis-asm.h (print_insn_tic54x): Declare. @@ -269,7 +284,7 @@ Mon Feb 1 21:05:46 1999 Catherine Moor * dis-asm.h (print_insn_i386_att): Declare. (print_insn_i386_intel): Declare. -998-12-30 Michael Meissner +1998-12-30 Michael Meissner * dis-asm.h (INIT_DISASSEMBLE_INFO_NO_ARCH): Cast STREAM and FPRINTF_FUNC to avoid compiler warnings. @@ -299,8 +314,7 @@ Tue Dec 8 00:30:31 1998 Elena Zannoni (demangling_styles): add new edg_demangling style (EDG_DEMANGLING_STYLE_STRING): new macro (EDG_DEMANGLING): new macro - - * demangle.h (DMGL_HP): new macro, for HP/aCC compiler. + (DMGL_HP): new macro, for HP/aCC compiler. (DMGL_STYLE_MASK): modify to include new HP's style. (demangling_styles): add new hp_demangling value. (HP_DEMANGLING_STYLE_STRING): new macro. diff -upr --new-file binutils-2.9.5.0.42/include/bfdlink.h binutils-2.9.5.0.46/include/bfdlink.h --- binutils-2.9.5.0.42/include/bfdlink.h Sun Mar 12 09:40:14 2000 +++ binutils-2.9.5.0.46/include/bfdlink.h Thu May 18 15:10:35 2000 @@ -179,6 +179,8 @@ struct bfd_link_info const struct bfd_link_callbacks *callbacks; /* true if BFD should generate a relocateable object file. */ boolean relocateable; + /* true if BFD should generate relocation information in the final executable. */ + boolean emitrelocations; /* true if BFD should generate a "task linked" object file, similar to relocatable but also with globals converted to statics. */ boolean task_link; diff -upr --new-file binutils-2.9.5.0.42/include/coff/ti.h binutils-2.9.5.0.46/include/coff/ti.h --- binutils-2.9.5.0.42/include/coff/ti.h Tue Apr 18 10:05:42 2000 +++ binutils-2.9.5.0.46/include/coff/ti.h Mon May 29 22:35:54 2000 @@ -232,12 +232,12 @@ PUT_SCNHDR_PAGE(ABFD,((struct internal_s /* Page macros The first GDB port requires flags in its remote memory access commands to - distinguish between data/prog space. hopefully we can make this go away - eventually. stuff the page in the upper bits of a 32-bit address, since + distinguish between data/prog space. Hopefully we can make this go away + eventually. Stuff the page in the upper bits of a 32-bit address, since the c5x family only uses 16 or 23 bits. c2x, c5x and most c54x devices have 16-bit addresses, but the c548 has - 23-bit program addresses. make sure the page flags don't interfere + 23-bit program addresses. Make sure the page flags don't interfere. These flags are used by GDB to identify the destination page for addresses. */ diff -upr --new-file binutils-2.9.5.0.42/include/elf/ChangeLog binutils-2.9.5.0.46/include/elf/ChangeLog --- binutils-2.9.5.0.42/include/elf/ChangeLog Tue May 2 10:59:25 2000 +++ binutils-2.9.5.0.46/include/elf/ChangeLog Sat Jun 3 14:33:43 2000 @@ -1,3 +1,14 @@ +2000-06-03 Alan Modra + + * reloc-macros.h (START_RELOC_NUMBERS): Fix name clash for + !__STDC__ case. + (RELOC_NUMBER): Use ansi stringify if ALMOST_STDC defined. + +2000-05-22 Richard Henderson + + * ia64.h (R_IA64_PCREL60B, R_IA64_PCREL21BI): New. + (R_IA64_PCREL22, R_IA64_PCREL64I): New. + 2000-05-02 H.J. Lu * common.h (ELFOSABI_NONE): Renamed from ELFOSABI_SYSV. diff -upr --new-file binutils-2.9.5.0.42/include/elf/ia64.h binutils-2.9.5.0.46/include/elf/ia64.h --- binutils-2.9.5.0.42/include/elf/ia64.h Sun Apr 23 09:40:42 2000 +++ binutils-2.9.5.0.46/include/elf/ia64.h Mon May 29 22:35:54 2000 @@ -1,5 +1,5 @@ /* IA-64 ELF support for BFD. - Copyright (C) 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. Contributed by David Mosberger-Tang This file is part of BFD, the Binary File Descriptor library. @@ -113,6 +113,7 @@ START_RELOC_NUMBERS (elf_ia64_reloc_type RELOC_NUMBER (R_IA64_FPTR64MSB, 0x46) /* @fptr(sym + add), data8 MSB */ RELOC_NUMBER (R_IA64_FPTR64LSB, 0x47) /* @fptr(sym + add), data8 LSB */ + RELOC_NUMBER (R_IA64_PCREL60B, 0x48) /* @pcrel(sym + add), brl */ RELOC_NUMBER (R_IA64_PCREL21B, 0x49) /* @pcrel(sym + add), ptb, call */ RELOC_NUMBER (R_IA64_PCREL21M, 0x4a) /* @pcrel(sym + add), chk.s */ RELOC_NUMBER (R_IA64_PCREL21F, 0x4b) /* @pcrel(sym + add), fchkf */ @@ -146,6 +147,10 @@ START_RELOC_NUMBERS (elf_ia64_reloc_type RELOC_NUMBER (R_IA64_LTV32LSB, 0x71) /* symbol + addend, data4 LSB */ RELOC_NUMBER (R_IA64_LTV64MSB, 0x72) /* symbol + addend, data8 MSB */ RELOC_NUMBER (R_IA64_LTV64LSB, 0x73) /* symbol + addend, data8 LSB */ + + RELOC_NUMBER (R_IA64_PCREL21BI, 0x79) /* @pcrel(sym + add), ptb, call */ + RELOC_NUMBER (R_IA64_PCREL22, 0x7a) /* @pcrel(sym + add), imm22 */ + RELOC_NUMBER (R_IA64_PCREL64I, 0x7b) /* @pcrel(sym + add), imm64 */ RELOC_NUMBER (R_IA64_IPLTMSB, 0x80) /* dynamic reloc, imported PLT, MSB */ RELOC_NUMBER (R_IA64_IPLTLSB, 0x81) /* dynamic reloc, imported PLT, LSB */ diff -upr --new-file binutils-2.9.5.0.42/include/elf/mips.h binutils-2.9.5.0.46/include/elf/mips.h --- binutils-2.9.5.0.42/include/elf/mips.h Sun Mar 12 09:32:32 2000 +++ binutils-2.9.5.0.46/include/elf/mips.h Mon May 29 22:35:55 2000 @@ -1,5 +1,5 @@ /* MIPS ELF support for BFD. - Copyright (C) 1993, 1994, 1995, 1996, 1998 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1996, 1998, 2000 Free Software Foundation, Inc. By Ian Lance Taylor, Cygnus Support, , from information in the System V Application Binary Interface, MIPS diff -upr --new-file binutils-2.9.5.0.42/include/elf/mn10300.h binutils-2.9.5.0.46/include/elf/mn10300.h --- binutils-2.9.5.0.42/include/elf/mn10300.h Thu Dec 2 08:45:05 1999 +++ binutils-2.9.5.0.46/include/elf/mn10300.h Mon May 29 22:35:55 2000 @@ -1,5 +1,5 @@ /* MN10300 ELF support for BFD. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2000 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. diff -upr --new-file binutils-2.9.5.0.42/include/elf/reloc-macros.h binutils-2.9.5.0.46/include/elf/reloc-macros.h --- binutils-2.9.5.0.42/include/elf/reloc-macros.h Thu Jun 3 11:02:09 1999 +++ binutils-2.9.5.0.46/include/elf/reloc-macros.h Sat Jun 3 14:33:43 2000 @@ -1,5 +1,5 @@ /* Generic relocation support for BFD. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2000 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -59,7 +59,7 @@ } } */ - + #ifndef _RELOC_MACROS_H #define _RELOC_MACROS_H @@ -78,15 +78,15 @@ name (rtype) \ switch (rtype) \ { -#ifdef __STDC__ +#if defined (__STDC__) || defined (ALMOST_STDC) #define RELOC_NUMBER(name, number) case number : return #name ; #else #define RELOC_NUMBER(name, number) case number : return "name" ; #endif -#define FAKE_RELOC(name, number) +#define FAKE_RELOC(name, number) #define EMPTY_RELOC(name) - + #define END_RELOC_NUMBERS \ default: return NULL; \ } \ @@ -100,15 +100,15 @@ name (rtype) \ to -1 so that the first real entry will still default to 0). Further entries then prepend a comma to their definitions, creating a list of enumerator entries that will satisfy these compilers. */ -#ifdef __STDC__ +#if defined (__STDC__) || defined (ALMOST_STDC) #define START_RELOC_NUMBERS(name) enum name { _##name = -1 #else -#define START_RELOC_NUMBERS(name) enum name { name = -1 +#define START_RELOC_NUMBERS(name) enum name { _/**/name = -1 #endif - + #define RELOC_NUMBER(name, number) , name = number -#define FAKE_RELOC(name, number) , name = number -#define EMPTY_RELOC(name) , name +#define FAKE_RELOC(name, number) , name = number +#define EMPTY_RELOC(name) , name #define END_RELOC_NUMBERS }; #endif diff -upr --new-file binutils-2.9.5.0.42/include/filenames.h binutils-2.9.5.0.46/include/filenames.h --- binutils-2.9.5.0.42/include/filenames.h Wed Dec 31 16:00:00 1969 +++ binutils-2.9.5.0.46/include/filenames.h Mon May 29 22:35:52 2000 @@ -0,0 +1,51 @@ +/* Macros for taking apart, interpreting and processing file names. + + These are here because some non-Posix (a.k.a. DOSish) systems have + drive letter brain-damage at the beginning of an absolute file name, + use forward- and back-slash in path names interchangeably, and + some of them have case-insensitive file names. + + Copyright 2000 Free Software Foundation, Inc. + +This file is part of BFD, the Binary File Descriptor library. + +This program 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 of the License, or +(at your option) any later version. + +This program 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 this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef FILENAMES_H +#define FILENAMES_H + +#if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__) + +#ifndef HAVE_DOS_BASED_FILE_SYSTEM +#define HAVE_DOS_BASED_FILE_SYSTEM 1 +#endif + +#define IS_DIR_SEPARATOR(c) ((c) == '/' || (c) == '\\') +/* Note that IS_ABSOLUTE_PATH accepts d:foo as well, although it is + only semi-absolute. This is because the users of IS_ABSOLUTE_PATH + want to know whether to prepend the current working directory to + a file name, which should not be done with a name like d:foo. */ +#define IS_ABSOLUTE_PATH(f) (IS_DIR_SEPARATOR((f)[0]) || (((f)[0]) && ((f)[1] == ':'))) +#define FILENAME_CMP(s1, s2) strcasecmp(s1, s2) + +#else /* not DOSish */ + +#define IS_DIR_SEPARATOR(c) ((c) == '/') +#define IS_ABSOLUTE_PATH(f) (IS_DIR_SEPARATOR((f)[0])) +#define FILENAME_CMP(s1, s2) strcmp(s1, s2) + +#endif /* not DOSish */ + +#endif /* FILENAMES_H */ diff -upr --new-file binutils-2.9.5.0.42/include/floatformat.h binutils-2.9.5.0.46/include/floatformat.h --- binutils-2.9.5.0.42/include/floatformat.h Thu Jun 3 11:02:08 1999 +++ binutils-2.9.5.0.46/include/floatformat.h Thu Jun 1 11:10:07 2000 @@ -1,5 +1,5 @@ /* IEEE floating point support declarations, for GDB, the GNU Debugger. - Copyright (C) 1991 Free Software Foundation, Inc. + Copyright (C) 1991, 2000 Free Software Foundation, Inc. This file is part of GDB. @@ -73,6 +73,9 @@ struct floatformat /* Is the integer bit explicit or implicit? */ enum floatformat_intbit intbit; + + /* Internal name for debugging. */ + const char *name; }; /* floatformats for IEEE single and double, big and little endian. */ diff -upr --new-file binutils-2.9.5.0.42/include/opcode/ChangeLog binutils-2.9.5.0.46/include/opcode/ChangeLog --- binutils-2.9.5.0.42/include/opcode/ChangeLog Fri May 12 08:04:03 2000 +++ binutils-2.9.5.0.46/include/opcode/ChangeLog Mon May 29 22:35:56 2000 @@ -1,3 +1,36 @@ +Wed Apr 12 17:11:20 2000 Donald Lindsay + + * d10v.h: added ALONE attribute for d10v_opcode.exec_type. + +2000-05-23 Maciej W. Rozycki + + * i386.h: Allow d suffix on iret, and add DefaultSize modifier. + +2000-05-17 Maciej W. Rozycki + + * i386.h: Use sl_FP, not sl_Suf for fild. + +2000-05-16 Frank Ch. Eigler + + * cgen.h (CGEN_MAX_SYNTAX_BYTES): Increase to 32. Check that + it exceeds CGEN_ACTUAL_MAX_SYNTAX_BYTES, if set. + (CGEN_MAX_IFMT_OPERANDS): Increase to 16. Check that it exceeds + CGEN_ACTUAL_MAX_IFMT_OPERANDS, if set. + +2000-05-13 Alan Modra , + + * i386.h (i386_optab): Cpu686 for sysenter,sysexit,fxsave,fxrestore. + +2000-05-13 Alan Modra , + Alexander Sokolov + + * i386.h (i386_optab): Add cpu_flags for all instructions. + +2000-05-13 Alan Modra + + From Gavin Romig-Koch + * i386.h (wld_Suf): Define. Use on pushf, popf, pusha, popa. + 2000-05-04 Timothy Wall * tic54x.h: New. diff -upr --new-file binutils-2.9.5.0.42/include/opcode/cgen.h binutils-2.9.5.0.46/include/opcode/cgen.h --- binutils-2.9.5.0.42/include/opcode/cgen.h Fri Feb 25 14:34:49 2000 +++ binutils-2.9.5.0.46/include/opcode/cgen.h Thu May 18 14:21:31 2000 @@ -735,10 +735,18 @@ typedef struct into the operand table. The operand table doesn't exist in C, per se, as the data is recorded in the parse/insert/extract/print switch statements. */ -#ifndef CGEN_MAX_SYNTAX_BYTES -#define CGEN_MAX_SYNTAX_BYTES 16 +/* This should be at least as large as necessary for any target. */ +#define CGEN_MAX_SYNTAX_BYTES 32 + +/* A target may know its own precise maximum. Assert that it falls below + the above limit. */ +#ifdef CGEN_ACTUAL_MAX_SYNTAX_BYTES +#if CGEN_ACTUAL_MAX_SYNTAX_BYTES > CGEN_MAX_SYNTAX_BYTES +#error "CGEN_ACTUAL_MAX_SYNTAX_BYTES too high - enlarge CGEN_MAX_SYNTAX_BYTES" +#endif #endif + typedef struct { unsigned char syntax[CGEN_MAX_SYNTAX_BYTES]; @@ -824,9 +832,17 @@ typedef struct { #define CGEN_IFMT_IFLD_IFLD(ii) ((ii)->ifld) } CGEN_IFMT_IFLD; -#ifndef CGEN_MAX_IFMT_OPERANDS -#define CGEN_MAX_IFMT_OPERANDS 1 +/* This should be at least as large as necessary for any target. */ +#define CGEN_MAX_IFMT_OPERANDS 16 + +/* A target may know its own precise maximum. Assert that it falls below + the above limit. */ +#ifdef CGEN_ACTUAL_MAX_IFMT_OPERANDS +#if CGEN_ACTUAL_MAX_IFMT_OPERANDS > CGEN_MAX_IFMT_OPERANDS +#error "CGEN_ACTUAL_MAX_IFMT_OPERANDS too high - enlarge CGEN_MAX_IFMT_OPERANDS" +#endif #endif + typedef struct { diff -upr --new-file binutils-2.9.5.0.42/include/opcode/d10v.h binutils-2.9.5.0.46/include/opcode/d10v.h --- binutils-2.9.5.0.42/include/opcode/d10v.h Sat Oct 9 09:13:57 1999 +++ binutils-2.9.5.0.46/include/opcode/d10v.h Mon May 29 22:35:56 2000 @@ -78,6 +78,7 @@ struct d10v_opcode #define WF0 128 /* modifies f0 */ #define WCAR 256 /* write Carry */ #define BRANCH 512 /* branch, no link */ +#define ALONE 1024 /* short but pack with a NOP if on asm line alone */ /* the opcode */ long opcode; diff -upr --new-file binutils-2.9.5.0.42/include/opcode/i386.h binutils-2.9.5.0.46/include/opcode/i386.h --- binutils-2.9.5.0.42/include/opcode/i386.h Fri Mar 31 09:16:57 2000 +++ binutils-2.9.5.0.46/include/opcode/i386.h Mon May 29 22:35:57 2000 @@ -1,5 +1,6 @@ /* opcode/i386.h -- Intel 80386 opcode table - Copyright 1989, 91, 92, 93, 94, 95, 96, 97, 98, 1999 Free Software Foundation. + Copyright 1989, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 + Free Software Foundation. This file is part of GAS, the GNU Assembler, and GDB, the GNU Debugger. @@ -58,6 +59,7 @@ static const template i386_optab[] = { #define bw_Suf (No_lSuf|No_sSuf|No_dSuf|No_xSuf) #define bl_Suf (No_wSuf|No_sSuf|No_dSuf|No_xSuf) #define wl_Suf (No_bSuf|No_sSuf|No_dSuf|No_xSuf) +#define wld_Suf (No_bSuf|No_sSuf|No_xSuf) #define sl_Suf (No_bSuf|No_wSuf|No_dSuf|No_xSuf) #define sld_Suf (No_bSuf|No_wSuf|No_xSuf) #define sldx_Suf (No_bSuf|No_wSuf) @@ -81,973 +83,992 @@ static const template i386_optab[] = { /* Move instructions. */ #define MOV_AX_DISP32 0xa0 -{ "mov", 2, 0xa0, X, bwl_Suf|D|W, { Disp16|Disp32, Acc, 0 } }, -{ "mov", 2, 0x88, X, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0 } }, -{ "mov", 2, 0xb0, X, bwl_Suf|W|ShortForm, { Imm, Reg, 0 } }, -{ "mov", 2, 0xc6, X, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0 } }, -/* The next two instructions accept WordReg so that a segment register +{ "mov", 2, 0xa0, X, 0, bwl_Suf|D|W, { Disp16|Disp32, Acc, 0 } }, +{ "mov", 2, 0x88, X, 0, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0 } }, +{ "mov", 2, 0xb0, X, 0, bwl_Suf|W|ShortForm, { Imm, Reg, 0 } }, +{ "mov", 2, 0xc6, X, 0, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0 } }, +/* The segment register moves accept WordReg so that a segment register can be copied to a 32 bit register, and vice versa, without using a size prefix. When moving to a 32 bit register, the upper 16 bits are set to an implementation defined value (on the Pentium Pro, the implementation defined value is zero). */ -{ "mov", 2, 0x8c, X, wl_Suf|Modrm, { SReg3|SReg2, WordReg|WordMem, 0 } }, -{ "mov", 2, 0x8e, X, wl_Suf|Modrm|IgnoreSize, { WordReg|WordMem, SReg3|SReg2, 0 } }, +{ "mov", 2, 0x8c, X, 0, wl_Suf|Modrm, { SReg2, WordReg|WordMem, 0 } }, +{ "mov", 2, 0x8c, X, Cpu386, wl_Suf|Modrm, { SReg3, WordReg|WordMem, 0 } }, +{ "mov", 2, 0x8e, X, 0, wl_Suf|Modrm|IgnoreSize, { WordReg|WordMem, SReg2, 0 } }, +{ "mov", 2, 0x8e, X, Cpu386, wl_Suf|Modrm|IgnoreSize, { WordReg|WordMem, SReg3, 0 } }, /* Move to/from control debug registers. */ -{ "mov", 2, 0x0f20, X, l_Suf|D|Modrm|IgnoreSize, { Control, Reg32|InvMem, 0} }, -{ "mov", 2, 0x0f21, X, l_Suf|D|Modrm|IgnoreSize, { Debug, Reg32|InvMem, 0} }, -{ "mov", 2, 0x0f24, X, l_Suf|D|Modrm|IgnoreSize, { Test, Reg32|InvMem, 0} }, +{ "mov", 2, 0x0f20, X, Cpu386, l_Suf|D|Modrm|IgnoreSize, { Control, Reg32|InvMem, 0} }, +{ "mov", 2, 0x0f21, X, Cpu386, l_Suf|D|Modrm|IgnoreSize, { Debug, Reg32|InvMem, 0} }, +{ "mov", 2, 0x0f24, X, Cpu386, l_Suf|D|Modrm|IgnoreSize, { Test, Reg32|InvMem, 0} }, /* Move with sign extend. */ /* "movsbl" & "movsbw" must not be unified into "movsb" to avoid conflict with the "movs" string move instruction. */ -{"movsbl", 2, 0x0fbe, X, NoSuf|Modrm, { Reg8|ByteMem, Reg32, 0} }, -{"movsbw", 2, 0x0fbe, X, NoSuf|Modrm, { Reg8|ByteMem, Reg16, 0} }, -{"movswl", 2, 0x0fbf, X, NoSuf|Modrm, { Reg16|ShortMem, Reg32, 0} }, -/* Intel Syntax */ -{"movsx", 2, 0x0fbf, X, w_Suf|Modrm|IgnoreSize, { Reg16|ShortMem, Reg32, 0} }, -{"movsx", 2, 0x0fbe, X, b_Suf|Modrm, { Reg8|ByteMem, WordReg, 0} }, +{"movsbl", 2, 0x0fbe, X, Cpu386, NoSuf|Modrm, { Reg8|ByteMem, Reg32, 0} }, +{"movsbw", 2, 0x0fbe, X, Cpu386, NoSuf|Modrm, { Reg8|ByteMem, Reg16, 0} }, +{"movswl", 2, 0x0fbf, X, Cpu386, NoSuf|Modrm, { Reg16|ShortMem, Reg32, 0} }, +/* Intel Syntax next 2 insns */ +{"movsx", 2, 0x0fbf, X, Cpu386, w_Suf|Modrm|IgnoreSize, { Reg16|ShortMem, Reg32, 0} }, +{"movsx", 2, 0x0fbe, X, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, WordReg, 0} }, /* Move with zero extend. */ -{"movzb", 2, 0x0fb6, X, wl_Suf|Modrm, { Reg8|ByteMem, WordReg, 0} }, -{"movzwl", 2, 0x0fb7, X, NoSuf|Modrm, { Reg16|ShortMem, Reg32, 0} }, -/* Intel Syntax */ -{"movzx", 2, 0x0fb7, X, w_Suf|Modrm|IgnoreSize, { Reg16|ShortMem, Reg32, 0} }, -{"movzx", 2, 0x0fb6, X, b_Suf|Modrm, { Reg8|ByteMem, WordReg, 0} }, +{"movzb", 2, 0x0fb6, X, Cpu386, wl_Suf|Modrm, { Reg8|ByteMem, WordReg, 0} }, +{"movzwl", 2, 0x0fb7, X, Cpu386, NoSuf|Modrm, { Reg16|ShortMem, Reg32, 0} }, +/* Intel Syntax next 2 insns */ +{"movzx", 2, 0x0fb7, X, Cpu386, w_Suf|Modrm|IgnoreSize, { Reg16|ShortMem, Reg32, 0} }, +{"movzx", 2, 0x0fb6, X, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, WordReg, 0} }, /* Push instructions. */ -{"push", 1, 0x50, X, wl_Suf|ShortForm|DefaultSize, { WordReg, 0, 0 } }, -{"push", 1, 0xff, 6, wl_Suf|Modrm|DefaultSize, { WordReg|WordMem, 0, 0 } }, -{"push", 1, 0x6a, X, wl_Suf|DefaultSize, { Imm8S, 0, 0} }, -{"push", 1, 0x68, X, wl_Suf|DefaultSize, { Imm16|Imm32, 0, 0} }, -{"push", 1, 0x06, X, wl_Suf|Seg2ShortForm|DefaultSize, { SReg2, 0, 0 } }, -{"push", 1, 0x0fa0, X, wl_Suf|Seg3ShortForm|DefaultSize, { SReg3, 0, 0 } }, -{"pusha", 0, 0x60, X, wl_Suf|DefaultSize, { 0, 0, 0 } }, +{"push", 1, 0x50, X, 0, wl_Suf|ShortForm|DefaultSize, { WordReg, 0, 0 } }, +{"push", 1, 0xff, 6, 0, wl_Suf|Modrm|DefaultSize, { WordReg|WordMem, 0, 0 } }, +{"push", 1, 0x6a, X, Cpu186, wl_Suf|DefaultSize, { Imm8S, 0, 0} }, +{"push", 1, 0x68, X, Cpu186, wl_Suf|DefaultSize, { Imm16|Imm32, 0, 0} }, +{"push", 1, 0x06, X, 0, wl_Suf|Seg2ShortForm|DefaultSize, { SReg2, 0, 0 } }, +{"push", 1, 0x0fa0, X, Cpu386, wl_Suf|Seg3ShortForm|DefaultSize, { SReg3, 0, 0 } }, +{"pusha", 0, 0x60, X, Cpu186, wld_Suf|DefaultSize, { 0, 0, 0 } }, /* Pop instructions. */ -{"pop", 1, 0x58, X, wl_Suf|ShortForm|DefaultSize, { WordReg, 0, 0 } }, -{"pop", 1, 0x8f, 0, wl_Suf|Modrm|DefaultSize, { WordReg|WordMem, 0, 0 } }, +{"pop", 1, 0x58, X, 0, wl_Suf|ShortForm|DefaultSize, { WordReg, 0, 0 } }, +{"pop", 1, 0x8f, 0, 0, wl_Suf|Modrm|DefaultSize, { WordReg|WordMem, 0, 0 } }, #define POP_SEG_SHORT 0x07 -{"pop", 1, 0x07, X, wl_Suf|Seg2ShortForm|DefaultSize, { SReg2, 0, 0 } }, -{"pop", 1, 0x0fa1, X, wl_Suf|Seg3ShortForm|DefaultSize, { SReg3, 0, 0 } }, -{"popa", 0, 0x61, X, wl_Suf|DefaultSize, { 0, 0, 0 } }, +{"pop", 1, 0x07, X, 0, wl_Suf|Seg2ShortForm|DefaultSize, { SReg2, 0, 0 } }, +{"pop", 1, 0x0fa1, X, Cpu386, wl_Suf|Seg3ShortForm|DefaultSize, { SReg3, 0, 0 } }, +{"popa", 0, 0x61, X, Cpu186, wld_Suf|DefaultSize, { 0, 0, 0 } }, /* Exchange instructions. xchg commutes: we allow both operand orders. */ -{"xchg", 2, 0x90, X, wl_Suf|ShortForm, { WordReg, Acc, 0 } }, -{"xchg", 2, 0x90, X, wl_Suf|ShortForm, { Acc, WordReg, 0 } }, -{"xchg", 2, 0x86, X, bwl_Suf|W|Modrm, { Reg, Reg|AnyMem, 0 } }, -{"xchg", 2, 0x86, X, bwl_Suf|W|Modrm, { Reg|AnyMem, Reg, 0 } }, +{"xchg", 2, 0x90, X, 0, wl_Suf|ShortForm, { WordReg, Acc, 0 } }, +{"xchg", 2, 0x90, X, 0, wl_Suf|ShortForm, { Acc, WordReg, 0 } }, +{"xchg", 2, 0x86, X, 0, bwl_Suf|W|Modrm, { Reg, Reg|AnyMem, 0 } }, +{"xchg", 2, 0x86, X, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, Reg, 0 } }, /* In/out from ports. */ -{"in", 2, 0xe4, X, bwl_Suf|W, { Imm8, Acc, 0 } }, -{"in", 2, 0xec, X, bwl_Suf|W, { InOutPortReg, Acc, 0 } }, -{"in", 1, 0xe4, X, bwl_Suf|W, { Imm8, 0, 0 } }, -{"in", 1, 0xec, X, bwl_Suf|W, { InOutPortReg, 0, 0 } }, -{"out", 2, 0xe6, X, bwl_Suf|W, { Acc, Imm8, 0 } }, -{"out", 2, 0xee, X, bwl_Suf|W, { Acc, InOutPortReg, 0 } }, -{"out", 1, 0xe6, X, bwl_Suf|W, { Imm8, 0, 0 } }, -{"out", 1, 0xee, X, bwl_Suf|W, { InOutPortReg, 0, 0 } }, +{"in", 2, 0xe4, X, 0, bwl_Suf|W, { Imm8, Acc, 0 } }, +{"in", 2, 0xec, X, 0, bwl_Suf|W, { InOutPortReg, Acc, 0 } }, +{"in", 1, 0xe4, X, 0, bwl_Suf|W, { Imm8, 0, 0 } }, +{"in", 1, 0xec, X, 0, bwl_Suf|W, { InOutPortReg, 0, 0 } }, +{"out", 2, 0xe6, X, 0, bwl_Suf|W, { Acc, Imm8, 0 } }, +{"out", 2, 0xee, X, 0, bwl_Suf|W, { Acc, InOutPortReg, 0 } }, +{"out", 1, 0xe6, X, 0, bwl_Suf|W, { Imm8, 0, 0 } }, +{"out", 1, 0xee, X, 0, bwl_Suf|W, { InOutPortReg, 0, 0 } }, /* Load effective address. */ -{"lea", 2, 0x8d, X, wl_Suf|Modrm, { WordMem, WordReg, 0 } }, +{"lea", 2, 0x8d, X, 0, wl_Suf|Modrm, { WordMem, WordReg, 0 } }, /* Load segment registers from memory. */ -{"lds", 2, 0xc5, X, wl_Suf|Modrm, { WordMem, WordReg, 0} }, -{"les", 2, 0xc4, X, wl_Suf|Modrm, { WordMem, WordReg, 0} }, -{"lfs", 2, 0x0fb4, X, wl_Suf|Modrm, { WordMem, WordReg, 0} }, -{"lgs", 2, 0x0fb5, X, wl_Suf|Modrm, { WordMem, WordReg, 0} }, -{"lss", 2, 0x0fb2, X, wl_Suf|Modrm, { WordMem, WordReg, 0} }, +{"lds", 2, 0xc5, X, 0, wl_Suf|Modrm, { WordMem, WordReg, 0} }, +{"les", 2, 0xc4, X, 0, wl_Suf|Modrm, { WordMem, WordReg, 0} }, +{"lfs", 2, 0x0fb4, X, Cpu386, wl_Suf|Modrm, { WordMem, WordReg, 0} }, +{"lgs", 2, 0x0fb5, X, Cpu386, wl_Suf|Modrm, { WordMem, WordReg, 0} }, +{"lss", 2, 0x0fb2, X, Cpu386, wl_Suf|Modrm, { WordMem, WordReg, 0} }, /* Flags register instructions. */ -{"clc", 0, 0xf8, X, NoSuf, { 0, 0, 0} }, -{"cld", 0, 0xfc, X, NoSuf, { 0, 0, 0} }, -{"cli", 0, 0xfa, X, NoSuf, { 0, 0, 0} }, -{"clts", 0, 0x0f06, X, NoSuf, { 0, 0, 0} }, -{"cmc", 0, 0xf5, X, NoSuf, { 0, 0, 0} }, -{"lahf", 0, 0x9f, X, NoSuf, { 0, 0, 0} }, -{"sahf", 0, 0x9e, X, NoSuf, { 0, 0, 0} }, -{"pushf", 0, 0x9c, X, wl_Suf|DefaultSize, { 0, 0, 0} }, -{"popf", 0, 0x9d, X, wl_Suf|DefaultSize, { 0, 0, 0} }, -{"stc", 0, 0xf9, X, NoSuf, { 0, 0, 0} }, -{"std", 0, 0xfd, X, NoSuf, { 0, 0, 0} }, -{"sti", 0, 0xfb, X, NoSuf, { 0, 0, 0} }, +{"clc", 0, 0xf8, X, 0, NoSuf, { 0, 0, 0} }, +{"cld", 0, 0xfc, X, 0, NoSuf, { 0, 0, 0} }, +{"cli", 0, 0xfa, X, 0, NoSuf, { 0, 0, 0} }, +{"clts", 0, 0x0f06, X, Cpu286, NoSuf, { 0, 0, 0} }, +{"cmc", 0, 0xf5, X, 0, NoSuf, { 0, 0, 0} }, +{"lahf", 0, 0x9f, X, 0, NoSuf, { 0, 0, 0} }, +{"sahf", 0, 0x9e, X, 0, NoSuf, { 0, 0, 0} }, +{"pushf", 0, 0x9c, X, 0, wld_Suf|DefaultSize, { 0, 0, 0} }, +{"popf", 0, 0x9d, X, 0, wld_Suf|DefaultSize, { 0, 0, 0} }, +{"stc", 0, 0xf9, X, 0, NoSuf, { 0, 0, 0} }, +{"std", 0, 0xfd, X, 0, NoSuf, { 0, 0, 0} }, +{"sti", 0, 0xfb, X, 0, NoSuf, { 0, 0, 0} }, /* Arithmetic. */ -{"add", 2, 0x00, X, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, -{"add", 2, 0x83, 0, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, -{"add", 2, 0x04, X, bwl_Suf|W, { Imm, Acc, 0} }, -{"add", 2, 0x80, 0, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, - -{"inc", 1, 0x40, X, wl_Suf|ShortForm, { WordReg, 0, 0} }, -{"inc", 1, 0xfe, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, - -{"sub", 2, 0x28, X, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, -{"sub", 2, 0x83, 5, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, -{"sub", 2, 0x2c, X, bwl_Suf|W, { Imm, Acc, 0} }, -{"sub", 2, 0x80, 5, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, - -{"dec", 1, 0x48, X, wl_Suf|ShortForm, { WordReg, 0, 0} }, -{"dec", 1, 0xfe, 1, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, - -{"sbb", 2, 0x18, X, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, -{"sbb", 2, 0x83, 3, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, -{"sbb", 2, 0x1c, X, bwl_Suf|W, { Imm, Acc, 0} }, -{"sbb", 2, 0x80, 3, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, - -{"cmp", 2, 0x38, X, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, -{"cmp", 2, 0x83, 7, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, -{"cmp", 2, 0x3c, X, bwl_Suf|W, { Imm, Acc, 0} }, -{"cmp", 2, 0x80, 7, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, - -{"test", 2, 0x84, X, bwl_Suf|W|Modrm, { Reg|AnyMem, Reg, 0} }, -{"test", 2, 0x84, X, bwl_Suf|W|Modrm, { Reg, Reg|AnyMem, 0} }, -{"test", 2, 0xa8, X, bwl_Suf|W, { Imm, Acc, 0} }, -{"test", 2, 0xf6, 0, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, - -{"and", 2, 0x20, X, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, -{"and", 2, 0x83, 4, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, -{"and", 2, 0x24, X, bwl_Suf|W, { Imm, Acc, 0} }, -{"and", 2, 0x80, 4, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, - -{"or", 2, 0x08, X, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, -{"or", 2, 0x83, 1, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, -{"or", 2, 0x0c, X, bwl_Suf|W, { Imm, Acc, 0} }, -{"or", 2, 0x80, 1, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, - -{"xor", 2, 0x30, X, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, -{"xor", 2, 0x83, 6, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, -{"xor", 2, 0x34, X, bwl_Suf|W, { Imm, Acc, 0} }, -{"xor", 2, 0x80, 6, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, - -/* iclr with 1 operand is really xor with 2 operands. */ -{"clr", 1, 0x30, X, bwl_Suf|W|Modrm|regKludge, { Reg, 0, 0 } }, - -{"adc", 2, 0x10, X, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, -{"adc", 2, 0x83, 2, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, -{"adc", 2, 0x14, X, bwl_Suf|W, { Imm, Acc, 0} }, -{"adc", 2, 0x80, 2, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, - -{"neg", 1, 0xf6, 3, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, -{"not", 1, 0xf6, 2, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, - -{"aaa", 0, 0x37, X, NoSuf, { 0, 0, 0} }, -{"aas", 0, 0x3f, X, NoSuf, { 0, 0, 0} }, -{"daa", 0, 0x27, X, NoSuf, { 0, 0, 0} }, -{"das", 0, 0x2f, X, NoSuf, { 0, 0, 0} }, -{"aad", 0, 0xd50a, X, NoSuf, { 0, 0, 0} }, -{"aad", 1, 0xd5, X, NoSuf, { Imm8S, 0, 0} }, -{"aam", 0, 0xd40a, X, NoSuf, { 0, 0, 0} }, -{"aam", 1, 0xd4, X, NoSuf, { Imm8S, 0, 0} }, +{"add", 2, 0x00, X, 0, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, +{"add", 2, 0x83, 0, 0, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, +{"add", 2, 0x04, X, 0, bwl_Suf|W, { Imm, Acc, 0} }, +{"add", 2, 0x80, 0, 0, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, + +{"inc", 1, 0x40, X, 0, wl_Suf|ShortForm, { WordReg, 0, 0} }, +{"inc", 1, 0xfe, 0, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, + +{"sub", 2, 0x28, X, 0, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, +{"sub", 2, 0x83, 5, 0, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, +{"sub", 2, 0x2c, X, 0, bwl_Suf|W, { Imm, Acc, 0} }, +{"sub", 2, 0x80, 5, 0, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, + +{"dec", 1, 0x48, X, 0, wl_Suf|ShortForm, { WordReg, 0, 0} }, +{"dec", 1, 0xfe, 1, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, + +{"sbb", 2, 0x18, X, 0, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, +{"sbb", 2, 0x83, 3, 0, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, +{"sbb", 2, 0x1c, X, 0, bwl_Suf|W, { Imm, Acc, 0} }, +{"sbb", 2, 0x80, 3, 0, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, + +{"cmp", 2, 0x38, X, 0, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, +{"cmp", 2, 0x83, 7, 0, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, +{"cmp", 2, 0x3c, X, 0, bwl_Suf|W, { Imm, Acc, 0} }, +{"cmp", 2, 0x80, 7, 0, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, + +{"test", 2, 0x84, X, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, Reg, 0} }, +{"test", 2, 0x84, X, 0, bwl_Suf|W|Modrm, { Reg, Reg|AnyMem, 0} }, +{"test", 2, 0xa8, X, 0, bwl_Suf|W, { Imm, Acc, 0} }, +{"test", 2, 0xf6, 0, 0, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, + +{"and", 2, 0x20, X, 0, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, +{"and", 2, 0x83, 4, 0, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, +{"and", 2, 0x24, X, 0, bwl_Suf|W, { Imm, Acc, 0} }, +{"and", 2, 0x80, 4, 0, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, + +{"or", 2, 0x08, X, 0, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, +{"or", 2, 0x83, 1, 0, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, +{"or", 2, 0x0c, X, 0, bwl_Suf|W, { Imm, Acc, 0} }, +{"or", 2, 0x80, 1, 0, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, + +{"xor", 2, 0x30, X, 0, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, +{"xor", 2, 0x83, 6, 0, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, +{"xor", 2, 0x34, X, 0, bwl_Suf|W, { Imm, Acc, 0} }, +{"xor", 2, 0x80, 6, 0, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, + +/* clr with 1 operand is really xor with 2 operands. */ +{"clr", 1, 0x30, X, 0, bwl_Suf|W|Modrm|regKludge, { Reg, 0, 0 } }, + +{"adc", 2, 0x10, X, 0, bwl_Suf|D|W|Modrm, { Reg, Reg|AnyMem, 0} }, +{"adc", 2, 0x83, 2, 0, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, 0} }, +{"adc", 2, 0x14, X, 0, bwl_Suf|W, { Imm, Acc, 0} }, +{"adc", 2, 0x80, 2, 0, bwl_Suf|W|Modrm, { Imm, Reg|AnyMem, 0} }, + +{"neg", 1, 0xf6, 3, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, +{"not", 1, 0xf6, 2, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, + +{"aaa", 0, 0x37, X, 0, NoSuf, { 0, 0, 0} }, +{"aas", 0, 0x3f, X, 0, NoSuf, { 0, 0, 0} }, +{"daa", 0, 0x27, X, 0, NoSuf, { 0, 0, 0} }, +{"das", 0, 0x2f, X, 0, NoSuf, { 0, 0, 0} }, +{"aad", 0, 0xd50a, X, 0, NoSuf, { 0, 0, 0} }, +{"aad", 1, 0xd5, X, 0, NoSuf, { Imm8S, 0, 0} }, +{"aam", 0, 0xd40a, X, 0, NoSuf, { 0, 0, 0} }, +{"aam", 1, 0xd4, X, 0, NoSuf, { Imm8S, 0, 0} }, /* Conversion insns. */ /* Intel naming */ -{"cbw", 0, 0x98, X, NoSuf|Size16, { 0, 0, 0} }, -{"cwde", 0, 0x98, X, NoSuf|Size32, { 0, 0, 0} }, -{"cwd", 0, 0x99, X, NoSuf|Size16, { 0, 0, 0} }, -{"cdq", 0, 0x99, X, NoSuf|Size32, { 0, 0, 0} }, +{"cbw", 0, 0x98, X, 0, NoSuf|Size16, { 0, 0, 0} }, +{"cwde", 0, 0x98, X, 0, NoSuf|Size32, { 0, 0, 0} }, +{"cwd", 0, 0x99, X, 0, NoSuf|Size16, { 0, 0, 0} }, +{"cdq", 0, 0x99, X, 0, NoSuf|Size32, { 0, 0, 0} }, /* AT&T naming */ -{"cbtw", 0, 0x98, X, NoSuf|Size16, { 0, 0, 0} }, -{"cwtl", 0, 0x98, X, NoSuf|Size32, { 0, 0, 0} }, -{"cwtd", 0, 0x99, X, NoSuf|Size16, { 0, 0, 0} }, -{"cltd", 0, 0x99, X, NoSuf|Size32, { 0, 0, 0} }, +{"cbtw", 0, 0x98, X, 0, NoSuf|Size16, { 0, 0, 0} }, +{"cwtl", 0, 0x98, X, 0, NoSuf|Size32, { 0, 0, 0} }, +{"cwtd", 0, 0x99, X, 0, NoSuf|Size16, { 0, 0, 0} }, +{"cltd", 0, 0x99, X, 0, NoSuf|Size32, { 0, 0, 0} }, /* Warning! the mul/imul (opcode 0xf6) must only have 1 operand! They are expanding 64-bit multiplies, and *cannot* be selected to accomplish 'imul %ebx, %eax' (opcode 0x0faf must be used in this case) These multiplies can only be selected with single operand forms. */ -{"mul", 1, 0xf6, 4, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, -{"imul", 1, 0xf6, 5, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, -{"imul", 2, 0x0faf, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"imul", 3, 0x6b, X, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, WordReg} }, -{"imul", 3, 0x69, X, wl_Suf|Modrm, { Imm16|Imm32, WordReg|WordMem, WordReg} }, +{"mul", 1, 0xf6, 4, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, +{"imul", 1, 0xf6, 5, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, +{"imul", 2, 0x0faf, X, Cpu386, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"imul", 3, 0x6b, X, Cpu186, wl_Suf|Modrm, { Imm8S, WordReg|WordMem, WordReg} }, +{"imul", 3, 0x69, X, Cpu186, wl_Suf|Modrm, { Imm16|Imm32, WordReg|WordMem, WordReg} }, /* imul with 2 operands mimics imul with 3 by putting the register in both i.rm.reg & i.rm.regmem fields. regKludge enables this transformation. */ -{"imul", 2, 0x6b, X, wl_Suf|Modrm|regKludge,{ Imm8S, WordReg, 0} }, -{"imul", 2, 0x69, X, wl_Suf|Modrm|regKludge,{ Imm16|Imm32, WordReg, 0} }, +{"imul", 2, 0x6b, X, Cpu186, wl_Suf|Modrm|regKludge,{ Imm8S, WordReg, 0} }, +{"imul", 2, 0x69, X, Cpu186, wl_Suf|Modrm|regKludge,{ Imm16|Imm32, WordReg, 0} }, -{"div", 1, 0xf6, 6, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, -{"div", 2, 0xf6, 6, bwl_Suf|W|Modrm, { Reg|AnyMem, Acc, 0} }, -{"idiv", 1, 0xf6, 7, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, -{"idiv", 2, 0xf6, 7, bwl_Suf|W|Modrm, { Reg|AnyMem, Acc, 0} }, - -{"rol", 2, 0xd0, 0, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, -{"rol", 2, 0xc0, 0, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, -{"rol", 2, 0xd2, 0, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, -{"rol", 1, 0xd0, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, - -{"ror", 2, 0xd0, 1, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, -{"ror", 2, 0xc0, 1, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, -{"ror", 2, 0xd2, 1, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, -{"ror", 1, 0xd0, 1, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, - -{"rcl", 2, 0xd0, 2, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, -{"rcl", 2, 0xc0, 2, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, -{"rcl", 2, 0xd2, 2, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, -{"rcl", 1, 0xd0, 2, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, - -{"rcr", 2, 0xd0, 3, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, -{"rcr", 2, 0xc0, 3, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, -{"rcr", 2, 0xd2, 3, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, -{"rcr", 1, 0xd0, 3, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, - -{"sal", 2, 0xd0, 4, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, -{"sal", 2, 0xc0, 4, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, -{"sal", 2, 0xd2, 4, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, -{"sal", 1, 0xd0, 4, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, -{"shl", 2, 0xd0, 4, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, -{"shl", 2, 0xc0, 4, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, -{"shl", 2, 0xd2, 4, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, -{"shl", 1, 0xd0, 4, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, - -{"shld", 3, 0x0fa4, X, wl_Suf|Modrm, { Imm8, WordReg, WordReg|WordMem} }, -{"shld", 3, 0x0fa5, X, wl_Suf|Modrm, { ShiftCount, WordReg, WordReg|WordMem} }, -{"shld", 2, 0x0fa5, X, wl_Suf|Modrm, { WordReg, WordReg|WordMem, 0} }, - -{"shr", 2, 0xd0, 5, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, -{"shr", 2, 0xc0, 5, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, -{"shr", 2, 0xd2, 5, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, -{"shr", 1, 0xd0, 5, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, - -{"shrd", 3, 0x0fac, X, wl_Suf|Modrm, { Imm8, WordReg, WordReg|WordMem} }, -{"shrd", 3, 0x0fad, X, wl_Suf|Modrm, { ShiftCount, WordReg, WordReg|WordMem} }, -{"shrd", 2, 0x0fad, X, wl_Suf|Modrm, { WordReg, WordReg|WordMem, 0} }, - -{"sar", 2, 0xd0, 7, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, -{"sar", 2, 0xc0, 7, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, -{"sar", 2, 0xd2, 7, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, -{"sar", 1, 0xd0, 7, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, +{"div", 1, 0xf6, 6, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, +{"div", 2, 0xf6, 6, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, Acc, 0} }, +{"idiv", 1, 0xf6, 7, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, +{"idiv", 2, 0xf6, 7, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, Acc, 0} }, + +{"rol", 2, 0xd0, 0, 0, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, +{"rol", 2, 0xc0, 0, Cpu186, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, +{"rol", 2, 0xd2, 0, 0, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, +{"rol", 1, 0xd0, 0, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, + +{"ror", 2, 0xd0, 1, 0, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, +{"ror", 2, 0xc0, 1, Cpu186, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, +{"ror", 2, 0xd2, 1, 0, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, +{"ror", 1, 0xd0, 1, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, + +{"rcl", 2, 0xd0, 2, 0, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, +{"rcl", 2, 0xc0, 2, Cpu186, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, +{"rcl", 2, 0xd2, 2, 0, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, +{"rcl", 1, 0xd0, 2, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, + +{"rcr", 2, 0xd0, 3, 0, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, +{"rcr", 2, 0xc0, 3, Cpu186, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, +{"rcr", 2, 0xd2, 3, 0, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, +{"rcr", 1, 0xd0, 3, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, + +{"sal", 2, 0xd0, 4, 0, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, +{"sal", 2, 0xc0, 4, Cpu186, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, +{"sal", 2, 0xd2, 4, 0, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, +{"sal", 1, 0xd0, 4, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, + +{"shl", 2, 0xd0, 4, 0, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, +{"shl", 2, 0xc0, 4, Cpu186, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, +{"shl", 2, 0xd2, 4, 0, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, +{"shl", 1, 0xd0, 4, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, + +{"shr", 2, 0xd0, 5, 0, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, +{"shr", 2, 0xc0, 5, Cpu186, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, +{"shr", 2, 0xd2, 5, 0, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, +{"shr", 1, 0xd0, 5, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, + +{"sar", 2, 0xd0, 7, 0, bwl_Suf|W|Modrm, { Imm1, Reg|AnyMem, 0} }, +{"sar", 2, 0xc0, 7, Cpu186, bwl_Suf|W|Modrm, { Imm8, Reg|AnyMem, 0} }, +{"sar", 2, 0xd2, 7, 0, bwl_Suf|W|Modrm, { ShiftCount, Reg|AnyMem, 0} }, +{"sar", 1, 0xd0, 7, 0, bwl_Suf|W|Modrm, { Reg|AnyMem, 0, 0} }, + +{"shld", 3, 0x0fa4, X, Cpu386, wl_Suf|Modrm, { Imm8, WordReg, WordReg|WordMem} }, +{"shld", 3, 0x0fa5, X, Cpu386, wl_Suf|Modrm, { ShiftCount, WordReg, WordReg|WordMem} }, +{"shld", 2, 0x0fa5, X, Cpu386, wl_Suf|Modrm, { WordReg, WordReg|WordMem, 0} }, + +{"shrd", 3, 0x0fac, X, Cpu386, wl_Suf|Modrm, { Imm8, WordReg, WordReg|WordMem} }, +{"shrd", 3, 0x0fad, X, Cpu386, wl_Suf|Modrm, { ShiftCount, WordReg, WordReg|WordMem} }, +{"shrd", 2, 0x0fad, X, Cpu386, wl_Suf|Modrm, { WordReg, WordReg|WordMem, 0} }, /* Control transfer instructions. */ -{"call", 1, 0xe8, X, wl_Suf|JumpDword|DefaultSize, { Disp16|Disp32, 0, 0} }, -{"call", 1, 0xff, 2, wl_Suf|Modrm|DefaultSize, { WordReg|WordMem|JumpAbsolute, 0, 0} }, +{"call", 1, 0xe8, X, 0, wl_Suf|JumpDword|DefaultSize, { Disp16|Disp32, 0, 0} }, +{"call", 1, 0xff, 2, 0, wl_Suf|Modrm|DefaultSize, { WordReg|WordMem|JumpAbsolute, 0, 0} }, /* Intel Syntax */ -{"call", 2, 0x9a, X, wl_Suf|JumpInterSegment|DefaultSize, { Imm16, Imm16|Imm32, 0} }, +{"call", 2, 0x9a, X, 0, wl_Suf|JumpInterSegment|DefaultSize, { Imm16, Imm16|Imm32, 0} }, /* Intel Syntax */ -{"call", 1, 0xff, 3, x_Suf|Modrm|DefaultSize, { WordMem, 0, 0} }, -{"lcall", 2, 0x9a, X, wl_Suf|JumpInterSegment|DefaultSize, { Imm16, Imm16|Imm32, 0} }, -{"lcall", 1, 0xff, 3, wl_Suf|Modrm|DefaultSize, { WordMem|JumpAbsolute, 0, 0} }, +{"call", 1, 0xff, 3, 0, x_Suf|Modrm|DefaultSize, { WordMem, 0, 0} }, +{"lcall", 2, 0x9a, X, 0, wl_Suf|JumpInterSegment|DefaultSize, { Imm16, Imm16|Imm32, 0} }, +{"lcall", 1, 0xff, 3, 0, wl_Suf|Modrm|DefaultSize, { WordMem|JumpAbsolute, 0, 0} }, #define JUMP_PC_RELATIVE 0xeb -{"jmp", 1, 0xeb, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jmp", 1, 0xff, 4, wl_Suf|Modrm, { WordReg|WordMem|JumpAbsolute, 0, 0} }, +{"jmp", 1, 0xeb, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jmp", 1, 0xff, 4, 0, wl_Suf|Modrm, { WordReg|WordMem|JumpAbsolute, 0, 0} }, /* Intel Syntax */ -{"jmp", 2, 0xea, X, wl_Suf|JumpInterSegment, { Imm16, Imm16|Imm32, 0} }, +{"jmp", 2, 0xea, X, 0, wl_Suf|JumpInterSegment, { Imm16, Imm16|Imm32, 0} }, /* Intel Syntax */ -{"jmp", 1, 0xff, 5, x_Suf|Modrm, { WordMem, 0, 0} }, -{"ljmp", 2, 0xea, X, wl_Suf|JumpInterSegment, { Imm16, Imm16|Imm32, 0} }, -{"ljmp", 1, 0xff, 5, wl_Suf|Modrm, { WordMem|JumpAbsolute, 0, 0} }, - -{"ret", 0, 0xc3, X, wl_Suf|DefaultSize, { 0, 0, 0} }, -{"ret", 1, 0xc2, X, wl_Suf|DefaultSize, { Imm16, 0, 0} }, -{"lret", 0, 0xcb, X, wl_Suf|DefaultSize, { 0, 0, 0} }, -{"lret", 1, 0xca, X, wl_Suf|DefaultSize, { Imm16, 0, 0} }, -{"enter", 2, 0xc8, X, wl_Suf|DefaultSize, { Imm16, Imm8, 0} }, -{"leave", 0, 0xc9, X, wl_Suf|DefaultSize, { 0, 0, 0} }, +{"jmp", 1, 0xff, 5, 0, x_Suf|Modrm, { WordMem, 0, 0} }, +{"ljmp", 2, 0xea, X, 0, wl_Suf|JumpInterSegment, { Imm16, Imm16|Imm32, 0} }, +{"ljmp", 1, 0xff, 5, 0, wl_Suf|Modrm, { WordMem|JumpAbsolute, 0, 0} }, + +{"ret", 0, 0xc3, X, 0, wl_Suf|DefaultSize, { 0, 0, 0} }, +{"ret", 1, 0xc2, X, 0, wl_Suf|DefaultSize, { Imm16, 0, 0} }, +{"lret", 0, 0xcb, X, 0, wl_Suf|DefaultSize, { 0, 0, 0} }, +{"lret", 1, 0xca, X, 0, wl_Suf|DefaultSize, { Imm16, 0, 0} }, +{"enter", 2, 0xc8, X, Cpu186, wl_Suf|DefaultSize, { Imm16, Imm8, 0} }, +{"leave", 0, 0xc9, X, Cpu186, wl_Suf|DefaultSize, { 0, 0, 0} }, /* Conditional jumps. */ -{"jo", 1, 0x70, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jno", 1, 0x71, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jb", 1, 0x72, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jc", 1, 0x72, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jnae", 1, 0x72, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jnb", 1, 0x73, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jnc", 1, 0x73, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jae", 1, 0x73, X, NoSuf|Jump, { Disp, 0, 0} }, -{"je", 1, 0x74, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jz", 1, 0x74, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jne", 1, 0x75, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jnz", 1, 0x75, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jbe", 1, 0x76, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jna", 1, 0x76, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jnbe", 1, 0x77, X, NoSuf|Jump, { Disp, 0, 0} }, -{"ja", 1, 0x77, X, NoSuf|Jump, { Disp, 0, 0} }, -{"js", 1, 0x78, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jns", 1, 0x79, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jp", 1, 0x7a, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jpe", 1, 0x7a, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jnp", 1, 0x7b, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jpo", 1, 0x7b, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jl", 1, 0x7c, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jnge", 1, 0x7c, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jnl", 1, 0x7d, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jge", 1, 0x7d, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jle", 1, 0x7e, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jng", 1, 0x7e, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jnle", 1, 0x7f, X, NoSuf|Jump, { Disp, 0, 0} }, -{"jg", 1, 0x7f, X, NoSuf|Jump, { Disp, 0, 0} }, +{"jo", 1, 0x70, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jno", 1, 0x71, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jb", 1, 0x72, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jc", 1, 0x72, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jnae", 1, 0x72, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jnb", 1, 0x73, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jnc", 1, 0x73, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jae", 1, 0x73, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"je", 1, 0x74, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jz", 1, 0x74, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jne", 1, 0x75, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jnz", 1, 0x75, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jbe", 1, 0x76, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jna", 1, 0x76, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jnbe", 1, 0x77, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"ja", 1, 0x77, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"js", 1, 0x78, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jns", 1, 0x79, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jp", 1, 0x7a, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jpe", 1, 0x7a, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jnp", 1, 0x7b, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jpo", 1, 0x7b, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jl", 1, 0x7c, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jnge", 1, 0x7c, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jnl", 1, 0x7d, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jge", 1, 0x7d, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jle", 1, 0x7e, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jng", 1, 0x7e, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jnle", 1, 0x7f, X, 0, NoSuf|Jump, { Disp, 0, 0} }, +{"jg", 1, 0x7f, X, 0, NoSuf|Jump, { Disp, 0, 0} }, /* jcxz vs. jecxz is chosen on the basis of the address size prefix. */ -{"jcxz", 1, 0xe3, X, NoSuf|JumpByte|Size16, { Disp, 0, 0} }, -{"jecxz", 1, 0xe3, X, NoSuf|JumpByte|Size32, { Disp, 0, 0} }, +{"jcxz", 1, 0xe3, X, 0, NoSuf|JumpByte|Size16, { Disp, 0, 0} }, +{"jecxz", 1, 0xe3, X, 0, NoSuf|JumpByte|Size32, { Disp, 0, 0} }, /* The loop instructions also use the address size prefix to select %cx rather than %ecx for the loop count, so the `w' form of these instructions emit an address size prefix rather than a data size prefix. */ -{"loop", 1, 0xe2, X, wl_Suf|JumpByte, { Disp, 0, 0} }, -{"loopz", 1, 0xe1, X, wl_Suf|JumpByte, { Disp, 0, 0} }, -{"loope", 1, 0xe1, X, wl_Suf|JumpByte, { Disp, 0, 0} }, -{"loopnz", 1, 0xe0, X, wl_Suf|JumpByte, { Disp, 0, 0} }, -{"loopne", 1, 0xe0, X, wl_Suf|JumpByte, { Disp, 0, 0} }, +{"loop", 1, 0xe2, X, 0, wl_Suf|JumpByte, { Disp, 0, 0} }, +{"loopz", 1, 0xe1, X, 0, wl_Suf|JumpByte, { Disp, 0, 0} }, +{"loope", 1, 0xe1, X, 0, wl_Suf|JumpByte, { Disp, 0, 0} }, +{"loopnz", 1, 0xe0, X, 0, wl_Suf|JumpByte, { Disp, 0, 0} }, +{"loopne", 1, 0xe0, X, 0, wl_Suf|JumpByte, { Disp, 0, 0} }, /* Set byte on flag instructions. */ -{"seto", 1, 0x0f90, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setno", 1, 0x0f91, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setb", 1, 0x0f92, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setc", 1, 0x0f92, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setnae", 1, 0x0f92, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setnb", 1, 0x0f93, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setnc", 1, 0x0f93, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setae", 1, 0x0f93, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"sete", 1, 0x0f94, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setz", 1, 0x0f94, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setne", 1, 0x0f95, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setnz", 1, 0x0f95, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setbe", 1, 0x0f96, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setna", 1, 0x0f96, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setnbe", 1, 0x0f97, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"seta", 1, 0x0f97, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"sets", 1, 0x0f98, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setns", 1, 0x0f99, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setp", 1, 0x0f9a, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setpe", 1, 0x0f9a, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setnp", 1, 0x0f9b, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setpo", 1, 0x0f9b, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setl", 1, 0x0f9c, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setnge", 1, 0x0f9c, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setnl", 1, 0x0f9d, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setge", 1, 0x0f9d, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setle", 1, 0x0f9e, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setng", 1, 0x0f9e, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setnle", 1, 0x0f9f, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, -{"setg", 1, 0x0f9f, 0, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"seto", 1, 0x0f90, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setno", 1, 0x0f91, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setb", 1, 0x0f92, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setc", 1, 0x0f92, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setnae", 1, 0x0f92, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setnb", 1, 0x0f93, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setnc", 1, 0x0f93, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setae", 1, 0x0f93, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"sete", 1, 0x0f94, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setz", 1, 0x0f94, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setne", 1, 0x0f95, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setnz", 1, 0x0f95, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setbe", 1, 0x0f96, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setna", 1, 0x0f96, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setnbe", 1, 0x0f97, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"seta", 1, 0x0f97, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"sets", 1, 0x0f98, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setns", 1, 0x0f99, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setp", 1, 0x0f9a, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setpe", 1, 0x0f9a, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setnp", 1, 0x0f9b, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setpo", 1, 0x0f9b, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setl", 1, 0x0f9c, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setnge", 1, 0x0f9c, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setnl", 1, 0x0f9d, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setge", 1, 0x0f9d, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setle", 1, 0x0f9e, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setng", 1, 0x0f9e, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setnle", 1, 0x0f9f, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, +{"setg", 1, 0x0f9f, 0, Cpu386, b_Suf|Modrm, { Reg8|ByteMem, 0, 0} }, /* String manipulation. */ -{"cmps", 0, 0xa6, X, bwld_Suf|W|IsString, { 0, 0, 0} }, -{"cmps", 2, 0xa6, X, bwld_Suf|W|IsString, { AnyMem|EsSeg, AnyMem, 0} }, -{"scmp", 0, 0xa6, X, bwld_Suf|W|IsString, { 0, 0, 0} }, -{"scmp", 2, 0xa6, X, bwld_Suf|W|IsString, { AnyMem|EsSeg, AnyMem, 0} }, -{"ins", 0, 0x6c, X, bwld_Suf|W|IsString, { 0, 0, 0} }, -{"ins", 2, 0x6c, X, bwld_Suf|W|IsString, { InOutPortReg, AnyMem|EsSeg, 0} }, -{"outs", 0, 0x6e, X, bwld_Suf|W|IsString, { 0, 0, 0} }, -{"outs", 2, 0x6e, X, bwld_Suf|W|IsString, { AnyMem, InOutPortReg, 0} }, -{"lods", 0, 0xac, X, bwld_Suf|W|IsString, { 0, 0, 0} }, -{"lods", 1, 0xac, X, bwld_Suf|W|IsString, { AnyMem, 0, 0} }, -{"lods", 2, 0xac, X, bwld_Suf|W|IsString, { AnyMem, Acc, 0} }, -{"slod", 0, 0xac, X, bwld_Suf|W|IsString, { 0, 0, 0} }, -{"slod", 1, 0xac, X, bwld_Suf|W|IsString, { AnyMem, 0, 0} }, -{"slod", 2, 0xac, X, bwld_Suf|W|IsString, { AnyMem, Acc, 0} }, -{"movs", 0, 0xa4, X, bwld_Suf|W|IsString, { 0, 0, 0} }, -{"movs", 2, 0xa4, X, bwld_Suf|W|IsString, { AnyMem, AnyMem|EsSeg, 0} }, -{"smov", 0, 0xa4, X, bwld_Suf|W|IsString, { 0, 0, 0} }, -{"smov", 2, 0xa4, X, bwld_Suf|W|IsString, { AnyMem, AnyMem|EsSeg, 0} }, -{"scas", 0, 0xae, X, bwld_Suf|W|IsString, { 0, 0, 0} }, -{"scas", 1, 0xae, X, bwld_Suf|W|IsString, { AnyMem|EsSeg, 0, 0} }, -{"scas", 2, 0xae, X, bwld_Suf|W|IsString, { AnyMem|EsSeg, Acc, 0} }, -{"ssca", 0, 0xae, X, bwld_Suf|W|IsString, { 0, 0, 0} }, -{"ssca", 1, 0xae, X, bwld_Suf|W|IsString, { AnyMem|EsSeg, 0, 0} }, -{"ssca", 2, 0xae, X, bwld_Suf|W|IsString, { AnyMem|EsSeg, Acc, 0} }, -{"stos", 0, 0xaa, X, bwld_Suf|W|IsString, { 0, 0, 0} }, -{"stos", 1, 0xaa, X, bwld_Suf|W|IsString, { AnyMem|EsSeg, 0, 0} }, -{"stos", 2, 0xaa, X, bwld_Suf|W|IsString, { Acc, AnyMem|EsSeg, 0} }, -{"ssto", 0, 0xaa, X, bwld_Suf|W|IsString, { 0, 0, 0} }, -{"ssto", 1, 0xaa, X, bwld_Suf|W|IsString, { AnyMem|EsSeg, 0, 0} }, -{"ssto", 2, 0xaa, X, bwld_Suf|W|IsString, { Acc, AnyMem|EsSeg, 0} }, -{"xlat", 0, 0xd7, X, b_Suf|IsString, { 0, 0, 0} }, -{"xlat", 1, 0xd7, X, b_Suf|IsString, { AnyMem, 0, 0} }, +{"cmps", 0, 0xa6, X, 0, bwld_Suf|W|IsString, { 0, 0, 0} }, +{"cmps", 2, 0xa6, X, 0, bwld_Suf|W|IsString, { AnyMem|EsSeg, AnyMem, 0} }, +{"scmp", 0, 0xa6, X, 0, bwld_Suf|W|IsString, { 0, 0, 0} }, +{"scmp", 2, 0xa6, X, 0, bwld_Suf|W|IsString, { AnyMem|EsSeg, AnyMem, 0} }, +{"ins", 0, 0x6c, X, Cpu186, bwld_Suf|W|IsString, { 0, 0, 0} }, +{"ins", 2, 0x6c, X, Cpu186, bwld_Suf|W|IsString, { InOutPortReg, AnyMem|EsSeg, 0} }, +{"outs", 0, 0x6e, X, Cpu186, bwld_Suf|W|IsString, { 0, 0, 0} }, +{"outs", 2, 0x6e, X, Cpu186, bwld_Suf|W|IsString, { AnyMem, InOutPortReg, 0} }, +{"lods", 0, 0xac, X, 0, bwld_Suf|W|IsString, { 0, 0, 0} }, +{"lods", 1, 0xac, X, 0, bwld_Suf|W|IsString, { AnyMem, 0, 0} }, +{"lods", 2, 0xac, X, 0, bwld_Suf|W|IsString, { AnyMem, Acc, 0} }, +{"slod", 0, 0xac, X, 0, bwld_Suf|W|IsString, { 0, 0, 0} }, +{"slod", 1, 0xac, X, 0, bwld_Suf|W|IsString, { AnyMem, 0, 0} }, +{"slod", 2, 0xac, X, 0, bwld_Suf|W|IsString, { AnyMem, Acc, 0} }, +{"movs", 0, 0xa4, X, 0, bwld_Suf|W|IsString, { 0, 0, 0} }, +{"movs", 2, 0xa4, X, 0, bwld_Suf|W|IsString, { AnyMem, AnyMem|EsSeg, 0} }, +{"smov", 0, 0xa4, X, 0, bwld_Suf|W|IsString, { 0, 0, 0} }, +{"smov", 2, 0xa4, X, 0, bwld_Suf|W|IsString, { AnyMem, AnyMem|EsSeg, 0} }, +{"scas", 0, 0xae, X, 0, bwld_Suf|W|IsString, { 0, 0, 0} }, +{"scas", 1, 0xae, X, 0, bwld_Suf|W|IsString, { AnyMem|EsSeg, 0, 0} }, +{"scas", 2, 0xae, X, 0, bwld_Suf|W|IsString, { AnyMem|EsSeg, Acc, 0} }, +{"ssca", 0, 0xae, X, 0, bwld_Suf|W|IsString, { 0, 0, 0} }, +{"ssca", 1, 0xae, X, 0, bwld_Suf|W|IsString, { AnyMem|EsSeg, 0, 0} }, +{"ssca", 2, 0xae, X, 0, bwld_Suf|W|IsString, { AnyMem|EsSeg, Acc, 0} }, +{"stos", 0, 0xaa, X, 0, bwld_Suf|W|IsString, { 0, 0, 0} }, +{"stos", 1, 0xaa, X, 0, bwld_Suf|W|IsString, { AnyMem|EsSeg, 0, 0} }, +{"stos", 2, 0xaa, X, 0, bwld_Suf|W|IsString, { Acc, AnyMem|EsSeg, 0} }, +{"ssto", 0, 0xaa, X, 0, bwld_Suf|W|IsString, { 0, 0, 0} }, +{"ssto", 1, 0xaa, X, 0, bwld_Suf|W|IsString, { AnyMem|EsSeg, 0, 0} }, +{"ssto", 2, 0xaa, X, 0, bwld_Suf|W|IsString, { Acc, AnyMem|EsSeg, 0} }, +{"xlat", 0, 0xd7, X, 0, b_Suf|IsString, { 0, 0, 0} }, +{"xlat", 1, 0xd7, X, 0, b_Suf|IsString, { AnyMem, 0, 0} }, /* Bit manipulation. */ -{"bsf", 2, 0x0fbc, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"bsr", 2, 0x0fbd, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"bt", 2, 0x0fa3, X, wl_Suf|Modrm, { WordReg, WordReg|WordMem, 0} }, -{"bt", 2, 0x0fba, 4, wl_Suf|Modrm, { Imm8, WordReg|WordMem, 0} }, -{"btc", 2, 0x0fbb, X, wl_Suf|Modrm, { WordReg, WordReg|WordMem, 0} }, -{"btc", 2, 0x0fba, 7, wl_Suf|Modrm, { Imm8, WordReg|WordMem, 0} }, -{"btr", 2, 0x0fb3, X, wl_Suf|Modrm, { WordReg, WordReg|WordMem, 0} }, -{"btr", 2, 0x0fba, 6, wl_Suf|Modrm, { Imm8, WordReg|WordMem, 0} }, -{"bts", 2, 0x0fab, X, wl_Suf|Modrm, { WordReg, WordReg|WordMem, 0} }, -{"bts", 2, 0x0fba, 5, wl_Suf|Modrm, { Imm8, WordReg|WordMem, 0} }, +{"bsf", 2, 0x0fbc, X, Cpu386, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"bsr", 2, 0x0fbd, X, Cpu386, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"bt", 2, 0x0fa3, X, Cpu386, wl_Suf|Modrm, { WordReg, WordReg|WordMem, 0} }, +{"bt", 2, 0x0fba, 4, Cpu386, wl_Suf|Modrm, { Imm8, WordReg|WordMem, 0} }, +{"btc", 2, 0x0fbb, X, Cpu386, wl_Suf|Modrm, { WordReg, WordReg|WordMem, 0} }, +{"btc", 2, 0x0fba, 7, Cpu386, wl_Suf|Modrm, { Imm8, WordReg|WordMem, 0} }, +{"btr", 2, 0x0fb3, X, Cpu386, wl_Suf|Modrm, { WordReg, WordReg|WordMem, 0} }, +{"btr", 2, 0x0fba, 6, Cpu386, wl_Suf|Modrm, { Imm8, WordReg|WordMem, 0} }, +{"bts", 2, 0x0fab, X, Cpu386, wl_Suf|Modrm, { WordReg, WordReg|WordMem, 0} }, +{"bts", 2, 0x0fba, 5, Cpu386, wl_Suf|Modrm, { Imm8, WordReg|WordMem, 0} }, /* Interrupts & op. sys insns. */ /* See gas/config/tc-i386.c for conversion of 'int $3' into the special int 3 insn. */ #define INT_OPCODE 0xcd #define INT3_OPCODE 0xcc -{"int", 1, 0xcd, X, NoSuf, { Imm8, 0, 0} }, -{"int3", 0, 0xcc, X, NoSuf, { 0, 0, 0} }, -{"into", 0, 0xce, X, NoSuf, { 0, 0, 0} }, -{"iret", 0, 0xcf, X, wl_Suf, { 0, 0, 0} }, +{"int", 1, 0xcd, X, 0, NoSuf, { Imm8, 0, 0} }, +{"int3", 0, 0xcc, X, 0, NoSuf, { 0, 0, 0} }, +{"into", 0, 0xce, X, 0, NoSuf, { 0, 0, 0} }, +{"iret", 0, 0xcf, X, 0, wld_Suf|DefaultSize, { 0, 0, 0} }, /* i386sl, i486sl, later 486, and Pentium. */ -{"rsm", 0, 0x0faa, X, NoSuf, { 0, 0, 0} }, +{"rsm", 0, 0x0faa, X, Cpu386, NoSuf, { 0, 0, 0} }, -{"bound", 2, 0x62, X, wl_Suf|Modrm, { WordReg, WordMem, 0} }, +{"bound", 2, 0x62, X, Cpu186, wl_Suf|Modrm, { WordReg, WordMem, 0} }, -{"hlt", 0, 0xf4, X, NoSuf, { 0, 0, 0} }, +{"hlt", 0, 0xf4, X, 0, NoSuf, { 0, 0, 0} }, /* nop is actually 'xchgl %eax, %eax'. */ -{"nop", 0, 0x90, X, NoSuf, { 0, 0, 0} }, +{"nop", 0, 0x90, X, 0, NoSuf, { 0, 0, 0} }, /* Protection control. */ -{"arpl", 2, 0x63, X, w_Suf|Modrm|IgnoreSize,{ Reg16, Reg16|ShortMem, 0} }, -{"lar", 2, 0x0f02, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"lgdt", 1, 0x0f01, 2, wl_Suf|Modrm, { WordMem, 0, 0} }, -{"lidt", 1, 0x0f01, 3, wl_Suf|Modrm, { WordMem, 0, 0} }, -{"lldt", 1, 0x0f00, 2, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} }, -{"lmsw", 1, 0x0f01, 6, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} }, -{"lsl", 2, 0x0f03, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"ltr", 1, 0x0f00, 3, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} }, - -{"sgdt", 1, 0x0f01, 0, wl_Suf|Modrm, { WordMem, 0, 0} }, -{"sidt", 1, 0x0f01, 1, wl_Suf|Modrm, { WordMem, 0, 0} }, -{"sldt", 1, 0x0f00, 0, wl_Suf|Modrm, { WordReg|WordMem, 0, 0} }, -{"smsw", 1, 0x0f01, 4, wl_Suf|Modrm, { WordReg|WordMem, 0, 0} }, -{"str", 1, 0x0f00, 1, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} }, +{"arpl", 2, 0x63, X, Cpu286, w_Suf|Modrm|IgnoreSize,{ Reg16, Reg16|ShortMem, 0} }, +{"lar", 2, 0x0f02, X, Cpu286, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"lgdt", 1, 0x0f01, 2, Cpu286, wl_Suf|Modrm, { WordMem, 0, 0} }, +{"lidt", 1, 0x0f01, 3, Cpu286, wl_Suf|Modrm, { WordMem, 0, 0} }, +{"lldt", 1, 0x0f00, 2, Cpu286, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} }, +{"lmsw", 1, 0x0f01, 6, Cpu286, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} }, +{"lsl", 2, 0x0f03, X, Cpu286, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"ltr", 1, 0x0f00, 3, Cpu286, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} }, + +{"sgdt", 1, 0x0f01, 0, Cpu286, wl_Suf|Modrm, { WordMem, 0, 0} }, +{"sidt", 1, 0x0f01, 1, Cpu286, wl_Suf|Modrm, { WordMem, 0, 0} }, +{"sldt", 1, 0x0f00, 0, Cpu286, wl_Suf|Modrm, { WordReg|WordMem, 0, 0} }, +{"smsw", 1, 0x0f01, 4, Cpu286, wl_Suf|Modrm, { WordReg|WordMem, 0, 0} }, +{"str", 1, 0x0f00, 1, Cpu286, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} }, -{"verr", 1, 0x0f00, 4, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} }, -{"verw", 1, 0x0f00, 5, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} }, +{"verr", 1, 0x0f00, 4, Cpu286, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} }, +{"verw", 1, 0x0f00, 5, Cpu286, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} }, /* Floating point instructions. */ /* load */ -{"fld", 1, 0xd9c0, X, FP|ShortForm, { FloatReg, 0, 0} }, /* register */ -{"fld", 1, 0xd9, 0, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, /* %st0 <-- mem float/double */ -{"fld", 1, 0xd9c0, X, l_FP|ShortForm|Ugh, { FloatReg, 0, 0} }, +{"fld", 1, 0xd9c0, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +{"fld", 1, 0xd9, 0, 0, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, +{"fld", 1, 0xd9c0, X, 0, l_FP|ShortForm|Ugh, { FloatReg, 0, 0} }, /* Intel Syntax */ -{"fld", 1, 0xdb, 5, x_FP|Modrm, { LLongMem, 0, 0} }, /* %st0 <-- mem efloat */ -{"fild", 1, 0xdf, 0, sl_Suf|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, /* %st0 <-- mem word(16)/dword(32) */ +{"fld", 1, 0xdb, 5, 0, x_FP|Modrm, { LLongMem, 0, 0} }, +{"fild", 1, 0xdf, 0, 0, sl_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, /* Intel Syntax */ -{"fildd", 1, 0xdf, 5, FP|Modrm, { LLongMem, 0, 0} }, /* %st0 <-- mem qword (64) */ -{"fildq", 1, 0xdf, 5, FP|Modrm, { LLongMem, 0, 0} }, /* %st0 <-- mem qword (64) */ -{"fildll", 1, 0xdf, 5, FP|Modrm, { LLongMem, 0, 0} }, /* %st0 <-- mem qword (64) */ -{"fldt", 1, 0xdb, 5, FP|Modrm, { LLongMem, 0, 0} }, /* %st0 <-- mem efloat */ -{"fbld", 1, 0xdf, 4, FP|Modrm, { LLongMem, 0, 0} }, /* %st0 <-- mem bcd */ +{"fildd", 1, 0xdf, 5, 0, FP|Modrm, { LLongMem, 0, 0} }, +{"fildq", 1, 0xdf, 5, 0, FP|Modrm, { LLongMem, 0, 0} }, +{"fildll", 1, 0xdf, 5, 0, FP|Modrm, { LLongMem, 0, 0} }, +{"fldt", 1, 0xdb, 5, 0, FP|Modrm, { LLongMem, 0, 0} }, +{"fbld", 1, 0xdf, 4, 0, FP|Modrm, { LLongMem, 0, 0} }, /* store (no pop) */ -{"fst", 1, 0xddd0, X, FP|ShortForm, { FloatReg, 0, 0} }, /* register */ -{"fst", 1, 0xd9, 2, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, /* %st0 --> mem float/double */ -{"fst", 1, 0xddd0, X, l_FP|ShortForm|Ugh, { FloatReg, 0, 0} }, -{"fist", 1, 0xdf, 2, sld_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, /* %st0 --> mem word(16)/dword(32) */ +{"fst", 1, 0xddd0, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +{"fst", 1, 0xd9, 2, 0, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, +{"fst", 1, 0xddd0, X, 0, l_FP|ShortForm|Ugh, { FloatReg, 0, 0} }, +{"fist", 1, 0xdf, 2, 0, sld_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, /* store (with pop) */ -{"fstp", 1, 0xddd8, X, FP|ShortForm, { FloatReg, 0, 0} }, /* register */ -{"fstp", 1, 0xd9, 3, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, /* %st0 --> mem float/double */ -{"fstp", 1, 0xddd8, X, l_FP|ShortForm|Ugh, { FloatReg, 0, 0} }, +{"fstp", 1, 0xddd8, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +{"fstp", 1, 0xd9, 3, 0, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, +{"fstp", 1, 0xddd8, X, 0, l_FP|ShortForm|Ugh, { FloatReg, 0, 0} }, /* Intel Syntax */ -{"fstp", 1, 0xdb, 7, x_FP|Modrm, { LLongMem, 0, 0} }, /* %st0 --> mem efloat */ -{"fistp", 1, 0xdf, 3, sl_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, /* %st0 --> mem word(16)/dword(32) */ +{"fstp", 1, 0xdb, 7, 0, x_FP|Modrm, { LLongMem, 0, 0} }, +{"fistp", 1, 0xdf, 3, 0, sl_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, /* Intel Syntax */ -{"fistpd", 1, 0xdf, 7, FP|Modrm, { LLongMem, 0, 0} }, /* %st0 --> mem qword (64) */ -{"fistpq", 1, 0xdf, 7, FP|Modrm, { LLongMem, 0, 0} }, /* %st0 --> mem qword (64) */ -{"fistpll",1, 0xdf, 7, FP|Modrm, { LLongMem, 0, 0} }, /* %st0 --> mem qword (64) */ -{"fstpt", 1, 0xdb, 7, FP|Modrm, { LLongMem, 0, 0} }, /* %st0 --> mem efloat */ -{"fbstp", 1, 0xdf, 6, FP|Modrm, { LLongMem, 0, 0} }, /* %st0 --> mem bcd */ +{"fistpd", 1, 0xdf, 7, 0, FP|Modrm, { LLongMem, 0, 0} }, +{"fistpq", 1, 0xdf, 7, 0, FP|Modrm, { LLongMem, 0, 0} }, +{"fistpll",1, 0xdf, 7, 0, FP|Modrm, { LLongMem, 0, 0} }, +{"fstpt", 1, 0xdb, 7, 0, FP|Modrm, { LLongMem, 0, 0} }, +{"fbstp", 1, 0xdf, 6, 0, FP|Modrm, { LLongMem, 0, 0} }, /* exchange %st with %st0 */ -{"fxch", 1, 0xd9c8, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fxch", 0, 0xd9c9, X, FP, { 0, 0, 0} }, /* alias for fxch %st(1) */ +{"fxch", 1, 0xd9c8, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +/* alias for fxch %st(1) */ +{"fxch", 0, 0xd9c9, X, 0, FP, { 0, 0, 0} }, /* comparison (without pop) */ -{"fcom", 1, 0xd8d0, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fcom", 0, 0xd8d1, X, FP, { 0, 0, 0} }, /* alias for fcom %st(1) */ -{"fcom", 1, 0xd8, 2, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, /* compare %st0, mem float/double */ -{"fcom", 1, 0xd8d0, X, l_FP|ShortForm|Ugh, { FloatReg, 0, 0} }, -{"ficom", 1, 0xde, 2, sl_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, /* compare %st0, mem word/dword */ +{"fcom", 1, 0xd8d0, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +/* alias for fcom %st(1) */ +{"fcom", 0, 0xd8d1, X, 0, FP, { 0, 0, 0} }, +{"fcom", 1, 0xd8, 2, 0, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, +{"fcom", 1, 0xd8d0, X, 0, l_FP|ShortForm|Ugh, { FloatReg, 0, 0} }, +{"ficom", 1, 0xde, 2, 0, sl_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, /* comparison (with pop) */ -{"fcomp", 1, 0xd8d8, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fcomp", 0, 0xd8d9, X, FP, { 0, 0, 0} }, /* alias for fcomp %st(1) */ -{"fcomp", 1, 0xd8, 3, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, /* compare %st0, mem float/double */ -{"fcomp", 1, 0xd8d8, X, l_FP|ShortForm|Ugh, { FloatReg, 0, 0} }, -{"ficomp", 1, 0xde, 3, sl_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, /* compare %st0, mem word/dword */ -{"fcompp", 0, 0xded9, X, FP, { 0, 0, 0} }, /* compare %st0, %st1 & pop 2 */ +{"fcomp", 1, 0xd8d8, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +/* alias for fcomp %st(1) */ +{"fcomp", 0, 0xd8d9, X, 0, FP, { 0, 0, 0} }, +{"fcomp", 1, 0xd8, 3, 0, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, +{"fcomp", 1, 0xd8d8, X, 0, l_FP|ShortForm|Ugh, { FloatReg, 0, 0} }, +{"ficomp", 1, 0xde, 3, 0, sl_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, +{"fcompp", 0, 0xded9, X, 0, FP, { 0, 0, 0} }, /* unordered comparison (with pop) */ -{"fucom", 1, 0xdde0, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fucom", 0, 0xdde1, X, FP, { 0, 0, 0} }, /* alias for fucom %st(1) */ -{"fucomp", 1, 0xdde8, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fucomp", 0, 0xdde9, X, FP, { 0, 0, 0} }, /* alias for fucomp %st(1) */ -{"fucompp",0, 0xdae9, X, FP, { 0, 0, 0} }, /* ucompare %st0, %st1 & pop twice */ +{"fucom", 1, 0xdde0, X, Cpu286, FP|ShortForm, { FloatReg, 0, 0} }, +/* alias for fucom %st(1) */ +{"fucom", 0, 0xdde1, X, Cpu286, FP, { 0, 0, 0} }, +{"fucomp", 1, 0xdde8, X, Cpu286, FP|ShortForm, { FloatReg, 0, 0} }, +/* alias for fucomp %st(1) */ +{"fucomp", 0, 0xdde9, X, Cpu286, FP, { 0, 0, 0} }, +{"fucompp",0, 0xdae9, X, Cpu286, FP, { 0, 0, 0} }, -{"ftst", 0, 0xd9e4, X, FP, { 0, 0, 0} }, /* test %st0 */ -{"fxam", 0, 0xd9e5, X, FP, { 0, 0, 0} }, /* examine %st0 */ +{"ftst", 0, 0xd9e4, X, 0, FP, { 0, 0, 0} }, +{"fxam", 0, 0xd9e5, X, 0, FP, { 0, 0, 0} }, /* load constants into %st0 */ -{"fld1", 0, 0xd9e8, X, FP, { 0, 0, 0} }, /* %st0 <-- 1.0 */ -{"fldl2t", 0, 0xd9e9, X, FP, { 0, 0, 0} }, /* %st0 <-- log2(10) */ -{"fldl2e", 0, 0xd9ea, X, FP, { 0, 0, 0} }, /* %st0 <-- log2(e) */ -{"fldpi", 0, 0xd9eb, X, FP, { 0, 0, 0} }, /* %st0 <-- pi */ -{"fldlg2", 0, 0xd9ec, X, FP, { 0, 0, 0} }, /* %st0 <-- log10(2) */ -{"fldln2", 0, 0xd9ed, X, FP, { 0, 0, 0} }, /* %st0 <-- ln(2) */ -{"fldz", 0, 0xd9ee, X, FP, { 0, 0, 0} }, /* %st0 <-- 0.0 */ +{"fld1", 0, 0xd9e8, X, 0, FP, { 0, 0, 0} }, +{"fldl2t", 0, 0xd9e9, X, 0, FP, { 0, 0, 0} }, +{"fldl2e", 0, 0xd9ea, X, 0, FP, { 0, 0, 0} }, +{"fldpi", 0, 0xd9eb, X, 0, FP, { 0, 0, 0} }, +{"fldlg2", 0, 0xd9ec, X, 0, FP, { 0, 0, 0} }, +{"fldln2", 0, 0xd9ed, X, 0, FP, { 0, 0, 0} }, +{"fldz", 0, 0xd9ee, X, 0, FP, { 0, 0, 0} }, /* arithmetic */ /* add */ -{"fadd", 2, 0xd8c0, X, FP|ShortForm|FloatD, { FloatReg, FloatAcc, 0} }, -{"fadd", 1, 0xd8c0, X, FP|ShortForm, { FloatReg, 0, 0} }, /* alias for fadd %st(i), %st */ +{"fadd", 2, 0xd8c0, X, 0, FP|ShortForm|FloatD, { FloatReg, FloatAcc, 0} }, +/* alias for fadd %st(i), %st */ +{"fadd", 1, 0xd8c0, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, #if SYSV386_COMPAT -{"fadd", 0, 0xdec1, X, FP|Ugh, { 0, 0, 0} }, /* alias for faddp */ +/* alias for faddp */ +{"fadd", 0, 0xdec1, X, 0, FP|Ugh, { 0, 0, 0} }, #endif -{"fadd", 1, 0xd8, 0, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, -{"fiadd", 1, 0xde, 0, sld_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, +{"fadd", 1, 0xd8, 0, 0, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, +{"fiadd", 1, 0xde, 0, 0, sld_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, -{"faddp", 2, 0xdec0, X, FP|ShortForm, { FloatAcc, FloatReg, 0} }, -{"faddp", 1, 0xdec0, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"faddp", 0, 0xdec1, X, FP, { 0, 0, 0} }, /* alias for faddp %st, %st(1) */ -{"faddp", 2, 0xdec0, X, FP|ShortForm|Ugh, { FloatReg, FloatAcc, 0} }, +{"faddp", 2, 0xdec0, X, 0, FP|ShortForm, { FloatAcc, FloatReg, 0} }, +{"faddp", 1, 0xdec0, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +/* alias for faddp %st, %st(1) */ +{"faddp", 0, 0xdec1, X, 0, FP, { 0, 0, 0} }, +{"faddp", 2, 0xdec0, X, 0, FP|ShortForm|Ugh, { FloatReg, FloatAcc, 0} }, /* subtract */ -{"fsub", 2, 0xd8e0, X, FP|ShortForm|FloatDR, { FloatReg, FloatAcc, 0} }, -{"fsub", 1, 0xd8e0, X, FP|ShortForm, { FloatReg, 0, 0} }, +{"fsub", 2, 0xd8e0, X, 0, FP|ShortForm|FloatDR, { FloatReg, FloatAcc, 0} }, +{"fsub", 1, 0xd8e0, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, #if SYSV386_COMPAT -{"fsub", 0, 0xdee1, X, FP|Ugh, { 0, 0, 0} }, /* alias for fsubp */ +/* alias for fsubp */ +{"fsub", 0, 0xdee1, X, 0, FP|Ugh, { 0, 0, 0} }, #endif -{"fsub", 1, 0xd8, 4, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, -{"fisub", 1, 0xde, 4, sl_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, +{"fsub", 1, 0xd8, 4, 0, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, +{"fisub", 1, 0xde, 4, 0, sl_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, #if SYSV386_COMPAT -{"fsubp", 2, 0xdee0, X, FP|ShortForm, { FloatAcc, FloatReg, 0} }, -{"fsubp", 1, 0xdee0, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fsubp", 0, 0xdee1, X, FP, { 0, 0, 0} }, +{"fsubp", 2, 0xdee0, X, 0, FP|ShortForm, { FloatAcc, FloatReg, 0} }, +{"fsubp", 1, 0xdee0, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +{"fsubp", 0, 0xdee1, X, 0, FP, { 0, 0, 0} }, #if OLDGCC_COMPAT -{"fsubp", 2, 0xdee0, X, FP|ShortForm|Ugh, { FloatReg, FloatAcc, 0} }, +{"fsubp", 2, 0xdee0, X, 0, FP|ShortForm|Ugh, { FloatReg, FloatAcc, 0} }, #endif #else -{"fsubp", 2, 0xdee8, X, FP|ShortForm, { FloatAcc, FloatReg, 0} }, -{"fsubp", 1, 0xdee8, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fsubp", 0, 0xdee9, X, FP, { 0, 0, 0} }, +{"fsubp", 2, 0xdee8, X, 0, FP|ShortForm, { FloatAcc, FloatReg, 0} }, +{"fsubp", 1, 0xdee8, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +{"fsubp", 0, 0xdee9, X, 0, FP, { 0, 0, 0} }, #endif /* subtract reverse */ -{"fsubr", 2, 0xd8e8, X, FP|ShortForm|FloatDR, { FloatReg, FloatAcc, 0} }, -{"fsubr", 1, 0xd8e8, X, FP|ShortForm, { FloatReg, 0, 0} }, +{"fsubr", 2, 0xd8e8, X, 0, FP|ShortForm|FloatDR, { FloatReg, FloatAcc, 0} }, +{"fsubr", 1, 0xd8e8, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, #if SYSV386_COMPAT -{"fsubr", 0, 0xdee9, X, FP|Ugh, { 0, 0, 0} }, /* alias for fsubrp */ +/* alias for fsubrp */ +{"fsubr", 0, 0xdee9, X, 0, FP|Ugh, { 0, 0, 0} }, #endif -{"fsubr", 1, 0xd8, 5, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, -{"fisubr", 1, 0xde, 5, sl_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, +{"fsubr", 1, 0xd8, 5, 0, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, +{"fisubr", 1, 0xde, 5, 0, sl_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, #if SYSV386_COMPAT -{"fsubrp", 2, 0xdee8, X, FP|ShortForm, { FloatAcc, FloatReg, 0} }, -{"fsubrp", 1, 0xdee8, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fsubrp", 0, 0xdee9, X, FP, { 0, 0, 0} }, +{"fsubrp", 2, 0xdee8, X, 0, FP|ShortForm, { FloatAcc, FloatReg, 0} }, +{"fsubrp", 1, 0xdee8, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +{"fsubrp", 0, 0xdee9, X, 0, FP, { 0, 0, 0} }, #if OLDGCC_COMPAT -{"fsubrp", 2, 0xdee8, X, FP|ShortForm|Ugh, { FloatReg, FloatAcc, 0} }, +{"fsubrp", 2, 0xdee8, X, 0, FP|ShortForm|Ugh, { FloatReg, FloatAcc, 0} }, #endif #else -{"fsubrp", 2, 0xdee0, X, FP|ShortForm, { FloatAcc, FloatReg, 0} }, -{"fsubrp", 1, 0xdee0, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fsubrp", 0, 0xdee1, X, FP, { 0, 0, 0} }, +{"fsubrp", 2, 0xdee0, X, 0, FP|ShortForm, { FloatAcc, FloatReg, 0} }, +{"fsubrp", 1, 0xdee0, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +{"fsubrp", 0, 0xdee1, X, 0, FP, { 0, 0, 0} }, #endif /* multiply */ -{"fmul", 2, 0xd8c8, X, FP|ShortForm|FloatD, { FloatReg, FloatAcc, 0} }, -{"fmul", 1, 0xd8c8, X, FP|ShortForm, { FloatReg, 0, 0} }, +{"fmul", 2, 0xd8c8, X, 0, FP|ShortForm|FloatD, { FloatReg, FloatAcc, 0} }, +{"fmul", 1, 0xd8c8, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, #if SYSV386_COMPAT -{"fmul", 0, 0xdec9, X, FP|Ugh, { 0, 0, 0} }, /* alias for fmulp */ +/* alias for fmulp */ +{"fmul", 0, 0xdec9, X, 0, FP|Ugh, { 0, 0, 0} }, #endif -{"fmul", 1, 0xd8, 1, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, -{"fimul", 1, 0xde, 1, sld_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, +{"fmul", 1, 0xd8, 1, 0, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, +{"fimul", 1, 0xde, 1, 0, sld_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, -{"fmulp", 2, 0xdec8, X, FP|ShortForm, { FloatAcc, FloatReg, 0} }, -{"fmulp", 1, 0xdec8, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fmulp", 0, 0xdec9, X, FP, { 0, 0, 0} }, -{"fmulp", 2, 0xdec8, X, FP|ShortForm|Ugh, { FloatReg, FloatAcc, 0} }, +{"fmulp", 2, 0xdec8, X, 0, FP|ShortForm, { FloatAcc, FloatReg, 0} }, +{"fmulp", 1, 0xdec8, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +{"fmulp", 0, 0xdec9, X, 0, FP, { 0, 0, 0} }, +{"fmulp", 2, 0xdec8, X, 0, FP|ShortForm|Ugh, { FloatReg, FloatAcc, 0} }, /* divide */ -{"fdiv", 2, 0xd8f0, X, FP|ShortForm|FloatDR, { FloatReg, FloatAcc, 0} }, -{"fdiv", 1, 0xd8f0, X, FP|ShortForm, { FloatReg, 0, 0} }, +{"fdiv", 2, 0xd8f0, X, 0, FP|ShortForm|FloatDR, { FloatReg, FloatAcc, 0} }, +{"fdiv", 1, 0xd8f0, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, #if SYSV386_COMPAT -{"fdiv", 0, 0xdef1, X, FP|Ugh, { 0, 0, 0} }, /* alias for fdivp */ +/* alias for fdivp */ +{"fdiv", 0, 0xdef1, X, 0, FP|Ugh, { 0, 0, 0} }, #endif -{"fdiv", 1, 0xd8, 6, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, -{"fidiv", 1, 0xde, 6, sld_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, +{"fdiv", 1, 0xd8, 6, 0, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, +{"fidiv", 1, 0xde, 6, 0, sld_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, #if SYSV386_COMPAT -{"fdivp", 2, 0xdef0, X, FP|ShortForm, { FloatAcc, FloatReg, 0} }, -{"fdivp", 1, 0xdef0, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fdivp", 0, 0xdef1, X, FP, { 0, 0, 0} }, +{"fdivp", 2, 0xdef0, X, 0, FP|ShortForm, { FloatAcc, FloatReg, 0} }, +{"fdivp", 1, 0xdef0, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +{"fdivp", 0, 0xdef1, X, 0, FP, { 0, 0, 0} }, #if OLDGCC_COMPAT -{"fdivp", 2, 0xdef0, X, FP|ShortForm|Ugh, { FloatReg, FloatAcc, 0} }, +{"fdivp", 2, 0xdef0, X, 0, FP|ShortForm|Ugh, { FloatReg, FloatAcc, 0} }, #endif #else -{"fdivp", 2, 0xdef8, X, FP|ShortForm, { FloatAcc, FloatReg, 0} }, -{"fdivp", 1, 0xdef8, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fdivp", 0, 0xdef9, X, FP, { 0, 0, 0} }, +{"fdivp", 2, 0xdef8, X, 0, FP|ShortForm, { FloatAcc, FloatReg, 0} }, +{"fdivp", 1, 0xdef8, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +{"fdivp", 0, 0xdef9, X, 0, FP, { 0, 0, 0} }, #endif /* divide reverse */ -{"fdivr", 2, 0xd8f8, X, FP|ShortForm|FloatDR, { FloatReg, FloatAcc, 0} }, -{"fdivr", 1, 0xd8f8, X, FP|ShortForm, { FloatReg, 0, 0} }, +{"fdivr", 2, 0xd8f8, X, 0, FP|ShortForm|FloatDR, { FloatReg, FloatAcc, 0} }, +{"fdivr", 1, 0xd8f8, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, #if SYSV386_COMPAT -{"fdivr", 0, 0xdef9, X, FP|Ugh, { 0, 0, 0} }, /* alias for fdivrp */ +/* alias for fdivrp */ +{"fdivr", 0, 0xdef9, X, 0, FP|Ugh, { 0, 0, 0} }, #endif -{"fdivr", 1, 0xd8, 7, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, -{"fidivr", 1, 0xde, 7, sl_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, +{"fdivr", 1, 0xd8, 7, 0, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, +{"fidivr", 1, 0xde, 7, 0, sl_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, #if SYSV386_COMPAT -{"fdivrp", 2, 0xdef8, X, FP|ShortForm, { FloatAcc, FloatReg, 0} }, -{"fdivrp", 1, 0xdef8, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fdivrp", 0, 0xdef9, X, FP, { 0, 0, 0} }, +{"fdivrp", 2, 0xdef8, X, 0, FP|ShortForm, { FloatAcc, FloatReg, 0} }, +{"fdivrp", 1, 0xdef8, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +{"fdivrp", 0, 0xdef9, X, 0, FP, { 0, 0, 0} }, #if OLDGCC_COMPAT -{"fdivrp", 2, 0xdef8, X, FP|ShortForm|Ugh, { FloatReg, FloatAcc, 0} }, +{"fdivrp", 2, 0xdef8, X, 0, FP|ShortForm|Ugh, { FloatReg, FloatAcc, 0} }, #endif #else -{"fdivrp", 2, 0xdef0, X, FP|ShortForm, { FloatAcc, FloatReg, 0} }, -{"fdivrp", 1, 0xdef0, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fdivrp", 0, 0xdef1, X, FP, { 0, 0, 0} }, +{"fdivrp", 2, 0xdef0, X, 0, FP|ShortForm, { FloatAcc, FloatReg, 0} }, +{"fdivrp", 1, 0xdef0, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, +{"fdivrp", 0, 0xdef1, X, 0, FP, { 0, 0, 0} }, #endif -{"f2xm1", 0, 0xd9f0, X, FP, { 0, 0, 0} }, -{"fyl2x", 0, 0xd9f1, X, FP, { 0, 0, 0} }, -{"fptan", 0, 0xd9f2, X, FP, { 0, 0, 0} }, -{"fpatan", 0, 0xd9f3, X, FP, { 0, 0, 0} }, -{"fxtract",0, 0xd9f4, X, FP, { 0, 0, 0} }, -{"fprem1", 0, 0xd9f5, X, FP, { 0, 0, 0} }, -{"fdecstp",0, 0xd9f6, X, FP, { 0, 0, 0} }, -{"fincstp",0, 0xd9f7, X, FP, { 0, 0, 0} }, -{"fprem", 0, 0xd9f8, X, FP, { 0, 0, 0} }, -{"fyl2xp1",0, 0xd9f9, X, FP, { 0, 0, 0} }, -{"fsqrt", 0, 0xd9fa, X, FP, { 0, 0, 0} }, -{"fsincos",0, 0xd9fb, X, FP, { 0, 0, 0} }, -{"frndint",0, 0xd9fc, X, FP, { 0, 0, 0} }, -{"fscale", 0, 0xd9fd, X, FP, { 0, 0, 0} }, -{"fsin", 0, 0xd9fe, X, FP, { 0, 0, 0} }, -{"fcos", 0, 0xd9ff, X, FP, { 0, 0, 0} }, -{"fchs", 0, 0xd9e0, X, FP, { 0, 0, 0} }, -{"fabs", 0, 0xd9e1, X, FP, { 0, 0, 0} }, +{"f2xm1", 0, 0xd9f0, X, 0, FP, { 0, 0, 0} }, +{"fyl2x", 0, 0xd9f1, X, 0, FP, { 0, 0, 0} }, +{"fptan", 0, 0xd9f2, X, 0, FP, { 0, 0, 0} }, +{"fpatan", 0, 0xd9f3, X, 0, FP, { 0, 0, 0} }, +{"fxtract",0, 0xd9f4, X, 0, FP, { 0, 0, 0} }, +{"fprem1", 0, 0xd9f5, X, Cpu286, FP, { 0, 0, 0} }, +{"fdecstp",0, 0xd9f6, X, 0, FP, { 0, 0, 0} }, +{"fincstp",0, 0xd9f7, X, 0, FP, { 0, 0, 0} }, +{"fprem", 0, 0xd9f8, X, 0, FP, { 0, 0, 0} }, +{"fyl2xp1",0, 0xd9f9, X, 0, FP, { 0, 0, 0} }, +{"fsqrt", 0, 0xd9fa, X, 0, FP, { 0, 0, 0} }, +{"fsincos",0, 0xd9fb, X, Cpu286, FP, { 0, 0, 0} }, +{"frndint",0, 0xd9fc, X, 0, FP, { 0, 0, 0} }, +{"fscale", 0, 0xd9fd, X, 0, FP, { 0, 0, 0} }, +{"fsin", 0, 0xd9fe, X, Cpu286, FP, { 0, 0, 0} }, +{"fcos", 0, 0xd9ff, X, Cpu286, FP, { 0, 0, 0} }, +{"fchs", 0, 0xd9e0, X, 0, FP, { 0, 0, 0} }, +{"fabs", 0, 0xd9e1, X, 0, FP, { 0, 0, 0} }, /* processor control */ -{"fninit", 0, 0xdbe3, X, FP, { 0, 0, 0} }, -{"finit", 0, 0xdbe3, X, FP|FWait, { 0, 0, 0} }, -{"fldcw", 1, 0xd9, 5, FP|Modrm, { ShortMem, 0, 0} }, -{"fnstcw", 1, 0xd9, 7, FP|Modrm, { ShortMem, 0, 0} }, -{"fstcw", 1, 0xd9, 7, FP|FWait|Modrm, { ShortMem, 0, 0} }, -{"fnstsw", 1, 0xdfe0, X, FP, { Acc, 0, 0} }, -{"fnstsw", 1, 0xdd, 7, FP|Modrm, { ShortMem, 0, 0} }, -{"fnstsw", 0, 0xdfe0, X, FP, { 0, 0, 0} }, -{"fstsw", 1, 0xdfe0, X, FP|FWait, { Acc, 0, 0} }, -{"fstsw", 1, 0xdd, 7, FP|FWait|Modrm, { ShortMem, 0, 0} }, -{"fstsw", 0, 0xdfe0, X, FP|FWait, { 0, 0, 0} }, -{"fnclex", 0, 0xdbe2, X, FP, { 0, 0, 0} }, -{"fclex", 0, 0xdbe2, X, FP|FWait, { 0, 0, 0} }, +{"fninit", 0, 0xdbe3, X, 0, FP, { 0, 0, 0} }, +{"finit", 0, 0xdbe3, X, 0, FP|FWait, { 0, 0, 0} }, +{"fldcw", 1, 0xd9, 5, 0, FP|Modrm, { ShortMem, 0, 0} }, +{"fnstcw", 1, 0xd9, 7, 0, FP|Modrm, { ShortMem, 0, 0} }, +{"fstcw", 1, 0xd9, 7, 0, FP|FWait|Modrm, { ShortMem, 0, 0} }, +{"fnstsw", 1, 0xdfe0, X, 0, FP, { Acc, 0, 0} }, +{"fnstsw", 1, 0xdd, 7, 0, FP|Modrm, { ShortMem, 0, 0} }, +{"fnstsw", 0, 0xdfe0, X, 0, FP, { 0, 0, 0} }, +{"fstsw", 1, 0xdfe0, X, 0, FP|FWait, { Acc, 0, 0} }, +{"fstsw", 1, 0xdd, 7, 0, FP|FWait|Modrm, { ShortMem, 0, 0} }, +{"fstsw", 0, 0xdfe0, X, 0, FP|FWait, { 0, 0, 0} }, +{"fnclex", 0, 0xdbe2, X, 0, FP, { 0, 0, 0} }, +{"fclex", 0, 0xdbe2, X, 0, FP|FWait, { 0, 0, 0} }, /* Short forms of fldenv, fstenv use data size prefix. */ -{"fnstenv",1, 0xd9, 6, sl_Suf|Modrm, { LLongMem, 0, 0} }, -{"fstenv", 1, 0xd9, 6, sl_Suf|FWait|Modrm, { LLongMem, 0, 0} }, -{"fldenv", 1, 0xd9, 4, sl_Suf|Modrm, { LLongMem, 0, 0} }, -{"fnsave", 1, 0xdd, 6, sl_Suf|Modrm, { LLongMem, 0, 0} }, -{"fsave", 1, 0xdd, 6, sl_Suf|FWait|Modrm, { LLongMem, 0, 0} }, -{"frstor", 1, 0xdd, 4, sl_Suf|Modrm, { LLongMem, 0, 0} }, +{"fnstenv",1, 0xd9, 6, 0, sl_Suf|Modrm, { LLongMem, 0, 0} }, +{"fstenv", 1, 0xd9, 6, 0, sl_Suf|FWait|Modrm, { LLongMem, 0, 0} }, +{"fldenv", 1, 0xd9, 4, 0, sl_Suf|Modrm, { LLongMem, 0, 0} }, +{"fnsave", 1, 0xdd, 6, 0, sl_Suf|Modrm, { LLongMem, 0, 0} }, +{"fsave", 1, 0xdd, 6, 0, sl_Suf|FWait|Modrm, { LLongMem, 0, 0} }, +{"frstor", 1, 0xdd, 4, 0, sl_Suf|Modrm, { LLongMem, 0, 0} }, -{"ffree", 1, 0xddc0, X, FP|ShortForm, { FloatReg, 0, 0} }, +{"ffree", 1, 0xddc0, X, 0, FP|ShortForm, { FloatReg, 0, 0} }, /* P6:free st(i), pop st */ -{"ffreep", 1, 0xdfc0, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fnop", 0, 0xd9d0, X, FP, { 0, 0, 0} }, +{"ffreep", 1, 0xdfc0, X, Cpu686, FP|ShortForm, { FloatReg, 0, 0} }, +{"fnop", 0, 0xd9d0, X, 0, FP, { 0, 0, 0} }, #define FWAIT_OPCODE 0x9b -{"fwait", 0, 0x9b, X, FP, { 0, 0, 0} }, +{"fwait", 0, 0x9b, X, 0, FP, { 0, 0, 0} }, /* Opcode prefixes; we allow them as separate insns too. */ #define ADDR_PREFIX_OPCODE 0x67 -{"addr16", 0, 0x67, X, NoSuf|IsPrefix|Size16|IgnoreSize, { 0, 0, 0} }, -{"addr32", 0, 0x67, X, NoSuf|IsPrefix|Size32|IgnoreSize, { 0, 0, 0} }, -{"aword", 0, 0x67, X, NoSuf|IsPrefix|Size16|IgnoreSize, { 0, 0, 0} }, -{"adword", 0, 0x67, X, NoSuf|IsPrefix|Size32|IgnoreSize, { 0, 0, 0} }, +{"addr16", 0, 0x67, X, Cpu386, NoSuf|IsPrefix|Size16|IgnoreSize, { 0, 0, 0} }, +{"addr32", 0, 0x67, X, Cpu386, NoSuf|IsPrefix|Size32|IgnoreSize, { 0, 0, 0} }, +{"aword", 0, 0x67, X, Cpu386, NoSuf|IsPrefix|Size16|IgnoreSize, { 0, 0, 0} }, +{"adword", 0, 0x67, X, Cpu386, NoSuf|IsPrefix|Size32|IgnoreSize, { 0, 0, 0} }, #define DATA_PREFIX_OPCODE 0x66 -{"data16", 0, 0x66, X, NoSuf|IsPrefix|Size16|IgnoreSize, { 0, 0, 0} }, -{"data32", 0, 0x66, X, NoSuf|IsPrefix|Size32|IgnoreSize, { 0, 0, 0} }, -{"word", 0, 0x66, X, NoSuf|IsPrefix|Size16|IgnoreSize, { 0, 0, 0} }, -{"dword", 0, 0x66, X, NoSuf|IsPrefix|Size32|IgnoreSize, { 0, 0, 0} }, +{"data16", 0, 0x66, X, Cpu386, NoSuf|IsPrefix|Size16|IgnoreSize, { 0, 0, 0} }, +{"data32", 0, 0x66, X, Cpu386, NoSuf|IsPrefix|Size32|IgnoreSize, { 0, 0, 0} }, +{"word", 0, 0x66, X, Cpu386, NoSuf|IsPrefix|Size16|IgnoreSize, { 0, 0, 0} }, +{"dword", 0, 0x66, X, Cpu386, NoSuf|IsPrefix|Size32|IgnoreSize, { 0, 0, 0} }, #define LOCK_PREFIX_OPCODE 0xf0 -{"lock", 0, 0xf0, X, NoSuf|IsPrefix, { 0, 0, 0} }, -{"wait", 0, 0x9b, X, NoSuf|IsPrefix, { 0, 0, 0} }, +{"lock", 0, 0xf0, X, 0, NoSuf|IsPrefix, { 0, 0, 0} }, +{"wait", 0, 0x9b, X, 0, NoSuf|IsPrefix, { 0, 0, 0} }, #define CS_PREFIX_OPCODE 0x2e -{"cs", 0, 0x2e, X, NoSuf|IsPrefix, { 0, 0, 0} }, +{"cs", 0, 0x2e, X, 0, NoSuf|IsPrefix, { 0, 0, 0} }, #define DS_PREFIX_OPCODE 0x3e -{"ds", 0, 0x3e, X, NoSuf|IsPrefix, { 0, 0, 0} }, +{"ds", 0, 0x3e, X, 0, NoSuf|IsPrefix, { 0, 0, 0} }, #define ES_PREFIX_OPCODE 0x26 -{"es", 0, 0x26, X, NoSuf|IsPrefix, { 0, 0, 0} }, +{"es", 0, 0x26, X, 0, NoSuf|IsPrefix, { 0, 0, 0} }, #define FS_PREFIX_OPCODE 0x64 -{"fs", 0, 0x64, X, NoSuf|IsPrefix, { 0, 0, 0} }, +{"fs", 0, 0x64, X, Cpu386, NoSuf|IsPrefix, { 0, 0, 0} }, #define GS_PREFIX_OPCODE 0x65 -{"gs", 0, 0x65, X, NoSuf|IsPrefix, { 0, 0, 0} }, +{"gs", 0, 0x65, X, Cpu386, NoSuf|IsPrefix, { 0, 0, 0} }, #define SS_PREFIX_OPCODE 0x36 -{"ss", 0, 0x36, X, NoSuf|IsPrefix, { 0, 0, 0} }, +{"ss", 0, 0x36, X, 0, NoSuf|IsPrefix, { 0, 0, 0} }, #define REPNE_PREFIX_OPCODE 0xf2 #define REPE_PREFIX_OPCODE 0xf3 -{"rep", 0, 0xf3, X, NoSuf|IsPrefix, { 0, 0, 0} }, -{"repe", 0, 0xf3, X, NoSuf|IsPrefix, { 0, 0, 0} }, -{"repz", 0, 0xf3, X, NoSuf|IsPrefix, { 0, 0, 0} }, -{"repne", 0, 0xf2, X, NoSuf|IsPrefix, { 0, 0, 0} }, -{"repnz", 0, 0xf2, X, NoSuf|IsPrefix, { 0, 0, 0} }, +{"rep", 0, 0xf3, X, 0, NoSuf|IsPrefix, { 0, 0, 0} }, +{"repe", 0, 0xf3, X, 0, NoSuf|IsPrefix, { 0, 0, 0} }, +{"repz", 0, 0xf3, X, 0, NoSuf|IsPrefix, { 0, 0, 0} }, +{"repne", 0, 0xf2, X, 0, NoSuf|IsPrefix, { 0, 0, 0} }, +{"repnz", 0, 0xf2, X, 0, NoSuf|IsPrefix, { 0, 0, 0} }, /* 486 extensions. */ -{"bswap", 1, 0x0fc8, X, l_Suf|ShortForm, { Reg32, 0, 0 } }, -{"xadd", 2, 0x0fc0, X, bwl_Suf|W|Modrm, { Reg, Reg|AnyMem, 0 } }, -{"cmpxchg", 2, 0x0fb0, X, bwl_Suf|W|Modrm, { Reg, Reg|AnyMem, 0 } }, -{"invd", 0, 0x0f08, X, NoSuf, { 0, 0, 0} }, -{"wbinvd", 0, 0x0f09, X, NoSuf, { 0, 0, 0} }, -{"invlpg", 1, 0x0f01, 7, NoSuf|Modrm, { AnyMem, 0, 0} }, +{"bswap", 1, 0x0fc8, X, Cpu486, l_Suf|ShortForm, { Reg32, 0, 0 } }, +{"xadd", 2, 0x0fc0, X, Cpu486, bwl_Suf|W|Modrm, { Reg, Reg|AnyMem, 0 } }, +{"cmpxchg", 2, 0x0fb0, X, Cpu486, bwl_Suf|W|Modrm, { Reg, Reg|AnyMem, 0 } }, +{"invd", 0, 0x0f08, X, Cpu486, NoSuf, { 0, 0, 0} }, +{"wbinvd", 0, 0x0f09, X, Cpu486, NoSuf, { 0, 0, 0} }, +{"invlpg", 1, 0x0f01, 7, Cpu486, NoSuf|Modrm, { AnyMem, 0, 0} }, /* 586 and late 486 extensions. */ -{"cpuid", 0, 0x0fa2, X, NoSuf, { 0, 0, 0} }, +{"cpuid", 0, 0x0fa2, X, Cpu486, NoSuf, { 0, 0, 0} }, /* Pentium extensions. */ -{"wrmsr", 0, 0x0f30, X, NoSuf, { 0, 0, 0} }, -{"rdtsc", 0, 0x0f31, X, NoSuf, { 0, 0, 0} }, -{"rdmsr", 0, 0x0f32, X, NoSuf, { 0, 0, 0} }, -{"cmpxchg8b",1,0x0fc7, 1, NoSuf|Modrm, { LLongMem, 0, 0} }, -{"sysenter",0, 0x0f34, X, NoSuf, { 0, 0, 0} }, -{"sysexit", 0, 0x0f35, X, NoSuf, { 0, 0, 0} }, -{"fxsave", 1, 0x0fae, 0, FP|Modrm, { LLongMem, 0, 0} }, -{"fxrstor", 1, 0x0fae, 1, FP|Modrm, { LLongMem, 0, 0} }, - -/* Pentium Pro extensions. */ -{"rdpmc", 0, 0x0f33, X, NoSuf, { 0, 0, 0} }, - -{"ud2", 0, 0x0f0b, X, NoSuf, { 0, 0, 0} }, /* official undefined instr. */ -{"ud2a", 0, 0x0f0b, X, NoSuf, { 0, 0, 0} }, /* alias for ud2 */ -{"ud2b", 0, 0x0fb9, X, NoSuf, { 0, 0, 0} }, /* 2nd. official undefined instr. */ - -{"cmovo", 2, 0x0f40, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovno", 2, 0x0f41, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovb", 2, 0x0f42, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovc", 2, 0x0f42, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovnae", 2, 0x0f42, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovae", 2, 0x0f43, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovnc", 2, 0x0f43, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovnb", 2, 0x0f43, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmove", 2, 0x0f44, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovz", 2, 0x0f44, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovne", 2, 0x0f45, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovnz", 2, 0x0f45, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovbe", 2, 0x0f46, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovna", 2, 0x0f46, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmova", 2, 0x0f47, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovnbe", 2, 0x0f47, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovs", 2, 0x0f48, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovns", 2, 0x0f49, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovp", 2, 0x0f4a, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovnp", 2, 0x0f4b, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovl", 2, 0x0f4c, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovnge", 2, 0x0f4c, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovge", 2, 0x0f4d, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovnl", 2, 0x0f4d, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovle", 2, 0x0f4e, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovng", 2, 0x0f4e, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovg", 2, 0x0f4f, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, -{"cmovnle", 2, 0x0f4f, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, - -{"fcmovb", 2, 0xdac0, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fcmovnae",2, 0xdac0, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fcmove", 2, 0xdac8, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fcmovbe", 2, 0xdad0, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fcmovna", 2, 0xdad0, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fcmovu", 2, 0xdad8, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fcmovae", 2, 0xdbc0, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fcmovnb", 2, 0xdbc0, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fcmovne", 2, 0xdbc8, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fcmova", 2, 0xdbd0, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fcmovnbe",2, 0xdbd0, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fcmovnu", 2, 0xdbd8, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, - -{"fcomi", 2, 0xdbf0, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fcomi", 0, 0xdbf1, X, FP|ShortForm, { 0, 0, 0} }, -{"fcomi", 1, 0xdbf0, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fucomi", 2, 0xdbe8, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fucomi", 0, 0xdbe9, X, FP|ShortForm, { 0, 0, 0} }, -{"fucomi", 1, 0xdbe8, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fcomip", 2, 0xdff0, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fcompi", 2, 0xdff0, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fcompi", 0, 0xdff1, X, FP|ShortForm, { 0, 0, 0} }, -{"fcompi", 1, 0xdff0, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fucomip", 2, 0xdfe8, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fucompi", 2, 0xdfe8, X, FP|ShortForm, { FloatReg, FloatAcc, 0} }, -{"fucompi", 0, 0xdfe9, X, FP|ShortForm, { 0, 0, 0} }, -{"fucompi", 1, 0xdfe8, X, FP|ShortForm, { FloatReg, 0, 0} }, +{"wrmsr", 0, 0x0f30, X, Cpu586, NoSuf, { 0, 0, 0} }, +{"rdtsc", 0, 0x0f31, X, Cpu586, NoSuf, { 0, 0, 0} }, +{"rdmsr", 0, 0x0f32, X, Cpu586, NoSuf, { 0, 0, 0} }, +{"cmpxchg8b",1,0x0fc7, 1, Cpu586, NoSuf|Modrm, { LLongMem, 0, 0} }, + +/* Pentium II/Pentium Pro extensions. */ +{"sysenter",0, 0x0f34, X, Cpu686, NoSuf, { 0, 0, 0} }, +{"sysexit", 0, 0x0f35, X, Cpu686, NoSuf, { 0, 0, 0} }, +{"fxsave", 1, 0x0fae, 0, Cpu686, FP|Modrm, { LLongMem, 0, 0} }, +{"fxrstor", 1, 0x0fae, 1, Cpu686, FP|Modrm, { LLongMem, 0, 0} }, +{"rdpmc", 0, 0x0f33, X, Cpu686, NoSuf, { 0, 0, 0} }, +/* official undefined instr. */ +{"ud2", 0, 0x0f0b, X, Cpu686, NoSuf, { 0, 0, 0} }, +/* alias for ud2 */ +{"ud2a", 0, 0x0f0b, X, Cpu686, NoSuf, { 0, 0, 0} }, +/* 2nd. official undefined instr. */ +{"ud2b", 0, 0x0fb9, X, Cpu686, NoSuf, { 0, 0, 0} }, + +{"cmovo", 2, 0x0f40, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovno", 2, 0x0f41, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovb", 2, 0x0f42, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovc", 2, 0x0f42, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovnae", 2, 0x0f42, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovae", 2, 0x0f43, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovnc", 2, 0x0f43, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovnb", 2, 0x0f43, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmove", 2, 0x0f44, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovz", 2, 0x0f44, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovne", 2, 0x0f45, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovnz", 2, 0x0f45, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovbe", 2, 0x0f46, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovna", 2, 0x0f46, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmova", 2, 0x0f47, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovnbe", 2, 0x0f47, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovs", 2, 0x0f48, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovns", 2, 0x0f49, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovp", 2, 0x0f4a, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovnp", 2, 0x0f4b, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovl", 2, 0x0f4c, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovnge", 2, 0x0f4c, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovge", 2, 0x0f4d, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovnl", 2, 0x0f4d, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovle", 2, 0x0f4e, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovng", 2, 0x0f4e, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovg", 2, 0x0f4f, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, +{"cmovnle", 2, 0x0f4f, X, Cpu686, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, + +{"fcmovb", 2, 0xdac0, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fcmovnae",2, 0xdac0, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fcmove", 2, 0xdac8, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fcmovbe", 2, 0xdad0, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fcmovna", 2, 0xdad0, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fcmovu", 2, 0xdad8, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fcmovae", 2, 0xdbc0, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fcmovnb", 2, 0xdbc0, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fcmovne", 2, 0xdbc8, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fcmova", 2, 0xdbd0, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fcmovnbe",2, 0xdbd0, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fcmovnu", 2, 0xdbd8, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, + +{"fcomi", 2, 0xdbf0, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fcomi", 0, 0xdbf1, X, Cpu686, FP|ShortForm, { 0, 0, 0} }, +{"fcomi", 1, 0xdbf0, X, Cpu686, FP|ShortForm, { FloatReg, 0, 0} }, +{"fucomi", 2, 0xdbe8, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fucomi", 0, 0xdbe9, X, Cpu686, FP|ShortForm, { 0, 0, 0} }, +{"fucomi", 1, 0xdbe8, X, Cpu686, FP|ShortForm, { FloatReg, 0, 0} }, +{"fcomip", 2, 0xdff0, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fcompi", 2, 0xdff0, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fcompi", 0, 0xdff1, X, Cpu686, FP|ShortForm, { 0, 0, 0} }, +{"fcompi", 1, 0xdff0, X, Cpu686, FP|ShortForm, { FloatReg, 0, 0} }, +{"fucomip", 2, 0xdfe8, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fucompi", 2, 0xdfe8, X, Cpu686, FP|ShortForm, { FloatReg, FloatAcc, 0} }, +{"fucompi", 0, 0xdfe9, X, Cpu686, FP|ShortForm, { 0, 0, 0} }, +{"fucompi", 1, 0xdfe8, X, Cpu686, FP|ShortForm, { FloatReg, 0, 0} }, /* MMX instructions. */ -{"emms", 0, 0x0f77, X, FP, { 0, 0, 0 } }, -{"movd", 2, 0x0f6e, X, FP|Modrm, { Reg32|LongMem, RegMMX, 0 } }, -{"movd", 2, 0x0f7e, X, FP|Modrm, { RegMMX, Reg32|LongMem, 0 } }, -{"movq", 2, 0x0f6f, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"movq", 2, 0x0f7f, X, FP|Modrm, { RegMMX, RegMMX|LongMem, 0 } }, -{"packssdw", 2, 0x0f6b, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"packsswb", 2, 0x0f63, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"packuswb", 2, 0x0f67, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"paddb", 2, 0x0ffc, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"paddw", 2, 0x0ffd, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"paddd", 2, 0x0ffe, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"paddsb", 2, 0x0fec, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"paddsw", 2, 0x0fed, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"paddusb", 2, 0x0fdc, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"paddusw", 2, 0x0fdd, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"pand", 2, 0x0fdb, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"pandn", 2, 0x0fdf, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"pcmpeqb", 2, 0x0f74, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"pcmpeqw", 2, 0x0f75, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"pcmpeqd", 2, 0x0f76, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"pcmpgtb", 2, 0x0f64, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"pcmpgtw", 2, 0x0f65, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"pcmpgtd", 2, 0x0f66, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"pmaddwd", 2, 0x0ff5, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"pmulhw", 2, 0x0fe5, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"pmullw", 2, 0x0fd5, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"por", 2, 0x0feb, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"psllw", 2, 0x0ff1, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"psllw", 2, 0x0f71, 6, FP|Modrm, { Imm8, RegMMX, 0 } }, -{"pslld", 2, 0x0ff2, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"pslld", 2, 0x0f72, 6, FP|Modrm, { Imm8, RegMMX, 0 } }, -{"psllq", 2, 0x0ff3, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"psllq", 2, 0x0f73, 6, FP|Modrm, { Imm8, RegMMX, 0 } }, -{"psraw", 2, 0x0fe1, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"psraw", 2, 0x0f71, 4, FP|Modrm, { Imm8, RegMMX, 0 } }, -{"psrad", 2, 0x0fe2, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"psrad", 2, 0x0f72, 4, FP|Modrm, { Imm8, RegMMX, 0 } }, -{"psrlw", 2, 0x0fd1, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"psrlw", 2, 0x0f71, 2, FP|Modrm, { Imm8, RegMMX, 0 } }, -{"psrld", 2, 0x0fd2, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"psrld", 2, 0x0f72, 2, FP|Modrm, { Imm8, RegMMX, 0 } }, -{"psrlq", 2, 0x0fd3, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"psrlq", 2, 0x0f73, 2, FP|Modrm, { Imm8, RegMMX, 0 } }, -{"psubb", 2, 0x0ff8, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"psubw", 2, 0x0ff9, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"psubd", 2, 0x0ffa, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"psubsb", 2, 0x0fe8, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"psubsw", 2, 0x0fe9, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"psubusb", 2, 0x0fd8, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"psubusw", 2, 0x0fd9, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"punpckhbw",2, 0x0f68, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"punpckhwd",2, 0x0f69, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"punpckhdq",2, 0x0f6a, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"punpcklbw",2, 0x0f60, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"punpcklwd",2, 0x0f61, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"punpckldq",2, 0x0f62, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, -{"pxor", 2, 0x0fef, X, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"emms", 0, 0x0f77, X, CpuMMX, FP, { 0, 0, 0 } }, +{"movd", 2, 0x0f6e, X, CpuMMX, FP|Modrm, { Reg32|LongMem, RegMMX, 0 } }, +{"movd", 2, 0x0f7e, X, CpuMMX, FP|Modrm, { RegMMX, Reg32|LongMem, 0 } }, +{"movq", 2, 0x0f6f, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"movq", 2, 0x0f7f, X, CpuMMX, FP|Modrm, { RegMMX, RegMMX|LongMem, 0 } }, +{"packssdw", 2, 0x0f6b, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"packsswb", 2, 0x0f63, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"packuswb", 2, 0x0f67, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"paddb", 2, 0x0ffc, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"paddw", 2, 0x0ffd, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"paddd", 2, 0x0ffe, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"paddsb", 2, 0x0fec, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"paddsw", 2, 0x0fed, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"paddusb", 2, 0x0fdc, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"paddusw", 2, 0x0fdd, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"pand", 2, 0x0fdb, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"pandn", 2, 0x0fdf, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"pcmpeqb", 2, 0x0f74, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"pcmpeqw", 2, 0x0f75, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"pcmpeqd", 2, 0x0f76, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"pcmpgtb", 2, 0x0f64, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"pcmpgtw", 2, 0x0f65, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"pcmpgtd", 2, 0x0f66, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"pmaddwd", 2, 0x0ff5, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"pmulhw", 2, 0x0fe5, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"pmullw", 2, 0x0fd5, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"por", 2, 0x0feb, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"psllw", 2, 0x0ff1, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"psllw", 2, 0x0f71, 6, CpuMMX, FP|Modrm, { Imm8, RegMMX, 0 } }, +{"pslld", 2, 0x0ff2, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"pslld", 2, 0x0f72, 6, CpuMMX, FP|Modrm, { Imm8, RegMMX, 0 } }, +{"psllq", 2, 0x0ff3, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"psllq", 2, 0x0f73, 6, CpuMMX, FP|Modrm, { Imm8, RegMMX, 0 } }, +{"psraw", 2, 0x0fe1, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"psraw", 2, 0x0f71, 4, CpuMMX, FP|Modrm, { Imm8, RegMMX, 0 } }, +{"psrad", 2, 0x0fe2, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"psrad", 2, 0x0f72, 4, CpuMMX, FP|Modrm, { Imm8, RegMMX, 0 } }, +{"psrlw", 2, 0x0fd1, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"psrlw", 2, 0x0f71, 2, CpuMMX, FP|Modrm, { Imm8, RegMMX, 0 } }, +{"psrld", 2, 0x0fd2, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"psrld", 2, 0x0f72, 2, CpuMMX, FP|Modrm, { Imm8, RegMMX, 0 } }, +{"psrlq", 2, 0x0fd3, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"psrlq", 2, 0x0f73, 2, CpuMMX, FP|Modrm, { Imm8, RegMMX, 0 } }, +{"psubb", 2, 0x0ff8, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"psubw", 2, 0x0ff9, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"psubd", 2, 0x0ffa, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"psubsb", 2, 0x0fe8, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"psubsw", 2, 0x0fe9, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"psubusb", 2, 0x0fd8, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"psubusw", 2, 0x0fd9, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"punpckhbw",2, 0x0f68, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"punpckhwd",2, 0x0f69, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"punpckhdq",2, 0x0f6a, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"punpcklbw",2, 0x0f60, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"punpcklwd",2, 0x0f61, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"punpckldq",2, 0x0f62, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, +{"pxor", 2, 0x0fef, X, CpuMMX, FP|Modrm, { RegMMX|LongMem, RegMMX, 0 } }, /* PIII Katmai New Instructions / SIMD instructions. */ -{"addps", 2, 0x0f58, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"addss", 2, 0xf30f58, X, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, -{"andnps", 2, 0x0f55, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"andps", 2, 0x0f54, X, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, -{"cmpeqps", 2, 0x0fc2, 0, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, -{"cmpeqss", 2, 0xf30fc2, 0, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, -{"cmpleps", 2, 0x0fc2, 2, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, -{"cmpless", 2, 0xf30fc2, 2, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, -{"cmpltps", 2, 0x0fc2, 1, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, -{"cmpltss", 2, 0xf30fc2, 1, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, -{"cmpneqps", 2, 0x0fc2, 4, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, -{"cmpneqss", 2, 0xf30fc2, 4, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, -{"cmpnleps", 2, 0x0fc2, 6, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, -{"cmpnless", 2, 0xf30fc2, 6, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, -{"cmpnltps", 2, 0x0fc2, 5, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, -{"cmpnltss", 2, 0xf30fc2, 5, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, -{"cmpordps", 2, 0x0fc2, 7, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, -{"cmpordss", 2, 0xf30fc2, 7, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, -{"cmpunordps",2, 0x0fc2, 3, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, -{"cmpunordss",2, 0xf30fc2, 3, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, -{"cmpps", 3, 0x0fc2, X, FP|Modrm, { Imm8, RegXMM|LLongMem, RegXMM } }, -{"cmpss", 3, 0xf30fc2, X, FP|Modrm, { Imm8, RegXMM|WordMem, RegXMM } }, -{"comiss", 2, 0x0f2f, X, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, -{"cvtpi2ps", 2, 0x0f2a, X, FP|Modrm, { RegMMX|LLongMem, RegXMM, 0 } }, -{"cvtps2pi", 2, 0x0f2d, X, FP|Modrm, { RegXMM|LLongMem, RegMMX, 0 } }, -{"cvtsi2ss", 2, 0xf30f2a, X, FP|Modrm, { Reg32|WordMem, RegXMM, 0 } }, -{"cvtss2si", 2, 0xf30f2d, X, FP|Modrm, { RegXMM|WordMem, Reg32, 0 } }, -{"cvttps2pi", 2, 0x0f2c, X, FP|Modrm, { RegXMM|LLongMem, RegMMX, 0 } }, -{"cvttss2si", 2, 0xf30f2c, X, FP|Modrm, { RegXMM|WordMem, Reg32, 0 } }, -{"divps", 2, 0x0f5e, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"divss", 2, 0xf30f5e, X, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, -{"ldmxcsr", 1, 0x0fae, 2, FP|Modrm, { WordMem, 0, 0 } }, -{"maskmovq", 2, 0x0ff7, X, FP|Modrm, { RegMMX|InvMem, RegMMX, 0 } }, -{"maxps", 2, 0x0f5f, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"maxss", 2, 0xf30f5f, X, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, -{"minps", 2, 0x0f5d, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"minss", 2, 0xf30f5d, X, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, -{"movaps", 2, 0x0f28, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"movaps", 2, 0x0f29, X, FP|Modrm, { RegXMM, RegXMM|LLongMem, 0 } }, -{"movhlps", 2, 0x0f12, X, FP|Modrm, { RegXMM|InvMem, RegXMM, 0 } }, -{"movhps", 2, 0x0f16, X, FP|Modrm, { LLongMem, RegXMM, 0 } }, -{"movhps", 2, 0x0f17, X, FP|Modrm, { RegXMM, LLongMem, 0 } }, -{"movlhps", 2, 0x0f16, X, FP|Modrm, { RegXMM|InvMem, RegXMM, 0 } }, -{"movlps", 2, 0x0f12, X, FP|Modrm, { LLongMem, RegXMM, 0 } }, -{"movlps", 2, 0x0f13, X, FP|Modrm, { RegXMM, LLongMem, 0 } }, -{"movmskps", 2, 0x0f50, X, FP|Modrm, { RegXMM|InvMem, Reg32, 0 } }, -{"movntps", 2, 0x0f2b, X, FP|Modrm, { RegXMM, LLongMem, 0 } }, -{"movntq", 2, 0x0fe7, X, FP|Modrm, { RegMMX, LLongMem, 0 } }, -{"movss", 2, 0xf30f10, X, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, -{"movss", 2, 0xf30f11, X, FP|Modrm, { RegXMM, RegXMM|WordMem, 0 } }, -{"movups", 2, 0x0f10, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"movups", 2, 0x0f11, X, FP|Modrm, { RegXMM, RegXMM|LLongMem, 0 } }, -{"mulps", 2, 0x0f59, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"mulss", 2, 0xf30f59, X, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, -{"orps", 2, 0x0f56, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"pavgb", 2, 0x0fe0, X, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, -{"pavgw", 2, 0x0fe3, X, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, -{"pextrw", 3, 0x0fc5, X, FP|Modrm, { Imm8, RegMMX, Reg32|InvMem } }, -{"pinsrw", 3, 0x0fc4, X, FP|Modrm, { Imm8, Reg32|ShortMem, RegMMX } }, -{"pmaxsw", 2, 0x0fee, X, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, -{"pmaxub", 2, 0x0fde, X, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, -{"pminsw", 2, 0x0fea, X, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, -{"pminub", 2, 0x0fda, X, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, -{"pmovmskb", 2, 0x0fd7, X, FP|Modrm, { RegMMX, Reg32|InvMem, 0 } }, -{"pmulhuw", 2, 0x0fe4, X, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, -{"prefetchnta", 1, 0x0f18, 0, FP|Modrm, { LLongMem, 0, 0 } }, -{"prefetcht0", 1, 0x0f18, 1, FP|Modrm, { LLongMem, 0, 0 } }, -{"prefetcht1", 1, 0x0f18, 2, FP|Modrm, { LLongMem, 0, 0 } }, -{"prefetcht2", 1, 0x0f18, 3, FP|Modrm, { LLongMem, 0, 0 } }, -{"psadbw", 2, 0x0ff6, X, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, -{"pshufw", 3, 0x0f70, X, FP|Modrm, { Imm8, RegMMX|LLongMem, RegMMX } }, -{"rcpps", 2, 0x0f53, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"rcpss", 2, 0xf30f53, X, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, -{"rsqrtps", 2, 0x0f52, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"rsqrtss", 2, 0xf30f52, X, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, -{"sfence", 0, 0x0faef8, X, FP, { 0, 0, 0 } }, -{"shufps", 3, 0x0fc6, X, FP|Modrm, { Imm8, RegXMM|LLongMem, RegXMM } }, -{"sqrtps", 2, 0x0f51, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"sqrtss", 2, 0xf30f51, X, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, -{"stmxcsr", 1, 0x0fae, 3, FP|Modrm, { WordMem, 0, 0 } }, -{"subps", 2, 0x0f5c, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"subss", 2, 0xf30f5c, X, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, -{"ucomiss", 2, 0x0f2e, X, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, -{"unpckhps", 2, 0x0f15, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"unpcklps", 2, 0x0f14, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, -{"xorps", 2, 0x0f57, X, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"addps", 2, 0x0f58, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"addss", 2, 0xf30f58, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, +{"andnps", 2, 0x0f55, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"andps", 2, 0x0f54, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, +{"cmpeqps", 2, 0x0fc2, 0, CpuSSE, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, +{"cmpeqss", 2, 0xf30fc2, 0, CpuSSE, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, +{"cmpleps", 2, 0x0fc2, 2, CpuSSE, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, +{"cmpless", 2, 0xf30fc2, 2, CpuSSE, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, +{"cmpltps", 2, 0x0fc2, 1, CpuSSE, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, +{"cmpltss", 2, 0xf30fc2, 1, CpuSSE, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, +{"cmpneqps", 2, 0x0fc2, 4, CpuSSE, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, +{"cmpneqss", 2, 0xf30fc2, 4, CpuSSE, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, +{"cmpnleps", 2, 0x0fc2, 6, CpuSSE, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, +{"cmpnless", 2, 0xf30fc2, 6, CpuSSE, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, +{"cmpnltps", 2, 0x0fc2, 5, CpuSSE, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, +{"cmpnltss", 2, 0xf30fc2, 5, CpuSSE, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, +{"cmpordps", 2, 0x0fc2, 7, CpuSSE, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, +{"cmpordss", 2, 0xf30fc2, 7, CpuSSE, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, +{"cmpunordps",2, 0x0fc2, 3, CpuSSE, FP|Modrm|ImmExt, { RegXMM|LLongMem, RegXMM, 0 } }, +{"cmpunordss",2, 0xf30fc2, 3, CpuSSE, FP|Modrm|ImmExt, { RegXMM|WordMem, RegXMM, 0 } }, +{"cmpps", 3, 0x0fc2, X, CpuSSE, FP|Modrm, { Imm8, RegXMM|LLongMem, RegXMM } }, +{"cmpss", 3, 0xf30fc2, X, CpuSSE, FP|Modrm, { Imm8, RegXMM|WordMem, RegXMM } }, +{"comiss", 2, 0x0f2f, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, +{"cvtpi2ps", 2, 0x0f2a, X, CpuSSE, FP|Modrm, { RegMMX|LLongMem, RegXMM, 0 } }, +{"cvtps2pi", 2, 0x0f2d, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegMMX, 0 } }, +{"cvtsi2ss", 2, 0xf30f2a, X, CpuSSE, FP|Modrm, { Reg32|WordMem, RegXMM, 0 } }, +{"cvtss2si", 2, 0xf30f2d, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, Reg32, 0 } }, +{"cvttps2pi", 2, 0x0f2c, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegMMX, 0 } }, +{"cvttss2si", 2, 0xf30f2c, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, Reg32, 0 } }, +{"divps", 2, 0x0f5e, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"divss", 2, 0xf30f5e, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, +{"ldmxcsr", 1, 0x0fae, 2, CpuSSE, FP|Modrm, { WordMem, 0, 0 } }, +{"maskmovq", 2, 0x0ff7, X, CpuSSE, FP|Modrm, { RegMMX|InvMem, RegMMX, 0 } }, +{"maxps", 2, 0x0f5f, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"maxss", 2, 0xf30f5f, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, +{"minps", 2, 0x0f5d, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"minss", 2, 0xf30f5d, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, +{"movaps", 2, 0x0f28, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"movaps", 2, 0x0f29, X, CpuSSE, FP|Modrm, { RegXMM, RegXMM|LLongMem, 0 } }, +{"movhlps", 2, 0x0f12, X, CpuSSE, FP|Modrm, { RegXMM|InvMem, RegXMM, 0 } }, +{"movhps", 2, 0x0f16, X, CpuSSE, FP|Modrm, { LLongMem, RegXMM, 0 } }, +{"movhps", 2, 0x0f17, X, CpuSSE, FP|Modrm, { RegXMM, LLongMem, 0 } }, +{"movlhps", 2, 0x0f16, X, CpuSSE, FP|Modrm, { RegXMM|InvMem, RegXMM, 0 } }, +{"movlps", 2, 0x0f12, X, CpuSSE, FP|Modrm, { LLongMem, RegXMM, 0 } }, +{"movlps", 2, 0x0f13, X, CpuSSE, FP|Modrm, { RegXMM, LLongMem, 0 } }, +{"movmskps", 2, 0x0f50, X, CpuSSE, FP|Modrm, { RegXMM|InvMem, Reg32, 0 } }, +{"movntps", 2, 0x0f2b, X, CpuSSE, FP|Modrm, { RegXMM, LLongMem, 0 } }, +{"movntq", 2, 0x0fe7, X, CpuSSE, FP|Modrm, { RegMMX, LLongMem, 0 } }, +{"movss", 2, 0xf30f10, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, +{"movss", 2, 0xf30f11, X, CpuSSE, FP|Modrm, { RegXMM, RegXMM|WordMem, 0 } }, +{"movups", 2, 0x0f10, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"movups", 2, 0x0f11, X, CpuSSE, FP|Modrm, { RegXMM, RegXMM|LLongMem, 0 } }, +{"mulps", 2, 0x0f59, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"mulss", 2, 0xf30f59, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, +{"orps", 2, 0x0f56, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"pavgb", 2, 0x0fe0, X, CpuSSE, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, +{"pavgw", 2, 0x0fe3, X, CpuSSE, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, +{"pextrw", 3, 0x0fc5, X, CpuSSE, FP|Modrm, { Imm8, RegMMX, Reg32|InvMem } }, +{"pinsrw", 3, 0x0fc4, X, CpuSSE, FP|Modrm, { Imm8, Reg32|ShortMem, RegMMX } }, +{"pmaxsw", 2, 0x0fee, X, CpuSSE, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, +{"pmaxub", 2, 0x0fde, X, CpuSSE, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, +{"pminsw", 2, 0x0fea, X, CpuSSE, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, +{"pminub", 2, 0x0fda, X, CpuSSE, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, +{"pmovmskb", 2, 0x0fd7, X, CpuSSE, FP|Modrm, { RegMMX, Reg32|InvMem, 0 } }, +{"pmulhuw", 2, 0x0fe4, X, CpuSSE, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, +{"prefetchnta", 1, 0x0f18, 0, CpuSSE, FP|Modrm, { LLongMem, 0, 0 } }, +{"prefetcht0", 1, 0x0f18, 1, CpuSSE, FP|Modrm, { LLongMem, 0, 0 } }, +{"prefetcht1", 1, 0x0f18, 2, CpuSSE, FP|Modrm, { LLongMem, 0, 0 } }, +{"prefetcht2", 1, 0x0f18, 3, CpuSSE, FP|Modrm, { LLongMem, 0, 0 } }, +{"psadbw", 2, 0x0ff6, X, CpuSSE, FP|Modrm, { RegMMX|LLongMem, RegMMX, 0 } }, +{"pshufw", 3, 0x0f70, X, CpuSSE, FP|Modrm, { Imm8, RegMMX|LLongMem, RegMMX } }, +{"rcpps", 2, 0x0f53, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"rcpss", 2, 0xf30f53, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, +{"rsqrtps", 2, 0x0f52, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"rsqrtss", 2, 0xf30f52, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, +{"sfence", 0, 0x0faef8, X, CpuSSE, FP, { 0, 0, 0 } }, +{"shufps", 3, 0x0fc6, X, CpuSSE, FP|Modrm, { Imm8, RegXMM|LLongMem, RegXMM } }, +{"sqrtps", 2, 0x0f51, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"sqrtss", 2, 0xf30f51, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, +{"stmxcsr", 1, 0x0fae, 3, CpuSSE, FP|Modrm, { WordMem, 0, 0 } }, +{"subps", 2, 0x0f5c, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"subss", 2, 0xf30f5c, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, +{"ucomiss", 2, 0x0f2e, X, CpuSSE, FP|Modrm, { RegXMM|WordMem, RegXMM, 0 } }, +{"unpckhps", 2, 0x0f15, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"unpcklps", 2, 0x0f14, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, +{"xorps", 2, 0x0f57, X, CpuSSE, FP|Modrm, { RegXMM|LLongMem, RegXMM, 0 } }, /* AMD 3DNow! instructions. */ -{"prefetch", 1, 0x0f0d, 0, FP|Modrm, { ByteMem, 0, 0 } }, -{"prefetchw",1, 0x0f0d, 1, FP|Modrm, { ByteMem, 0, 0 } }, -{"femms", 0, 0x0f0e, X, FP, { 0, 0, 0 } }, -{"pavgusb", 2, 0x0f0f, 0xbf, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pf2id", 2, 0x0f0f, 0x1d, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pf2iw", 2, 0x0f0f, 0x1c, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, /* Athlon */ -{"pfacc", 2, 0x0f0f, 0xae, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pfadd", 2, 0x0f0f, 0x9e, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pfcmpeq", 2, 0x0f0f, 0xb0, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pfcmpge", 2, 0x0f0f, 0x90, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pfcmpgt", 2, 0x0f0f, 0xa0, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pfmax", 2, 0x0f0f, 0xa4, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pfmin", 2, 0x0f0f, 0x94, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pfmul", 2, 0x0f0f, 0xb4, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pfnacc", 2, 0x0f0f, 0x8a, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, /* Athlon */ -{"pfpnacc", 2, 0x0f0f, 0x8e, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, /* Athlon */ -{"pfrcp", 2, 0x0f0f, 0x96, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pfrcpit1", 2, 0x0f0f, 0xa6, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pfrcpit2", 2, 0x0f0f, 0xb6, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pfrsqit1", 2, 0x0f0f, 0xa7, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pfrsqrt", 2, 0x0f0f, 0x97, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pfsub", 2, 0x0f0f, 0x9a, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pfsubr", 2, 0x0f0f, 0xaa, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pi2fd", 2, 0x0f0f, 0x0d, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pi2fw", 2, 0x0f0f, 0x0c, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, /* Athlon */ -{"pmulhrw", 2, 0x0f0f, 0xb7, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{"pswapd", 2, 0x0f0f, 0xbb, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, /* Athlon */ +{"prefetch", 1, 0x0f0d, 0, Cpu3dnow, FP|Modrm, { ByteMem, 0, 0 } }, +{"prefetchw",1, 0x0f0d, 1, Cpu3dnow, FP|Modrm, { ByteMem, 0, 0 } }, +{"femms", 0, 0x0f0e, X, Cpu3dnow, FP, { 0, 0, 0 } }, +{"pavgusb", 2, 0x0f0f, 0xbf, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pf2id", 2, 0x0f0f, 0x1d, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pf2iw", 2, 0x0f0f, 0x1c, Cpu3dnow|Cpu686, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfacc", 2, 0x0f0f, 0xae, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfadd", 2, 0x0f0f, 0x9e, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfcmpeq", 2, 0x0f0f, 0xb0, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfcmpge", 2, 0x0f0f, 0x90, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfcmpgt", 2, 0x0f0f, 0xa0, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfmax", 2, 0x0f0f, 0xa4, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfmin", 2, 0x0f0f, 0x94, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfmul", 2, 0x0f0f, 0xb4, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfnacc", 2, 0x0f0f, 0x8a, Cpu3dnow|Cpu686, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfpnacc", 2, 0x0f0f, 0x8e, Cpu3dnow|Cpu686, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfrcp", 2, 0x0f0f, 0x96, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfrcpit1", 2, 0x0f0f, 0xa6, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfrcpit2", 2, 0x0f0f, 0xb6, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfrsqit1", 2, 0x0f0f, 0xa7, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfrsqrt", 2, 0x0f0f, 0x97, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfsub", 2, 0x0f0f, 0x9a, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pfsubr", 2, 0x0f0f, 0xaa, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pi2fd", 2, 0x0f0f, 0x0d, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pi2fw", 2, 0x0f0f, 0x0c, Cpu3dnow|Cpu686, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pmulhrw", 2, 0x0f0f, 0xb7, Cpu3dnow, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, +{"pswapd", 2, 0x0f0f, 0xbb, Cpu3dnow|Cpu686, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, -{NULL, 0, 0, 0, 0, { 0, 0, 0} } /* sentinel */ +/* sentinel */ +{NULL, 0, 0, 0, 0, 0, { 0, 0, 0} } }; #undef X #undef NoSuf @@ -1059,6 +1080,7 @@ static const template i386_optab[] = { #undef bw_Suf #undef bl_Suf #undef wl_Suf +#undef wld_Suf #undef sl_Suf #undef sld_Suf #undef sldx_Suf diff -upr --new-file binutils-2.9.5.0.42/ld/ChangeLog binutils-2.9.5.0.46/ld/ChangeLog --- binutils-2.9.5.0.42/ld/ChangeLog Fri May 12 08:04:44 2000 +++ binutils-2.9.5.0.46/ld/ChangeLog Mon May 29 22:36:39 2000 @@ -1,3 +1,78 @@ +2000-05-23 Marek Michalkiewicz + + * emulparams/avr1200.sh (STACK): Define as 0. + * emulparams/avr23xx.sh (STACK): Define as last internal SRAM address. + * emulparams/avr4433.sh (STACK): Likewise. + * emulparams/avr44x4.sh (STACK): Likewise. + * emulparams/avr85xx.sh (STACK): Likewise. + * emulparams/avrmega103.sh (STACK): Likewise. + * emulparams/avrmega161.sh (STACK): Likewise. + * emulparams/avrmega603.sh (STACK): Likewise. + * scripttempl/elf32avr.sc (__data_start): Define for gcrt1. + (__stack): Define from ${STACK} for main(). + +2000-05-26 Alan Modra + + * Makefile.am: Update dependencies with "make dep-am" + * Makefile.in: Regenerate. + +2000-05-26 Eli Zaretskii + + * ldmain.c: Include filenames.h. + (set_scripts_dir): Support backslashes in program name. + +2000-05-22 Igor Shevlyakov + + * ldmain.c (main): When deciding if ".text" section should be + read-only, don't forget to reset SEC_READONLY because it + could be already set. + +2000-05-22 Thomas de Lellis + + * ld.1: Add documentation for new command line option: + --section-start = + This is a generic version of -Ttext etc. which accepts + any section name as a parameter instead of just text/data/ + bss. + * ld.texinfo: More docs. + * NEWS: More docs. + * lexsup.c: (parse_args): Recognize new command line option. + (ld_options): Add new option. + +2000-05-18 H.J. Lu + + * lexsup.c (parse_args): `i' == `r', not `q'. + +Thu May 18 10:47:57 2000 Jeffrey A Law (law@cygnus.com) + + * configure.tgt (hppa*64*-*-*): Enable PA64 target. + +2000-05-17 S. Bharadwaj Yadavalli + Rick Gorton + + Add support for '-q' == '--emit-relocs' switch. + * ldmain.c (main): Default to false. + * lexsup.c (parse_args): Turn on emitrelocations flag if set. + * NEWS: Describe the emitrelocations switch. + * ld.texinfo: Describe the emitrelocations switch. + +2000-05-16 Charles Wilson + + * ld/emultempl/pe.em (_open_dynamic_archive): New function: Search + the library path for "foo.dll" and "libfoo.dll" dynamic libraries + before searching for 'libfoo.a' in response to a '-Bdynamic -lfoo' + link options. + +2000-05-15 David O'Brien + + * lexsup.c (parse_args): Update the year in the copyright notice. + +2000-05-13 Alan Modra + + * ld.h (gettext, dgettext, dcgettext, textdomain, bindtextdomain): + Replace defines with those from intl/libgettext.h to quieten gcc + warnings. + 2000-05-10 H.J. Lu * ldlang.c (open_input_bfds): Don't load the same file within @@ -550,7 +625,7 @@ Wed Nov 3 23:31:19 1999 Jeffrey A Law 1999-09-22 Nick Clifton - * Makefile.am: Add earm_epoc_pe.c build target. + * Makefile.am: Add earm_epoc_pe.c build target. Sat Sep 18 07:57:10 1999 Jeffrey A Law (law@cygnus.com) diff -upr --new-file binutils-2.9.5.0.42/ld/Makefile.am binutils-2.9.5.0.46/ld/Makefile.am --- binutils-2.9.5.0.42/ld/Makefile.am Tue May 2 10:23:29 2000 +++ binutils-2.9.5.0.46/ld/Makefile.am Tue May 30 09:54:28 2000 @@ -930,9 +930,10 @@ ldlang.o: ldlang.c ../bfd/bfd.h $(INCDIR ldmisc.h ldctor.h ldfile.h $(INCDIR)/fnmatch.h $(INCDIR)/demangle.h ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \ - $(INCDIR)/progress.h $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h \ - ldmain.h ldmisc.h ldwrite.h ldgram.h ldexp.h ldlang.h \ - ldemul.h ldlex.h ldfile.h ldctor.h + $(INCDIR)/progress.h $(INCDIR)/bfdlink.h $(INCDIR)/filenames.h \ + ld.h $(INCDIR)/bin-bugs.h ldmain.h ldmisc.h ldwrite.h \ + ldgram.h ldexp.h ldlang.h ldemul.h ldlex.h ldfile.h \ + ldctor.h ldmisc.o: ldmisc.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \ $(INCDIR)/demangle.h ld.h $(INCDIR)/bin-bugs.h ldmisc.h \ diff -upr --new-file binutils-2.9.5.0.42/ld/Makefile.in binutils-2.9.5.0.46/ld/Makefile.in --- binutils-2.9.5.0.42/ld/Makefile.in Tue May 2 10:23:29 2000 +++ binutils-2.9.5.0.46/ld/Makefile.in Tue May 30 09:54:28 2000 @@ -436,7 +436,7 @@ ldgram.c ldlex.c DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(ld_new_SOURCES) OBJECTS = $(ld_new_OBJECTS) @@ -1609,9 +1609,10 @@ ldlang.o: ldlang.c ../bfd/bfd.h $(INCDIR ldmisc.h ldctor.h ldfile.h $(INCDIR)/fnmatch.h $(INCDIR)/demangle.h ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \ - $(INCDIR)/progress.h $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h \ - ldmain.h ldmisc.h ldwrite.h ldgram.h ldexp.h ldlang.h \ - ldemul.h ldlex.h ldfile.h ldctor.h + $(INCDIR)/progress.h $(INCDIR)/bfdlink.h $(INCDIR)/filenames.h \ + ld.h $(INCDIR)/bin-bugs.h ldmain.h ldmisc.h ldwrite.h \ + ldgram.h ldexp.h ldlang.h ldemul.h ldlex.h ldfile.h \ + ldctor.h ldmisc.o: ldmisc.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \ $(INCDIR)/demangle.h ld.h $(INCDIR)/bin-bugs.h ldmisc.h \ diff -upr --new-file binutils-2.9.5.0.42/ld/NEWS binutils-2.9.5.0.46/ld/NEWS --- binutils-2.9.5.0.42/ld/NEWS Wed Apr 12 10:06:52 2000 +++ binutils-2.9.5.0.46/ld/NEWS Tue May 30 09:54:28 2000 @@ -2,6 +2,15 @@ Changes in version 2.10: +* Added command line switch --section-start to set the start address of any + specified section. + +* Added ability to emit full relocation information in linked executables, + enabled by --emit-relocs. Some post-linkage optimization tools need + this information in order to be able to correctly identify and perform + symbol relative addressing in the event of changes in section contents + (instructions being added or deleted, extending data sections, etc.) + * Added AT> to the linker script language to allow load-time allocation of sections into regions. diff -upr --new-file binutils-2.9.5.0.42/ld/configure.tgt binutils-2.9.5.0.46/ld/configure.tgt --- binutils-2.9.5.0.42/ld/configure.tgt Tue May 2 10:23:29 2000 +++ binutils-2.9.5.0.46/ld/configure.tgt Thu May 18 15:10:35 2000 @@ -203,7 +203,7 @@ m68*-hp*-netbsd*) targ_emul=m68k4knbsd ; m68*-*-netbsd*) targ_emul=m68knbsd ;; m68*-*-psos*) targ_emul=m68kpsos ;; m68*-*-rtems*) targ_emul=m68kcoff ;; -#hppa*w*-*) targ_emul=elf64hppa ;; +hppa*64*-*) targ_emul=elf64hppa ;; hppa*-*-*elf*) targ_emul=hppaelf ;; hppa*-*-linux-gnu*) targ_emul=hppaelf ;; hppa*-*-lites*) targ_emul=hppaelf ;; diff -upr --new-file binutils-2.9.5.0.42/ld/emulparams/avr1200.sh binutils-2.9.5.0.46/ld/emulparams/avr1200.sh --- binutils-2.9.5.0.42/ld/emulparams/avr1200.sh Fri Mar 31 09:17:40 2000 +++ binutils-2.9.5.0.46/ld/emulparams/avr1200.sh Mon May 29 22:36:47 2000 @@ -9,3 +9,4 @@ TEMPLATE_NAME=generic TEXT_LENGTH=1K DATA_LENGTH=0 EEPROM_LENGTH=64 +STACK=0 diff -upr --new-file binutils-2.9.5.0.42/ld/emulparams/avr23xx.sh binutils-2.9.5.0.46/ld/emulparams/avr23xx.sh --- binutils-2.9.5.0.42/ld/emulparams/avr23xx.sh Fri Mar 31 09:17:40 2000 +++ binutils-2.9.5.0.46/ld/emulparams/avr23xx.sh Mon May 29 22:36:47 2000 @@ -9,4 +9,5 @@ TEMPLATE_NAME=generic TEXT_LENGTH=2K DATA_LENGTH=128 EEPROM_LENGTH=128 +STACK=0x0DF diff -upr --new-file binutils-2.9.5.0.42/ld/emulparams/avr4433.sh binutils-2.9.5.0.46/ld/emulparams/avr4433.sh --- binutils-2.9.5.0.42/ld/emulparams/avr4433.sh Fri Mar 31 09:17:40 2000 +++ binutils-2.9.5.0.46/ld/emulparams/avr4433.sh Mon May 29 22:36:47 2000 @@ -9,4 +9,5 @@ TEMPLATE_NAME=generic TEXT_LENGTH=4K DATA_LENGTH=128 EEPROM_LENGTH=256 +STACK=0x0DF diff -upr --new-file binutils-2.9.5.0.42/ld/emulparams/avr44x4.sh binutils-2.9.5.0.46/ld/emulparams/avr44x4.sh --- binutils-2.9.5.0.42/ld/emulparams/avr44x4.sh Fri Mar 31 09:17:40 2000 +++ binutils-2.9.5.0.46/ld/emulparams/avr44x4.sh Mon May 29 22:36:47 2000 @@ -9,4 +9,5 @@ TEMPLATE_NAME=generic TEXT_LENGTH=4K DATA_LENGTH=256 EEPROM_LENGTH=256 +STACK=0x15F diff -upr --new-file binutils-2.9.5.0.42/ld/emulparams/avr85xx.sh binutils-2.9.5.0.46/ld/emulparams/avr85xx.sh --- binutils-2.9.5.0.42/ld/emulparams/avr85xx.sh Fri Mar 31 09:17:40 2000 +++ binutils-2.9.5.0.46/ld/emulparams/avr85xx.sh Mon May 29 22:36:47 2000 @@ -9,4 +9,5 @@ TEMPLATE_NAME=generic TEXT_LENGTH=8K DATA_LENGTH=512 EEPROM_LENGTH=512 +STACK=0x25F diff -upr --new-file binutils-2.9.5.0.42/ld/emulparams/avrmega103.sh binutils-2.9.5.0.46/ld/emulparams/avrmega103.sh --- binutils-2.9.5.0.42/ld/emulparams/avrmega103.sh Fri Mar 31 09:17:40 2000 +++ binutils-2.9.5.0.46/ld/emulparams/avrmega103.sh Mon May 29 22:36:47 2000 @@ -7,6 +7,6 @@ EMBEDDED=yes TEMPLATE_NAME=generic TEXT_LENGTH=128K -DATA_LENGTH=4K +DATA_LENGTH=4000 EEPROM_LENGTH=4K - +STACK=0x0FFF diff -upr --new-file binutils-2.9.5.0.42/ld/emulparams/avrmega161.sh binutils-2.9.5.0.46/ld/emulparams/avrmega161.sh --- binutils-2.9.5.0.42/ld/emulparams/avrmega161.sh Fri Mar 31 09:17:40 2000 +++ binutils-2.9.5.0.46/ld/emulparams/avrmega161.sh Mon May 29 22:36:47 2000 @@ -9,4 +9,5 @@ TEMPLATE_NAME=generic TEXT_LENGTH=16K DATA_LENGTH=1K EEPROM_LENGTH=512 +STACK=0x45F diff -upr --new-file binutils-2.9.5.0.42/ld/emulparams/avrmega603.sh binutils-2.9.5.0.46/ld/emulparams/avrmega603.sh --- binutils-2.9.5.0.42/ld/emulparams/avrmega603.sh Fri Mar 31 09:17:40 2000 +++ binutils-2.9.5.0.46/ld/emulparams/avrmega603.sh Mon May 29 22:36:47 2000 @@ -7,6 +7,6 @@ EMBEDDED=yes TEMPLATE_NAME=generic TEXT_LENGTH=64K -DATA_LENGTH=4K +DATA_LENGTH=4000 EEPROM_LENGTH=2K - +STACK=0x0FFF diff -upr --new-file binutils-2.9.5.0.42/ld/emultempl/pe.em binutils-2.9.5.0.46/ld/emultempl/pe.em --- binutils-2.9.5.0.42/ld/emultempl/pe.em Tue May 2 10:09:36 2000 +++ binutils-2.9.5.0.46/ld/emultempl/pe.em Thu May 18 14:22:21 2000 @@ -105,6 +105,8 @@ static boolean gld_${EMULATION_NAME}_pla static char *gld_${EMULATION_NAME}_get_script PARAMS ((int *)); static int gld_${EMULATION_NAME}_parse_args PARAMS ((int, char **)); static void gld_${EMULATION_NAME}_finish PARAMS ((void)); +static boolean gld_${EMULATION_NAME}_open_dynamic_archive + PARAMS ((const char *, search_dirs_type *, lang_input_statement_type *)); static struct internal_extra_pe_aouthdr pe; static int dll; @@ -114,8 +116,8 @@ static lang_assignment_statement_type *i static int pe_enable_stdcall_fixup = -1; /* 0=disable 1=enable */ #ifdef DLL_SUPPORT -static char *pe_out_def_filename = 0; -static char *pe_implib_filename = 0; +static char *pe_out_def_filename = NULL; +static char *pe_implib_filename = NULL; #endif extern const char *output_filename; @@ -814,7 +816,7 @@ gld_${EMULATION_NAME}_after_open () sprintf (new_name, "%s.%c", is->the_bfd->filename, seq); is->the_bfd->filename = new_name; - new_name = xmalloc (strlen(is->filename) + 3); + new_name = xmalloc (strlen (is->filename) + 3); sprintf (new_name, "%s.%c", is->filename, seq); is->filename = new_name; } @@ -868,10 +870,10 @@ gld_${EMULATION_NAME}_before_allocation( #endif /* TARGET_IS_armpe */ } - +#ifdef DLL_SUPPORT /* This is called when an input file isn't recognized as a BFD. We check here for .DEF files and pull them in automatically. */ -#ifdef DLL_SUPPORT + static int saw_option(char *option) { @@ -881,7 +883,7 @@ saw_option(char *option) return init[i].inited; return 0; } -#endif +#endif /* DLL_SUPPORT */ static boolean gld_${EMULATION_NAME}_unrecognized_file(entry) @@ -1047,6 +1049,7 @@ gld_${EMULATION_NAME}_finish () pe_dll_generate_implib (pe_def_file, pe_implib_filename); } #if defined(TARGET_IS_shpe) || defined(TARGET_IS_mipspe) + /* ARM doesn't need relocs. */ else { pe_exe_fill_sections (output_bfd, &link_info); @@ -1055,7 +1058,7 @@ gld_${EMULATION_NAME}_finish () if (pe_out_def_filename) pe_dll_generate_def_file (pe_out_def_filename); -#endif +#endif /* DLL_SUPPORT */ } @@ -1303,6 +1306,45 @@ gld_${EMULATION_NAME}_place_orphan (file return true; } +static boolean +gld_${EMULATION_NAME}_open_dynamic_archive (arch, search, entry) + const char * arch; + search_dirs_type * search; + lang_input_statement_type * entry; +{ + const char * filename; + char * string; + + if (! entry->is_archive) + return false; + + filename = entry->filename; + + string = (char *) xmalloc (strlen (search->name) + + strlen (filename) + + sizeof "/lib.dll" + + 1); + + /* Try "foo.dll" first. */ + sprintf (string, "%s/%s.dll", search->name, filename); + + if (! ldfile_try_open_bfd (string, entry)) + { + /* Try "libfoo.dll" next. */ + sprintf (string, "%s/lib%s.dll", search->name, filename); + + if (! ldfile_try_open_bfd (string, entry)) + { + free (string); + return false; + } + } + + entry->filename = string; + + return true; +} + static int gld_${EMULATION_NAME}_find_potential_libraries (name, entry) char * name; @@ -1356,7 +1398,7 @@ struct ld_emulation_xfer_struct ld_${EMU "${OUTPUT_FORMAT}", gld_${EMULATION_NAME}_finish, /* finish */ NULL, /* create output section statements */ - NULL, /* open dynamic archive */ + gld_${EMULATION_NAME}_open_dynamic_archive, gld_${EMULATION_NAME}_place_orphan, gld_${EMULATION_NAME}_set_symbols, gld_${EMULATION_NAME}_parse_args, diff -upr --new-file binutils-2.9.5.0.42/ld/ld.1 binutils-2.9.5.0.46/ld/ld.1 --- binutils-2.9.5.0.42/ld/ld.1 Thu Jun 3 11:02:10 1999 +++ binutils-2.9.5.0.46/ld/ld.1 Mon May 29 22:36:41 2000 @@ -39,7 +39,7 @@ ld \- the GNU linker .br .RB "[\|" "\-defsym\ "\c .I symbol\c -\& = \c +\&=\c .I expression\c \&\|] .RB "[\|" \-\-demangle "\|]" @@ -122,6 +122,11 @@ ld \- the GNU linker .RB "[\|" "\-T\ "\c .I commandfile\c \&\|] +.RB "[\|" "\-\-section\-start\ "\c +.I sectionname\c +\&=\c +.I sectionorg\c +\&\|] .RB "[\|" "\-Ttext\ "\c .I textorg\c \&\|] @@ -253,8 +258,9 @@ The exceptions\(em\&which may meaningful .B \-format\c \&), \c .B \-defsym\c -\&, -\c +\&, \c +.B \-\-section\-start\c +\&, \c .B \-L\c \&, \c .B \-l\c @@ -454,7 +460,7 @@ specified (\c \& has the same effect. .TP -.BI "-defsym " "symbol" "\fR = \fP" expression +.BI "-defsym " "symbol" "\fR=\fP" expression Create a global symbol in the output file, containing the absolute address given by \c .I expression\c @@ -888,6 +894,20 @@ relocations one output section will cont Similar to .B \-split\-by\-reloc but creates a new output section for each input file. + +.TP +.BI "--section-start " "sectionname" "\fR=\fP"org +Locate a section in the output file at the absolute +address given by \c +.I org\c +\&. \c +\c +.I org\c +\& must be a hexadecimal integer. +You may use this option as many +times as necessary to locate multiple sections in the command +line. If you need more elaborate expressions, consider +using the linker command language from a script. .TP .BI "\-Tbss " "org"\c diff -upr --new-file binutils-2.9.5.0.42/ld/ld.h binutils-2.9.5.0.46/ld/ld.h --- binutils-2.9.5.0.42/ld/ld.h Tue May 2 10:23:29 2000 +++ binutils-2.9.5.0.46/ld/ld.h Sun May 14 10:25:52 2000 @@ -35,12 +35,11 @@ # define N_(String) (String) # endif #else -/* Stubs that do something close enough. */ -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) +# define gettext(Msgid) (Msgid) +# define dgettext(Domainname, Msgid) (Msgid) +# define dcgettext(Domainname, Msgid, Category) (Msgid) +# define textdomain(Domainname) while (0) /* nothing */ +# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */ # define _(String) (String) # define N_(String) (String) #endif diff -upr --new-file binutils-2.9.5.0.42/ld/ld.texinfo binutils-2.9.5.0.46/ld/ld.texinfo --- binutils-2.9.5.0.42/ld/ld.texinfo Tue May 2 10:09:24 2000 +++ binutils-2.9.5.0.46/ld/ld.texinfo Tue May 30 09:54:28 2000 @@ -588,6 +588,16 @@ If @var{level} is a numeric values great the output. This might take significantly longer and therefore probably should only be enabled for the final binary. +@kindex -q +@kindex --emit-relocs +@cindex retain relocations in final executable +@item -q +@itemx --emit-relocs +Leave relocation sections and contents in fully linked exececutables. +Post link analysis and optimization tools may need this information in +order to perform correct modifications of executables. This results +in larger executables. + @cindex partial link @cindex relocatable output @kindex -r @@ -1132,6 +1142,18 @@ full debugging information by over 30 pe @code{dbx} program can not read the resulting program (@code{gdb} has no trouble). The @samp{--traditional-format} switch tells @code{ld} to not combine duplicate entries. + +@kindex --section-start @var{sectionname}=@var{org} +@item --section-start @var{sectionname}=@var{org} +Locate a section in the output file at the absolute +address given by @var{org}. You may use this option as many +times as necessary to locate multiple sections in the command +line. +@var{org} must be a single hexadecimal integer; +for compatibility with other linkers, you may omit the leading +@samp{0x} usually associated with hexadecimal values. @emph{Note:} there +should be no white space between @var{sectionname}, the equals +sign (``@key{=}''), and @var{org}. @kindex -Tbss @var{org} @kindex -Tdata @var{org} diff -upr --new-file binutils-2.9.5.0.42/ld/ldmain.c binutils-2.9.5.0.46/ld/ldmain.c --- binutils-2.9.5.0.42/ld/ldmain.c Sun Mar 12 09:40:14 2000 +++ binutils-2.9.5.0.46/ld/ldmain.c Tue May 30 09:54:28 2000 @@ -1,5 +1,5 @@ /* Main program of GNU linker. - Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 1999 + Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. Written by Steve Chamberlain steve@cygnus.com @@ -27,6 +27,7 @@ Software Foundation, 59 Temple Place - S #include "libiberty.h" #include "progress.h" #include "bfdlink.h" +#include "filenames.h" #include "ld.h" #include "ldmain.h" @@ -215,6 +216,7 @@ main (argc, argv) link_info.callbacks = &link_callbacks; link_info.relocateable = false; + link_info.emitrelocations = false; link_info.shared = false; link_info.symbolic = false; link_info.static_link = false; @@ -347,17 +349,18 @@ main (argc, argv) /* Print error messages for any missing symbols, for any warning symbols, and possibly multiple definitions */ - - if (config.text_read_only) - { - /* Look for a text section and mark the readonly attribute in it */ - asection *found = bfd_get_section_by_name (output_bfd, ".text"); - - if (found != (asection *) NULL) - { + /* Look for a text section and switch the readonly attribute in it. */ + { + asection * found = bfd_get_section_by_name (output_bfd, ".text"); + + if (found != (asection *) NULL) + { + if (config.text_read_only) found->flags |= SEC_READONLY; - } - } + else + found->flags &= ~SEC_READONLY; + } + } if (link_info.relocateable) output_bfd->flags &= ~EXEC_P; @@ -591,6 +594,14 @@ set_scripts_dir () /* Look for "ldscripts" in the dir where our binary is. */ end = strrchr (program_name, '/'); +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + { + /* We could have \foo\bar, or /foo\bar. */ + char *bslash = strrchr (program_name, '\\'); + if (bslash > end) + end = bslash; + } +#endif if (end == NULL) { @@ -1174,7 +1185,7 @@ undefined_symbol (info, name, abfd, sect bfd *abfd; asection *section; bfd_vma address; - boolean fatal; + boolean fatal ATTRIBUTE_UNUSED; { static char *error_name; static unsigned int error_count; diff -upr --new-file binutils-2.9.5.0.42/ld/lexsup.c binutils-2.9.5.0.46/ld/lexsup.c --- binutils-2.9.5.0.42/ld/lexsup.c Fri May 12 08:11:30 2000 +++ binutils-2.9.5.0.46/ld/lexsup.c Tue May 30 09:54:28 2000 @@ -126,7 +126,8 @@ int parsing_defsym = 0; #define OPTION_NO_UNDEFINED (OPTION_MPC860C0 + 1) #define OPTION_INIT (OPTION_NO_UNDEFINED + 1) #define OPTION_FINI (OPTION_INIT + 1) -#define OPTION_MULTILIB_DIR (OPTION_FINI + 1) +#define OPTION_SECTION_START (OPTION_FINI + 1) +#define OPTION_MULTILIB_DIR (OPTION_SECTION_START + 1) /* The long options. This structure is used for both the option parsing and the help text. */ @@ -207,6 +208,8 @@ static const struct ld_option ld_options 'O', NULL, N_("Optimize output file"), ONE_DASH }, { {"Qy", no_argument, NULL, OPTION_IGNORE}, '\0', NULL, N_("Ignored for SVR4 compatibility"), ONE_DASH }, + { {"emit-relocs", no_argument, NULL, 'q'}, + 'q', NULL, "Generate relocations in final output", TWO_DASHES }, { {"relocateable", no_argument, NULL, 'r'}, 'r', NULL, N_("Generate relocateable output"), TWO_DASHES }, { {NULL, no_argument, NULL, '\0'}, @@ -344,6 +347,8 @@ static const struct ld_option ld_options '\0', N_("SYMBOL"), N_("Do task level linking"), TWO_DASHES }, { {"traditional-format", no_argument, NULL, OPTION_TRADITIONAL_FORMAT}, '\0', NULL, N_("Use same format as native linker"), TWO_DASHES }, + { {"section-start", required_argument, NULL, OPTION_SECTION_START}, + '\0', N_("SECTION=ADDRESS"), N_("Set address of named section"), TWO_DASHES }, { {"Tbss", required_argument, NULL, OPTION_TBSS}, '\0', N_("ADDRESS"), N_("Set address of .bss section"), ONE_DASH }, { {"Tdata", required_argument, NULL, OPTION_TDATA}, @@ -730,6 +735,9 @@ parse_args (argc, argv) case OPTION_OFORMAT: lang_add_output_format (optarg, (char *) NULL, (char *) NULL, 0); break; + case 'q': + link_info.emitrelocations = true; + break; case 'i': case 'r': link_info.relocateable = true; @@ -856,6 +864,39 @@ parse_args (argc, argv) case OPTION_MULTILIB_DIR: command_line.multilib_dir = buystring (optarg); break; + case OPTION_SECTION_START: + { + char *optarg2; + + /* Check for =... */ + optarg2 = strchr (optarg, '='); + if (optarg2 == NULL) + { + fprintf (stderr, + _("%s: Invalid argument to option \"--section-start\"\n"), + program_name); + xexit (1); + } + + optarg2 ++; + + /* So far so good. Are all the args present? */ + if ((*optarg == '\0') || (*optarg2 == '\0')) + { + fprintf (stderr, + _("%s: Missing argument(s) to option \"--section-start\"\n"), + program_name); + xexit (1); + } + + optarg2[-1] = '\0'; + + /* Then set it... */ + set_section_start (optarg, optarg2); + + optarg2[-1] = '='; + } + break; case OPTION_TBSS: set_section_start (".bss", optarg); break; @@ -897,7 +938,7 @@ parse_args (argc, argv) case OPTION_VERSION: /* This output is intended to follow the GNU standards document. */ printf ("GNU ld %s\n", ld_program_version); - printf (_("Copyright 1997 Free Software Foundation, Inc.\n")); + printf (_("Copyright 2000 Free Software Foundation, Inc.\n")); printf (_("\ This program is free software; you may redistribute it under the terms of\n\ the GNU General Public License. This program has absolutely no warranty.\n")); diff -upr --new-file binutils-2.9.5.0.42/ld/scripttempl/elf32avr.sc binutils-2.9.5.0.46/ld/scripttempl/elf32avr.sc --- binutils-2.9.5.0.42/ld/scripttempl/elf32avr.sc Fri Mar 31 09:17:43 2000 +++ binutils-2.9.5.0.46/ld/scripttempl/elf32avr.sc Mon May 29 22:36:50 2000 @@ -88,6 +88,7 @@ SECTIONS .data ${RELOCATING-0} : ${RELOCATING+AT (ADDR (.text) + SIZEOF (.text))} { + ${RELOCATING+ PROVIDE (__data_start = .) ; } *(.data) *(.gnu.linkonce.d*) ${RELOCATING+. = ALIGN(2);} @@ -144,6 +145,7 @@ SECTIONS .debug_loc 0 : { *(.debug_loc) } .debug_macinfo 0 : { *(.debug_macinfo) } + PROVIDE (__stack = ${STACK}) ; } EOF diff -upr --new-file binutils-2.9.5.0.42/ld/testsuite/ChangeLog binutils-2.9.5.0.46/ld/testsuite/ChangeLog --- binutils-2.9.5.0.42/ld/testsuite/ChangeLog Sun Apr 23 09:41:41 2000 +++ binutils-2.9.5.0.46/ld/testsuite/ChangeLog Sun May 21 14:19:56 2000 @@ -1,3 +1,21 @@ +2000-05-21 H.J. Lu (hjl@gnu.org) + + * ld-elfvsb/main.c (main_visibility_check): Fix the protected + visibility test. + +2000-05-13 H.J. Lu (hjl@gnu.org) + + * lib/ld-lib.exp (default_ld_link): Redirect the linker output + to link_output and make it global. + + * ld-elfvsb/elf-offset.ld: New. ELF visibility fearture + tests. + * ld-elfvsb/elfvsb.dat: Likewise. + * ld-elfvsb/elfvsb.exp: Likewise. + * ld-elfvsb/main.c: Likewise. + * ld-elfvsb/sh1.c: Likewise. + * ld-elfvsb/sh2.c: Likewise. + Fri Apr 21 15:16:07 2000 Richard Henderson * testsuite/ld-scripts/phdrs.exp: IA-64 is 64-bit ELF too. diff -upr --new-file binutils-2.9.5.0.42/ld/testsuite/ChangeLog.linux binutils-2.9.5.0.46/ld/testsuite/ChangeLog.linux --- binutils-2.9.5.0.42/ld/testsuite/ChangeLog.linux Thu May 4 08:47:08 2000 +++ binutils-2.9.5.0.46/ld/testsuite/ChangeLog.linux Sun May 14 10:28:30 2000 @@ -1,17 +0,0 @@ -2000-05-04 H.J. Lu (hjl@gnu.org) - - * ld-elfvsb/elfvsb.exp (visibility_run): Mark all "protected" - tests "expected to fail." - -2000-05-03 H.J. Lu (hjl@gnu.org) - - * lib/ld-lib.exp (default_ld_link): Redirect the linker output - to link_output and make it global. - - * ld-elfvsb/elf-offset.ld: New. ELF visibility fearture - tests. - * ld-elfvsb/elfvsb.dat: Likewise. - * ld-elfvsb/elfvsb.exp: Likewise. - * ld-elfvsb/main.c: Likewise. - * ld-elfvsb/sh1.c: Likewise. - * ld-elfvsb/sh2.c: Likewise. diff -upr --new-file binutils-2.9.5.0.42/ld/testsuite/ld-elfvsb/main.c binutils-2.9.5.0.46/ld/testsuite/ld-elfvsb/main.c --- binutils-2.9.5.0.42/ld/testsuite/ld-elfvsb/main.c Thu May 4 08:29:21 2000 +++ binutils-2.9.5.0.46/ld/testsuite/ld-elfvsb/main.c Sun May 21 14:51:06 2000 @@ -29,13 +29,19 @@ visibility () { return 1; } -#endif static int main_visibility_check () { + return visibility_funptr () != visibility; +} +#else +static int +main_visibility_check () +{ return visibility_funptr () == visibility; } +#endif /* This function is called by the shared library. */ diff -upr --new-file binutils-2.9.5.0.42/libiberty/ChangeLog binutils-2.9.5.0.46/libiberty/ChangeLog --- binutils-2.9.5.0.42/libiberty/ChangeLog Sun Apr 23 09:40:35 2000 +++ binutils-2.9.5.0.46/libiberty/ChangeLog Thu Jun 1 11:10:02 2000 @@ -1,3 +1,30 @@ +Tue May 30 16:45:25 2000 Andrew Cagney + + * floatformat.c: Add name to each floatformat field. + +Tue May 30 15:07:52 2000 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (objalloc.o): Depend on config.h + +2000-05-29 Zack Weinberg + + * hashtab.c, partition.c, xmemdup.c: Include string.h + if HAVE_STRING_H. + * pexecute.c, xexit.c: Include stdlib.h if HAVE_STDLIB_H. + * objalloc.c: Include config.h. Include stdlib.h and don't + declare malloc or free if HAVE_STDLIB_H. + * strerror.c, strsignal.c: Include stdlib.h if HAVE_STDLIB_H, + else declare malloc without prototype. Include string.h if + HAVE_STRING_H, else declare memset without prototype. Don't + include stddef.h. + + * sort.c: Bring over from GCC. + +2000-05-26 Alexandre Oliva + + * Makefile.in (maintainer-clean-subdir): Fix handling of empty + SUBDIRS. + 2000-04-21 Michael Sokolov * Makefile.in (*-subdir): Revamp slightly to avoid losing on diff -upr --new-file binutils-2.9.5.0.42/libiberty/Makefile.in binutils-2.9.5.0.46/libiberty/Makefile.in --- binutils-2.9.5.0.42/libiberty/Makefile.in Sun Apr 23 09:48:03 2000 +++ binutils-2.9.5.0.46/libiberty/Makefile.in Thu Jun 1 11:19:45 2000 @@ -253,9 +253,9 @@ all-subdir check-subdir installcheck-sub install-info-subdir clean-info-subdir dvi-subdir install-subdir \ etags-subdir mostlyclean-subdir clean-subdir distclean-subdir \ maintainer-clean-subdir: - @if test "x$(SUBDIRS)" = x; then exit 0; fi; \ + @subdirs='$(SUBDIRS)'; \ target=`echo $@ | sed -e 's/-subdir//'`; \ - for dir in $(SUBDIRS) ; do \ + for dir in $$subdirs ; do \ cd $$dir && $(MAKE) $(FLAGS_TO_PASS) $$target; \ done @@ -280,7 +280,7 @@ getruntime.o: config.h $(INCDIR)/libiber hex.o: $(INCDIR)/libiberty.h floatformat.o: $(INCDIR)/floatformat.h mkstemps.o: config.h -objalloc.o: $(INCDIR)/objalloc.h +objalloc.o: config.h $(INCDIR)/objalloc.h obstack.o: config.h $(INCDIR)/obstack.h partition.o: config.h $(INCDIR)/partition.h pexecute.o: config.h $(INCDIR)/libiberty.h diff -upr --new-file binutils-2.9.5.0.42/libiberty/floatformat.c binutils-2.9.5.0.46/libiberty/floatformat.c --- binutils-2.9.5.0.42/libiberty/floatformat.c Thu Aug 5 17:15:06 1999 +++ binutils-2.9.5.0.46/libiberty/floatformat.c Thu Jun 1 11:10:03 2000 @@ -1,5 +1,5 @@ /* IEEE floating point support routines, for GDB, the GNU Debugger. - Copyright (C) 1991, 1994, 1999 Free Software Foundation, Inc. + Copyright (C) 1991, 1994, 1999, 2000 Free Software Foundation, Inc. This file is part of GDB. @@ -36,19 +36,27 @@ extern char *memset (); /* floatformats for IEEE single and double, big and little endian. */ const struct floatformat floatformat_ieee_single_big = { - floatformat_big, 32, 0, 1, 8, 127, 255, 9, 23, floatformat_intbit_no + floatformat_big, 32, 0, 1, 8, 127, 255, 9, 23, + floatformat_intbit_no, + "floatformat_ieee_single_big" }; const struct floatformat floatformat_ieee_single_little = { - floatformat_little, 32, 0, 1, 8, 127, 255, 9, 23, floatformat_intbit_no + floatformat_little, 32, 0, 1, 8, 127, 255, 9, 23, + floatformat_intbit_no, + "floatformat_ieee_single_little" }; const struct floatformat floatformat_ieee_double_big = { - floatformat_big, 64, 0, 1, 11, 1023, 2047, 12, 52, floatformat_intbit_no + floatformat_big, 64, 0, 1, 11, 1023, 2047, 12, 52, + floatformat_intbit_no, + "floatformat_ieee_double_big" }; const struct floatformat floatformat_ieee_double_little = { - floatformat_little, 64, 0, 1, 11, 1023, 2047, 12, 52, floatformat_intbit_no + floatformat_little, 64, 0, 1, 11, 1023, 2047, 12, 52, + floatformat_intbit_no, + "floatformat_ieee_double_little" }; /* floatformat for IEEE double, little endian byte order, with big endian word @@ -56,24 +64,30 @@ const struct floatformat floatformat_iee const struct floatformat floatformat_ieee_double_littlebyte_bigword = { - floatformat_littlebyte_bigword, 64, 0, 1, 11, 1023, 2047, 12, 52, floatformat_intbit_no + floatformat_littlebyte_bigword, 64, 0, 1, 11, 1023, 2047, 12, 52, + floatformat_intbit_no, + "floatformat_ieee_double_little" }; const struct floatformat floatformat_i387_ext = { floatformat_little, 80, 0, 1, 15, 0x3fff, 0x7fff, 16, 64, - floatformat_intbit_yes + floatformat_intbit_yes, + "floatformat_i387_ext" }; const struct floatformat floatformat_m68881_ext = { /* Note that the bits from 16 to 31 are unused. */ - floatformat_big, 96, 0, 1, 15, 0x3fff, 0x7fff, 32, 64, floatformat_intbit_yes + floatformat_big, 96, 0, 1, 15, 0x3fff, 0x7fff, 32, 64, + floatformat_intbit_yes, + "floatformat_m68881_ext" }; const struct floatformat floatformat_i960_ext = { /* Note that the bits from 0 to 15 are unused. */ floatformat_little, 96, 16, 17, 15, 0x3fff, 0x7fff, 32, 64, - floatformat_intbit_yes + floatformat_intbit_yes, + "floatformat_i960_ext" }; const struct floatformat floatformat_m88110_ext = { @@ -81,17 +95,20 @@ const struct floatformat floatformat_m88 /* Harris uses raw format 128 bytes long, but the number is just an ieee double, and the last 64 bits are wasted. */ floatformat_big,128, 0, 1, 11, 0x3ff, 0x7ff, 12, 52, - floatformat_intbit_no + floatformat_intbit_no, + "floatformat_m88110_ext(harris)" #else floatformat_big, 80, 0, 1, 15, 0x3fff, 0x7fff, 16, 64, - floatformat_intbit_yes + floatformat_intbit_yes, + "floatformat_m88110_ext" #endif /* HARRIS_FLOAT_FORMAT */ }; const struct floatformat floatformat_arm_ext = { /* Bits 1 to 16 are unused. */ floatformat_big, 96, 0, 17, 15, 0x3fff, 0x7fff, 32, 64, - floatformat_intbit_yes + floatformat_intbit_yes, + "floatformat_arm_ext" }; static unsigned long get_field PARAMS ((unsigned char *, diff -upr --new-file binutils-2.9.5.0.42/libiberty/hashtab.c binutils-2.9.5.0.46/libiberty/hashtab.c --- binutils-2.9.5.0.42/libiberty/hashtab.c Fri Mar 31 09:16:51 2000 +++ binutils-2.9.5.0.46/libiberty/hashtab.c Mon May 29 22:35:49 2000 @@ -41,6 +41,10 @@ Boston, MA 02111-1307, USA. */ #include #endif +#ifdef HAVE_STRING_H +#include +#endif + #include #include "libiberty.h" diff -upr --new-file binutils-2.9.5.0.42/libiberty/objalloc.c binutils-2.9.5.0.46/libiberty/objalloc.c --- binutils-2.9.5.0.42/libiberty/objalloc.c Thu Jun 3 11:02:12 1999 +++ binutils-2.9.5.0.46/libiberty/objalloc.c Mon May 29 22:35:48 2000 @@ -18,6 +18,8 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "ansidecl.h" +#include "config.h" + #include "objalloc.h" /* Get a definition for NULL. */ @@ -33,9 +35,14 @@ Boston, MA 02111-1307, USA. */ #include #endif +#ifdef HAVE_STDLIB_H +#include +#else /* For systems with larger pointers than ints, this must be declared. */ extern PTR malloc PARAMS ((size_t)); extern void free PARAMS ((PTR)); +#endif + #endif /* These routines allocate space for an object. Freeing allocated diff -upr --new-file binutils-2.9.5.0.42/libiberty/partition.c binutils-2.9.5.0.46/libiberty/partition.c --- binutils-2.9.5.0.42/libiberty/partition.c Fri Mar 31 09:16:51 2000 +++ binutils-2.9.5.0.46/libiberty/partition.c Mon May 29 22:35:50 2000 @@ -27,6 +27,10 @@ #include #endif +#ifdef HAVE_STRING_H +#include +#endif + #include "libiberty.h" #include "partition.h" diff -upr --new-file binutils-2.9.5.0.42/libiberty/pexecute.c binutils-2.9.5.0.46/libiberty/pexecute.c --- binutils-2.9.5.0.42/libiberty/pexecute.c Thu Feb 24 11:11:28 2000 +++ binutils-2.9.5.0.46/libiberty/pexecute.c Mon May 29 22:35:48 2000 @@ -35,6 +35,9 @@ Boston, MA 02111-1307, USA. */ #ifdef HAVE_UNISTD_H #include #endif +#ifdef HAVE_STDLIB_H +#include +#endif #define ISSPACE (x) isspace(x) #ifdef HAVE_SYS_WAIT_H #include diff -upr --new-file binutils-2.9.5.0.42/libiberty/sort.c binutils-2.9.5.0.46/libiberty/sort.c --- binutils-2.9.5.0.42/libiberty/sort.c Wed Dec 31 16:00:00 1969 +++ binutils-2.9.5.0.46/libiberty/sort.c Mon May 29 22:35:50 2000 @@ -0,0 +1,185 @@ +/* Sorting algorithms. + Copyright (C) 2000 Free Software Foundation, Inc. + Contributed by Mark Mitchell . + +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. */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif +#include "libiberty.h" +#include "sort.h" +#include +#ifdef HAVE_STDLIB_H +#include +#endif +#ifdef HAVE_STRING_H +#include +#endif + +#ifndef UCHAR_MAX +#define UCHAR_MAX ((unsigned char)(-1)) +#endif + +/* POINTERS and WORK are both arrays of N pointers. When this + function returns POINTERS will be sorted in ascending order. */ + +void sort_pointers (n, pointers, work) + size_t n; + void **pointers; + void **work; +{ + /* The type of a single digit. This can be any unsigned integral + type. When changing this, DIGIT_MAX should be changed as + well. */ + typedef unsigned char digit_t; + + /* The maximum value a single digit can have. */ +#define DIGIT_MAX (UCHAR_MAX + 1) + + /* The Ith entry is the number of elements in *POINTERSP that have I + in the digit on which we are currently sorting. */ + unsigned int count[DIGIT_MAX]; + /* Nonzero if we are running on a big-endian machine. */ + int big_endian_p; + size_t i; + size_t j; + + /* The algorithm used here is radix sort which takes time linear in + the number of elements in the array. */ + + /* The algorithm here depends on being able to swap the two arrays + an even number of times. */ + if ((sizeof (void *) / sizeof (digit_t)) % 2 != 0) + abort (); + + /* Figure out the endianness of the machine. */ + for (i = 0, j = 0; i < sizeof (size_t); ++i) + { + j *= (UCHAR_MAX + 1); + j += i; + } + big_endian_p = (((char *)&j)[0] == 0); + + /* Move through the pointer values from least significant to most + significant digits. */ + for (i = 0; i < sizeof (void *) / sizeof (digit_t); ++i) + { + digit_t *digit; + digit_t *bias; + digit_t *top; + unsigned int *countp; + void **pointerp; + + /* The offset from the start of the pointer will depend on the + endianness of the machine. */ + if (big_endian_p) + j = sizeof (void *) / sizeof (digit_t) - i; + else + j = i; + + /* Now, perform a stable sort on this digit. We use counting + sort. */ + memset (count, 0, DIGIT_MAX * sizeof (unsigned int)); + + /* Compute the address of the appropriate digit in the first and + one-past-the-end elements of the array. On a little-endian + machine, the least-significant digit is closest to the front. */ + bias = ((digit_t *) pointers) + j; + top = ((digit_t *) (pointers + n)) + j; + + /* Count how many there are of each value. At the end of this + loop, COUNT[K] will contain the number of pointers whose Ith + digit is K. */ + for (digit = bias; + digit < top; + digit += sizeof (void *) / sizeof (digit_t)) + ++count[*digit]; + + /* Now, make COUNT[K] contain the number of pointers whose Ith + digit is less than or equal to K. */ + for (countp = count + 1; countp < count + DIGIT_MAX; ++countp) + *countp += countp[-1]; + + /* Now, drop the pointers into their correct locations. */ + for (pointerp = pointers + n - 1; pointerp >= pointers; --pointerp) + work[--count[((digit_t *) pointerp)[j]]] = *pointerp; + + /* Swap WORK and POINTERS so that POINTERS contains the sorted + array. */ + pointerp = pointers; + pointers = work; + work = pointerp; + } +} + +/* Everything below here is a unit test for the routines in this + file. */ + +#ifdef UNIT_TEST + +#include + +void *xmalloc (n) + size_t n; +{ + return malloc (n); +} + +int main (int argc, char **argv) +{ + int k; + int result; + size_t i; + void **pointers; + void **work; + + if (argc > 1) + k = atoi (argv[1]); + else + k = 10; + + pointers = xmalloc (k * sizeof (void *)); + work = xmalloc (k * sizeof (void *)); + + for (i = 0; i < k; ++i) + { + pointers[i] = (void *) random (); + printf ("%x\n", pointers[i]); + } + + sort_pointers (k, pointers, work); + + printf ("\nSorted\n\n"); + + result = 0; + + for (i = 0; i < k; ++i) + { + printf ("%x\n", pointers[i]); + if (i > 0 && (char*) pointers[i] < (char*) pointers[i - 1]) + result = 1; + } + + free (pointers); + free (work); + + return result; +} + +#endif diff -upr --new-file binutils-2.9.5.0.42/libiberty/strerror.c binutils-2.9.5.0.46/libiberty/strerror.c --- binutils-2.9.5.0.42/libiberty/strerror.c Thu Jun 3 11:02:12 1999 +++ binutils-2.9.5.0.46/libiberty/strerror.c Mon May 29 22:35:48 2000 @@ -25,14 +25,17 @@ /* Routines imported from standard C runtime libraries. */ -#ifdef __STDC__ -#include -extern void *malloc (size_t size); /* 4.10.3.3 */ -extern void *memset (void *s, int c, size_t n); /* 4.11.6.1 */ -#else /* !__STDC__ */ -extern char *malloc (); /* Standard memory allocater */ -extern char *memset (); -#endif /* __STDC__ */ +#ifdef HAVE_STDLIB_H +#include +#else +extern PTR malloc (); +#endif + +#ifdef HAVE_STRING_H +#include +#else +extern PTR memset (); +#endif #ifndef MAX # define MAX(a,b) ((a) > (b) ? (a) : (b)) diff -upr --new-file binutils-2.9.5.0.42/libiberty/strsignal.c binutils-2.9.5.0.46/libiberty/strsignal.c --- binutils-2.9.5.0.42/libiberty/strsignal.c Thu Jun 3 11:02:12 1999 +++ binutils-2.9.5.0.46/libiberty/strsignal.c Mon May 29 22:35:48 2000 @@ -23,14 +23,17 @@ /* Routines imported from standard C runtime libraries. */ -#ifdef __STDC__ -#include -extern void *malloc (size_t size); /* 4.10.3.3 */ -extern void *memset (void *s, int c, size_t n); /* 4.11.6.1 */ -#else /* !__STDC__ */ -extern char *malloc (); /* Standard memory allocater */ -extern char *memset (); -#endif /* __STDC__ */ +#ifdef HAVE_STDLIB_H +#include +#else +extern PTR malloc (); +#endif + +#ifdef HAVE_STRING_H +#include +#else +extern PTR memset (); +#endif /* Undefine the macro we used to hide the definition of sys_siglist found in the system header files. */ diff -upr --new-file binutils-2.9.5.0.42/libiberty/xexit.c binutils-2.9.5.0.46/libiberty/xexit.c --- binutils-2.9.5.0.42/libiberty/xexit.c Thu Jun 3 11:02:12 1999 +++ binutils-2.9.5.0.46/libiberty/xexit.c Mon May 29 22:35:49 2000 @@ -21,6 +21,9 @@ Boston, MA 02111-1307, USA. */ #include "libiberty.h" #include +#ifdef HAVE_STDLIB_H +#include +#endif /* This variable is set by xatexit if it is called. This way, xmalloc doesn't drag xatexit into the link. */ diff -upr --new-file binutils-2.9.5.0.42/libiberty/xmemdup.c binutils-2.9.5.0.46/libiberty/xmemdup.c --- binutils-2.9.5.0.42/libiberty/xmemdup.c Thu Feb 24 11:11:29 2000 +++ binutils-2.9.5.0.46/libiberty/xmemdup.c Mon May 29 22:35:50 2000 @@ -9,6 +9,9 @@ #include "libiberty.h" #include /* For size_t. */ +#ifdef HAVE_STRING_H +#include +#endif PTR xmemdup (input, copy_size, alloc_size) diff -upr --new-file binutils-2.9.5.0.42/ltmain.sh binutils-2.9.5.0.46/ltmain.sh --- binutils-2.9.5.0.42/ltmain.sh Tue Feb 29 11:15:08 2000 +++ binutils-2.9.5.0.46/ltmain.sh Sun May 14 10:25:47 2000 @@ -2779,6 +2779,11 @@ static const void *lt_preloaded_setup() # Quote the relink command for shipping. if test -n "$relink_command"; then + # Preserve any variables that may affect compiler behavior + variables_saved_for_relink="GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + for var in $variables_saved_for_relink; do + relink_command="$var=\""`eval \$echo \"X'$'$var\" | $Xsed -e "$sed_quote_subst"`"\"; export $var; $relink_command" + done relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` fi diff -upr --new-file binutils-2.9.5.0.42/opcodes/ChangeLog binutils-2.9.5.0.46/opcodes/ChangeLog --- binutils-2.9.5.0.42/opcodes/ChangeLog Fri May 12 08:03:06 2000 +++ binutils-2.9.5.0.46/opcodes/ChangeLog Fri Jun 2 16:25:43 2000 @@ -1,3 +1,78 @@ +2000-06-02 Kazu Hirata =0A= + + * h8300-dis.c: Follow the GNU coding style. + (bfd_h8_disassemble) Fix a typo. + +2000-06-02 Nick Clifton + + * h8300-dis.c (bfd_h8_disassemble): + +2000-06-01 Kazu Hirata + + * h8300-dis.c (bfd_h8_disassemble_init): Fix a typo. + (bfd_h8_disassemble): Distinguish the operand size of inc/dev.[wl] + correctly. Fix a typo. + +2000-05-31 Nick Clifton + + * opintl.h (_(String)): Explain why dgettext is used instead of + gettext. + +2000-05-30 Nick Clifton + + * opintl.h (gettext, dgettext, dcgettext, textdomain, + bindtextdomain): Replace defines with those from intl/libgettext.h + to quieten gcc warnings. + +2000-05-26 Alan Modra + + * Makefile.am: Update dependencies with "make dep-am" + * Makefile.in: Regenerate. + +Thu May 25 22:53:20 2000 Alexandre Oliva + + * m10300-dis.c (disassemble): Don't assume 32-bit longs when + sign-extending operands. + +Mon May 15 15:18:07 2000 Donald Lindsay + + * d10v-opc.c (d10v_opcodes): add ALONE tag to all short branches + except brf's. + +2000-05-21 Nick Clifton + + * Makefile.am (LIBIBERTY): Define. + +Fri May 19 12:29:27 EDT 2000 Diego Novillo + + * mips-dis.c (REGISTER_NAMES): Rename to STD_REGISTER_NAMES. + (STD_REGISTER_NAMES): New name for REGISTER_NAMES. + (reg_names): Rename to std_reg_names. Change it to a char ** + static variable. + (std_reg_names): New name for reg_names. + (set_mips_isa_type): Set reg_names to point to std_reg_names by + default. + +2000-05-16 Frank Ch. Eigler + + * fr30-desc.h: Partially regenerated to account for changed + CGEN_MAX_* -> CGEN_ACTUAL_MAX_* macros. + * m32r-desc.h: Ditto. + +2000-05-15 Nick Clifton + + * arm-opc.h: Use upper case for flasg in MSR and MRS + instructions. Allow any bit to be set in the field_mask of + the MSR instruction. + + * arm-dis.c (print_insn_arm): Decode _x and _s bits of the + field_mask of an MSR instruction. + +2000-05-11 Thomas de Lellis + + * arm-opc.c: Disassembly of thumb ldsb/ldsh + instructions changed to ldrsb/ldrsh. + 2000-05-11 Ulf Carlsson * mips-dis.c (print_insn_arg): Don't mask top 32 bits of 64-bit diff -upr --new-file binutils-2.9.5.0.42/opcodes/Makefile.am binutils-2.9.5.0.46/opcodes/Makefile.am --- binutils-2.9.5.0.42/opcodes/Makefile.am Fri May 12 08:11:30 2000 +++ binutils-2.9.5.0.46/opcodes/Makefile.am Mon May 29 22:40:16 2000 @@ -16,6 +16,9 @@ lib_LTLIBRARIES = libopcodes.la # This is where bfd.h lives. BFD_H = ../bfd/bfd.h +# This is where libiberty lives. +LIBIBERTY = ../libiberty/libiberty.a + # Header files. HFILES = \ arm-opc.h \ @@ -350,9 +353,22 @@ i386-dis.lo: i386-dis.c $(INCDIR)/dis-as $(INCDIR)/ansidecl.h sysdep.h config.h opintl.h i960-dis.lo: i960-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/dis-asm.h $(BFD_H) -ia64-dis.lo: ia64-dis.c $(INCDIR)/dis-asm.h $(INCDIR)/opcode/ia64.h $(BFD_H) -ia64-opc.lo: $(INCDIR)/opcode/ia64.h $(BFD_H) $(INCDIR)/libiberty.h \ - $(INCDIR)/ansidecl.h sysdep.h ia64-asmtab.h ia64-asmtab.c +ia64-dis.lo: ia64-dis.c $(INCDIR)/dis-asm.h $(BFD_H) \ + $(INCDIR)/ansidecl.h $(INCDIR)/opcode/ia64.h +ia64-opc-a.lo: ia64-opc-a.c ia64-opc.h $(INCDIR)/opcode/ia64.h +ia64-opc-b.lo: ia64-opc-b.c ia64-opc.h $(INCDIR)/opcode/ia64.h +ia64-opc-f.lo: ia64-opc-f.c ia64-opc.h $(INCDIR)/opcode/ia64.h +ia64-opc-i.lo: ia64-opc-i.c ia64-opc.h $(INCDIR)/opcode/ia64.h +ia64-opc-m.lo: ia64-opc-m.c ia64-opc.h $(INCDIR)/opcode/ia64.h +ia64-opc-d.lo: ia64-opc-d.c +ia64-opc.lo: ia64-opc.c $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ + sysdep.h config.h ia64-asmtab.h $(INCDIR)/opcode/ia64.h \ + ia64-asmtab.c +ia64-gen.lo: ia64-gen.c $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ + sysdep.h config.h ia64-opc.h $(INCDIR)/opcode/ia64.h \ + ia64-opc-a.c ia64-opc-i.c ia64-opc-m.c ia64-opc-b.c \ + ia64-opc-f.c ia64-opc-x.c ia64-opc-d.c +ia64-asmtab.lo: ia64-asmtab.c m32r-asm.lo: m32r-asm.c sysdep.h config.h $(INCDIR)/ansidecl.h \ $(BFD_H) $(INCDIR)/symcat.h m32r-desc.h $(INCDIR)/opcode/cgen.h \ m32r-opc.h opintl.h @@ -403,13 +419,6 @@ m10300-opc.lo: m10300-opc.c sysdep.h con ns32k-dis.lo: ns32k-dis.c $(BFD_H) $(INCDIR)/ansidecl.h \ sysdep.h config.h $(INCDIR)/dis-asm.h $(INCDIR)/opcode/ns32k.h \ opintl.h -pj-dis.lo: pj-dis.c $(INCDIR)/opcode/pj.h $(INCDIR)/dis-asm.h \ - $(BFD_H) $(INCDIR)/ansidecl.h -pj-opc.lo: pj-opc.c $(INCDIR)/ansidecl.h $(INCDIR)/opcode/pj.h -ppc-dis.lo: ppc-dis.c $(INCDIR)/ansidecl.h sysdep.h \ - config.h $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/opcode/ppc.h -ppc-opc.lo: ppc-opc.c $(INCDIR)/ansidecl.h $(INCDIR)/opcode/ppc.h \ - opintl.h pj-dis.lo: pj-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/opcode/pj.h $(INCDIR)/dis-asm.h $(BFD_H) pj-opc.lo: pj-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \ @@ -427,10 +436,10 @@ sparc-opc.lo: sparc-opc.c sysdep.h confi $(INCDIR)/opcode/sparc.h tic30-dis.lo: tic30-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/opcode/tic30.h -tic54x-dis.lo: tic54x-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/opcode/tic54x.h -tic54x-opc.lo: tic54x-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/opcode/tic54x.h +tic54x-dis.lo: tic54x-dis.c $(INCDIR)/dis-asm.h $(BFD_H) \ + $(INCDIR)/ansidecl.h $(INCDIR)/opcode/tic54x.h $(INCDIR)/coff/tic54x.h \ + $(INCDIR)/coff/ti.h +tic54x-opc.lo: tic54x-opc.c $(INCDIR)/ansidecl.h $(INCDIR)/opcode/tic54x.h tic80-dis.lo: tic80-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/opcode/tic80.h $(INCDIR)/dis-asm.h $(BFD_H) tic80-opc.lo: tic80-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \ diff -upr --new-file binutils-2.9.5.0.42/opcodes/Makefile.in binutils-2.9.5.0.46/opcodes/Makefile.in --- binutils-2.9.5.0.42/opcodes/Makefile.in Fri May 12 08:11:30 2000 +++ binutils-2.9.5.0.46/opcodes/Makefile.in Mon May 29 22:40:16 2000 @@ -119,6 +119,9 @@ lib_LTLIBRARIES = libopcodes.la # This is where bfd.h lives. BFD_H = ../bfd/bfd.h +# This is where libiberty lives. +LIBIBERTY = ../libiberty/libiberty.a + # Header files. HFILES = \ arm-opc.h \ @@ -327,7 +330,7 @@ acinclude.m4 aclocal.m4 config.in config DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = libopcodes.a.c $(libopcodes_la_SOURCES) OBJECTS = libopcodes.a.o $(libopcodes_la_OBJECTS) @@ -694,23 +697,6 @@ all-redirect all-am all installdirs-am i distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean -ia64-ic.tbl: $(srcdir)/ia64-ic.tbl - $(LN_S) -f $(srcdir)/ia64-ic.tbl -ia64-raw.tbl: $(srcdir)/ia64-raw.tbl - $(LN_S) -f $(srcdir)/ia64-raw.tbl -ia64-waw.tbl: $(srcdir)/ia64-waw.tbl - $(LN_S) -f $(srcdir)/ia64-waw.tbl -ia64-war.tbl: $(srcdir)/ia64-war.tbl - $(LN_S) -f $(srcdir)/ia64-war.tbl - -ia64-gen: ia64-gen.o - $(LINK) ia64-gen.o $(LIBIBERTY) - -ia64-gen.o: ia64-gen.c ia64-opc.c ia64-opc-a.c ia64-opc-b.c ia64-opc-f.c \ - ia64-opc-i.c ia64-opc-m.c ia64-opc-d.c ia64-opc.h - -ia64-asmtab.c: @MAINT@ ia64-gen ia64-ic.tbl ia64-raw.tbl ia64-waw.tbl ia64-war.tbl - ./ia64-gen > $(srcdir)/ia64-asmtab.c disassemble.lo: disassemble.c $(INCDIR)/dis-asm.h $(LIBTOOL) --mode=compile $(COMPILE) -c @archdefs@ $(srcdir)/disassemble.c @@ -735,6 +721,24 @@ config.status: $(srcdir)/configure $(src # The start marker is written this way to pass through automake unscathed. +ia64-ic.tbl: $(srcdir)/ia64-ic.tbl + $(LN_S) -f $(srcdir)/ia64-ic.tbl +ia64-raw.tbl: $(srcdir)/ia64-raw.tbl + $(LN_S) -f $(srcdir)/ia64-raw.tbl +ia64-waw.tbl: $(srcdir)/ia64-waw.tbl + $(LN_S) -f $(srcdir)/ia64-waw.tbl +ia64-war.tbl: $(srcdir)/ia64-war.tbl + $(LN_S) -f $(srcdir)/ia64-war.tbl + +ia64-gen: ia64-gen.o + $(LINK) ia64-gen.o $(LIBIBERTY) + +ia64-gen.o: ia64-gen.c ia64-opc.c ia64-opc-a.c ia64-opc-b.c ia64-opc-f.c \ + ia64-opc-i.c ia64-opc-m.c ia64-opc-d.c ia64-opc.h + +ia64-asmtab.c: @MAINT@ ia64-gen ia64-ic.tbl ia64-raw.tbl ia64-waw.tbl ia64-war.tbl + ./ia64-gen > $(srcdir)/ia64-asmtab.c + # This dependency stuff is copied from BFD. DEP: dep.sed $(CFILES) $(HFILES) config.h @@ -847,9 +851,22 @@ i386-dis.lo: i386-dis.c $(INCDIR)/dis-as $(INCDIR)/ansidecl.h sysdep.h config.h opintl.h i960-dis.lo: i960-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/dis-asm.h $(BFD_H) -ia64-dis.lo: ia64-dis.c $(INCDIR)/dis-asm.h $(INCDIR)/opcode/ia64.h $(BFD_H) -ia64-opc.lo: $(INCDIR)/opcode/ia64.h $(BFD_H) $(INCDIR)/libiberty.h \ - $(INCDIR)/ansidecl.h sysdep.h ia64-asmtab.h ia64-asmtab.c +ia64-dis.lo: ia64-dis.c $(INCDIR)/dis-asm.h $(BFD_H) \ + $(INCDIR)/ansidecl.h $(INCDIR)/opcode/ia64.h +ia64-opc-a.lo: ia64-opc-a.c ia64-opc.h $(INCDIR)/opcode/ia64.h +ia64-opc-b.lo: ia64-opc-b.c ia64-opc.h $(INCDIR)/opcode/ia64.h +ia64-opc-f.lo: ia64-opc-f.c ia64-opc.h $(INCDIR)/opcode/ia64.h +ia64-opc-i.lo: ia64-opc-i.c ia64-opc.h $(INCDIR)/opcode/ia64.h +ia64-opc-m.lo: ia64-opc-m.c ia64-opc.h $(INCDIR)/opcode/ia64.h +ia64-opc-d.lo: ia64-opc-d.c +ia64-opc.lo: ia64-opc.c $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ + sysdep.h config.h ia64-asmtab.h $(INCDIR)/opcode/ia64.h \ + ia64-asmtab.c +ia64-gen.lo: ia64-gen.c $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ + sysdep.h config.h ia64-opc.h $(INCDIR)/opcode/ia64.h \ + ia64-opc-a.c ia64-opc-i.c ia64-opc-m.c ia64-opc-b.c \ + ia64-opc-f.c ia64-opc-x.c ia64-opc-d.c +ia64-asmtab.lo: ia64-asmtab.c m32r-asm.lo: m32r-asm.c sysdep.h config.h $(INCDIR)/ansidecl.h \ $(BFD_H) $(INCDIR)/symcat.h m32r-desc.h $(INCDIR)/opcode/cgen.h \ m32r-opc.h opintl.h @@ -900,13 +917,6 @@ m10300-opc.lo: m10300-opc.c sysdep.h con ns32k-dis.lo: ns32k-dis.c $(BFD_H) $(INCDIR)/ansidecl.h \ sysdep.h config.h $(INCDIR)/dis-asm.h $(INCDIR)/opcode/ns32k.h \ opintl.h -pj-dis.lo: pj-dis.c $(INCDIR)/opcode/pj.h $(INCDIR)/dis-asm.h \ - $(BFD_H) $(INCDIR)/ansidecl.h -pj-opc.lo: pj-opc.c $(INCDIR)/ansidecl.h $(INCDIR)/opcode/pj.h -ppc-dis.lo: ppc-dis.c $(INCDIR)/ansidecl.h sysdep.h \ - config.h $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/opcode/ppc.h -ppc-opc.lo: ppc-opc.c $(INCDIR)/ansidecl.h $(INCDIR)/opcode/ppc.h \ - opintl.h pj-dis.lo: pj-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/opcode/pj.h $(INCDIR)/dis-asm.h $(BFD_H) pj-opc.lo: pj-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \ @@ -924,10 +934,10 @@ sparc-opc.lo: sparc-opc.c sysdep.h confi $(INCDIR)/opcode/sparc.h tic30-dis.lo: tic30-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/opcode/tic30.h -tic54x-dis.lo: tic54x-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/opcode/tic54x.h -tic54x-opc.lo: tic54x-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/opcode/tic54x.h +tic54x-dis.lo: tic54x-dis.c $(INCDIR)/dis-asm.h $(BFD_H) \ + $(INCDIR)/ansidecl.h $(INCDIR)/opcode/tic54x.h $(INCDIR)/coff/tic54x.h \ + $(INCDIR)/coff/ti.h +tic54x-opc.lo: tic54x-opc.c $(INCDIR)/ansidecl.h $(INCDIR)/opcode/tic54x.h tic80-dis.lo: tic80-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/opcode/tic80.h $(INCDIR)/dis-asm.h $(BFD_H) tic80-opc.lo: tic80-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \ diff -upr --new-file binutils-2.9.5.0.42/opcodes/arm-dis.c binutils-2.9.5.0.46/opcodes/arm-dis.c --- binutils-2.9.5.0.42/opcodes/arm-dis.c Sat Feb 19 11:21:18 2000 +++ binutils-2.9.5.0.46/opcodes/arm-dis.c Thu May 18 14:20:32 2000 @@ -420,7 +420,7 @@ print_insn_arm (pc, info, given) break; case 'C': - switch (given & 0x00090000) + switch (given & 0x000f0000) { default: func (stream, "_???"); @@ -429,10 +429,16 @@ print_insn_arm (pc, info, given) func (stream, "_all"); break; case 0x10000: - func (stream, "_ctl"); + func (stream, "_c"); + break; + case 0x20000: + func (stream, "_x"); + break; + case 0x40000: + func (stream, "_s"); break; case 0x80000: - func (stream, "_flg"); + func (stream, "_f"); break; } break; diff -upr --new-file binutils-2.9.5.0.42/opcodes/arm-opc.h binutils-2.9.5.0.46/opcodes/arm-opc.h --- binutils-2.9.5.0.42/opcodes/arm-opc.h Fri Mar 31 09:16:11 2000 +++ binutils-2.9.5.0.46/opcodes/arm-opc.h Thu May 18 14:20:32 2000 @@ -1,6 +1,6 @@ /* Opcode table for the ARM. - Copyright 1994, 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright 1994, 1995, 1996, 1997, 2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -93,8 +93,8 @@ static struct arm_opcode arm_opcodes[] = {0x00a00000, 0x0de00000, "adc%c%20's\t%12-15r, %16-19r, %o"}, {0x00c00000, 0x0de00000, "sbc%c%20's\t%12-15r, %16-19r, %o"}, {0x00e00000, 0x0de00000, "rsc%c%20's\t%12-15r, %16-19r, %o"}, - {0x0120f000, 0x0db6f000, "msr%c\t%22?scpsr%C, %o"}, - {0x010f0000, 0x0fbf0fff, "mrs%c\t%12-15r, %22?scpsr"}, + {0x0120f000, 0x0db0f000, "msr%c\t%22?SCPSR%C, %o"}, + {0x010f0000, 0x0fbf0fff, "mrs%c\t%12-15r, %22?SCPSR"}, {0x01000000, 0x0de00000, "tst%c%p\t%16-19r, %o"}, {0x01200000, 0x0de00000, "teq%c%p\t%16-19r, %o"}, {0x01400000, 0x0de00000, "cmp%c%p\t%16-19r, %o"}, @@ -164,7 +164,7 @@ static struct arm_opcode arm_opcodes[] = {0x0e000010, 0x0f100010, "mcr%c\t%8-11d, %21-23d, %12-15r, cr%16-19d, cr%0-3d, {%5-7d}"}, {0x0c000000, 0x0e100000, "stc%c%22'l\t%8-11d, cr%12-15d, %A"}, {0x0c100000, 0x0e100000, "ldc%c%22'l\t%8-11d, cr%12-15d, %A"}, - + /* The rest. */ {0x00000000, 0x00000000, "undefined instruction %0-31x"}, {0x00000000, 0x00000000, 0} @@ -213,7 +213,7 @@ static struct thumb_opcode thumb_opcodes /* format 8 */ {0x5200, 0xFE00, "strh\t%0-2r, [%3-5r, %6-8r]"}, {0x5A00, 0xFE00, "ldrh\t%0-2r, [%3-5r, %6-8r]"}, - {0x5600, 0xF600, "lds%11?hb\t%0-2r, [%3-5r, %6-8r]"}, + {0x5600, 0xF600, "ldrs%11?hb\t%0-2r, [%3-5r, %6-8r]"}, /* format 7 */ {0x5000, 0xFA00, "str%10'b\t%0-2r, [%3-5r, %6-8r]"}, {0x5800, 0xFA00, "ldr%10'b\t%0-2r, [%3-5r, %6-8r]"}, diff -upr --new-file binutils-2.9.5.0.42/opcodes/configure binutils-2.9.5.0.46/opcodes/configure --- binutils-2.9.5.0.42/opcodes/configure Fri May 12 08:11:30 2000 +++ binutils-2.9.5.0.46/opcodes/configure Tue May 30 14:05:15 2000 @@ -51,6 +51,7 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= +sitefile= srcdir= target=NONE verbose= @@ -165,6 +166,7 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages + --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -335,6 +337,11 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; + -site-file | --site-file | --site-fil | --site-fi | --site-f) + ac_prev=sitefile ;; + -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) + sitefile="$ac_optarg" ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -500,12 +507,16 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +if test -z "$sitefile"; then + if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi fi +else + CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -592,7 +603,7 @@ else { echo "configure: error: can not r fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:596: checking host system type" >&5 +echo "configure:607: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -613,7 +624,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:617: checking target system type" >&5 +echo "configure:628: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -631,7 +642,7 @@ target_os=`echo $target | sed 's/^\([^-] echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:635: checking build system type" >&5 +echo "configure:646: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -656,7 +667,7 @@ test "$host_alias" != "$target_alias" && # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:660: checking for $ac_word" >&5 +echo "configure:671: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -686,7 +697,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:690: checking for $ac_word" >&5 +echo "configure:701: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -737,7 +748,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:741: checking for $ac_word" >&5 +echo "configure:752: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -769,7 +780,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:773: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:784: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -780,12 +791,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 784 "configure" +#line 795 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -811,12 +822,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:815: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:826: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:820: checking whether we are using GNU C" >&5 +echo "configure:831: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -825,7 +836,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -844,7 +855,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:848: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:859: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -876,7 +887,7 @@ else fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:880: checking for POSIXized ISC" >&5 +echo "configure:891: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -914,7 +925,7 @@ BFD_VERSION=`grep INIT_AUTOMAKE ${srcdir # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:918: checking for a BSD compatible install" >&5 +echo "configure:929: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -967,7 +978,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:971: checking whether build environment is sane" >&5 +echo "configure:982: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -1024,7 +1035,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1028: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1039: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1070,7 +1081,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1074: checking for working aclocal" >&5 +echo "configure:1085: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1083,7 +1094,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1087: checking for working autoconf" >&5 +echo "configure:1098: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1096,7 +1107,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1100: checking for working automake" >&5 +echo "configure:1111: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1109,7 +1120,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1113: checking for working autoheader" >&5 +echo "configure:1124: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1122,7 +1133,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1126: checking for working makeinfo" >&5 +echo "configure:1137: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1145,7 +1156,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1149: checking for $ac_word" >&5 +echo "configure:1160: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1177,7 +1188,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1181: checking for $ac_word" >&5 +echo "configure:1192: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1209,7 +1220,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1213: checking for $ac_word" >&5 +echo "configure:1224: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1315,7 +1326,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1319: checking for $ac_word" >&5 +echo "configure:1330: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1354,7 +1365,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1358: checking for ld used by GCC" >&5 +echo "configure:1369: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1378,10 +1389,10 @@ echo "configure:1358: checking for ld us esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1382: checking for GNU ld" >&5 +echo "configure:1393: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1385: checking for non-GNU ld" >&5 +echo "configure:1396: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1416,7 +1427,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1420: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1431: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1432,7 +1443,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1436: checking for BSD-compatible nm" >&5 +echo "configure:1447: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1468,7 +1479,7 @@ NM="$ac_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1472: checking whether ln -s works" >&5 +echo "configure:1483: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1517,8 +1528,8 @@ test x"$silent" = xyes && libtool_flags= case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1521 "configure"' > conftest.$ac_ext - if { (eval echo configure:1522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1532 "configure"' > conftest.$ac_ext + if { (eval echo configure:1533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1539,19 +1550,19 @@ case "$lt_target" in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1543: checking whether the C compiler needs -belf" >&5 +echo "configure:1554: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1724,7 +1735,7 @@ test "$program_transform_name" = "" && p echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1728: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1739: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1747,12 +1758,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1751: checking for Cygwin environment" >&5 +echo "configure:1762: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1780,19 +1791,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1784: checking for mingw32 environment" >&5 +echo "configure:1795: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1811,7 +1822,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1815: checking for executable suffix" >&5 +echo "configure:1826: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1821,10 +1832,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj) ;; + *.c | *.o | *.obj | *.ilk | *.pdb) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -1847,7 +1858,7 @@ ac_exeext=$EXEEXT # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1851: checking for $ac_word" >&5 +echo "configure:1862: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1877,7 +1888,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1881: checking for $ac_word" >&5 +echo "configure:1892: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1928,7 +1939,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1932: checking for $ac_word" >&5 +echo "configure:1943: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1960,7 +1971,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1964: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1975: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1971,12 +1982,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1975 "configure" +#line 1986 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2002,12 +2013,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2006: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2017: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2011: checking whether we are using GNU C" >&5 +echo "configure:2022: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2016,7 +2027,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2035,7 +2046,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2039: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2050: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2069,7 +2080,7 @@ fi ALL_LINGUAS= echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2073: checking how to run the C preprocessor" >&5 +echo "configure:2084: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2084,13 +2095,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2101,13 +2112,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2118,13 +2129,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2149,12 +2160,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2153: checking for ANSI C header files" >&5 +echo "configure:2164: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2162,7 +2173,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2179,7 +2190,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2197,7 +2208,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2218,7 +2229,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2229,7 +2240,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2253,12 +2264,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2257: checking for working const" >&5 +echo "configure:2268: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2328,21 +2339,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2332: checking for inline" >&5 +echo "configure:2343: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2368,12 +2379,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2372: checking for off_t" >&5 +echo "configure:2383: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2401,12 +2412,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2405: checking for size_t" >&5 +echo "configure:2416: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2436,19 +2447,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2440: checking for working alloca.h" >&5 +echo "configure:2451: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2469,12 +2480,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2473: checking for alloca" >&5 +echo "configure:2484: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2534,12 +2545,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2538: checking whether alloca needs Cray hooks" >&5 +echo "configure:2549: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2568: checking for $ac_func" >&5 +echo "configure:2579: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2619,7 +2630,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2623: checking stack direction for C alloca" >&5 +echo "configure:2634: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2627,7 +2638,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2671,17 +2682,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2675: checking for $ac_hdr" >&5 +echo "configure:2686: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2710,12 +2721,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2714: checking for $ac_func" >&5 +echo "configure:2725: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2763,7 +2774,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2767: checking for working mmap" >&5 +echo "configure:2778: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2771,7 +2782,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2939,17 +2950,17 @@ unistd.h values.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2943: checking for $ac_hdr" >&5 +echo "configure:2954: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2964: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2979,12 +2990,12 @@ done __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2983: checking for $ac_func" >&5 +echo "configure:2994: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3036,12 +3047,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3040: checking for $ac_func" >&5 +echo "configure:3051: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3098,19 +3109,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3102: checking for LC_MESSAGES" >&5 +echo "configure:3113: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:3114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -3131,7 +3142,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3135: checking whether NLS is requested" >&5 +echo "configure:3146: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -3151,7 +3162,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3155: checking whether included gettext is requested" >&5 +echo "configure:3166: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -3170,17 +3181,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3174: checking for libintl.h" >&5 +echo "configure:3185: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3197,19 +3208,19 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:3201: checking for gettext in libc" >&5 +echo "configure:3212: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:3213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -3225,7 +3236,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3229: checking for bindtextdomain in -lintl" >&5 +echo "configure:3240: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3233,7 +3244,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3260,19 +3271,19 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:3264: checking for gettext in libintl" >&5 +echo "configure:3275: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libintl=yes else @@ -3300,7 +3311,7 @@ EOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3304: checking for $ac_word" >&5 +echo "configure:3315: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3334,12 +3345,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3338: checking for $ac_func" >&5 +echo "configure:3349: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3389,7 +3400,7 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3393: checking for $ac_word" >&5 +echo "configure:3404: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3425,7 +3436,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3429: checking for $ac_word" >&5 +echo "configure:3440: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3457,7 +3468,7 @@ else fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -3497,7 +3508,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3501: checking for $ac_word" >&5 +echo "configure:3512: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3531,7 +3542,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3535: checking for $ac_word" >&5 +echo "configure:3546: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3567,7 +3578,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3571: checking for $ac_word" >&5 +echo "configure:3582: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3657,7 +3668,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3661: checking for catalogs to be installed" >&5 +echo "configure:3672: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -3685,17 +3696,17 @@ echo "configure:3661: checking for catal if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:3689: checking for linux/version.h" >&5 +echo "configure:3700: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3772,7 +3783,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:3776: checking for a BSD compatible install" >&5 +echo "configure:3787: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3829,17 +3840,17 @@ for ac_hdr in string.h strings.h stdlib. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3833: checking for $ac_hdr" >&5 +echo "configure:3844: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* diff -upr --new-file binutils-2.9.5.0.42/opcodes/d10v-opc.c binutils-2.9.5.0.46/opcodes/d10v-opc.c --- binutils-2.9.5.0.42/opcodes/d10v-opc.c Sun Apr 16 10:07:27 2000 +++ binutils-2.9.5.0.46/opcodes/d10v-opc.c Mon May 29 22:34:56 2000 @@ -179,11 +179,11 @@ const struct d10v_opcode d10v_opcodes[] { "and3", LONG_L, 1, MU, SEQ, 0x6000000, 0x3f000000, { RDST, RSRC, NUM16 } }, { "bclri", SHORT_2, 1, IU, PAR, 0xc01, 0x7e01, { RDST, UNUM4 } }, { "bl", OPCODE_FAKE, 0, 0, 0, 0, 0, { 0, 8, 16, 0 } }, - { "bl.s", SHORT_B, 3, MU, BRANCH_LINK|PAR, 0x4900, 0x7f00, { ANUM8 } }, + { "bl.s", SHORT_B, 3, MU, ALONE|BRANCH_LINK|PAR, 0x4900, 0x7f00, { ANUM8 } }, { "bl.l", LONG_B, 3, MU, BRANCH_LINK|SEQ, 0x24800000, 0x3fff0000, { ANUM16 } }, { "bnoti", SHORT_2, 1, IU, PAR, 0xa01, 0x7e01, { RDST, UNUM4 } }, { "bra", OPCODE_FAKE, 0, 0, 0, 0, 0, { 0, 8, 16, 0 } }, - { "bra.s", SHORT_B, 3, MU, BRANCH|PAR, 0x4800, 0x7f00, { ANUM8 } }, + { "bra.s", SHORT_B, 3, MU, ALONE|BRANCH|PAR, 0x4800, 0x7f00, { ANUM8 } }, { "bra.l", LONG_B, 3, MU, BRANCH|SEQ, 0x24000000, 0x3fff0000, { ANUM16 } }, { "brf0f", OPCODE_FAKE, 0, 0, 0, 0, 0, { 0, 8, 16, 0 } }, { "brf0f.s", SHORT_B, 3, MU, BRANCH|PAR|RF0, 0x4a00, 0x7f00, { ANUM8 } }, @@ -208,7 +208,7 @@ const struct d10v_opcode d10v_opcodes[] { "cmpui", LONG_L, 1, MU, SEQ, 0x23000000, 0x3f0f0000, { RSRC2, UNUM16 } }, { "cpfg", SHORT_2, 1, MU, PAR, 0x4e0f, 0x7fdf, { FDST, CFSRC } }, { "cpfg", SHORT_2, 1, MU, PAR, 0x4e09, 0x7fd9, { FDST, FFSRC } }, - { "dbt", SHORT_2, 5, MU, PAR, 0x5f20, 0x7fff, { 0 } }, + { "dbt", SHORT_2, 5, MU, ALONE|PAR, 0x5f20, 0x7fff, { 0 } }, { "divs", LONG_L, 1, BOTH, SEQ, 0x14002800, 0x3f10fe21, { RDSTE, RSRC } }, { "exef0f", SHORT_2, 1, EITHER, PARONLY, 0x4e04, 0x7fff, { 0 } }, { "exef0t", SHORT_2, 1, EITHER, PARONLY, 0x4e24, 0x7fff, { 0 } }, @@ -220,8 +220,8 @@ const struct d10v_opcode d10v_opcodes[] { "exetat", SHORT_2, 1, EITHER, PARONLY, 0x4e22, 0x7fff, { 0 } }, { "exp", LONG_R, 1, IU, SEQ, 0x15002a00, 0x3ffffe03, { RDST, RSRCE } }, { "exp", LONG_R, 1, IU, SEQ, 0x15002a02, 0x3ffffe0f, { RDST, ASRC } }, - { "jl", SHORT_2, 3, MU, BRANCH_LINK|PAR, 0x4d00, 0x7fe1, { RSRC } }, - { "jmp", SHORT_2, 3, MU, BRANCH|PAR, 0x4c00, 0x7fe1, { RSRC } }, + { "jl", SHORT_2, 3, MU, ALONE|BRANCH_LINK|PAR, 0x4d00, 0x7fe1, { RSRC } }, + { "jmp", SHORT_2, 3, MU, ALONE|BRANCH|PAR, 0x4c00, 0x7fe1, { RSRC } }, { "ld", LONG_L, 1, MU, SEQ, 0x30000000, 0x3f000000, { RDST, ATPAR, NUM16, RSRC } }, { "ld", SHORT_2, 1, MU, PAR|RMEM, 0x6401, 0x7e01, { RDST, ATSIGN, RSRC, MINUS } }, { "ld", SHORT_2, 1, MU, PAR|RMEM, 0x6001, 0x7e01, { RDST, ATSIGN, RSRC, PLUS } }, @@ -288,13 +288,13 @@ const struct d10v_opcode d10v_opcodes[] { "rachi", SHORT_2, 1, IU, PAR|WF0, 0x4201, 0x7e01, { RDST, ASRC, NUM3 } }, { "rep", LONG_L, 2, MU, SEQ, 0x27000000, 0x3ff00000, { RSRC, ANUM16 } }, { "repi", LONG_L, 2, MU, SEQ, 0x2f000000, 0x3f000000, { UNUM8, ANUM16 } }, - { "rtd", SHORT_2, 3, MU, PAR, 0x5f60, 0x7fff, { 0 } }, - { "rte", SHORT_2, 3, MU, PAR, 0x5f40, 0x7fff, { 0 } }, + { "rtd", SHORT_2, 3, MU, ALONE|PAR, 0x5f60, 0x7fff, { 0 } }, + { "rte", SHORT_2, 3, MU, ALONE|PAR, 0x5f40, 0x7fff, { 0 } }, { "sadd", SHORT_2, 1, IU, PAR, 0x1223, 0x7eef, { ADST, ASRC } }, { "setf0f", SHORT_2, 1, MU, PAR|RF0, 0x4611, 0x7e1f, { RDST } }, { "setf0t", SHORT_2, 1, MU, PAR|RF0, 0x4613, 0x7e1f, { RDST } }, { "slae", SHORT_2, 1, IU, PAR, 0x3220, 0x7ee1, { ADST, RSRC } }, - { "sleep", SHORT_2, 1, MU, PAR, 0x5fc0, 0x7fff, { 0 } }, + { "sleep", SHORT_2, 1, MU, ALONE|PAR, 0x5fc0, 0x7fff, { 0 } }, { "sll", SHORT_2, 1, IU, PAR, 0x2200, 0x7e01, { RDST, RSRC } }, { "sll", SHORT_2, 1, IU, PAR, 0x3200, 0x7ee1, { ADST, RSRC } }, { "slli", SHORT_2, 1, IU, PAR, 0x2201, 0x7e01, { RDST, UNUM4 } }, @@ -323,7 +323,7 @@ const struct d10v_opcode d10v_opcodes[] { "st2w", LONG_L, 1, MU, SEQ, 0x37010000, 0x3f1f0000, { RSRC2E, ATSIGN, NUM16 } }, { "stb", LONG_L, 1, MU, SEQ, 0x3c000000, 0x3f000000, { RSRC2, ATPAR, NUM16, RSRC } }, { "stb", SHORT_2, 1, MU, PAR|WMEM, 0x7800, 0x7e01, { RSRC2, ATSIGN, RSRC } }, - { "stop", SHORT_2, 1, MU, PAR, 0x5fe0, 0x7fff, { 0 } }, + { "stop", SHORT_2, 1, MU, ALONE|PAR, 0x5fe0, 0x7fff, { 0 } }, { "sub", SHORT_2, 1, EITHER, PAR|WCAR, 0x0, 0x7e01, { RDST, RSRC } }, { "sub", SHORT_2, 1, IU, PAR, 0x1001, 0x7ee3, { ADST, RSRC } }, { "sub", SHORT_2, 1, IU, PAR, 0x1003, 0x7eef, { ADST, ASRC } }, @@ -333,10 +333,10 @@ const struct d10v_opcode d10v_opcodes[] { "subac3s", LONG_R, 1, IU, SEQ, 0x17001000, 0x3ffffe22, { RDSTE, RSRCE, ASRC0 } }, { "subac3s", LONG_R, 1, IU, SEQ, 0x17001002, 0x3ffffe2e, { RDSTE, ASRC, ASRC0 } }, { "subi", SHORT_2, 1, EITHER, PAR, 0x1, 0x7e01, { RDST, UNUM4S } }, - { "trap", SHORT_2, 5, MU, BRANCH_LINK|PAR, 0x5f00, 0x7fe1, { UNUM4 } }, + { "trap", SHORT_2, 5, MU, ALONE|BRANCH_LINK|PAR, 0x5f00, 0x7fe1, { UNUM4 } }, { "tst0i", LONG_L, 1, MU, SEQ, 0x7000000, 0x3f0f0000, { RSRC2, NUM16 } }, { "tst1i", LONG_L, 1, MU, SEQ, 0xf000000, 0x3f0f0000, { RSRC2, NUM16 } }, - { "wait", SHORT_2, 1, MU, PAR, 0x5f80, 0x7fff, { 0 } }, + { "wait", SHORT_2, 1, MU, ALONE|PAR, 0x5f80, 0x7fff, { 0 } }, { "xor", SHORT_2, 1, EITHER, PAR, 0xa00, 0x7e01, { RDST, RSRC } }, { "xor3", LONG_L, 1, MU, SEQ, 0x5000000, 0x3f000000, { RDST, RSRC, NUM16 } }, { 0, 0, 0, 0, 0, 0, 0, { 0 } }, diff -upr --new-file binutils-2.9.5.0.42/opcodes/disassemble.c binutils-2.9.5.0.46/opcodes/disassemble.c --- binutils-2.9.5.0.42/opcodes/disassemble.c Fri May 12 08:11:30 2000 +++ binutils-2.9.5.0.46/opcodes/disassemble.c Tue May 30 14:05:15 2000 @@ -282,7 +282,7 @@ disassembler (abfd) void disassembler_usage (stream) - FILE *stream ATTRIBUTE_UNUSED; + FILE * stream ATTRIBUTE_UNUSED; { #ifdef ARCH_arm print_arm_disassembler_options (stream); diff -upr --new-file binutils-2.9.5.0.42/opcodes/fr30-desc.h binutils-2.9.5.0.46/opcodes/fr30-desc.h --- binutils-2.9.5.0.42/opcodes/fr30-desc.h Sat Oct 9 09:14:15 1999 +++ binutils-2.9.5.0.46/opcodes/fr30-desc.h Thu May 18 14:20:33 2000 @@ -43,18 +43,16 @@ with this program; if not, write to the #define CGEN_INT_INSN_P 0 -/* FIXME: Need to compute CGEN_MAX_SYNTAX_BYTES. */ +/* Maximum number of syntax bytes in an instruction. */ +#define CGEN_ACTUAL_MAX_SYNTAX_BYTES 15 /* CGEN_MNEMONIC_OPERANDS is defined if mnemonics have operands. e.g. In "b,a foo" the ",a" is an operand. If mnemonics have operands we can't hash on everything up to the space. */ #define CGEN_MNEMONIC_OPERANDS -/* Maximum number of operands any insn or macro-insn has. */ -#define CGEN_MAX_INSN_OPERANDS 16 - /* Maximum number of fields in an instruction. */ -#define CGEN_MAX_IFMT_OPERANDS 7 +#define CGEN_ACTUAL_MAX_IFMT_OPERANDS 7 /* Enums. */ diff -upr --new-file binutils-2.9.5.0.42/opcodes/h8300-dis.c binutils-2.9.5.0.46/opcodes/h8300-dis.c --- binutils-2.9.5.0.42/opcodes/h8300-dis.c Sun Apr 16 10:07:27 2000 +++ binutils-2.9.5.0.46/opcodes/h8300-dis.c Fri Jun 2 16:25:45 2000 @@ -1,5 +1,5 @@ /* Disassemble h8300 instructions. - Copyright (C) 1993, 1998 Free Software Foundation, Inc. + Copyright (C) 1993, 1998, 2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,14 +25,11 @@ Foundation, Inc., 59 Temple Place - Suit /* Run through the opcodes and sort them into order to make them easy - to disassemble - */ + to disassemble. */ static void bfd_h8_disassemble_init () { unsigned int i; - - struct h8_opcode *p; for (p = h8_opcodes; p->name; p++) @@ -41,27 +38,25 @@ bfd_h8_disassemble_init () int n2 = 0; if ((int) p->data.nib[0] < 16) - { - n1 = (int) p->data.nib[0]; - } + n1 = (int) p->data.nib[0]; else n1 = 0; + if ((int) p->data.nib[1] < 16) - { - n2 = (int) p->data.nib[1]; - } + n2 = (int) p->data.nib[1]; else n2 = 0; /* Just make sure there are an even number of nibbles in it, and - that the count is the same s the length */ + that the count is the same as the length. */ for (i = 0; p->data.nib[i] != E; i++) - /*EMPTY*/ ; + /*EMPTY*/; + if (i & 1) abort (); + p->length = i / 2; } - } @@ -71,25 +66,22 @@ bfd_h8_disassemble (addr, info, mode) disassemble_info *info; int mode; { - /* Find the first entry in the table for this opcode */ + /* Find the first entry in the table for this opcode. */ static CONST char *regnames[] = { "r0h", "r1h", "r2h", "r3h", "r4h", "r5h", "r6h", "r7h", - "r0l", "r1l", "r2l", "r3l", "r4l", "r5l", "r6l", "r7l"}; - + "r0l", "r1l", "r2l", "r3l", "r4l", "r5l", "r6l", "r7l" + }; static CONST char *wregnames[] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "e0", "e1", "e2", "e3", "e4", "e5", "e6", "e7" - }; - + }; static CONST char *lregnames[] = { "er0", "er1", "er2", "er3", "er4", "er5", "er6", "er7", "er0", "er1", "er2", "er3", "er4", "er5", "er6", "er7" - } - ; - + }; int rs = 0; int rd = 0; int rdisp = 0; @@ -101,8 +93,7 @@ bfd_h8_disassemble (addr, info, mode) char CONST **pregnames = mode != 0 ? lregnames : wregnames; int status; int l; - - unsigned char data[20]; + unsigned char data[20]; void *stream = info->stream; fprintf_ftype fprintf = info->fprintf_func; @@ -112,20 +103,17 @@ bfd_h8_disassemble (addr, info, mode) init = 1; } - status = info->read_memory_func(addr, data, 2, info); - if (status != 0) + status = info->read_memory_func (addr, data, 2, info); + if (status != 0) { - info->memory_error_func(status, addr, info); + info->memory_error_func (status, addr, info); return -1; } - for (l = 2; status == 0 && l < 10; l+=2) - { - status = info->read_memory_func(addr+l, data+l, 2, info); - } - + for (l = 2; status == 0 && l < 10; l += 2) + status = info->read_memory_func (addr + l, data+l, 2, info); - /* Find the exact opcode/arg combo */ + /* Find the exact opcode/arg combo. */ while (q->name) { op_type *nib; @@ -140,83 +128,77 @@ bfd_h8_disassemble (addr, info, mode) thisnib = (len & 1) ? (thisnib & 0xf) : ((thisnib >> 4) & 0xf); - if (looking_for < 16 && looking_for >=0) + if (looking_for < 16 && looking_for >= 0) { - - if (looking_for != thisnib) + if (looking_for != thisnib) goto fail; } - - else + else { - if ((int) looking_for & (int) B31) { - if (! (((int) thisnib & 0x8) != 0)) + if (! (((int) thisnib & 0x8) != 0)) goto fail; + looking_for = (op_type) ((int) looking_for & ~(int) B31); } + if ((int) looking_for & (int) B30) { - if (!(((int) thisnib & 0x8) == 0)) + if (!(((int) thisnib & 0x8) == 0)) goto fail; + looking_for = (op_type) ((int) looking_for & ~(int) B30); } if (looking_for & DBIT) { - if ((looking_for & 5) != (thisnib &5)) goto fail; + if ((looking_for & 2) != (thisnib & 2)) + goto fail; + abs = (thisnib & 0x8) ? 2 : 1; - } - - else if (looking_for & (REG | IND|INC|DEC)) + } + else if (looking_for & (REG | IND | INC | DEC)) { if (looking_for & SRC) - { - rs = thisnib; - } + rs = thisnib; else - { - rd = thisnib; - } + rd = thisnib; } else if (looking_for & L_16) { abs = (data[len >> 1]) * 256 + data[(len + 2) >> 1]; plen = 16; - } - else if(looking_for & ABSJMP) + else if (looking_for & ABSJMP) { - abs = - (data[1] << 16) - | (data[2] << 8) - | (data[3]); + abs = (data[1] << 16) | (data[2] << 8) | (data[3]); } - else if(looking_for & MEMIND) + else if (looking_for & MEMIND) { abs = data[1]; } else if (looking_for & L_32) { int i = len >> 1; + abs = (data[i] << 24) | (data[i + 1] << 16) - | (data[i + 2] << 8) - | (data[i+ 3]); + | (data[i + 2] << 8) + | (data[i+ 3]); - plen =32; - + plen = 32; } else if (looking_for & L_24) { int i = len >> 1; - abs = (data[i] << 16) | (data[i + 1] << 8)| (data[i+2]); - plen =24; + + abs = (data[i] << 16) | (data[i + 1] << 8) | (data[i + 2]); + plen = 24; } else if (looking_for & IGNORE) { - + ; } else if (looking_for & DISPREG) { @@ -224,7 +206,7 @@ bfd_h8_disassemble (addr, info, mode) } else if (looking_for & KBIT) { - switch (thisnib) + switch (thisnib) { case 9: abs = 4; @@ -241,7 +223,7 @@ bfd_h8_disassemble (addr, info, mode) } else if (looking_for & L_8) { - plen = 8; + plen = 8; abs = data[len >> 1]; } else if (looking_for & L_3) @@ -259,19 +241,14 @@ bfd_h8_disassemble (addr, info, mode) } else if (looking_for == E) { + int i; - { - int i; - - for (i = 0; i < q->length; i++) - { - fprintf (stream, "%02x ", data[i]); - } - for (; i < 6; i++) - { - fprintf (stream, " "); - } - } + for (i = 0; i < q->length; i++) + fprintf (stream, "%02x ", data[i]); + + for (; i < 6; i++) + fprintf (stream, " "); + fprintf (stream, "%s\t", q->name); /* Gross. Disgusting. */ @@ -297,27 +274,26 @@ bfd_h8_disassemble (addr, info, mode) return q->length; } - /* Fill in the args */ + /* Fill in the args. */ { op_type *args = q->args.nib; int hadone = 0; - while (*args != E) { int x = *args; + if (hadone) fprintf (stream, ","); - if (x & L_3) { fprintf (stream, "#0x%x", (unsigned) bit); } - else if (x & (IMM|KBIT|DBIT)) + else if (x & (IMM | KBIT | DBIT)) { /* Bletch. For shal #2,er0 and friends. */ - if (*(args+1) & SRC_IN_DST) + if (*(args + 1) & SRC_IN_DST) abs = 2; fprintf (stream, "#0x%x", (unsigned) abs); @@ -325,6 +301,7 @@ bfd_h8_disassemble (addr, info, mode) else if (x & REG) { int rn = (x & DST) ? rd : rs; + switch (x & SIZE) { case L_8: @@ -337,7 +314,6 @@ bfd_h8_disassemble (addr, info, mode) case L_32: fprintf (stream, "%s", lregnames[rn]); break; - } } else if (x & MACREG) @@ -352,46 +328,44 @@ bfd_h8_disassemble (addr, info, mode) { fprintf (stream, "@-%s", pregnames[rd]); } - else if (x & IND) { int rn = (x & DST) ? rd : rs; fprintf (stream, "@%s", pregnames[rn]); } - else if (x & ABS8MEM) { fprintf (stream, "@0x%x:8", (unsigned) abs); } - - else if (x & (ABS|ABSJMP)) + else if (x & (ABS | ABSJMP)) { fprintf (stream, "@0x%x:%d", (unsigned) abs, plen); } - else if (x & MEMIND) { fprintf (stream, "@@%d (%x)", abs, abs); } - else if (x & PCREL) { - if (x & L_16) + if (x & L_16) + { + abs += 2; + fprintf (stream, + ".%s%d (%x)", (short) abs > 0 ? "+" : "", + (short) abs, addr + (short) abs + 2); + } + else { - abs +=2; - fprintf (stream, ".%s%d (%x)", (short) abs > 0 ? "+" : "", (short) abs, - addr + (short) abs + 2); + fprintf (stream, + ".%s%d (%x)", (char) abs > 0 ? "+" : "", + (char) abs, addr + (char) abs + 2); } - else { - fprintf (stream, ".%s%d (%x)", (char) abs > 0 ? "+" : "", (char) abs, - addr + (char) abs + 2); - } } else if (x & DISP) { - fprintf (stream, "@(0x%x:%d,%s)", abs,plen, pregnames[rdisp]); + fprintf (stream, "@(0x%x:%d,%s)", + abs,plen, pregnames[rdisp]); } - else if (x & CCR) { fprintf (stream, "ccr"); @@ -403,19 +377,17 @@ bfd_h8_disassemble (addr, info, mode) else /* xgettext:c-format */ fprintf (stream, _("Hmmmm %x"), x); + hadone = 1; args++; } } + return q->length; } - - else - { - /* xgettext:c-format */ - fprintf (stream, _("Don't understand %x \n"), looking_for); - } + /* xgettext:c-format */ + fprintf (stream, _("Don't understand %x \n"), looking_for); } len++; @@ -426,33 +398,34 @@ bfd_h8_disassemble (addr, info, mode) q++; } - /* Fell of the end */ + /* Fell off the end. */ fprintf (stream, "%02x %02x .word\tH'%x,H'%x", data[0], data[1], data[0], data[1]); + return 2; } -int +int print_insn_h8300 (addr, info) -bfd_vma addr; -disassemble_info *info; + bfd_vma addr; + disassemble_info *info; { - return bfd_h8_disassemble (addr, info , 0); + return bfd_h8_disassemble (addr, info, 0); } -int +int print_insn_h8300h (addr, info) -bfd_vma addr; -disassemble_info *info; + bfd_vma addr; + disassemble_info *info; { - return bfd_h8_disassemble (addr, info , 1); + return bfd_h8_disassemble (addr, info, 1); } -int +int print_insn_h8300s (addr, info) -bfd_vma addr; -disassemble_info *info; + bfd_vma addr; + disassemble_info *info; { - return bfd_h8_disassemble (addr, info , 2); + return bfd_h8_disassemble (addr, info, 2); } diff -upr --new-file binutils-2.9.5.0.42/opcodes/ia64-asmtab.c binutils-2.9.5.0.46/opcodes/ia64-asmtab.c --- binutils-2.9.5.0.42/opcodes/ia64-asmtab.c Sun Apr 23 09:39:53 2000 +++ binutils-2.9.5.0.46/opcodes/ia64-asmtab.c Tue May 30 13:57:52 2000 @@ -349,1161 +349,972 @@ dependencies[] = { }; static const short dep0[] = { - 88, 249, 2131, 2294, + 2131, 2294, }; static const short dep1[] = { - 32, 33, 88, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 20602, - + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 20602, }; static const short dep2[] = { - 2131, 2294, + 32, 33, 2129, 2130, 2131, 2294, 4127, 20602, }; static const short dep3[] = { - 32, 33, 2129, 2130, 2131, 2294, 4127, 20602, + 32, 33, 81, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 20602, }; static const short dep4[] = { - 32, 33, 81, 88, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, - 20602, + 2314, 2315, 2318, 2319, }; static const short dep5[] = { - 88, 249, 2157, 2158, 2160, 2161, 2163, 2311, 2314, 2315, 2318, 2319, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 2314, 2315, 2318, 2319, 4127, + 20602, }; static const short dep6[] = { - 32, 33, 88, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2311, 2314, 2315, - 2318, 2319, 4127, 20602, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, }; static const short dep7[] = { - 88, 249, 22637, 22638, 22640, 22641, 22643, 22791, 22794, 22795, 22798, 22799, - + 2312, 2314, 2316, 2318, }; static const short dep8[] = { - 32, 33, 88, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, 22791, - 22794, 22795, 22798, 22799, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 2312, 2315, 2316, 2319, 4127, + 20602, }; static const short dep9[] = { - 88, 249, 2312, 2314, 2316, 2318, + 2313, 2315, 2317, 2319, }; static const short dep10[] = { - 32, 33, 88, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2312, 2315, 2316, - 2319, 4127, 20602, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 2313, 2314, 2317, 2318, 4127, + 20602, }; static const short dep11[] = { - 88, 249, 2313, 2315, 2317, 2319, + 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, }; static const short dep12[] = { - 32, 33, 88, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2313, 2314, 2317, - 2318, 4127, 20602, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 2312, 2313, 2314, 2315, 2316, + 2317, 2318, 2319, 4127, 20602, }; static const short dep13[] = { - 88, 249, 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, + 2357, }; static const short dep14[] = { - 32, 33, 88, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2312, 2313, 2314, - 2315, 2316, 2317, 2318, 2319, 4127, 20602, + 145, 164, 2074, 2075, 2157, 2159, 2160, 2162, 2163, }; static const short dep15[] = { - 88, 249, 2357, + 144, 288, 2357, }; static const short dep16[] = { - 32, 33, 88, 145, 163, 164, 249, 2074, 2075, 2157, 2159, 2160, 2162, 2163, - 4127, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 21, 22, + 23, 24, 25, 133, 145, 164, 288, 2074, 2075, 2157, 2159, 2160, 2162, 2163, + }; static const short dep17[] = { - 88, 144, 249, 288, 2357, 28841, 28980, + 1, 4, 32, 123, 171, 174, 208, 275, 2357, }; static const short dep18[] = { - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 21, 22, - 23, 24, 25, 32, 33, 88, 133, 145, 163, 164, 249, 288, 2074, 2075, 2157, 2159, - 2160, 2162, 2163, 4127, 28841, 28980, + 1, 18, 20, 30, 32, 33, 145, 147, 148, 164, 171, 174, 208, 275, 2074, 2075, + 2157, 2159, 2160, 2162, 2163, 4127, }; static const short dep19[] = { - 1, 4, 32, 88, 123, 171, 174, 208, 249, 275, 2357, 28841, 28980, + 1, 32, 43, 171, 208, 215, }; static const short dep20[] = { - 1, 18, 20, 30, 32, 33, 88, 145, 147, 148, 163, 164, 171, 174, 208, 249, 275, - 2074, 2075, 2157, 2159, 2160, 2162, 2163, 4127, 28841, 28980, + 1, 30, 32, 33, 142, 171, 208, 215, 4127, }; static const short dep21[] = { - 1, 32, 43, 88, 171, 208, 215, 249, 28841, 28980, + 32, 208, }; static const short dep22[] = { - 1, 30, 32, 33, 88, 142, 163, 171, 208, 215, 249, 4127, 28841, 28980, + 208, }; static const short dep23[] = { - 32, 88, 208, 249, + 1, 32, 117, 118, 120, 121, 122, 123, 124, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 139, 140, 141, 142, 143, 144, 145, 148, 149, 150, 151, + 152, 153, 154, 155, 158, 159, 160, 161, 162, 163, 164, 165, 166, 171, 208, + 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, + 287, 288, 289, 290, 291, 293, 294, 296, 297, 298, 299, 300, 301, 302, 303, + 304, 305, 306, }; static const short dep24[] = { - 88, 163, 208, 249, + 1, 30, 32, 33, 42, 43, 47, 50, 64, 171, 208, 272, 273, 274, 275, 276, 277, + 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 293, + 294, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 4127, }; static const short dep25[] = { - 1, 32, 88, 117, 118, 120, 121, 122, 123, 124, 127, 128, 129, 130, 131, 132, - 133, 134, 135, 136, 137, 139, 140, 141, 142, 143, 144, 145, 148, 149, 150, - 151, 152, 153, 154, 155, 158, 159, 160, 161, 162, 163, 164, 165, 166, 171, - 208, 249, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, - 285, 286, 287, 288, 289, 290, 291, 293, 294, 296, 297, 298, 299, 300, 301, - 302, 303, 304, 305, 306, 28841, 28980, + 122, 274, }; static const short dep26[] = { - 1, 30, 32, 33, 42, 43, 47, 50, 64, 88, 123, 163, 171, 208, 249, 272, 273, - 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, - 289, 290, 291, 293, 294, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, - 306, 4127, 28841, 28980, + 274, }; static const short dep27[] = { - 88, 122, 249, 274, + 123, 275, }; static const short dep28[] = { - 88, 123, 163, 249, 274, + 18, 19, 89, 92, 96, 99, 123, 145, 275, }; static const short dep29[] = { - 88, 123, 249, 275, + 2157, 2159, 2160, 2162, 2163, }; static const short dep30[] = { - 18, 19, 88, 89, 92, 96, 99, 123, 145, 163, 249, 275, + 1, 18, 32, 171, 196, 197, 208, 2074, 2252, 2255, 2357, }; static const short dep31[] = { - 32, 33, 88, 163, 249, 2157, 2159, 2160, 2162, 2163, 4127, + 1, 4, 30, 32, 33, 123, 145, 164, 171, 196, 198, 208, 2074, 2075, 2157, 2159, + 2160, 2162, 2163, 2253, 2255, 4127, }; static const short dep32[] = { - 1, 18, 32, 88, 171, 196, 197, 208, 249, 2074, 2252, 2255, 2357, 28841, 28980, - + 2074, 2076, }; static const short dep33[] = { - 1, 4, 30, 32, 33, 88, 123, 145, 163, 164, 171, 196, 198, 208, 249, 2074, 2075, - 2157, 2159, 2160, 2162, 2163, 2253, 2255, 4127, 28841, 28980, + 145, 164, 2157, 2159, 2160, 2162, 2163, }; static const short dep34[] = { - 88, 249, + 4, 29, 30, 31, 113, 114, 174, 208, 270, 271, 2357, }; static const short dep35[] = { - 88, 163, 249, 2074, 2076, + 4, 29, 32, 33, 145, 164, 174, 208, 270, 271, 309, 2157, 2159, 2160, 2162, + 2163, 4127, }; static const short dep36[] = { - 32, 33, 88, 145, 163, 164, 249, 2157, 2159, 2160, 2162, 2163, 4127, + 17, 195, 2357, }; static const short dep37[] = { - 4, 29, 30, 31, 88, 113, 114, 174, 208, 249, 270, 271, 2357, + 17, 145, 164, 195, 2157, 2159, 2160, 2162, 2163, }; static const short dep38[] = { - 4, 29, 32, 33, 88, 145, 163, 164, 174, 208, 249, 270, 271, 309, 2157, 2159, - 2160, 2162, 2163, 4127, + 4, 17, 29, 30, 31, 113, 114, 174, 195, 208, 270, 271, 2357, }; static const short dep39[] = { - 17, 88, 195, 249, 2357, + 4, 17, 29, 32, 33, 145, 164, 174, 195, 208, 270, 271, 309, 2157, 2159, 2160, + 2162, 2163, 4127, }; static const short dep40[] = { - 17, 32, 33, 88, 145, 163, 164, 195, 249, 2157, 2159, 2160, 2162, 2163, 4127, - + 1, 4, 30, 32, 33, 123, 145, 164, 171, 196, 198, 208, 2157, 2159, 2160, 2162, + 2163, 2253, 2255, 4127, }; static const short dep41[] = { - 4, 17, 29, 30, 31, 88, 113, 114, 174, 195, 208, 249, 270, 271, 2357, + 9, 179, 180, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, }; static const short dep42[] = { - 4, 17, 29, 32, 33, 88, 145, 163, 164, 174, 195, 208, 249, 270, 271, 309, 2157, - 2159, 2160, 2162, 2163, 4127, + 5, 13, 14, 32, 33, 179, 181, 2126, 2127, 2128, 2157, 2158, 2161, 2292, 4127, + 16513, 16515, 18724, 18726, 18727, 18729, }; static const short dep43[] = { - 1, 4, 30, 32, 33, 88, 123, 145, 163, 164, 171, 196, 198, 208, 249, 2157, 2159, - 2160, 2162, 2163, 2253, 2255, 4127, 28841, 28980, + 9, 10, 11, 12, 179, 180, 182, 183, 185, 186, 188, 189, 2127, 2292, 18582, + 18583, 18724, 18725, 18727, 18728, }; static const short dep44[] = { - 88, 163, 249, + 5, 6, 7, 8, 13, 14, 32, 33, 179, 181, 182, 184, 185, 187, 188, 190, 2126, + 2127, 2128, 2157, 2158, 2161, 2292, 4127, 16513, 16515, 18724, 18726, 18727, + 18729, }; static const short dep45[] = { - 9, 88, 179, 180, 249, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, - 22637, 22638, 22639, 22641, 22642, 22791, 22794, 22795, 22798, 22799, + 10, 182, 183, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, }; static const short dep46[] = { - 5, 13, 14, 32, 33, 88, 163, 179, 181, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 2292, 4127, 16513, 16515, 18724, 18726, 18727, 18729, 22791, 22794, 22795, - 22798, 22799, + 6, 13, 14, 32, 33, 182, 184, 2126, 2127, 2128, 2157, 2158, 2161, 2292, 4127, + 16513, 16515, 18724, 18726, 18727, 18729, }; static const short dep47[] = { - 9, 10, 11, 12, 88, 179, 180, 182, 183, 185, 186, 188, 189, 249, 2127, 2292, - 18582, 18583, 18724, 18725, 18727, 18728, 22637, 22638, 22639, 22641, 22642, - 22791, 22794, 22795, 22798, 22799, + 11, 185, 186, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, }; static const short dep48[] = { - 5, 6, 7, 8, 13, 14, 32, 33, 88, 163, 179, 181, 182, 184, 185, 187, 188, 190, - 249, 2126, 2127, 2128, 2157, 2158, 2161, 2292, 4127, 16513, 16515, 18724, - 18726, 18727, 18729, 22791, 22794, 22795, 22798, 22799, + 7, 13, 14, 32, 33, 185, 187, 2126, 2127, 2128, 2157, 2158, 2161, 2292, 4127, + 16513, 16515, 18724, 18726, 18727, 18729, }; static const short dep49[] = { - 10, 88, 182, 183, 249, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, - 22637, 22638, 22639, 22641, 22642, 22791, 22794, 22795, 22798, 22799, + 12, 188, 189, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, }; static const short dep50[] = { - 6, 13, 14, 32, 33, 88, 163, 182, 184, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 2292, 4127, 16513, 16515, 18724, 18726, 18727, 18729, 22791, 22794, 22795, - 22798, 22799, + 8, 13, 14, 32, 33, 188, 190, 2126, 2127, 2128, 2157, 2158, 2161, 2292, 4127, + 16513, 16515, 18724, 18726, 18727, 18729, }; static const short dep51[] = { - 11, 88, 185, 186, 249, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, - 22637, 22638, 22639, 22641, 22642, 22791, 22794, 22795, 22798, 22799, + 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, }; static const short dep52[] = { - 7, 13, 14, 32, 33, 88, 163, 185, 187, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 2292, 4127, 16513, 16515, 18724, 18726, 18727, 18729, 22791, 22794, 22795, - 22798, 22799, + 32, 33, 2126, 2127, 2128, 2157, 2158, 2161, 2292, 4127, 16513, 16515, 18724, + 18726, 18727, 18729, }; static const short dep53[] = { - 12, 88, 188, 189, 249, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, - 22637, 22638, 22639, 22641, 22642, 22791, 22794, 22795, 22798, 22799, + 5, 175, }; static const short dep54[] = { - 8, 13, 14, 32, 33, 88, 163, 188, 190, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 2292, 4127, 16513, 16515, 18724, 18726, 18727, 18729, 22791, 22794, 22795, - 22798, 22799, + 5, 175, 2157, 2158, 2161, }; static const short dep55[] = { - 9, 88, 179, 180, 249, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, - + 5, 2157, 2158, 2161, }; static const short dep56[] = { - 5, 13, 14, 32, 33, 88, 163, 179, 181, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 2292, 4127, 16513, 16515, 18724, 18726, 18727, 18729, + 6, 176, }; static const short dep57[] = { - 9, 10, 11, 12, 88, 179, 180, 182, 183, 185, 186, 188, 189, 249, 2127, 2292, - 18582, 18583, 18724, 18725, 18727, 18728, + 5, 176, 2157, 2158, 2161, }; static const short dep58[] = { - 5, 6, 7, 8, 13, 14, 32, 33, 88, 163, 179, 181, 182, 184, 185, 187, 188, 190, - 249, 2126, 2127, 2128, 2157, 2158, 2161, 2292, 4127, 16513, 16515, 18724, - 18726, 18727, 18729, + 7, 177, }; static const short dep59[] = { - 10, 88, 182, 183, 249, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, - + 5, 177, 2157, 2158, 2161, }; static const short dep60[] = { - 6, 13, 14, 32, 33, 88, 163, 182, 184, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 2292, 4127, 16513, 16515, 18724, 18726, 18727, 18729, + 8, 178, }; static const short dep61[] = { - 11, 88, 185, 186, 249, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, - + 5, 178, 2157, 2158, 2161, }; static const short dep62[] = { - 7, 13, 14, 32, 33, 88, 163, 185, 187, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 2292, 4127, 16513, 16515, 18724, 18726, 18727, 18729, + 9, 180, 181, }; static const short dep63[] = { - 12, 88, 188, 189, 249, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, - + 180, 181, 2157, 2158, 2161, }; static const short dep64[] = { - 8, 13, 14, 32, 33, 88, 163, 188, 190, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 2292, 4127, 16513, 16515, 18724, 18726, 18727, 18729, + 2157, 2158, 2161, }; static const short dep65[] = { - 88, 249, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, + 10, 183, 184, }; static const short dep66[] = { - 32, 33, 88, 163, 249, 2126, 2127, 2128, 2157, 2158, 2161, 2292, 4127, 16513, - 16515, 18724, 18726, 18727, 18729, + 183, 184, 2157, 2158, 2161, }; static const short dep67[] = { - 5, 88, 175, 249, + 11, 186, 187, }; static const short dep68[] = { - 5, 32, 33, 88, 163, 175, 249, 2157, 2158, 2161, 4127, + 186, 187, 2157, 2158, 2161, }; static const short dep69[] = { - 5, 32, 33, 88, 163, 249, 2157, 2158, 2161, 4127, + 12, 189, 190, }; static const short dep70[] = { - 6, 88, 176, 249, + 189, 190, 2157, 2158, 2161, }; static const short dep71[] = { - 5, 32, 33, 88, 163, 176, 249, 2157, 2158, 2161, 4127, + 9, 13, 14, 145, 164, 2157, 2158, 2161, }; static const short dep72[] = { - 7, 88, 177, 249, + 9, 10, 13, 14, 145, 164, 2157, 2158, 2161, }; static const short dep73[] = { - 5, 32, 33, 88, 163, 177, 249, 2157, 2158, 2161, 4127, + 9, 11, 13, 14, 145, 164, 2157, 2158, 2161, }; static const short dep74[] = { - 8, 88, 178, 249, + 9, 12, 13, 14, 145, 164, 2157, 2158, 2161, }; static const short dep75[] = { - 5, 32, 33, 88, 163, 178, 249, 2157, 2158, 2161, 4127, + 9, 179, 180, }; static const short dep76[] = { - 9, 88, 180, 181, 249, + 5, 13, 14, 179, 181, 2157, 2158, 2161, }; static const short dep77[] = { - 32, 33, 88, 163, 180, 181, 249, 2157, 2158, 2161, 4127, + 9, 10, 11, 12, 179, 180, 182, 183, 185, 186, 188, 189, }; static const short dep78[] = { - 32, 33, 88, 163, 249, 2157, 2158, 2161, 4127, + 5, 6, 7, 8, 13, 14, 179, 181, 182, 184, 185, 187, 188, 190, 2157, 2158, 2161, + }; static const short dep79[] = { - 10, 88, 183, 184, 249, + 10, 182, 183, }; static const short dep80[] = { - 32, 33, 88, 163, 183, 184, 249, 2157, 2158, 2161, 4127, + 6, 13, 14, 182, 184, 2157, 2158, 2161, }; static const short dep81[] = { - 11, 88, 186, 187, 249, + 11, 185, 186, }; static const short dep82[] = { - 32, 33, 88, 163, 186, 187, 249, 2157, 2158, 2161, 4127, + 7, 13, 14, 185, 187, 2157, 2158, 2161, }; static const short dep83[] = { - 12, 88, 189, 190, 249, + 12, 188, 189, }; static const short dep84[] = { - 32, 33, 88, 163, 189, 190, 249, 2157, 2158, 2161, 4127, + 8, 13, 14, 188, 190, 2157, 2158, 2161, }; static const short dep85[] = { - 9, 13, 14, 32, 33, 88, 145, 163, 164, 249, 2157, 2158, 2161, 4127, + 9, 179, 180, 2314, 2315, 2318, 2319, }; static const short dep86[] = { - 9, 10, 13, 14, 32, 33, 88, 145, 163, 164, 249, 2157, 2158, 2161, 4127, + 5, 13, 14, 179, 181, 2157, 2158, 2161, 2314, 2315, 2318, 2319, }; static const short dep87[] = { - 9, 11, 13, 14, 32, 33, 88, 145, 163, 164, 249, 2157, 2158, 2161, 4127, + 9, 10, 11, 12, 179, 180, 182, 183, 185, 186, 188, 189, 2314, 2315, 2318, 2319, + }; static const short dep88[] = { - 9, 12, 13, 14, 32, 33, 88, 145, 163, 164, 249, 2157, 2158, 2161, 4127, + 5, 6, 7, 8, 13, 14, 179, 181, 182, 184, 185, 187, 188, 190, 2157, 2158, 2161, + 2314, 2315, 2318, 2319, }; static const short dep89[] = { - 9, 88, 179, 180, 249, + 10, 182, 183, 2314, 2315, 2318, 2319, }; static const short dep90[] = { - 5, 13, 14, 32, 33, 88, 163, 179, 181, 249, 2157, 2158, 2161, 4127, + 6, 13, 14, 182, 184, 2157, 2158, 2161, 2314, 2315, 2318, 2319, }; static const short dep91[] = { - 9, 10, 11, 12, 88, 179, 180, 182, 183, 185, 186, 188, 189, 249, + 11, 185, 186, 2314, 2315, 2318, 2319, }; static const short dep92[] = { - 5, 6, 7, 8, 13, 14, 32, 33, 88, 163, 179, 181, 182, 184, 185, 187, 188, 190, - 249, 2157, 2158, 2161, 4127, + 7, 13, 14, 185, 187, 2157, 2158, 2161, 2314, 2315, 2318, 2319, }; static const short dep93[] = { - 10, 88, 182, 183, 249, + 12, 188, 189, 2314, 2315, 2318, 2319, }; static const short dep94[] = { - 6, 13, 14, 32, 33, 88, 163, 182, 184, 249, 2157, 2158, 2161, 4127, + 8, 13, 14, 188, 190, 2157, 2158, 2161, 2314, 2315, 2318, 2319, }; static const short dep95[] = { - 11, 88, 185, 186, 249, + 32, 33, 2126, 2127, 2128, 2157, 2158, 2161, 2314, 2315, 2318, 2319, 4127, + 16513, 16515, }; static const short dep96[] = { - 7, 13, 14, 32, 33, 88, 163, 185, 187, 249, 2157, 2158, 2161, 4127, + 32, 33, 2126, 2127, 2128, 2157, 2158, 2161, 4127, 16513, 16515, }; static const short dep97[] = { - 12, 88, 188, 189, 249, + 13, 14, 32, 33, 2126, 2127, 2128, 2157, 2158, 2161, 2292, 4127, 16513, 16515, + 18724, 18726, 18727, 18729, }; static const short dep98[] = { - 8, 13, 14, 32, 33, 88, 163, 188, 190, 249, 2157, 2158, 2161, 4127, + 32, 33, 145, 164, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, }; static const short dep99[] = { - 9, 88, 179, 180, 249, 2157, 2158, 2159, 2161, 2162, 2311, 2314, 2315, 2318, - 2319, + 2075, 2076, 2253, 2254, }; static const short dep100[] = { - 5, 13, 14, 32, 33, 88, 163, 179, 181, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 2311, 2314, 2315, 2318, 2319, 4127, 16513, 16515, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 2252, 2254, 4127, 20602, }; static const short dep101[] = { - 9, 10, 11, 12, 88, 179, 180, 182, 183, 185, 186, 188, 189, 249, 2157, 2158, - 2159, 2161, 2162, 2311, 2314, 2315, 2318, 2319, + 32, 33, 2074, 2076, 2157, 2158, 2161, 2294, 4127, 20602, }; static const short dep102[] = { - 5, 6, 7, 8, 13, 14, 32, 33, 88, 163, 179, 181, 182, 184, 185, 187, 188, 190, - 249, 2126, 2127, 2128, 2157, 2158, 2161, 2311, 2314, 2315, 2318, 2319, 4127, - 16513, 16515, + 14446, 14448, 14449, 14451, 14602, 14603, 14606, 14607, }; static const short dep103[] = { - 10, 88, 182, 183, 249, 2157, 2158, 2159, 2161, 2162, 2311, 2314, 2315, 2318, - 2319, + 32, 33, 2129, 2130, 2131, 4127, 14602, 14603, 14606, 14607, 20602, 24685, + 24686, 24689, }; static const short dep104[] = { - 6, 13, 14, 32, 33, 88, 163, 182, 184, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 2311, 2314, 2315, 2318, 2319, 4127, 16513, 16515, + 110, 112, 113, 115, 14602, 14603, 14606, 14607, }; static const short dep105[] = { - 11, 88, 185, 186, 249, 2157, 2158, 2159, 2161, 2162, 2311, 2314, 2315, 2318, - 2319, + 14602, 14603, 14606, 14607, 24685, 24686, 24689, }; static const short dep106[] = { - 7, 13, 14, 32, 33, 88, 163, 185, 187, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 2311, 2314, 2315, 2318, 2319, 4127, 16513, 16515, + 32, 33, 2157, 2158, 2161, 2294, 4127, 20602, }; static const short dep107[] = { - 12, 88, 188, 189, 249, 2157, 2158, 2159, 2161, 2162, 2311, 2314, 2315, 2318, - 2319, + 32, 33, 110, 113, 2294, 4127, 20602, 24685, }; static const short dep108[] = { - 8, 13, 14, 32, 33, 88, 163, 188, 190, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 2311, 2314, 2315, 2318, 2319, 4127, 16513, 16515, + 4, 17, 19, 20, 174, 195, 198, 2073, 2251, }; static const short dep109[] = { - 9, 88, 179, 180, 249, 22637, 22638, 22639, 22641, 22642, 22791, 22794, 22795, - 22798, 22799, + 32, 33, 174, 195, 197, 2129, 2130, 2131, 2157, 2158, 2161, 2251, 4127, 20602, + }; static const short dep110[] = { - 5, 13, 14, 32, 33, 88, 163, 179, 181, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 4127, 16513, 16515, 22791, 22794, 22795, 22798, 22799, + 4, 17, 18, 19, 32, 33, 2073, 2157, 2158, 2161, 2294, 4127, 20602, }; static const short dep111[] = { - 9, 10, 11, 12, 88, 179, 180, 182, 183, 185, 186, 188, 189, 249, 22637, 22638, - 22639, 22641, 22642, 22791, 22794, 22795, 22798, 22799, + 32, 33, 2129, 2130, 2131, 2314, 2315, 2318, 2319, 4127, 20602, }; static const short dep112[] = { - 5, 6, 7, 8, 13, 14, 32, 33, 88, 163, 179, 181, 182, 184, 185, 187, 188, 190, - 249, 2126, 2127, 2128, 2157, 2158, 2161, 4127, 16513, 16515, 22791, 22794, - 22795, 22798, 22799, + 32, 33, 2129, 2130, 2131, 4127, 20602, }; static const short dep113[] = { - 10, 88, 182, 183, 249, 22637, 22638, 22639, 22641, 22642, 22791, 22794, 22795, - 22798, 22799, + 32, 33, 2129, 2130, 2131, 2312, 2315, 2316, 2319, 4127, 20602, }; static const short dep114[] = { - 6, 13, 14, 32, 33, 88, 163, 182, 184, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 4127, 16513, 16515, 22791, 22794, 22795, 22798, 22799, + 32, 33, 2129, 2130, 2131, 2313, 2314, 2317, 2318, 4127, 20602, }; static const short dep115[] = { - 11, 88, 185, 186, 249, 22637, 22638, 22639, 22641, 22642, 22791, 22794, 22795, - 22798, 22799, + 32, 33, 2129, 2130, 2131, 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, + 4127, 20602, }; static const short dep116[] = { - 7, 13, 14, 32, 33, 88, 163, 185, 187, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 4127, 16513, 16515, 22791, 22794, 22795, 22798, 22799, + 0, 32, 33, 145, 164, 2157, 2158, 2161, 4127, }; static const short dep117[] = { - 12, 88, 188, 189, 249, 22637, 22638, 22639, 22641, 22642, 22791, 22794, 22795, - 22798, 22799, + 0, 170, }; static const short dep118[] = { - 8, 13, 14, 32, 33, 88, 163, 188, 190, 249, 2126, 2127, 2128, 2157, 2158, 2161, - 4127, 16513, 16515, 22791, 22794, 22795, 22798, 22799, + 0, 32, 33, 145, 164, 170, 2157, 2158, 2161, 4127, }; static const short dep119[] = { - 88, 249, 2157, 2158, 2159, 2161, 2162, 2311, 2314, 2315, 2318, 2319, + 170, 2157, 2158, 2161, }; static const short dep120[] = { - 32, 33, 88, 163, 249, 2126, 2127, 2128, 2157, 2158, 2161, 2311, 2314, 2315, - 2318, 2319, 4127, 16513, 16515, + 2, 21, 172, 199, }; static const short dep121[] = { - 88, 249, 22637, 22638, 22639, 22641, 22642, 22791, 22794, 22795, 22798, 22799, - + 1, 2, 21, 22, 157, 158, 172, 199, }; static const short dep122[] = { - 32, 33, 88, 163, 249, 2126, 2127, 2128, 2157, 2158, 2161, 4127, 16513, 16515, - 22791, 22794, 22795, 22798, 22799, + 1, 21, 22, 30, 32, 33, 157, 158, 172, 199, 4127, }; static const short dep123[] = { - 13, 14, 32, 33, 88, 163, 249, 2126, 2127, 2128, 2157, 2158, 2161, 2292, 4127, - 16513, 16515, 18724, 18726, 18727, 18729, + 0, 32, 33, 170, 2157, 2158, 2161, 4127, }; static const short dep124[] = { - 32, 33, 88, 145, 163, 164, 249, 2129, 2130, 2131, 2157, 2158, 2161, 4127, - 20602, + 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 21, 22, 23, 171, 172, 173, + 175, 176, 177, 178, 180, 181, 183, 184, 186, 187, 189, 190, 191, 192, 193, + 199, 200, 201, 2064, 2073, 2242, 2251, }; static const short dep125[] = { - 88, 249, 2075, 2076, 2253, 2254, + 22, 32, 33, 123, 171, 172, 173, 175, 176, 177, 178, 180, 181, 183, 184, 186, + 187, 189, 190, 191, 192, 193, 199, 200, 201, 2129, 2130, 2131, 2157, 2158, + 2161, 2242, 2251, 4127, 20602, }; static const short dep126[] = { - 32, 33, 88, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2252, 2254, 4127, - 20602, + 162, 2157, 2158, 2161, }; static const short dep127[] = { - 32, 33, 88, 163, 249, 2074, 2076, 2157, 2158, 2161, 2294, 4127, 20602, + 162, }; static const short dep128[] = { - 88, 249, 14446, 14448, 14449, 14451, 14602, 14603, 14606, 14607, + 64, 2157, 2158, 2161, }; static const short dep129[] = { - 32, 33, 88, 163, 249, 2129, 2130, 2131, 4127, 14602, 14603, 14606, 14607, - 20602, 24685, 24686, 24689, + 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 21, 22, 23, 32, 33, 123, 160, + 2064, 2073, 2157, 2158, 2161, 2294, 4127, 20602, }; static const short dep130[] = { - 88, 110, 112, 113, 115, 249, 14602, 14603, 14606, 14607, + 35, 36, 37, 38, 39, 40, 41, 42, 44, 45, 46, 47, 48, 49, 50, 52, 53, 54, 55, + 56, 57, 59, 61, 62, 63, 64, 85, 87, 210, 211, 212, 213, 214, 215, 216, 217, + 218, 219, 220, 222, 223, 224, 225, 226, 228, 230, 231, 232, 248, 2108, 2277, + }; static const short dep131[] = { - 32, 33, 88, 163, 249, 4127, 14602, 14603, 14606, 14607, 24685, 24686, 24689, - + 32, 33, 87, 142, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 222, + 223, 224, 225, 226, 228, 230, 231, 232, 248, 2129, 2130, 2131, 2157, 2158, + 2161, 2277, 4127, 20602, }; static const short dep132[] = { - 32, 33, 88, 163, 249, 2157, 2158, 2161, 2294, 4127, 20602, + 51, 86, 221, 248, 2131, 2294, }; static const short dep133[] = { - 32, 33, 88, 110, 113, 163, 249, 2294, 4127, 20602, 24685, + 32, 33, 35, 36, 38, 40, 41, 43, 44, 45, 46, 48, 49, 52, 53, 55, 56, 57, 58, + 59, 61, 62, 63, 85, 86, 142, 221, 248, 2099, 2108, 2157, 2158, 2161, 2294, + 4127, 20602, }; static const short dep134[] = { - 4, 17, 19, 20, 88, 174, 195, 198, 249, 2073, 2251, + 2, 21, 33, 172, 199, 208, 2131, 2294, }; static const short dep135[] = { - 32, 33, 88, 163, 174, 195, 197, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2251, - 4127, 20602, + 2, 18, 19, 21, 22, 30, 32, 33, 157, 158, 172, 199, 208, 2294, 4127, 20602, + }; static const short dep136[] = { - 4, 17, 18, 19, 32, 33, 88, 163, 249, 2073, 2157, 2158, 2161, 2294, 4127, 20602, - + 117, 118, 120, 121, 125, 126, 129, 130, 131, 132, 133, 134, 135, 136, 138, + 141, 142, 146, 147, 150, 151, 152, 153, 154, 156, 157, 159, 160, 161, 162, + 164, 165, 166, 272, 273, 277, 279, 280, 281, 282, 284, 286, 290, 293, 294, + 296, 297, 298, 299, 301, 302, 303, 305, 306, }; static const short dep137[] = { - 0, 32, 33, 88, 145, 163, 164, 249, 2157, 2158, 2161, 4127, + 32, 33, 64, 272, 273, 277, 279, 280, 281, 282, 284, 286, 290, 293, 294, 296, + 297, 298, 299, 301, 302, 303, 305, 306, 2129, 2130, 2131, 2157, 2158, 2161, + 4127, 20602, }; static const short dep138[] = { - 0, 88, 170, 249, + 116, 118, 119, 121, 150, 151, 166, 272, 273, 293, 294, 296, 297, 306, }; static const short dep139[] = { - 0, 32, 33, 88, 145, 163, 164, 170, 249, 2157, 2158, 2161, 4127, + 32, 33, 162, 272, 273, 293, 294, 296, 297, 306, 2129, 2130, 2131, 2157, 2158, + 2161, 4127, 20602, }; static const short dep140[] = { - 32, 33, 88, 163, 170, 249, 2157, 2158, 2161, 4127, + 32, 33, 118, 121, 126, 127, 130, 132, 134, 136, 138, 139, 141, 145, 146, 148, + 149, 150, 151, 153, 154, 156, 158, 159, 161, 165, 166, 2157, 2158, 2161, 2294, + 4127, 20602, }; static const short dep141[] = { - 2, 21, 88, 172, 199, 249, 28841, 28980, + 32, 33, 118, 121, 150, 151, 166, 2157, 2158, 2161, 2294, 4127, 20602, }; static const short dep142[] = { - 1, 2, 21, 22, 88, 157, 158, 163, 172, 199, 249, 28841, 28980, + 68, 69, 92, 93, 236, 237, 251, 252, }; static const short dep143[] = { - 1, 21, 22, 30, 32, 33, 88, 157, 158, 163, 172, 199, 249, 4127, 28841, 28980, - + 32, 33, 39, 54, 69, 71, 77, 90, 93, 142, 167, 236, 237, 251, 252, 2129, 2130, + 2131, 2157, 2158, 2161, 4127, 20602, }; static const short dep144[] = { - 0, 32, 33, 88, 163, 170, 249, 2157, 2158, 2161, 4127, + 32, 33, 39, 54, 69, 71, 90, 93, 95, 97, 142, 167, 236, 237, 251, 252, 2129, + 2130, 2131, 2157, 2158, 2161, 4127, 20602, }; static const short dep145[] = { - 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 21, 22, 23, 88, 171, 172, - 173, 175, 176, 177, 178, 180, 181, 183, 184, 186, 187, 189, 190, 191, 192, - 193, 199, 200, 201, 249, 2064, 2073, 2242, 2251, 28841, 28980, + 12455, 12456, 12595, }; static const short dep146[] = { - 22, 32, 33, 88, 123, 163, 171, 172, 173, 175, 176, 177, 178, 180, 181, 183, - 184, 186, 187, 189, 190, 191, 192, 193, 199, 200, 201, 249, 2129, 2130, 2131, - 2157, 2158, 2161, 2242, 2251, 4127, 20602, 28841, 28980, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 12595, 20602, }; static const short dep147[] = { - 88, 249, 14452, 14454, 14455, 14457, 14486, 14487, 14502, 14608, 14609, 14629, - 14630, 14632, 14633, 14642, + 6210, 6211, 6378, }; static const short dep148[] = { - 32, 33, 88, 162, 163, 249, 2157, 2158, 2161, 4127, 14608, 14609, 14629, 14630, - 14632, 14633, 14642, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 6378, 20602, }; static const short dep149[] = { - 14452, 14454, 14455, 14457, 14486, 14487, 14502, 14608, 14609, 14629, 14630, - 14632, 14633, 14642, + 6228, 6391, }; static const short dep150[] = { - 162, 14608, 14609, 14629, 14630, 14632, 14633, 14642, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 6391, 20602, }; static const short dep151[] = { - 88, 249, 14453, 14454, 14456, 14457, 14465, 14466, 14467, 14468, 14469, 14470, - 14471, 14472, 14474, 14477, 14478, 14486, 14487, 14488, 14489, 14490, 14495, - 14496, 14497, 14498, 14502, 14608, 14609, 14615, 14616, 14617, 14618, 14620, - 14622, 14629, 14630, 14632, 14633, 14634, 14635, 14638, 14639, 14642, + 6246, 6247, 6248, 6249, 6402, 6404, 8451, }; static const short dep152[] = { - 32, 33, 64, 88, 123, 163, 249, 2157, 2158, 2161, 4127, 14608, 14609, 14615, - 14616, 14617, 14618, 14620, 14622, 14629, 14630, 14632, 14633, 14634, 14635, - 14638, 14639, 14642, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 6249, 6403, 6404, 8295, + 8450, 20602, }; static const short dep153[] = { - 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 21, 22, 23, 32, 33, 88, 123, - 160, 163, 249, 2064, 2073, 2157, 2158, 2161, 2294, 4127, 20602, 28841, + 6250, 6251, 6405, }; static const short dep154[] = { - 35, 36, 37, 38, 39, 40, 41, 42, 44, 45, 46, 47, 48, 49, 50, 52, 53, 54, 55, - 56, 57, 59, 61, 62, 63, 64, 85, 87, 88, 210, 211, 212, 213, 214, 215, 216, - 217, 218, 219, 220, 222, 223, 224, 225, 226, 228, 230, 231, 232, 248, 249, - 2108, 2277, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 6405, 20602, }; static const short dep155[] = { - 32, 33, 87, 88, 123, 142, 163, 210, 211, 212, 213, 214, 215, 216, 217, 218, - 219, 220, 222, 223, 224, 225, 226, 228, 230, 231, 232, 248, 249, 2129, 2130, - 2131, 2157, 2158, 2161, 2277, 4127, 20602, + 6252, 6406, }; static const short dep156[] = { - 51, 86, 88, 221, 248, 249, 2131, 2294, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 6406, 20602, }; static const short dep157[] = { - 32, 33, 35, 36, 38, 40, 41, 43, 44, 45, 46, 48, 49, 52, 53, 55, 56, 57, 58, - 59, 61, 62, 63, 85, 86, 88, 123, 142, 163, 221, 248, 249, 2099, 2108, 2157, - 2158, 2161, 2294, 4127, 20602, + 10341, 10497, }; static const short dep158[] = { - 2, 21, 33, 88, 172, 199, 208, 249, 2131, 2294, 28841, 28980, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 10497, 20602, }; static const short dep159[] = { - 2, 18, 19, 21, 22, 30, 32, 33, 88, 157, 158, 163, 172, 199, 208, 249, 2294, - 4127, 20602, 28841, 28980, + 68, 69, 73, 74, 92, 93, 236, 237, 239, 240, 251, 252, }; static const short dep160[] = { - 88, 117, 118, 120, 121, 125, 126, 129, 130, 131, 132, 133, 134, 135, 136, - 138, 141, 142, 146, 147, 150, 151, 152, 153, 154, 156, 157, 159, 160, 161, - 162, 164, 165, 166, 249, 272, 273, 277, 279, 280, 281, 282, 284, 286, 290, - 293, 294, 296, 297, 298, 299, 301, 302, 303, 305, 306, + 32, 33, 39, 69, 71, 74, 77, 90, 93, 142, 167, 236, 237, 239, 241, 251, 252, + 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, }; static const short dep161[] = { - 32, 33, 64, 88, 123, 163, 249, 272, 273, 277, 279, 280, 281, 282, 284, 286, - 290, 293, 294, 296, 297, 298, 299, 301, 302, 303, 305, 306, 2129, 2130, 2131, - 2157, 2158, 2161, 4127, 20602, + 68, 69, 92, 93, 95, 96, 236, 237, 251, 252, 253, 254, }; static const short dep162[] = { - 88, 116, 118, 119, 121, 150, 151, 166, 249, 272, 273, 293, 294, 296, 297, - 306, + 32, 33, 39, 54, 69, 71, 90, 93, 95, 97, 142, 167, 236, 237, 251, 252, 253, + 254, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, }; static const short dep163[] = { - 32, 33, 88, 162, 163, 249, 272, 273, 293, 294, 296, 297, 306, 2129, 2130, - 2131, 2157, 2158, 2161, 4127, 20602, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 12456, 20602, }; static const short dep164[] = { - 32, 33, 88, 118, 121, 123, 126, 127, 130, 132, 134, 136, 138, 139, 141, 145, - 146, 148, 149, 150, 151, 153, 154, 156, 158, 159, 161, 163, 165, 166, 249, - 2157, 2158, 2161, 2294, 4127, 20602, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 6210, 20602, }; static const short dep165[] = { - 32, 33, 88, 118, 121, 150, 151, 163, 166, 249, 2157, 2158, 2161, 2294, 4127, - 20602, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 6228, 20602, }; static const short dep166[] = { - 32, 33, 67, 68, 73, 75, 88, 102, 123, 152, 163, 167, 249, 2129, 2130, 2131, - 2157, 2158, 2161, 2294, 4127, 20602, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 6248, 8294, 20602, + }; static const short dep167[] = { - 32, 33, 67, 68, 73, 75, 88, 102, 123, 124, 125, 127, 128, 152, 163, 167, 249, - 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 6250, 20602, }; static const short dep168[] = { - 68, 69, 88, 92, 93, 236, 237, 249, 251, 252, + 32, 33, 123, 162, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 6251, 6252, + 20602, }; static const short dep169[] = { - 32, 33, 39, 54, 69, 71, 77, 88, 90, 93, 123, 142, 163, 167, 236, 237, 249, - 251, 252, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 10341, 20602, }; static const short dep170[] = { - 32, 33, 39, 54, 69, 71, 88, 90, 93, 95, 97, 123, 142, 163, 167, 236, 237, - 249, 251, 252, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, + 32, 33, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 6178, 20602, }; static const short dep171[] = { - 88, 249, 12455, 12456, 12595, + 68, 70, 71, 89, 90, 91, 235, 236, 250, 251, }; static const short dep172[] = { - 32, 33, 88, 123, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 12595, - 20602, + 32, 33, 69, 70, 74, 76, 91, 93, 95, 98, 167, 235, 237, 250, 252, 2129, 2130, + 2131, 2157, 2158, 2161, 4127, 20602, }; static const short dep173[] = { - 88, 249, 6210, 6211, 6378, + 68, 70, 71, 72, 89, 90, 91, 94, 235, 236, 238, 250, 251, }; static const short dep174[] = { - 32, 33, 88, 123, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 6378, - 20602, + 32, 33, 69, 70, 72, 74, 76, 91, 93, 94, 95, 98, 167, 235, 237, 238, 250, 252, + 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, }; static const short dep175[] = { - 88, 249, 6228, 6391, + 68, 70, 71, 75, 76, 77, 89, 90, 91, 235, 236, 241, 242, 250, 251, }; static const short dep176[] = { - 32, 33, 88, 123, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 6391, - 20602, + 32, 33, 69, 70, 74, 76, 91, 93, 167, 235, 237, 240, 242, 250, 252, 2129, 2130, + 2131, 2157, 2158, 2161, 4127, 20602, }; static const short dep177[] = { - 88, 249, 6246, 6247, 6248, 6249, 6402, 6404, 8451, + 68, 70, 71, 89, 90, 91, 97, 98, 99, 235, 236, 250, 251, 254, 255, }; static const short dep178[] = { - 32, 33, 88, 123, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 6249, - 6403, 6404, 8295, 8450, 20602, + 32, 33, 69, 70, 91, 93, 95, 98, 167, 235, 237, 250, 252, 253, 255, 2129, 2130, + 2131, 2157, 2158, 2161, 4127, 20602, }; static const short dep179[] = { - 88, 249, 6250, 6251, 6405, + 32, 33, 38, 62, 167, 2129, 2130, 2131, 2294, 4127, 20602, }; static const short dep180[] = { - 32, 33, 88, 123, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 6405, - 20602, + 32, 33, 167, 2129, 2130, 2131, 2294, 4127, 20602, }; static const short dep181[] = { - 88, 249, 6252, 6406, + 32, 33, 68, 73, 75, 167, 2129, 2130, 2131, 2294, 4127, 20602, }; static const short dep182[] = { - 32, 33, 88, 123, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 6406, - 20602, + 32, 33, 68, 73, 75, 167, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 20602, + }; static const short dep183[] = { - 88, 249, 10341, 10497, + 32, 33, 145, 164, 2126, 2127, 2128, 2129, 2130, 2131, 2157, 2158, 2161, 4127, + 16513, 16515, 20602, }; static const short dep184[] = { - 32, 33, 88, 123, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 10497, - 20602, + 32, 33, 68, 73, 75, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, }; static const short dep185[] = { - 68, 69, 73, 74, 88, 92, 93, 236, 237, 239, 240, 249, 251, 252, + 32, 33, 69, 70, 91, 235, 237, 250, 252, 2129, 2130, 2131, 2157, 2158, 2161, + 4127, 20602, }; static const short dep186[] = { - 32, 33, 39, 69, 71, 74, 77, 88, 90, 93, 123, 142, 163, 167, 236, 237, 239, - 241, 249, 251, 252, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, + 32, 33, 67, 68, 73, 75, 100, 102, 116, 117, 119, 120, 123, 124, 125, 127, + 128, 135, 152, 167, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 20602, + }; static const short dep187[] = { - 68, 69, 88, 92, 93, 95, 96, 236, 237, 249, 251, 252, 253, 254, + 32, 33, 36, 67, 68, 73, 75, 100, 102, 116, 117, 119, 120, 123, 124, 125, 127, + 128, 135, 137, 152, 167, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 20602, + }; static const short dep188[] = { - 32, 33, 39, 54, 69, 71, 88, 90, 93, 95, 97, 123, 142, 163, 167, 236, 237, - 249, 251, 252, 253, 254, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, - + 0, 170, 2131, 2294, }; static const short dep189[] = { - 32, 33, 88, 123, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, - 12456, 20602, + 0, 32, 33, 67, 68, 73, 75, 100, 102, 116, 117, 119, 120, 123, 124, 125, 127, + 128, 135, 152, 167, 170, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 20602, + }; static const short dep190[] = { - 32, 33, 88, 123, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, - 6210, 20602, + 0, 32, 33, 36, 67, 68, 73, 75, 100, 102, 116, 117, 119, 120, 123, 124, 125, + 127, 128, 135, 137, 152, 167, 170, 2129, 2130, 2131, 2157, 2158, 2161, 2294, + 4127, 20602, }; static const short dep191[] = { - 32, 33, 88, 123, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, - 6228, 20602, + 23, 32, 33, 67, 68, 73, 75, 100, 102, 116, 117, 119, 120, 123, 124, 125, 127, + 128, 135, 152, 167, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 20602, + }; static const short dep192[] = { - 32, 33, 88, 123, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, - 6248, 8294, 20602, + 0, 170, 2294, 26706, }; static const short dep193[] = { - 32, 33, 88, 123, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, - 6250, 20602, + 23, 201, }; static const short dep194[] = { - 32, 33, 88, 123, 162, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, - 4127, 6251, 6252, 20602, + 201, }; static const short dep195[] = { - 32, 33, 88, 123, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, - 10341, 20602, + 0, 100, 170, 256, 2131, 2294, }; static const short dep196[] = { - 32, 33, 88, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 6178, - 20602, + 0, 3, 32, 33, 67, 68, 73, 75, 100, 102, 116, 117, 119, 120, 123, 124, 125, + 127, 128, 135, 152, 167, 170, 256, 2129, 2130, 2131, 2157, 2158, 2161, 2294, + 4127, 20602, }; static const short dep197[] = { - 68, 70, 71, 88, 89, 90, 91, 235, 236, 249, 250, 251, + 0, 32, 33, 67, 68, 73, 75, 100, 102, 116, 117, 119, 120, 123, 124, 125, 127, + 128, 135, 152, 167, 170, 256, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, + 20602, }; static const short dep198[] = { - 32, 33, 69, 70, 74, 76, 88, 91, 93, 95, 98, 123, 163, 167, 235, 237, 249, - 250, 252, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, + 32, 33, 2126, 2127, 2128, 2157, 2158, 2161, 2294, 4127, 16513, 16515, 20602, + }; static const short dep199[] = { - 68, 70, 71, 72, 88, 89, 90, 91, 94, 235, 236, 238, 249, 250, 251, + 32, 33, 67, 68, 73, 75, 100, 102, 116, 117, 119, 120, 123, 124, 125, 127, + 128, 135, 152, 167, 2129, 2130, 2131, 2157, 2158, 2161, 2292, 4127, 16513, + 16515, 18724, 18726, 18727, 18729, 20602, }; static const short dep200[] = { - 32, 33, 69, 70, 72, 74, 76, 88, 91, 93, 94, 95, 98, 123, 163, 167, 235, 237, - 238, 249, 250, 252, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, + 32, 33, 36, 67, 68, 73, 75, 100, 102, 116, 117, 119, 120, 123, 124, 125, 127, + 128, 135, 137, 152, 167, 2129, 2130, 2131, 2157, 2158, 2161, 2292, 4127, 16513, + 16515, 18724, 18726, 18727, 18729, 20602, }; static const short dep201[] = { - 68, 70, 71, 75, 76, 77, 88, 89, 90, 91, 235, 236, 241, 242, 249, 250, 251, - + 0, 170, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, }; static const short dep202[] = { - 32, 33, 69, 70, 74, 76, 88, 91, 93, 123, 163, 167, 235, 237, 240, 242, 249, - 250, 252, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, + 0, 32, 33, 67, 68, 73, 75, 100, 102, 116, 117, 119, 120, 123, 124, 125, 127, + 128, 135, 152, 167, 170, 2129, 2130, 2131, 2157, 2158, 2161, 2292, 4127, 16513, + 16515, 18724, 18726, 18727, 18729, 20602, }; static const short dep203[] = { - 68, 70, 71, 88, 89, 90, 91, 97, 98, 99, 235, 236, 249, 250, 251, 254, 255, - + 0, 32, 33, 36, 67, 68, 73, 75, 100, 102, 116, 117, 119, 120, 123, 124, 125, + 127, 128, 135, 137, 152, 167, 170, 2129, 2130, 2131, 2157, 2158, 2161, 2292, + 4127, 16513, 16515, 18724, 18726, 18727, 18729, 20602, }; static const short dep204[] = { - 32, 33, 69, 70, 88, 91, 93, 95, 98, 123, 163, 167, 235, 237, 249, 250, 252, - 253, 255, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, + 0, 170, 2128, 2292, 18582, 18583, 18724, 18725, 18727, 18728, }; static const short dep205[] = { - 32, 33, 38, 62, 88, 163, 167, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, - 4127, 20602, + 0, 100, 170, 256, }; static const short dep206[] = { - 32, 33, 88, 163, 167, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, - 20602, + 0, 32, 33, 67, 68, 73, 75, 102, 116, 117, 119, 120, 123, 124, 125, 127, 128, + 135, 152, 167, 170, 256, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, + }; static const short dep207[] = { - 32, 33, 68, 73, 75, 88, 123, 163, 167, 249, 2129, 2130, 2131, 2157, 2158, - 2161, 2294, 4127, 20602, + 67, 123, 137, 2157, 2158, 2161, }; static const short dep208[] = { - 32, 33, 88, 145, 163, 164, 249, 2126, 2127, 2128, 2129, 2130, 2131, 2157, - 2158, 2161, 4127, 16513, 16515, 20602, + 67, 123, 124, 128, 137, 2157, 2158, 2161, }; static const short dep209[] = { - 32, 33, 68, 73, 75, 88, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 4127, - 20602, + 32, 33, 67, 123, 137, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, 20602, + }; static const short dep210[] = { - 32, 33, 69, 70, 88, 91, 123, 163, 235, 237, 249, 250, 252, 2129, 2130, 2131, - 2157, 2158, 2161, 4127, 20602, + 32, 33, 67, 123, 124, 128, 137, 2129, 2130, 2131, 2157, 2158, 2161, 2294, + 4127, 20602, }; static const short dep211[] = { - 32, 33, 67, 68, 73, 75, 88, 100, 102, 116, 117, 119, 120, 123, 124, 125, 127, - 128, 135, 152, 163, 167, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, 4127, - 20602, + 2157, 2158, 2159, 2160, 2161, 2162, 2163, }; static const short dep212[] = { - 32, 33, 36, 67, 68, 73, 75, 88, 100, 102, 116, 117, 119, 120, 123, 124, 125, - 127, 128, 135, 137, 152, 163, 167, 249, 2129, 2130, 2131, 2157, 2158, 2161, - 2294, 4127, 20602, -}; - -static const short dep213[] = { - 0, 88, 170, 249, 2131, 2294, -}; - -static const short dep214[] = { - 0, 32, 33, 67, 68, 73, 75, 88, 100, 102, 116, 117, 119, 120, 123, 124, 125, - 127, 128, 135, 152, 163, 167, 170, 249, 2129, 2130, 2131, 2157, 2158, 2161, - 2294, 4127, 20602, -}; - -static const short dep215[] = { - 0, 32, 33, 36, 67, 68, 73, 75, 88, 100, 102, 116, 117, 119, 120, 123, 124, - 125, 127, 128, 135, 137, 152, 163, 167, 170, 249, 2129, 2130, 2131, 2157, - 2158, 2161, 2294, 4127, 20602, -}; - -static const short dep216[] = { - 23, 32, 33, 67, 68, 73, 75, 88, 100, 102, 116, 117, 119, 120, 123, 124, 125, - 127, 128, 135, 152, 163, 167, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, - 4127, 20602, -}; - -static const short dep217[] = { - 0, 88, 170, 249, 2294, 26706, -}; - -static const short dep218[] = { - 0, 88, 100, 170, 249, 256, -}; - -static const short dep219[] = { - 0, 32, 33, 67, 68, 73, 75, 88, 102, 116, 117, 119, 120, 123, 124, 125, 127, - 128, 135, 152, 163, 167, 170, 249, 256, 2129, 2130, 2131, 2157, 2158, 2161, - 4127, 20602, -}; - -static const short dep220[] = { - 0, 23, 88, 100, 170, 201, 249, 256, -}; - -static const short dep221[] = { - 0, 32, 33, 67, 68, 73, 75, 88, 102, 116, 117, 119, 120, 123, 124, 125, 127, - 128, 135, 152, 163, 167, 170, 201, 249, 256, 2129, 2130, 2131, 2157, 2158, - 2161, 4127, 20602, -}; - -static const short dep222[] = { - 0, 88, 100, 170, 249, 256, 2131, 2294, -}; - -static const short dep223[] = { - 0, 3, 32, 33, 67, 68, 73, 75, 88, 100, 102, 116, 117, 119, 120, 123, 124, - 125, 127, 128, 135, 152, 163, 167, 170, 249, 256, 2129, 2130, 2131, 2157, - 2158, 2161, 2294, 4127, 20602, -}; - -static const short dep224[] = { - 0, 32, 33, 67, 68, 73, 75, 88, 100, 102, 116, 117, 119, 120, 123, 124, 125, - 127, 128, 135, 152, 163, 167, 170, 249, 256, 2129, 2130, 2131, 2157, 2158, - 2161, 2294, 4127, 20602, -}; - -static const short dep225[] = { - 32, 33, 88, 163, 249, 2126, 2127, 2128, 2157, 2158, 2161, 2294, 4127, 16513, - 16515, 20602, -}; - -static const short dep226[] = { - 32, 33, 67, 68, 73, 75, 88, 100, 102, 116, 117, 119, 120, 123, 124, 125, 127, - 128, 135, 152, 163, 167, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2292, 4127, - 16513, 16515, 18724, 18726, 18727, 18729, 20602, -}; - -static const short dep227[] = { - 32, 33, 36, 67, 68, 73, 75, 88, 100, 102, 116, 117, 119, 120, 123, 124, 125, - 127, 128, 135, 137, 152, 163, 167, 249, 2129, 2130, 2131, 2157, 2158, 2161, - 2292, 4127, 16513, 16515, 18724, 18726, 18727, 18729, 20602, -}; - -static const short dep228[] = { - 0, 88, 170, 249, 2127, 2292, 18582, 18583, 18724, 18725, 18727, 18728, -}; - -static const short dep229[] = { - 0, 32, 33, 67, 68, 73, 75, 88, 100, 102, 116, 117, 119, 120, 123, 124, 125, - 127, 128, 135, 152, 163, 167, 170, 249, 2129, 2130, 2131, 2157, 2158, 2161, - 2292, 4127, 16513, 16515, 18724, 18726, 18727, 18729, 20602, -}; - -static const short dep230[] = { - 0, 32, 33, 36, 67, 68, 73, 75, 88, 100, 102, 116, 117, 119, 120, 123, 124, - 125, 127, 128, 135, 137, 152, 163, 167, 170, 249, 2129, 2130, 2131, 2157, - 2158, 2161, 2292, 4127, 16513, 16515, 18724, 18726, 18727, 18729, 20602, -}; - -static const short dep231[] = { - 0, 88, 170, 249, 2128, 2292, 18582, 18583, 18724, 18725, 18727, 18728, -}; - -static const short dep232[] = { - 32, 33, 67, 88, 123, 137, 163, 249, 2157, 2158, 2161, 4127, -}; - -static const short dep233[] = { - 32, 33, 67, 88, 123, 124, 128, 137, 163, 249, 2157, 2158, 2161, 4127, -}; - -static const short dep234[] = { - 32, 33, 67, 88, 123, 137, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 2294, - 4127, 20602, -}; - -static const short dep235[] = { - 32, 33, 67, 88, 123, 124, 128, 137, 163, 249, 2129, 2130, 2131, 2157, 2158, - 2161, 2294, 4127, 20602, -}; - -static const short dep236[] = { - 32, 33, 88, 163, 249, 2129, 2130, 2131, 2157, 2158, 2161, 4127, 20602, -}; - -static const short dep237[] = { - 32, 33, 88, 163, 249, 2157, 2158, 2159, 2160, 2161, 2162, 2163, 4127, -}; - -static const short dep238[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17, 19, 20, 21, 22, 23, - 88, 171, 172, 173, 174, 175, 176, 177, 178, 180, 181, 183, 184, 186, 187, - 189, 190, 191, 192, 193, 195, 198, 199, 200, 201, 249, 2064, 2073, 2131, 2242, - 2251, 2294, 28841, 28980, + 171, 172, 173, 174, 175, 176, 177, 178, 180, 181, 183, 184, 186, 187, 189, + 190, 191, 192, 193, 195, 198, 199, 200, 201, 2064, 2073, 2131, 2242, 2251, + 2294, }; -static const short dep239[] = { +static const short dep213[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 21, 22, 23, - 32, 33, 88, 123, 160, 163, 171, 172, 173, 174, 175, 176, 177, 178, 180, 181, - 183, 184, 186, 187, 189, 190, 191, 192, 193, 195, 197, 199, 200, 201, 249, - 2064, 2073, 2129, 2130, 2131, 2157, 2158, 2161, 2242, 2251, 2294, 4127, 20602, - 28841, 28980, + 32, 33, 123, 160, 171, 172, 173, 174, 175, 176, 177, 178, 180, 181, 183, 184, + 186, 187, 189, 190, 191, 192, 193, 195, 197, 199, 200, 201, 2064, 2073, 2129, + 2130, 2131, 2157, 2158, 2161, 2242, 2251, 2294, 4127, 20602, }; #define NELS(X) (sizeof(X)/sizeof(X[0])) static const struct ia64_opcode_dependency op_dependencies[] = { { NELS(dep1), dep1, NELS(dep0), dep0, }, - { NELS(dep3), dep3, NELS(dep2), dep2, }, - { NELS(dep4), dep4, NELS(dep0), dep0, }, - { NELS(dep6), dep6, NELS(dep5), dep5, }, + { NELS(dep2), dep2, NELS(dep0), dep0, }, + { 0, NULL, 0, NULL, }, + { NELS(dep3), dep3, NELS(dep0), dep0, }, + { NELS(dep5), dep5, NELS(dep4), dep4, }, + { NELS(dep6), dep6, 0, NULL, }, { NELS(dep8), dep8, NELS(dep7), dep7, }, { NELS(dep10), dep10, NELS(dep9), dep9, }, { NELS(dep12), dep12, NELS(dep11), dep11, }, @@ -1515,141 +1326,131 @@ op_dependencies[] = { { NELS(dep24), dep24, NELS(dep23), dep23, }, { NELS(dep26), dep26, NELS(dep25), dep25, }, { NELS(dep28), dep28, NELS(dep27), dep27, }, - { NELS(dep30), dep30, NELS(dep29), dep29, }, - { NELS(dep31), dep31, NELS(dep15), dep15, }, - { NELS(dep33), dep33, NELS(dep32), dep32, }, + { NELS(dep29), dep29, NELS(dep13), dep13, }, + { NELS(dep31), dep31, NELS(dep30), dep30, }, + { NELS(dep32), dep32, 0, NULL, }, + { NELS(dep33), dep33, NELS(dep13), dep13, }, { NELS(dep35), dep35, NELS(dep34), dep34, }, - { NELS(dep36), dep36, NELS(dep15), dep15, }, - { NELS(dep38), dep38, NELS(dep37), dep37, }, - { NELS(dep40), dep40, NELS(dep39), dep39, }, + { NELS(dep37), dep37, NELS(dep36), dep36, }, + { NELS(dep39), dep39, NELS(dep38), dep38, }, + { NELS(dep40), dep40, NELS(dep30), dep30, }, { NELS(dep42), dep42, NELS(dep41), dep41, }, - { NELS(dep43), dep43, NELS(dep32), dep32, }, - { NELS(dep44), dep44, NELS(dep34), dep34, }, + { NELS(dep44), dep44, NELS(dep43), dep43, }, { NELS(dep46), dep46, NELS(dep45), dep45, }, { NELS(dep48), dep48, NELS(dep47), dep47, }, { NELS(dep50), dep50, NELS(dep49), dep49, }, { NELS(dep52), dep52, NELS(dep51), dep51, }, { NELS(dep54), dep54, NELS(dep53), dep53, }, - { NELS(dep56), dep56, NELS(dep55), dep55, }, - { NELS(dep58), dep58, NELS(dep57), dep57, }, - { NELS(dep60), dep60, NELS(dep59), dep59, }, - { NELS(dep62), dep62, NELS(dep61), dep61, }, - { NELS(dep64), dep64, NELS(dep63), dep63, }, + { NELS(dep55), dep55, 0, NULL, }, + { NELS(dep57), dep57, NELS(dep56), dep56, }, + { NELS(dep59), dep59, NELS(dep58), dep58, }, + { NELS(dep61), dep61, NELS(dep60), dep60, }, + { NELS(dep63), dep63, NELS(dep62), dep62, }, + { NELS(dep64), dep64, 0, NULL, }, { NELS(dep66), dep66, NELS(dep65), dep65, }, { NELS(dep68), dep68, NELS(dep67), dep67, }, - { NELS(dep69), dep69, NELS(dep34), dep34, }, - { NELS(dep71), dep71, NELS(dep70), dep70, }, - { NELS(dep73), dep73, NELS(dep72), dep72, }, - { NELS(dep75), dep75, NELS(dep74), dep74, }, - { NELS(dep77), dep77, NELS(dep76), dep76, }, - { NELS(dep78), dep78, NELS(dep34), dep34, }, + { NELS(dep70), dep70, NELS(dep69), dep69, }, + { NELS(dep71), dep71, 0, NULL, }, + { NELS(dep72), dep72, 0, NULL, }, + { NELS(dep73), dep73, 0, NULL, }, + { NELS(dep74), dep74, 0, NULL, }, + { NELS(dep76), dep76, NELS(dep75), dep75, }, + { NELS(dep78), dep78, NELS(dep77), dep77, }, { NELS(dep80), dep80, NELS(dep79), dep79, }, { NELS(dep82), dep82, NELS(dep81), dep81, }, { NELS(dep84), dep84, NELS(dep83), dep83, }, - { NELS(dep85), dep85, NELS(dep34), dep34, }, - { NELS(dep86), dep86, NELS(dep34), dep34, }, - { NELS(dep87), dep87, NELS(dep34), dep34, }, - { NELS(dep88), dep88, NELS(dep34), dep34, }, + { NELS(dep86), dep86, NELS(dep85), dep85, }, + { NELS(dep88), dep88, NELS(dep87), dep87, }, { NELS(dep90), dep90, NELS(dep89), dep89, }, { NELS(dep92), dep92, NELS(dep91), dep91, }, { NELS(dep94), dep94, NELS(dep93), dep93, }, - { NELS(dep96), dep96, NELS(dep95), dep95, }, - { NELS(dep98), dep98, NELS(dep97), dep97, }, + { NELS(dep95), dep95, NELS(dep4), dep4, }, + { NELS(dep96), dep96, 0, NULL, }, + { NELS(dep97), dep97, NELS(dep51), dep51, }, + { NELS(dep98), dep98, 0, NULL, }, { NELS(dep100), dep100, NELS(dep99), dep99, }, - { NELS(dep102), dep102, NELS(dep101), dep101, }, - { NELS(dep104), dep104, NELS(dep103), dep103, }, - { NELS(dep106), dep106, NELS(dep105), dep105, }, - { NELS(dep108), dep108, NELS(dep107), dep107, }, - { NELS(dep110), dep110, NELS(dep109), dep109, }, - { NELS(dep112), dep112, NELS(dep111), dep111, }, - { NELS(dep114), dep114, NELS(dep113), dep113, }, - { NELS(dep116), dep116, NELS(dep115), dep115, }, + { NELS(dep101), dep101, NELS(dep0), dep0, }, + { NELS(dep103), dep103, NELS(dep102), dep102, }, + { NELS(dep105), dep105, NELS(dep104), dep104, }, + { NELS(dep106), dep106, NELS(dep0), dep0, }, + { NELS(dep107), dep107, NELS(dep0), dep0, }, + { NELS(dep109), dep109, NELS(dep108), dep108, }, + { NELS(dep110), dep110, NELS(dep0), dep0, }, + { NELS(dep111), dep111, NELS(dep4), dep4, }, + { NELS(dep112), dep112, 0, NULL, }, + { NELS(dep113), dep113, NELS(dep7), dep7, }, + { NELS(dep114), dep114, NELS(dep9), dep9, }, + { NELS(dep115), dep115, NELS(dep11), dep11, }, + { NELS(dep116), dep116, 0, NULL, }, { NELS(dep118), dep118, NELS(dep117), dep117, }, - { NELS(dep120), dep120, NELS(dep119), dep119, }, - { NELS(dep122), dep122, NELS(dep121), dep121, }, - { NELS(dep123), dep123, NELS(dep65), dep65, }, - { 0, NULL, 0, NULL, }, - { NELS(dep124), dep124, NELS(dep34), dep34, }, - { NELS(dep126), dep126, NELS(dep125), dep125, }, - { NELS(dep127), dep127, NELS(dep0), dep0, }, - { NELS(dep129), dep129, NELS(dep128), dep128, }, + { NELS(dep119), dep119, NELS(dep117), dep117, }, + { NELS(dep121), dep121, NELS(dep120), dep120, }, + { NELS(dep122), dep122, NELS(dep120), dep120, }, + { NELS(dep123), dep123, NELS(dep117), dep117, }, + { NELS(dep125), dep125, NELS(dep124), dep124, }, + { NELS(dep126), dep126, 0, NULL, }, + { NELS(dep127), dep127, 0, NULL, }, + { NELS(dep128), dep128, 0, NULL, }, + { NELS(dep129), dep129, NELS(dep0), dep0, }, { NELS(dep131), dep131, NELS(dep130), dep130, }, - { NELS(dep132), dep132, NELS(dep0), dep0, }, - { NELS(dep133), dep133, NELS(dep0), dep0, }, + { NELS(dep133), dep133, NELS(dep132), dep132, }, { NELS(dep135), dep135, NELS(dep134), dep134, }, - { NELS(dep136), dep136, NELS(dep0), dep0, }, - { NELS(dep137), dep137, NELS(dep34), dep34, }, + { NELS(dep137), dep137, NELS(dep136), dep136, }, { NELS(dep139), dep139, NELS(dep138), dep138, }, - { NELS(dep140), dep140, NELS(dep138), dep138, }, - { NELS(dep142), dep142, NELS(dep141), dep141, }, - { NELS(dep143), dep143, NELS(dep141), dep141, }, - { NELS(dep144), dep144, NELS(dep138), dep138, }, + { NELS(dep140), dep140, NELS(dep0), dep0, }, + { NELS(dep141), dep141, NELS(dep0), dep0, }, + { NELS(dep143), dep143, NELS(dep142), dep142, }, + { NELS(dep144), dep144, NELS(dep142), dep142, }, { NELS(dep146), dep146, NELS(dep145), dep145, }, { NELS(dep148), dep148, NELS(dep147), dep147, }, { NELS(dep150), dep150, NELS(dep149), dep149, }, { NELS(dep152), dep152, NELS(dep151), dep151, }, - { NELS(dep153), dep153, NELS(dep0), dep0, }, - { NELS(dep155), dep155, NELS(dep154), dep154, }, - { NELS(dep157), dep157, NELS(dep156), dep156, }, - { NELS(dep159), dep159, NELS(dep158), dep158, }, - { NELS(dep161), dep161, NELS(dep160), dep160, }, - { NELS(dep163), dep163, NELS(dep162), dep162, }, + { NELS(dep154), dep154, NELS(dep153), dep153, }, + { NELS(dep156), dep156, NELS(dep155), dep155, }, + { NELS(dep158), dep158, NELS(dep157), dep157, }, + { NELS(dep160), dep160, NELS(dep159), dep159, }, + { NELS(dep162), dep162, NELS(dep161), dep161, }, + { NELS(dep163), dep163, NELS(dep0), dep0, }, { NELS(dep164), dep164, NELS(dep0), dep0, }, { NELS(dep165), dep165, NELS(dep0), dep0, }, { NELS(dep166), dep166, NELS(dep0), dep0, }, - { NELS(dep167), dep167, NELS(dep34), dep34, }, - { NELS(dep169), dep169, NELS(dep168), dep168, }, - { NELS(dep170), dep170, NELS(dep168), dep168, }, + { NELS(dep167), dep167, NELS(dep0), dep0, }, + { NELS(dep168), dep168, NELS(dep0), dep0, }, + { NELS(dep169), dep169, NELS(dep0), dep0, }, + { NELS(dep170), dep170, NELS(dep0), dep0, }, { NELS(dep172), dep172, NELS(dep171), dep171, }, { NELS(dep174), dep174, NELS(dep173), dep173, }, { NELS(dep176), dep176, NELS(dep175), dep175, }, { NELS(dep178), dep178, NELS(dep177), dep177, }, - { NELS(dep180), dep180, NELS(dep179), dep179, }, - { NELS(dep182), dep182, NELS(dep181), dep181, }, - { NELS(dep184), dep184, NELS(dep183), dep183, }, - { NELS(dep186), dep186, NELS(dep185), dep185, }, - { NELS(dep188), dep188, NELS(dep187), dep187, }, - { NELS(dep189), dep189, NELS(dep0), dep0, }, - { NELS(dep190), dep190, NELS(dep0), dep0, }, + { NELS(dep179), dep179, NELS(dep0), dep0, }, + { NELS(dep180), dep180, NELS(dep0), dep0, }, + { NELS(dep181), dep181, NELS(dep0), dep0, }, + { NELS(dep182), dep182, NELS(dep0), dep0, }, + { NELS(dep183), dep183, 0, NULL, }, + { NELS(dep184), dep184, 0, NULL, }, + { NELS(dep185), dep185, NELS(dep171), dep171, }, + { NELS(dep186), dep186, NELS(dep0), dep0, }, + { NELS(dep187), dep187, NELS(dep0), dep0, }, + { NELS(dep189), dep189, NELS(dep188), dep188, }, + { NELS(dep190), dep190, NELS(dep188), dep188, }, { NELS(dep191), dep191, NELS(dep0), dep0, }, - { NELS(dep192), dep192, NELS(dep0), dep0, }, - { NELS(dep193), dep193, NELS(dep0), dep0, }, - { NELS(dep194), dep194, NELS(dep0), dep0, }, - { NELS(dep195), dep195, NELS(dep0), dep0, }, - { NELS(dep196), dep196, NELS(dep0), dep0, }, - { NELS(dep198), dep198, NELS(dep197), dep197, }, - { NELS(dep200), dep200, NELS(dep199), dep199, }, + { NELS(dep189), dep189, NELS(dep192), dep192, }, + { NELS(dep194), dep194, NELS(dep193), dep193, }, + { NELS(dep196), dep196, NELS(dep195), dep195, }, + { NELS(dep197), dep197, NELS(dep195), dep195, }, + { NELS(dep198), dep198, NELS(dep0), dep0, }, + { NELS(dep199), dep199, NELS(dep51), dep51, }, + { NELS(dep200), dep200, NELS(dep51), dep51, }, { NELS(dep202), dep202, NELS(dep201), dep201, }, - { NELS(dep204), dep204, NELS(dep203), dep203, }, - { NELS(dep205), dep205, NELS(dep0), dep0, }, - { NELS(dep206), dep206, NELS(dep0), dep0, }, - { NELS(dep207), dep207, NELS(dep0), dep0, }, - { NELS(dep208), dep208, NELS(dep34), dep34, }, - { NELS(dep209), dep209, NELS(dep34), dep34, }, - { NELS(dep210), dep210, NELS(dep197), dep197, }, - { NELS(dep211), dep211, NELS(dep0), dep0, }, - { NELS(dep212), dep212, NELS(dep0), dep0, }, - { NELS(dep214), dep214, NELS(dep213), dep213, }, - { NELS(dep215), dep215, NELS(dep213), dep213, }, - { NELS(dep216), dep216, NELS(dep0), dep0, }, - { NELS(dep214), dep214, NELS(dep217), dep217, }, - { NELS(dep219), dep219, NELS(dep218), dep218, }, - { NELS(dep221), dep221, NELS(dep220), dep220, }, - { NELS(dep223), dep223, NELS(dep222), dep222, }, - { NELS(dep224), dep224, NELS(dep222), dep222, }, - { NELS(dep225), dep225, NELS(dep0), dep0, }, - { NELS(dep226), dep226, NELS(dep65), dep65, }, - { NELS(dep227), dep227, NELS(dep65), dep65, }, - { NELS(dep229), dep229, NELS(dep228), dep228, }, - { NELS(dep230), dep230, NELS(dep228), dep228, }, - { NELS(dep229), dep229, NELS(dep231), dep231, }, - { NELS(dep232), dep232, NELS(dep34), dep34, }, - { NELS(dep233), dep233, NELS(dep34), dep34, }, - { NELS(dep234), dep234, NELS(dep0), dep0, }, - { NELS(dep235), dep235, NELS(dep0), dep0, }, - { NELS(dep236), dep236, NELS(dep34), dep34, }, - { NELS(dep237), dep237, NELS(dep15), dep15, }, - { NELS(dep239), dep239, NELS(dep238), dep238, }, + { NELS(dep203), dep203, NELS(dep201), dep201, }, + { NELS(dep202), dep202, NELS(dep204), dep204, }, + { NELS(dep206), dep206, NELS(dep205), dep205, }, + { NELS(dep207), dep207, 0, NULL, }, + { NELS(dep208), dep208, 0, NULL, }, + { NELS(dep209), dep209, NELS(dep0), dep0, }, + { NELS(dep210), dep210, NELS(dep0), dep0, }, + { NELS(dep211), dep211, NELS(dep13), dep13, }, + { NELS(dep213), dep213, NELS(dep212), dep212, }, }; static const struct ia64_completer_table @@ -1661,141 +1462,141 @@ completer_table[] = { { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 1 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 91 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 85 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, 417, -1, 0, 1, 8 }, - { 0x0, 0x0, 0, 480, -1, 0, 1, 19 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 148 }, - { 0x0, 0x0, 0, 579, -1, 0, 1, 19 }, - { 0x0, 0x0, 0, 1739, -1, 0, 1, 12 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 11 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 74 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 74 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 15 }, + { 0x0, 0x0, 0, 417, -1, 0, 1, 9 }, + { 0x0, 0x0, 0, 480, -1, 0, 1, 20 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 140 }, + { 0x0, 0x0, 0, 579, -1, 0, 1, 20 }, + { 0x0, 0x0, 0, 1739, -1, 0, 1, 13 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 12 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 63 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 63 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 16 }, { 0x1, 0x1, 0, -1, -1, 13, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 35 }, - { 0x0, 0x0, 0, 1912, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 35 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 35 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 125 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 46 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 42 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 81 }, - { 0x0, 0x0, 0, 1779, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, 1955, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, 1783, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 35 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 35 }, - { 0x0, 0x0, 0, 1785, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, 1964, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, 1967, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 35 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 35 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 35 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, 1985, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 35 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 35 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, 1988, -1, 0, 1, 31 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 0, 1912, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 118 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 41 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 37 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 75 }, + { 0x0, 0x0, 0, 1779, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, 1955, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, 1783, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 0, 1785, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, 1964, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, 1967, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, - { 0x0, 0x0, 0, 1991, -1, 0, 1, 68 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 35 }, + { 0x0, 0x0, 0, 1985, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, 1988, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, 1991, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 32 }, + { 0x0, 0x0, 0, 1997, -1, 0, 1, 26 }, + { 0x0, 0x0, 0, 1118, -1, 0, 1, 30 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 37 }, - { 0x0, 0x0, 0, 1997, -1, 0, 1, 31 }, - { 0x0, 0x0, 0, 1118, -1, 0, 1, 35 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 42 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 35 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 80 }, - { 0x0, 0x0, 0, 1151, -1, 0, 1, 127 }, - { 0x0, 0x0, 0, 1160, -1, 0, 1, 127 }, - { 0x0, 0x0, 0, 1169, -1, 0, 1, 127 }, - { 0x0, 0x0, 0, 1178, -1, 0, 1, 127 }, - { 0x0, 0x0, 0, 1187, -1, 0, 1, 127 }, - { 0x0, 0x0, 0, 1196, -1, 0, 1, 127 }, - { 0x0, 0x0, 0, 1205, -1, 0, 1, 127 }, - { 0x0, 0x0, 0, 1214, -1, 0, 1, 127 }, - { 0x0, 0x0, 0, 1223, -1, 0, 1, 127 }, - { 0x0, 0x0, 0, 1233, -1, 0, 1, 127 }, - { 0x0, 0x0, 0, 1243, -1, 0, 1, 127 }, - { 0x0, 0x0, 0, 1253, -1, 0, 1, 127 }, - { 0x0, 0x0, 0, 1262, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1268, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1274, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1280, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1286, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1292, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1298, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1304, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1310, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1316, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1322, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1328, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1334, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1340, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1346, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1352, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1358, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1364, -1, 0, 1, 138 }, - { 0x0, 0x0, 0, 1368, -1, 0, 1, 143 }, - { 0x0, 0x0, 0, 1372, -1, 0, 1, 145 }, - { 0x0, 0x0, 0, 1376, -1, 0, 1, 145 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 82 }, - { 0x0, 0x0, 0, 250, -1, 0, 1, 42 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 74 }, + { 0x0, 0x0, 0, 1151, -1, 0, 1, 120 }, + { 0x0, 0x0, 0, 1160, -1, 0, 1, 120 }, + { 0x0, 0x0, 0, 1169, -1, 0, 1, 120 }, + { 0x0, 0x0, 0, 1178, -1, 0, 1, 120 }, + { 0x0, 0x0, 0, 1187, -1, 0, 1, 120 }, + { 0x0, 0x0, 0, 1196, -1, 0, 1, 120 }, + { 0x0, 0x0, 0, 1205, -1, 0, 1, 120 }, + { 0x0, 0x0, 0, 1214, -1, 0, 1, 120 }, + { 0x0, 0x0, 0, 1223, -1, 0, 1, 120 }, + { 0x0, 0x0, 0, 1233, -1, 0, 1, 120 }, + { 0x0, 0x0, 0, 1243, -1, 0, 1, 120 }, + { 0x0, 0x0, 0, 1253, -1, 0, 1, 120 }, + { 0x0, 0x0, 0, 1262, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1268, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1274, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1280, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1286, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1292, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1298, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1304, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1310, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1316, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1322, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1328, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1334, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1340, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1346, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1352, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1358, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1364, -1, 0, 1, 130 }, + { 0x0, 0x0, 0, 1368, -1, 0, 1, 136 }, + { 0x0, 0x0, 0, 1372, -1, 0, 1, 138 }, + { 0x0, 0x0, 0, 1376, -1, 0, 1, 138 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 76 }, + { 0x0, 0x0, 0, 250, -1, 0, 1, 37 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 1 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 1 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 35 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 70 }, - { 0x1, 0x1, 0, 933, -1, 20, 1, 70 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 71 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 72 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 73 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 74 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 75 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 3 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 59 }, + { 0x1, 0x1, 0, 933, -1, 20, 1, 59 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 60 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 61 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 62 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 63 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 64 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 83 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 84 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 86 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 87 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 88 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 89 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 90 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 92 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 93 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 94 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 95 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 100 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 96 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 97 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 98 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 101 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 102 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 103 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 104 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 105 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 106 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 109 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 110 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 111 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 112 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 113 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 114 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 115 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 116 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 149 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 149 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 149 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 74 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 107 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 108 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 141 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 141 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 141 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 63 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 148 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 140 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, { 0x0, 0x0, 0, 2283, -1, 0, 1, 0 }, @@ -1809,23 +1610,23 @@ completer_table[] = { { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, { 0x0, 0x0, 0, 2298, -1, 0, 1, 0 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, 2299, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, 2300, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, 2301, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, 2302, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, 2285, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, 2286, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 13 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 87 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 86 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 2299, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 2300, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 2301, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 2302, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 2285, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 2286, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 14 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 81 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 80 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, @@ -1833,116 +1634,116 @@ completer_table[] = { { 0x1, 0x1, 0, -1, -1, 13, 1, 0 }, { 0x0, 0x0, 0, 2304, -1, 0, 1, 0 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 87 }, - { 0x0, 0x0, 0, 1640, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1642, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1644, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1646, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1648, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1650, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1653, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1656, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1659, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1660, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1661, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1662, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1663, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1664, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1665, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, 1666, -1, 0, 1, 133 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 85 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 123 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 121 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 123 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 122 }, - { 0x0, 0x0, 0, 1377, -1, 0, 1, 136 }, - { 0x0, 0x0, 0, 1378, -1, 0, 1, 136 }, - { 0x0, 0x0, 0, 1379, -1, 0, 1, 136 }, - { 0x0, 0x0, 0, 1380, -1, 0, 1, 136 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 81 }, + { 0x0, 0x0, 0, 1640, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1642, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1644, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1646, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1648, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1650, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1653, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1656, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1659, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1660, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1661, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1662, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1663, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1664, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1665, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1666, -1, 0, 1, 2 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, { 0x0, 0x0, 0, -1, -1, 0, 1, 0 }, - { 0x0, 0x0, 1, 217, -1, 0, 1, 14 }, - { 0x1, 0x1, 2, -1, -1, 27, 1, 14 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 79 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 116 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 113 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 115 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 114 }, + { 0x0, 0x0, 0, 1377, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1378, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1379, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, 1380, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 1 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 1 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, + { 0x0, 0x0, 0, -1, -1, 0, 1, 2 }, + { 0x0, 0x0, 1, 217, -1, 0, 1, 15 }, + { 0x1, 0x1, 2, -1, -1, 27, 1, 15 }, { 0x0, 0x0, 3, -1, 1062, 0, 0, -1 }, { 0x0, 0x0, 3, -1, 1063, 0, 0, -1 }, - { 0x1, 0x1, 3, 2174, 1144, 33, 1, 129 }, - { 0x1, 0x1, 3, 2175, 1153, 33, 1, 129 }, - { 0x1, 0x1, 3, 2176, 1162, 33, 1, 129 }, - { 0x1, 0x1, 3, 2177, 1171, 33, 1, 129 }, - { 0x1, 0x1, 3, 2178, 1180, 33, 1, 129 }, - { 0x1, 0x1, 3, 2179, 1189, 33, 1, 129 }, - { 0x1, 0x1, 3, 2180, 1198, 33, 1, 129 }, - { 0x1, 0x1, 3, 2181, 1207, 33, 1, 129 }, - { 0x1, 0x1, 3, 2182, 1216, 33, 1, 129 }, - { 0x1, 0x1, 3, 2183, 1225, 33, 1, 129 }, - { 0x1, 0x1, 3, 2184, 1235, 33, 1, 129 }, - { 0x1, 0x1, 3, 2185, 1245, 33, 1, 129 }, - { 0x1, 0x1, 3, 2186, 1258, 33, 1, 140 }, - { 0x1, 0x1, 3, 2187, 1264, 33, 1, 140 }, - { 0x1, 0x1, 3, 2188, 1270, 33, 1, 140 }, - { 0x1, 0x1, 3, 2189, 1276, 33, 1, 140 }, - { 0x1, 0x1, 3, 2190, 1282, 33, 1, 140 }, - { 0x1, 0x1, 3, 2191, 1288, 33, 1, 140 }, - { 0x1, 0x1, 3, 2192, 1294, 33, 1, 140 }, - { 0x1, 0x1, 3, 2193, 1300, 33, 1, 140 }, - { 0x1, 0x1, 3, 2194, 1306, 33, 1, 140 }, - { 0x1, 0x1, 3, 2195, 1312, 33, 1, 140 }, - { 0x1, 0x1, 3, 2196, 1318, 33, 1, 140 }, - { 0x1, 0x1, 3, 2197, 1324, 33, 1, 140 }, - { 0x1, 0x1, 3, 2198, 1330, 33, 1, 140 }, - { 0x1, 0x1, 3, 2199, 1336, 33, 1, 140 }, - { 0x1, 0x1, 3, 2200, 1342, 33, 1, 140 }, - { 0x1, 0x1, 3, 2201, 1348, 33, 1, 140 }, - { 0x1, 0x1, 3, 2202, 1354, 33, 1, 140 }, - { 0x1, 0x1, 3, 2203, 1360, 33, 1, 140 }, - { 0x1, 0x1, 3, -1, -1, 27, 1, 42 }, - { 0x0, 0x0, 4, 1753, 1131, 0, 1, 135 }, - { 0x0, 0x0, 4, 1754, 1133, 0, 1, 135 }, - { 0x0, 0x0, 4, 1755, 1135, 0, 1, 135 }, - { 0x0, 0x0, 4, 1756, 1137, 0, 1, 135 }, - { 0x0, 0x0, 4, 1757, 1139, 0, 1, 136 }, - { 0x0, 0x0, 4, 1758, 1141, 0, 1, 136 }, - { 0x1, 0x1, 4, -1, 1148, 33, 1, 132 }, - { 0x5, 0x5, 4, 375, 1147, 32, 1, 127 }, - { 0x1, 0x1, 4, -1, 1157, 33, 1, 132 }, - { 0x5, 0x5, 4, 376, 1156, 32, 1, 127 }, - { 0x1, 0x1, 4, -1, 1166, 33, 1, 132 }, - { 0x5, 0x5, 4, 377, 1165, 32, 1, 127 }, - { 0x1, 0x1, 4, -1, 1175, 33, 1, 132 }, - { 0x5, 0x5, 4, 378, 1174, 32, 1, 127 }, - { 0x1, 0x1, 4, -1, 1184, 33, 1, 132 }, - { 0x5, 0x5, 4, 379, 1183, 32, 1, 127 }, - { 0x1, 0x1, 4, -1, 1193, 33, 1, 132 }, - { 0x5, 0x5, 4, 380, 1192, 32, 1, 127 }, - { 0x1, 0x1, 4, -1, 1202, 33, 1, 132 }, - { 0x5, 0x5, 4, 381, 1201, 32, 1, 127 }, - { 0x1, 0x1, 4, -1, 1211, 33, 1, 132 }, - { 0x5, 0x5, 4, 382, 1210, 32, 1, 127 }, - { 0x1, 0x1, 4, -1, 1220, 33, 1, 132 }, - { 0x5, 0x5, 4, 383, 1219, 32, 1, 127 }, - { 0x1, 0x1, 4, -1, 1230, 33, 1, 132 }, - { 0x5, 0x5, 4, 849, 1228, 32, 1, 127 }, - { 0x1, 0x1, 4, -1, 1240, 33, 1, 132 }, - { 0x5, 0x5, 4, 850, 1238, 32, 1, 127 }, - { 0x1, 0x1, 4, -1, 1250, 33, 1, 132 }, - { 0x5, 0x5, 4, 851, 1248, 32, 1, 127 }, - { 0x1, 0x21, 10, 1675, -1, 33, 1, 5 }, - { 0x200001, 0x200001, 10, 1676, -1, 12, 1, 5 }, - { 0x0, 0x0, 10, 1677, -1, 0, 1, 5 }, - { 0x1, 0x1, 10, 1678, -1, 12, 1, 5 }, - { 0x1, 0x1, 10, 1679, -1, 33, 1, 5 }, - { 0x200001, 0x200001, 10, 1680, -1, 12, 1, 5 }, - { 0x1, 0x21, 10, 1681, -1, 33, 1, 5 }, - { 0x200001, 0x200001, 10, 1682, -1, 12, 1, 5 }, + { 0x1, 0x1, 3, 2174, 1144, 33, 1, 122 }, + { 0x1, 0x1, 3, 2175, 1153, 33, 1, 122 }, + { 0x1, 0x1, 3, 2176, 1162, 33, 1, 122 }, + { 0x1, 0x1, 3, 2177, 1171, 33, 1, 122 }, + { 0x1, 0x1, 3, 2178, 1180, 33, 1, 122 }, + { 0x1, 0x1, 3, 2179, 1189, 33, 1, 122 }, + { 0x1, 0x1, 3, 2180, 1198, 33, 1, 122 }, + { 0x1, 0x1, 3, 2181, 1207, 33, 1, 122 }, + { 0x1, 0x1, 3, 2182, 1216, 33, 1, 122 }, + { 0x1, 0x1, 3, 2183, 1225, 33, 1, 122 }, + { 0x1, 0x1, 3, 2184, 1235, 33, 1, 122 }, + { 0x1, 0x1, 3, 2185, 1245, 33, 1, 122 }, + { 0x1, 0x1, 3, 2186, 1258, 33, 1, 132 }, + { 0x1, 0x1, 3, 2187, 1264, 33, 1, 132 }, + { 0x1, 0x1, 3, 2188, 1270, 33, 1, 132 }, + { 0x1, 0x1, 3, 2189, 1276, 33, 1, 132 }, + { 0x1, 0x1, 3, 2190, 1282, 33, 1, 132 }, + { 0x1, 0x1, 3, 2191, 1288, 33, 1, 132 }, + { 0x1, 0x1, 3, 2192, 1294, 33, 1, 132 }, + { 0x1, 0x1, 3, 2193, 1300, 33, 1, 132 }, + { 0x1, 0x1, 3, 2194, 1306, 33, 1, 132 }, + { 0x1, 0x1, 3, 2195, 1312, 33, 1, 132 }, + { 0x1, 0x1, 3, 2196, 1318, 33, 1, 132 }, + { 0x1, 0x1, 3, 2197, 1324, 33, 1, 132 }, + { 0x1, 0x1, 3, 2198, 1330, 33, 1, 132 }, + { 0x1, 0x1, 3, 2199, 1336, 33, 1, 132 }, + { 0x1, 0x1, 3, 2200, 1342, 33, 1, 132 }, + { 0x1, 0x1, 3, 2201, 1348, 33, 1, 132 }, + { 0x1, 0x1, 3, 2202, 1354, 33, 1, 132 }, + { 0x1, 0x1, 3, 2203, 1360, 33, 1, 132 }, + { 0x1, 0x1, 3, -1, -1, 27, 1, 37 }, + { 0x0, 0x0, 4, 1753, 1131, 0, 1, 127 }, + { 0x0, 0x0, 4, 1754, 1133, 0, 1, 127 }, + { 0x0, 0x0, 4, 1755, 1135, 0, 1, 127 }, + { 0x0, 0x0, 4, 1756, 1137, 0, 1, 127 }, + { 0x0, 0x0, 4, 1757, 1139, 0, 1, 128 }, + { 0x0, 0x0, 4, 1758, 1141, 0, 1, 128 }, + { 0x1, 0x1, 4, -1, 1148, 33, 1, 125 }, + { 0x5, 0x5, 4, 375, 1147, 32, 1, 120 }, + { 0x1, 0x1, 4, -1, 1157, 33, 1, 125 }, + { 0x5, 0x5, 4, 376, 1156, 32, 1, 120 }, + { 0x1, 0x1, 4, -1, 1166, 33, 1, 125 }, + { 0x5, 0x5, 4, 377, 1165, 32, 1, 120 }, + { 0x1, 0x1, 4, -1, 1175, 33, 1, 125 }, + { 0x5, 0x5, 4, 378, 1174, 32, 1, 120 }, + { 0x1, 0x1, 4, -1, 1184, 33, 1, 125 }, + { 0x5, 0x5, 4, 379, 1183, 32, 1, 120 }, + { 0x1, 0x1, 4, -1, 1193, 33, 1, 125 }, + { 0x5, 0x5, 4, 380, 1192, 32, 1, 120 }, + { 0x1, 0x1, 4, -1, 1202, 33, 1, 125 }, + { 0x5, 0x5, 4, 381, 1201, 32, 1, 120 }, + { 0x1, 0x1, 4, -1, 1211, 33, 1, 125 }, + { 0x5, 0x5, 4, 382, 1210, 32, 1, 120 }, + { 0x1, 0x1, 4, -1, 1220, 33, 1, 125 }, + { 0x5, 0x5, 4, 383, 1219, 32, 1, 120 }, + { 0x1, 0x1, 4, -1, 1230, 33, 1, 125 }, + { 0x5, 0x5, 4, 849, 1228, 32, 1, 120 }, + { 0x1, 0x1, 4, -1, 1240, 33, 1, 125 }, + { 0x5, 0x5, 4, 850, 1238, 32, 1, 120 }, + { 0x1, 0x1, 4, -1, 1250, 33, 1, 125 }, + { 0x5, 0x5, 4, 851, 1248, 32, 1, 120 }, + { 0x1, 0x21, 10, 1675, -1, 33, 1, 6 }, + { 0x200001, 0x200001, 10, 1676, -1, 12, 1, 6 }, + { 0x0, 0x0, 10, 1677, -1, 0, 1, 6 }, + { 0x1, 0x1, 10, 1678, -1, 12, 1, 6 }, + { 0x1, 0x1, 10, 1679, -1, 33, 1, 6 }, + { 0x200001, 0x200001, 10, 1680, -1, 12, 1, 6 }, + { 0x1, 0x21, 10, 1681, -1, 33, 1, 6 }, + { 0x200001, 0x200001, 10, 1682, -1, 12, 1, 6 }, { 0x0, 0x0, 10, -1, 1703, 0, 0, -1 }, { 0x0, 0x0, 10, -1, 1704, 0, 0, -1 }, { 0x0, 0x0, 10, -1, 1705, 0, 0, -1 }, @@ -1951,14 +1752,14 @@ completer_table[] = { { 0x0, 0x0, 10, -1, 1708, 0, 0, -1 }, { 0x0, 0x0, 10, -1, 1709, 0, 0, -1 }, { 0x0, 0x0, 10, -1, 1710, 0, 0, -1 }, - { 0x1, 0x21, 10, 1683, -1, 33, 1, 5 }, - { 0x200001, 0x200001, 10, 1684, -1, 12, 1, 5 }, - { 0x0, 0x0, 10, 1685, -1, 0, 1, 5 }, - { 0x1, 0x1, 10, 1686, -1, 12, 1, 5 }, - { 0x1, 0x1, 10, 1687, -1, 33, 1, 5 }, - { 0x200001, 0x200001, 10, 1688, -1, 12, 1, 5 }, - { 0x1, 0x21, 10, 1689, -1, 33, 1, 5 }, - { 0x200001, 0x200001, 10, 1690, -1, 12, 1, 5 }, + { 0x1, 0x21, 10, 1683, -1, 33, 1, 6 }, + { 0x200001, 0x200001, 10, 1684, -1, 12, 1, 6 }, + { 0x0, 0x0, 10, 1685, -1, 0, 1, 6 }, + { 0x1, 0x1, 10, 1686, -1, 12, 1, 6 }, + { 0x1, 0x1, 10, 1687, -1, 33, 1, 6 }, + { 0x200001, 0x200001, 10, 1688, -1, 12, 1, 6 }, + { 0x1, 0x21, 10, 1689, -1, 33, 1, 6 }, + { 0x200001, 0x200001, 10, 1690, -1, 12, 1, 6 }, { 0x0, 0x0, 10, -1, 1719, 0, 0, -1 }, { 0x0, 0x0, 10, -1, 1720, 0, 0, -1 }, { 0x0, 0x0, 10, -1, 1721, 0, 0, -1 }, @@ -1967,68 +1768,68 @@ completer_table[] = { { 0x0, 0x0, 10, -1, 1724, 0, 0, -1 }, { 0x0, 0x0, 10, -1, 1725, 0, 0, -1 }, { 0x0, 0x0, 10, -1, 1726, 0, 0, -1 }, - { 0x1, 0x1, 10, 1691, -1, 36, 1, 5 }, - { 0x1000001, 0x1000001, 10, 1692, -1, 12, 1, 5 }, + { 0x1, 0x1, 10, 1691, -1, 36, 1, 69 }, + { 0x1000001, 0x1000001, 10, 1692, -1, 12, 1, 69 }, { 0x0, 0x0, 10, -1, 1727, 0, 0, -1 }, { 0x0, 0x0, 10, -1, 1729, 0, 0, -1 }, - { 0x1, 0x1, 10, 1693, -1, 36, 1, 5 }, - { 0x1000001, 0x1000001, 10, 1694, -1, 12, 1, 5 }, + { 0x1, 0x1, 10, 1693, -1, 36, 1, 69 }, + { 0x1000001, 0x1000001, 10, 1694, -1, 12, 1, 69 }, { 0x0, 0x0, 10, -1, 1731, 0, 0, -1 }, { 0x0, 0x0, 10, -1, 1733, 0, 0, -1 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x0, 0x0, 11, 1695, -1, 0, 1, 5 }, - { 0x1, 0x1, 11, 1696, -1, 12, 1, 5 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x0, 0x0, 11, 1697, -1, 0, 1, 5 }, - { 0x1, 0x1, 11, 1698, -1, 12, 1, 5 }, - { 0x1, 0x1, 11, 1699, -1, 33, 1, 5 }, - { 0x200001, 0x200001, 11, 1700, -1, 12, 1, 5 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x0, 0x0, 11, 1701, -1, 0, 1, 5 }, - { 0x1, 0x1, 11, 1702, -1, 12, 1, 5 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x0, 0x0, 11, 1711, -1, 0, 1, 5 }, - { 0x1, 0x1, 11, 1712, -1, 12, 1, 5 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x0, 0x0, 11, 1713, -1, 0, 1, 5 }, - { 0x1, 0x1, 11, 1714, -1, 12, 1, 5 }, - { 0x1, 0x1, 11, 1715, -1, 33, 1, 5 }, - { 0x200001, 0x200001, 11, 1716, -1, 12, 1, 5 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x2, 0x3, 11, -1, -1, 37, 1, 7 }, - { 0x0, 0x0, 11, 1717, -1, 0, 1, 5 }, - { 0x1, 0x1, 11, 1718, -1, 12, 1, 5 }, - { 0x1, 0x1, 11, -1, -1, 36, 1, 7 }, - { 0x1, 0x1, 11, -1, -1, 36, 1, 7 }, - { 0x1, 0x1, 11, 1728, -1, 36, 1, 5 }, - { 0x1000001, 0x1000001, 11, 1730, -1, 12, 1, 5 }, - { 0x1, 0x1, 11, -1, -1, 36, 1, 7 }, - { 0x1, 0x1, 11, -1, -1, 36, 1, 7 }, - { 0x1, 0x1, 11, 1732, -1, 36, 1, 5 }, - { 0x1000001, 0x1000001, 11, 1734, -1, 12, 1, 5 }, - { 0x0, 0x0, 12, -1, -1, 0, 1, 16 }, - { 0x0, 0x0, 12, -1, -1, 0, 1, 16 }, - { 0x1, 0x1, 13, 258, 1146, 34, 1, 127 }, - { 0x1, 0x1, 13, 260, 1155, 34, 1, 127 }, - { 0x1, 0x1, 13, 262, 1164, 34, 1, 127 }, - { 0x1, 0x1, 13, 264, 1173, 34, 1, 127 }, - { 0x1, 0x1, 13, 266, 1182, 34, 1, 127 }, - { 0x1, 0x1, 13, 268, 1191, 34, 1, 127 }, - { 0x1, 0x1, 13, 270, 1200, 34, 1, 127 }, - { 0x1, 0x1, 13, 272, 1209, 34, 1, 127 }, - { 0x1, 0x1, 13, 274, 1218, 34, 1, 127 }, - { 0x1, 0x1, 13, 276, 1227, 34, 1, 127 }, - { 0x1, 0x1, 13, 278, 1237, 34, 1, 127 }, - { 0x1, 0x1, 13, 280, 1247, 34, 1, 127 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x0, 0x0, 11, 1695, -1, 0, 1, 6 }, + { 0x1, 0x1, 11, 1696, -1, 12, 1, 6 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x0, 0x0, 11, 1697, -1, 0, 1, 6 }, + { 0x1, 0x1, 11, 1698, -1, 12, 1, 6 }, + { 0x1, 0x1, 11, 1699, -1, 33, 1, 6 }, + { 0x200001, 0x200001, 11, 1700, -1, 12, 1, 6 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x0, 0x0, 11, 1701, -1, 0, 1, 6 }, + { 0x1, 0x1, 11, 1702, -1, 12, 1, 6 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x0, 0x0, 11, 1711, -1, 0, 1, 6 }, + { 0x1, 0x1, 11, 1712, -1, 12, 1, 6 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x0, 0x0, 11, 1713, -1, 0, 1, 6 }, + { 0x1, 0x1, 11, 1714, -1, 12, 1, 6 }, + { 0x1, 0x1, 11, 1715, -1, 33, 1, 6 }, + { 0x200001, 0x200001, 11, 1716, -1, 12, 1, 6 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x2, 0x3, 11, -1, -1, 37, 1, 8 }, + { 0x0, 0x0, 11, 1717, -1, 0, 1, 6 }, + { 0x1, 0x1, 11, 1718, -1, 12, 1, 6 }, + { 0x1, 0x1, 11, -1, -1, 36, 1, 71 }, + { 0x1, 0x1, 11, -1, -1, 36, 1, 71 }, + { 0x1, 0x1, 11, 1728, -1, 36, 1, 69 }, + { 0x1000001, 0x1000001, 11, 1730, -1, 12, 1, 69 }, + { 0x1, 0x1, 11, -1, -1, 36, 1, 71 }, + { 0x1, 0x1, 11, -1, -1, 36, 1, 71 }, + { 0x1, 0x1, 11, 1732, -1, 36, 1, 69 }, + { 0x1000001, 0x1000001, 11, 1734, -1, 12, 1, 69 }, + { 0x0, 0x0, 12, -1, -1, 0, 1, 17 }, + { 0x0, 0x0, 12, -1, -1, 0, 1, 17 }, + { 0x1, 0x1, 13, 258, 1146, 34, 1, 120 }, + { 0x1, 0x1, 13, 260, 1155, 34, 1, 120 }, + { 0x1, 0x1, 13, 262, 1164, 34, 1, 120 }, + { 0x1, 0x1, 13, 264, 1173, 34, 1, 120 }, + { 0x1, 0x1, 13, 266, 1182, 34, 1, 120 }, + { 0x1, 0x1, 13, 268, 1191, 34, 1, 120 }, + { 0x1, 0x1, 13, 270, 1200, 34, 1, 120 }, + { 0x1, 0x1, 13, 272, 1209, 34, 1, 120 }, + { 0x1, 0x1, 13, 274, 1218, 34, 1, 120 }, + { 0x1, 0x1, 13, 276, 1227, 34, 1, 120 }, + { 0x1, 0x1, 13, 278, 1237, 34, 1, 120 }, + { 0x1, 0x1, 13, 280, 1247, 34, 1, 120 }, { 0x0, 0x0, 19, -1, 618, 0, 0, -1 }, { 0x0, 0x0, 19, -1, 619, 0, 0, -1 }, { 0x0, 0x0, 19, -1, 620, 0, 0, -1 }, @@ -2069,25 +1870,13 @@ completer_table[] = { { 0x0, 0x0, 21, 655, 2266, 0, 0, -1 }, { 0x0, 0x0, 23, -1, 2262, 0, 0, -1 }, { 0x0, 0x0, 23, -1, 2263, 0, 0, -1 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, 995, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, + { 0x1, 0x1, 24, 995, -1, 35, 1, 9 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, @@ -2096,14 +1885,6 @@ completer_table[] = { { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 8 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, @@ -2116,49 +1897,45 @@ completer_table[] = { { 0x1, 0x1, 24, -1, -1, 35, 1, 10 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 10 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 10 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 9 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 10 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 10 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 10 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 10 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 17 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 17 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 17 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 17 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 17 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 17 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 17 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 17 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 17 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 17 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 17 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 17 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, 1016, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 11 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 11 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 11 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 11 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 11 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 11 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 11 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 11 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 11 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 11 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 11 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 11 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 18 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 18 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 18 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 18 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 18 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 18 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 18 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 18 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 18 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 18 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 18 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 18 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, 1016, -1, 35, 1, 20 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, @@ -2195,18 +1972,18 @@ completer_table[] = { { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 21 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 22 }, @@ -2231,33 +2008,6 @@ completer_table[] = { { 0x1, 0x1, 24, -1, -1, 35, 1, 23 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 23 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 23 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, 1049, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, - { 0x1, 0x1, 24, -1, -1, 35, 1, 19 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 23 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 23 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 23 }, @@ -2270,38 +2020,89 @@ completer_table[] = { { 0x1, 0x1, 24, -1, -1, 35, 1, 23 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 23 }, { 0x1, 0x1, 24, -1, -1, 35, 1, 23 }, - { 0x1, 0x1, 24, -1, -1, 33, 1, 79 }, - { 0x1, 0x1, 24, -1, -1, 33, 1, 79 }, - { 0x1, 0x1, 24, 1064, 1149, 35, 1, 132 }, - { 0x1, 0x1, 24, 1065, 1158, 35, 1, 132 }, - { 0x1, 0x1, 24, 1066, 1167, 35, 1, 132 }, - { 0x1, 0x1, 24, 1067, 1176, 35, 1, 132 }, - { 0x1, 0x1, 24, 1068, 1185, 35, 1, 132 }, - { 0x1, 0x1, 24, 1069, 1194, 35, 1, 132 }, - { 0x1, 0x1, 24, 1070, 1203, 35, 1, 132 }, - { 0x1, 0x1, 24, 1071, 1212, 35, 1, 132 }, - { 0x1, 0x1, 24, 1072, 1221, 35, 1, 132 }, - { 0x1, 0x1, 24, 1073, 1231, 35, 1, 132 }, - { 0x1, 0x1, 24, 1074, 1241, 35, 1, 132 }, - { 0x1, 0x1, 24, 1075, 1251, 35, 1, 132 }, - { 0x1, 0x1, 24, 1076, 1260, 35, 1, 142 }, - { 0x1, 0x1, 24, 1077, 1266, 35, 1, 142 }, - { 0x1, 0x1, 24, 1078, 1272, 35, 1, 142 }, - { 0x1, 0x1, 24, 1079, 1278, 35, 1, 142 }, - { 0x1, 0x1, 24, 1080, 1284, 35, 1, 142 }, - { 0x1, 0x1, 24, 1081, 1290, 35, 1, 142 }, - { 0x1, 0x1, 24, 1082, 1296, 35, 1, 142 }, - { 0x1, 0x1, 24, 1083, 1302, 35, 1, 142 }, - { 0x1, 0x1, 24, 1084, 1308, 35, 1, 142 }, - { 0x1, 0x1, 24, 1085, 1314, 35, 1, 142 }, - { 0x1, 0x1, 24, 1086, 1320, 35, 1, 142 }, - { 0x1, 0x1, 24, 1087, 1326, 35, 1, 142 }, - { 0x1, 0x1, 24, 1088, 1332, 35, 1, 142 }, - { 0x1, 0x1, 24, 1089, 1338, 35, 1, 142 }, - { 0x1, 0x1, 24, 1090, 1344, 35, 1, 142 }, - { 0x1, 0x1, 24, 1091, 1350, 35, 1, 142 }, - { 0x1, 0x1, 24, 1092, 1356, 35, 1, 142 }, - { 0x1, 0x1, 24, 1093, 1362, 35, 1, 142 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, 1049, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 20 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 35, 1, 24 }, + { 0x1, 0x1, 24, -1, -1, 33, 1, 73 }, + { 0x1, 0x1, 24, -1, -1, 33, 1, 73 }, + { 0x1, 0x1, 24, 1064, 1149, 35, 1, 125 }, + { 0x1, 0x1, 24, 1065, 1158, 35, 1, 125 }, + { 0x1, 0x1, 24, 1066, 1167, 35, 1, 125 }, + { 0x1, 0x1, 24, 1067, 1176, 35, 1, 125 }, + { 0x1, 0x1, 24, 1068, 1185, 35, 1, 125 }, + { 0x1, 0x1, 24, 1069, 1194, 35, 1, 125 }, + { 0x1, 0x1, 24, 1070, 1203, 35, 1, 125 }, + { 0x1, 0x1, 24, 1071, 1212, 35, 1, 125 }, + { 0x1, 0x1, 24, 1072, 1221, 35, 1, 125 }, + { 0x1, 0x1, 24, 1073, 1231, 35, 1, 125 }, + { 0x1, 0x1, 24, 1074, 1241, 35, 1, 125 }, + { 0x1, 0x1, 24, 1075, 1251, 35, 1, 125 }, + { 0x1, 0x1, 24, 1076, 1260, 35, 1, 134 }, + { 0x1, 0x1, 24, 1077, 1266, 35, 1, 134 }, + { 0x1, 0x1, 24, 1078, 1272, 35, 1, 134 }, + { 0x1, 0x1, 24, 1079, 1278, 35, 1, 134 }, + { 0x1, 0x1, 24, 1080, 1284, 35, 1, 134 }, + { 0x1, 0x1, 24, 1081, 1290, 35, 1, 134 }, + { 0x1, 0x1, 24, 1082, 1296, 35, 1, 134 }, + { 0x1, 0x1, 24, 1083, 1302, 35, 1, 134 }, + { 0x1, 0x1, 24, 1084, 1308, 35, 1, 134 }, + { 0x1, 0x1, 24, 1085, 1314, 35, 1, 134 }, + { 0x1, 0x1, 24, 1086, 1320, 35, 1, 134 }, + { 0x1, 0x1, 24, 1087, 1326, 35, 1, 134 }, + { 0x1, 0x1, 24, 1088, 1332, 35, 1, 134 }, + { 0x1, 0x1, 24, 1089, 1338, 35, 1, 134 }, + { 0x1, 0x1, 24, 1090, 1344, 35, 1, 134 }, + { 0x1, 0x1, 24, 1091, 1350, 35, 1, 134 }, + { 0x1, 0x1, 24, 1092, 1356, 35, 1, 134 }, + { 0x1, 0x1, 24, 1093, 1362, 35, 1, 134 }, { 0x0, 0x0, 32, 2246, 2244, 0, 0, -1 }, { 0x0, 0x0, 32, 2249, 2247, 0, 0, -1 }, { 0x0, 0x0, 32, 2255, 2254, 0, 0, -1 }, @@ -2310,1754 +2111,1754 @@ completer_table[] = { { 0x0, 0x0, 32, 2273, 2272, 0, 0, -1 }, { 0x0, 0x0, 34, -1, 2265, 0, 0, -1 }, { 0x0, 0x0, 34, -1, 2267, 0, 0, -1 }, - { 0x1, 0x1, 37, -1, 1823, 37, 1, 31 }, - { 0x1, 0x1, 37, -1, 1858, 37, 1, 31 }, + { 0x1, 0x1, 37, -1, 1823, 37, 1, 26 }, + { 0x1, 0x1, 37, -1, 1858, 37, 1, 26 }, { 0x0, 0x0, 37, -1, 1861, 0, 0, -1 }, - { 0x1, 0x1, 37, -1, -1, 37, 1, 31 }, - { 0x1, 0x1, 37, -1, 1866, 37, 1, 31 }, + { 0x1, 0x1, 37, -1, -1, 37, 1, 26 }, + { 0x1, 0x1, 37, -1, 1866, 37, 1, 26 }, { 0x0, 0x0, 37, -1, 1869, 0, 0, -1 }, - { 0x1, 0x1, 37, -1, -1, 37, 1, 31 }, + { 0x1, 0x1, 37, -1, -1, 37, 1, 26 }, { 0x0, 0x0, 37, -1, 1872, 0, 0, -1 }, - { 0x1, 0x1, 37, -1, -1, 37, 1, 31 }, - { 0x1, 0x1, 37, -1, 1875, 37, 1, 31 }, - { 0x1, 0x1, 37, -1, 1878, 37, 1, 31 }, - { 0x1, 0x1, 37, -1, 1908, 37, 1, 31 }, - { 0x3, 0x3, 37, -1, -1, 30, 1, 137 }, - { 0x0, 0x0, 37, 909, -1, 0, 1, 98 }, - { 0x0, 0x0, 37, -1, -1, 0, 1, 107 }, - { 0x0, 0x0, 37, 915, -1, 0, 1, 119 }, - { 0x3, 0x3, 37, -1, -1, 30, 1, 147 }, - { 0x0, 0x0, 37, 916, -1, 0, 1, 42 }, + { 0x1, 0x1, 37, -1, -1, 37, 1, 26 }, + { 0x1, 0x1, 37, -1, 1875, 37, 1, 26 }, + { 0x1, 0x1, 37, -1, 1878, 37, 1, 26 }, + { 0x1, 0x1, 37, -1, 1908, 37, 1, 26 }, + { 0x3, 0x3, 37, -1, -1, 30, 1, 129 }, + { 0x0, 0x0, 37, 909, -1, 0, 1, 90 }, + { 0x0, 0x0, 37, -1, -1, 0, 1, 99 }, + { 0x0, 0x0, 37, 915, -1, 0, 1, 111 }, + { 0x3, 0x3, 37, -1, -1, 30, 1, 5 }, + { 0x0, 0x0, 37, 916, -1, 0, 1, 37 }, { 0x0, 0x0, 39, -1, 786, 0, 0, -1 }, { 0x0, 0x0, 39, -1, 794, 0, 0, -1 }, { 0x0, 0x0, 39, 918, 790, 0, 0, -1 }, - { 0x3, 0x3, 39, -1, 445, 33, 1, 8 }, - { 0x18000001, 0x18000001, 39, -1, 453, 6, 1, 9 }, - { 0x3, 0x3, 39, 919, 449, 33, 1, 8 }, + { 0x3, 0x3, 39, -1, 445, 33, 1, 9 }, + { 0x18000001, 0x18000001, 39, -1, 453, 6, 1, 10 }, + { 0x3, 0x3, 39, 919, 449, 33, 1, 9 }, { 0x0, 0x0, 39, -1, 798, 0, 0, -1 }, - { 0x3, 0x3, 39, -1, 465, 33, 1, 10 }, + { 0x3, 0x3, 39, -1, 465, 33, 1, 11 }, { 0x0, 0x0, 39, -1, 802, 0, 0, -1 }, - { 0x3, 0x3, 39, -1, 477, 33, 1, 17 }, + { 0x3, 0x3, 39, -1, 477, 33, 1, 18 }, { 0x0, 0x0, 39, -1, 807, 0, 0, -1 }, { 0x0, 0x0, 39, -1, 811, 0, 0, -1 }, - { 0x3, 0x3, 39, -1, 500, 33, 1, 19 }, - { 0x3, 0x3, 39, -1, 504, 33, 1, 19 }, + { 0x3, 0x3, 39, -1, 500, 33, 1, 20 }, + { 0x3, 0x3, 39, -1, 504, 33, 1, 20 }, { 0x0, 0x0, 39, -1, 815, 0, 0, -1 }, { 0x0, 0x0, 39, -1, 819, 0, 0, -1 }, - { 0x3, 0x3, 39, -1, 524, 33, 1, 20 }, - { 0x18000001, 0x18000001, 39, -1, 528, 6, 1, 20 }, + { 0x3, 0x3, 39, -1, 524, 33, 1, 21 }, + { 0x18000001, 0x18000001, 39, -1, 528, 6, 1, 21 }, { 0x0, 0x0, 39, -1, 823, 0, 0, -1 }, - { 0x3, 0x3, 39, -1, 540, 33, 1, 21 }, + { 0x3, 0x3, 39, -1, 540, 33, 1, 22 }, { 0x0, 0x0, 39, -1, 827, 0, 0, -1 }, { 0x0, 0x0, 39, -1, 831, 0, 0, -1 }, - { 0x3, 0x3, 39, -1, 560, 33, 1, 22 }, - { 0x18000001, 0x18000001, 39, -1, 564, 6, 1, 22 }, + { 0x3, 0x3, 39, -1, 560, 33, 1, 23 }, + { 0x18000001, 0x18000001, 39, -1, 564, 6, 1, 23 }, { 0x0, 0x0, 39, -1, 835, 0, 0, -1 }, - { 0x3, 0x3, 39, -1, 576, 33, 1, 23 }, + { 0x3, 0x3, 39, -1, 576, 33, 1, 24 }, { 0x0, 0x0, 39, -1, 840, 0, 0, -1 }, { 0x0, 0x0, 39, -1, 844, 0, 0, -1 }, - { 0x3, 0x3, 39, -1, 599, 33, 1, 19 }, - { 0x3, 0x3, 39, -1, 603, 33, 1, 19 }, + { 0x3, 0x3, 39, -1, 599, 33, 1, 20 }, + { 0x3, 0x3, 39, -1, 603, 33, 1, 20 }, { 0x0, 0x0, 39, -1, 848, 0, 0, -1 }, - { 0x3, 0x3, 39, -1, 615, 33, 1, 23 }, + { 0x3, 0x3, 39, -1, 615, 33, 1, 24 }, { 0x0, 0x0, 40, 674, 785, 0, 0, -1 }, { 0x0, 0x0, 40, 675, 793, 0, 0, -1 }, { 0x0, 0x0, 40, 676, 789, 0, 0, -1 }, - { 0x1, 0x1, 40, 677, 444, 34, 1, 8 }, - { 0x10000001, 0x10000001, 40, 678, 452, 6, 1, 9 }, - { 0x1, 0x1, 40, 679, 448, 34, 1, 8 }, + { 0x1, 0x1, 40, 677, 444, 34, 1, 9 }, + { 0x10000001, 0x10000001, 40, 678, 452, 6, 1, 10 }, + { 0x1, 0x1, 40, 679, 448, 34, 1, 9 }, { 0x0, 0x0, 40, 680, 797, 0, 0, -1 }, - { 0x1, 0x1, 40, 681, 464, 34, 1, 10 }, + { 0x1, 0x1, 40, 681, 464, 34, 1, 11 }, { 0x0, 0x0, 40, 682, 801, 0, 0, -1 }, - { 0x1, 0x1, 40, 683, 476, 34, 1, 17 }, + { 0x1, 0x1, 40, 683, 476, 34, 1, 18 }, { 0x0, 0x0, 40, 684, 806, 0, 0, -1 }, { 0x0, 0x0, 40, 685, 810, 0, 0, -1 }, - { 0x1, 0x1, 40, 686, 499, 34, 1, 19 }, - { 0x1, 0x1, 40, 687, 503, 34, 1, 19 }, + { 0x1, 0x1, 40, 686, 499, 34, 1, 20 }, + { 0x1, 0x1, 40, 687, 503, 34, 1, 20 }, { 0x0, 0x0, 40, 688, 814, 0, 0, -1 }, { 0x0, 0x0, 40, 689, 818, 0, 0, -1 }, - { 0x1, 0x1, 40, 690, 523, 34, 1, 20 }, - { 0x10000001, 0x10000001, 40, 691, 527, 6, 1, 20 }, + { 0x1, 0x1, 40, 690, 523, 34, 1, 21 }, + { 0x10000001, 0x10000001, 40, 691, 527, 6, 1, 21 }, { 0x0, 0x0, 40, 692, 822, 0, 0, -1 }, - { 0x1, 0x1, 40, 693, 539, 34, 1, 21 }, + { 0x1, 0x1, 40, 693, 539, 34, 1, 22 }, { 0x0, 0x0, 40, 694, 826, 0, 0, -1 }, { 0x0, 0x0, 40, 695, 830, 0, 0, -1 }, - { 0x1, 0x1, 40, 696, 559, 34, 1, 22 }, - { 0x10000001, 0x10000001, 40, 697, 563, 6, 1, 22 }, + { 0x1, 0x1, 40, 696, 559, 34, 1, 23 }, + { 0x10000001, 0x10000001, 40, 697, 563, 6, 1, 23 }, { 0x0, 0x0, 40, 698, 834, 0, 0, -1 }, - { 0x1, 0x1, 40, 699, 575, 34, 1, 23 }, + { 0x1, 0x1, 40, 699, 575, 34, 1, 24 }, { 0x0, 0x0, 40, 700, 839, 0, 0, -1 }, { 0x0, 0x0, 40, 701, 843, 0, 0, -1 }, - { 0x1, 0x1, 40, 702, 598, 34, 1, 19 }, - { 0x1, 0x1, 40, 703, 602, 34, 1, 19 }, + { 0x1, 0x1, 40, 702, 598, 34, 1, 20 }, + { 0x1, 0x1, 40, 703, 602, 34, 1, 20 }, { 0x0, 0x0, 40, 704, 847, 0, 0, -1 }, - { 0x1, 0x1, 40, 705, 614, 34, 1, 23 }, - { 0x800001, 0x800001, 40, -1, 923, 4, 1, 18 }, - { 0x1, 0x1, 40, 1769, 921, 4, 1, 18 }, - { 0x1, 0x1, 40, 771, 926, 4, 1, 24 }, - { 0x2, 0x3, 40, -1, 931, 20, 1, 70 }, - { 0x1, 0x1, 40, 1770, 929, 21, 1, 70 }, - { 0x0, 0x0, 41, -1, -1, 0, 1, 83 }, - { 0x0, 0x0, 41, -1, -1, 0, 1, 83 }, - { 0x0, 0x0, 41, -1, -1, 0, 1, 126 }, - { 0x1, 0x1, 43, 1094, 281, 38, 1, 3 }, + { 0x1, 0x1, 40, 705, 614, 34, 1, 24 }, + { 0x800001, 0x800001, 40, -1, 923, 4, 1, 19 }, + { 0x1, 0x1, 40, 1769, 921, 4, 1, 19 }, + { 0x1, 0x1, 40, 771, 926, 4, 1, 2 }, + { 0x2, 0x3, 40, -1, 931, 20, 1, 59 }, + { 0x1, 0x1, 40, 1770, 929, 21, 1, 59 }, + { 0x0, 0x0, 41, -1, -1, 0, 1, 77 }, + { 0x0, 0x0, 41, -1, -1, 0, 1, 77 }, + { 0x0, 0x0, 41, -1, -1, 0, 1, 119 }, + { 0x1, 0x1, 43, 1094, 281, 38, 1, 4 }, { 0x0, 0x0, 43, -1, 324, 0, 0, -1 }, - { 0x1, 0x1, 43, 1097, 287, 38, 1, 3 }, + { 0x1, 0x1, 43, 1097, 287, 38, 1, 4 }, { 0x0, 0x0, 43, -1, 336, 0, 0, -1 }, { 0x0, 0x0, 43, -1, 290, 0, 0, -1 }, { 0x0, 0x0, 43, -1, 296, 0, 0, -1 }, - { 0x1, 0x1, 43, 1102, 297, 38, 1, 3 }, + { 0x1, 0x1, 43, 1102, 297, 38, 1, 4 }, { 0x0, 0x0, 43, -1, 340, 0, 0, -1 }, - { 0x1, 0x1, 43, 1105, 303, 38, 1, 3 }, + { 0x1, 0x1, 43, 1105, 303, 38, 1, 4 }, { 0x0, 0x0, 43, -1, 352, 0, 0, -1 }, { 0x0, 0x0, 43, -1, 306, 0, 0, -1 }, { 0x0, 0x0, 43, -1, 312, 0, 0, -1 }, { 0x0, 0x0, 43, 978, 1830, 0, 0, -1 }, - { 0x0, 0x0, 43, 979, 2351, 0, 1, 56 }, + { 0x0, 0x0, 43, 979, 2351, 0, 1, 51 }, { 0x0, 0x0, 43, 980, 1882, 0, 0, -1 }, - { 0x0, 0x0, 43, 981, -1, 0, 1, 51 }, + { 0x0, 0x0, 43, 981, -1, 0, 1, 46 }, { 0x0, 0x0, 43, 893, -1, 0, 1, 0 }, { 0x0, 0x0, 43, 894, -1, 0, 1, 0 }, { 0x0, 0x0, 43, 895, -1, 0, 1, 0 }, - { 0x1, 0x1, 44, -1, 1366, 30, 1, 144 }, - { 0x1, 0x1, 44, 776, 1365, 30, 1, 143 }, - { 0x1, 0x1, 44, -1, 1370, 30, 1, 146 }, - { 0x1, 0x1, 44, 777, 1369, 30, 1, 145 }, - { 0x1, 0x1, 44, -1, 1374, 30, 1, 146 }, - { 0x1, 0x1, 44, 778, 1373, 30, 1, 145 }, - { 0x3, 0x3, 45, -1, 927, 3, 1, 24 }, - { 0x1, 0x1, 46, 1790, -1, 30, 1, 137 }, - { 0x1, 0x1, 46, 1821, -1, 30, 1, 147 }, - { 0x0, 0x0, 48, -1, -1, 0, 1, 42 }, - { 0x0, 0x0, 48, -1, -1, 0, 1, 42 }, - { 0x1, 0x1, 55, -1, 1367, 31, 1, 144 }, - { 0x1, 0x1, 55, -1, 1371, 31, 1, 146 }, - { 0x1, 0x1, 55, -1, 1375, 31, 1, 146 }, - { 0x0, 0x0, 55, -1, -1, 0, 1, 97 }, - { 0x2, 0x3, 55, -1, -1, 27, 1, 97 }, - { 0x1, 0x1, 55, -1, -1, 28, 1, 97 }, - { 0x0, 0x0, 64, 12, 415, 0, 1, 8 }, - { 0x0, 0x0, 64, 996, 418, 0, 1, 8 }, - { 0x1, 0x1, 64, 997, 420, 33, 1, 8 }, - { 0x1, 0x1, 64, 998, 422, 34, 1, 8 }, - { 0x3, 0x3, 64, 999, 424, 33, 1, 8 }, - { 0x0, 0x0, 64, 1000, 426, 0, 1, 8 }, - { 0x1, 0x1, 64, 1001, 428, 33, 1, 8 }, - { 0x1, 0x1, 64, 1002, 430, 34, 1, 8 }, - { 0x3, 0x3, 64, 1003, 432, 33, 1, 8 }, - { 0x1, 0x1, 64, 1004, 434, 6, 1, 9 }, - { 0x8000001, 0x8000001, 64, 1005, 436, 6, 1, 9 }, - { 0x10000001, 0x10000001, 64, 1006, 438, 6, 1, 9 }, - { 0x18000001, 0x18000001, 64, 1007, 440, 6, 1, 9 }, - { 0x0, 0x0, 64, 1008, 454, 0, 1, 10 }, - { 0x1, 0x1, 64, 1009, 456, 33, 1, 10 }, - { 0x1, 0x1, 64, 1010, 458, 34, 1, 10 }, - { 0x3, 0x3, 64, 1011, 460, 33, 1, 10 }, - { 0x0, 0x0, 64, 1012, 466, 0, 1, 17 }, - { 0x1, 0x1, 64, 1013, 468, 33, 1, 17 }, - { 0x1, 0x1, 64, 1014, 470, 34, 1, 17 }, - { 0x3, 0x3, 64, 1015, 472, 33, 1, 17 }, - { 0x0, 0x0, 64, 13, 478, 0, 1, 19 }, - { 0x0, 0x0, 64, 1017, 481, 0, 1, 19 }, - { 0x1, 0x1, 64, 1018, 483, 33, 1, 19 }, - { 0x1, 0x1, 64, 1019, 485, 34, 1, 19 }, - { 0x3, 0x3, 64, 1020, 487, 33, 1, 19 }, - { 0x0, 0x0, 64, 1021, 489, 0, 1, 19 }, - { 0x1, 0x1, 64, 1022, 491, 33, 1, 19 }, - { 0x1, 0x1, 64, 1023, 493, 34, 1, 19 }, - { 0x3, 0x3, 64, 1024, 495, 33, 1, 19 }, - { 0x0, 0x0, 64, 1025, 505, 0, 1, 20 }, - { 0x1, 0x1, 64, 1026, 507, 33, 1, 20 }, - { 0x1, 0x1, 64, 1027, 509, 34, 1, 20 }, - { 0x3, 0x3, 64, 1028, 511, 33, 1, 20 }, - { 0x1, 0x1, 64, 1029, 513, 6, 1, 20 }, - { 0x8000001, 0x8000001, 64, 1030, 515, 6, 1, 20 }, - { 0x10000001, 0x10000001, 64, 1031, 517, 6, 1, 20 }, - { 0x18000001, 0x18000001, 64, 1032, 519, 6, 1, 20 }, - { 0x0, 0x0, 64, 1033, 529, 0, 1, 21 }, - { 0x1, 0x1, 64, 1034, 531, 33, 1, 21 }, - { 0x1, 0x1, 64, 1035, 533, 34, 1, 21 }, - { 0x3, 0x3, 64, 1036, 535, 33, 1, 21 }, - { 0x0, 0x0, 64, 1037, 541, 0, 1, 22 }, - { 0x1, 0x1, 64, 1038, 543, 33, 1, 22 }, - { 0x1, 0x1, 64, 1039, 545, 34, 1, 22 }, - { 0x3, 0x3, 64, 1040, 547, 33, 1, 22 }, - { 0x1, 0x1, 64, 1041, 549, 6, 1, 22 }, - { 0x8000001, 0x8000001, 64, 1042, 551, 6, 1, 22 }, - { 0x10000001, 0x10000001, 64, 1043, 553, 6, 1, 22 }, - { 0x18000001, 0x18000001, 64, 1044, 555, 6, 1, 22 }, - { 0x0, 0x0, 64, 1045, 565, 0, 1, 23 }, - { 0x1, 0x1, 64, 1046, 567, 33, 1, 23 }, - { 0x1, 0x1, 64, 1047, 569, 34, 1, 23 }, - { 0x3, 0x3, 64, 1048, 571, 33, 1, 23 }, - { 0x0, 0x0, 64, 15, 577, 0, 1, 19 }, - { 0x0, 0x0, 64, 1050, 580, 0, 1, 19 }, - { 0x1, 0x1, 64, 1051, 582, 33, 1, 19 }, - { 0x1, 0x1, 64, 1052, 584, 34, 1, 19 }, - { 0x3, 0x3, 64, 1053, 586, 33, 1, 19 }, - { 0x0, 0x0, 64, 1054, 588, 0, 1, 19 }, - { 0x1, 0x1, 64, 1055, 590, 33, 1, 19 }, - { 0x1, 0x1, 64, 1056, 592, 34, 1, 19 }, - { 0x3, 0x3, 64, 1057, 594, 33, 1, 19 }, - { 0x0, 0x0, 64, 1058, 604, 0, 1, 23 }, - { 0x1, 0x1, 64, 1059, 606, 33, 1, 23 }, - { 0x1, 0x1, 64, 1060, 608, 34, 1, 23 }, - { 0x3, 0x3, 64, 1061, 610, 33, 1, 23 }, - { 0x3, 0x3, 65, 384, 1229, 33, 1, 131 }, - { 0x3, 0x3, 65, 385, 1239, 33, 1, 131 }, - { 0x3, 0x3, 65, 386, 1249, 33, 1, 131 }, - { 0x0, 0x0, 65, -1, 1254, 0, 1, 138 }, - { 0x0, 0x0, 65, -1, 1255, 0, 1, 138 }, - { 0x0, 0x0, 65, -1, 1256, 0, 1, 138 }, + { 0x1, 0x1, 44, -1, 1366, 30, 1, 137 }, + { 0x1, 0x1, 44, 776, 1365, 30, 1, 136 }, + { 0x1, 0x1, 44, -1, 1370, 30, 1, 139 }, + { 0x1, 0x1, 44, 777, 1369, 30, 1, 138 }, + { 0x1, 0x1, 44, -1, 1374, 30, 1, 139 }, + { 0x1, 0x1, 44, 778, 1373, 30, 1, 138 }, + { 0x3, 0x3, 45, -1, 927, 3, 1, 2 }, + { 0x1, 0x1, 46, 1790, -1, 30, 1, 129 }, + { 0x1, 0x1, 46, 1821, -1, 30, 1, 5 }, + { 0x0, 0x0, 48, -1, -1, 0, 1, 37 }, + { 0x0, 0x0, 48, -1, -1, 0, 1, 37 }, + { 0x1, 0x1, 55, -1, 1367, 31, 1, 137 }, + { 0x1, 0x1, 55, -1, 1371, 31, 1, 139 }, + { 0x1, 0x1, 55, -1, 1375, 31, 1, 139 }, + { 0x0, 0x0, 55, -1, -1, 0, 1, 2 }, + { 0x2, 0x3, 55, -1, -1, 27, 1, 2 }, + { 0x1, 0x1, 55, -1, -1, 28, 1, 2 }, + { 0x0, 0x0, 64, 12, 415, 0, 1, 9 }, + { 0x0, 0x0, 64, 996, 418, 0, 1, 9 }, + { 0x1, 0x1, 64, 997, 420, 33, 1, 9 }, + { 0x1, 0x1, 64, 998, 422, 34, 1, 9 }, + { 0x3, 0x3, 64, 999, 424, 33, 1, 9 }, + { 0x0, 0x0, 64, 1000, 426, 0, 1, 9 }, + { 0x1, 0x1, 64, 1001, 428, 33, 1, 9 }, + { 0x1, 0x1, 64, 1002, 430, 34, 1, 9 }, + { 0x3, 0x3, 64, 1003, 432, 33, 1, 9 }, + { 0x1, 0x1, 64, 1004, 434, 6, 1, 10 }, + { 0x8000001, 0x8000001, 64, 1005, 436, 6, 1, 10 }, + { 0x10000001, 0x10000001, 64, 1006, 438, 6, 1, 10 }, + { 0x18000001, 0x18000001, 64, 1007, 440, 6, 1, 10 }, + { 0x0, 0x0, 64, 1008, 454, 0, 1, 11 }, + { 0x1, 0x1, 64, 1009, 456, 33, 1, 11 }, + { 0x1, 0x1, 64, 1010, 458, 34, 1, 11 }, + { 0x3, 0x3, 64, 1011, 460, 33, 1, 11 }, + { 0x0, 0x0, 64, 1012, 466, 0, 1, 18 }, + { 0x1, 0x1, 64, 1013, 468, 33, 1, 18 }, + { 0x1, 0x1, 64, 1014, 470, 34, 1, 18 }, + { 0x3, 0x3, 64, 1015, 472, 33, 1, 18 }, + { 0x0, 0x0, 64, 13, 478, 0, 1, 20 }, + { 0x0, 0x0, 64, 1017, 481, 0, 1, 20 }, + { 0x1, 0x1, 64, 1018, 483, 33, 1, 20 }, + { 0x1, 0x1, 64, 1019, 485, 34, 1, 20 }, + { 0x3, 0x3, 64, 1020, 487, 33, 1, 20 }, + { 0x0, 0x0, 64, 1021, 489, 0, 1, 20 }, + { 0x1, 0x1, 64, 1022, 491, 33, 1, 20 }, + { 0x1, 0x1, 64, 1023, 493, 34, 1, 20 }, + { 0x3, 0x3, 64, 1024, 495, 33, 1, 20 }, + { 0x0, 0x0, 64, 1025, 505, 0, 1, 21 }, + { 0x1, 0x1, 64, 1026, 507, 33, 1, 21 }, + { 0x1, 0x1, 64, 1027, 509, 34, 1, 21 }, + { 0x3, 0x3, 64, 1028, 511, 33, 1, 21 }, + { 0x1, 0x1, 64, 1029, 513, 6, 1, 21 }, + { 0x8000001, 0x8000001, 64, 1030, 515, 6, 1, 21 }, + { 0x10000001, 0x10000001, 64, 1031, 517, 6, 1, 21 }, + { 0x18000001, 0x18000001, 64, 1032, 519, 6, 1, 21 }, + { 0x0, 0x0, 64, 1033, 529, 0, 1, 22 }, + { 0x1, 0x1, 64, 1034, 531, 33, 1, 22 }, + { 0x1, 0x1, 64, 1035, 533, 34, 1, 22 }, + { 0x3, 0x3, 64, 1036, 535, 33, 1, 22 }, + { 0x0, 0x0, 64, 1037, 541, 0, 1, 23 }, + { 0x1, 0x1, 64, 1038, 543, 33, 1, 23 }, + { 0x1, 0x1, 64, 1039, 545, 34, 1, 23 }, + { 0x3, 0x3, 64, 1040, 547, 33, 1, 23 }, + { 0x1, 0x1, 64, 1041, 549, 6, 1, 23 }, + { 0x8000001, 0x8000001, 64, 1042, 551, 6, 1, 23 }, + { 0x10000001, 0x10000001, 64, 1043, 553, 6, 1, 23 }, + { 0x18000001, 0x18000001, 64, 1044, 555, 6, 1, 23 }, + { 0x0, 0x0, 64, 1045, 565, 0, 1, 24 }, + { 0x1, 0x1, 64, 1046, 567, 33, 1, 24 }, + { 0x1, 0x1, 64, 1047, 569, 34, 1, 24 }, + { 0x3, 0x3, 64, 1048, 571, 33, 1, 24 }, + { 0x0, 0x0, 64, 15, 577, 0, 1, 20 }, + { 0x0, 0x0, 64, 1050, 580, 0, 1, 20 }, + { 0x1, 0x1, 64, 1051, 582, 33, 1, 20 }, + { 0x1, 0x1, 64, 1052, 584, 34, 1, 20 }, + { 0x3, 0x3, 64, 1053, 586, 33, 1, 20 }, + { 0x0, 0x0, 64, 1054, 588, 0, 1, 20 }, + { 0x1, 0x1, 64, 1055, 590, 33, 1, 20 }, + { 0x1, 0x1, 64, 1056, 592, 34, 1, 20 }, + { 0x3, 0x3, 64, 1057, 594, 33, 1, 20 }, + { 0x0, 0x0, 64, 1058, 604, 0, 1, 24 }, + { 0x1, 0x1, 64, 1059, 606, 33, 1, 24 }, + { 0x1, 0x1, 64, 1060, 608, 34, 1, 24 }, + { 0x3, 0x3, 64, 1061, 610, 33, 1, 24 }, + { 0x3, 0x3, 65, 384, 1229, 33, 1, 124 }, + { 0x3, 0x3, 65, 385, 1239, 33, 1, 124 }, + { 0x3, 0x3, 65, 386, 1249, 33, 1, 124 }, + { 0x0, 0x0, 65, -1, 1254, 0, 1, 130 }, + { 0x0, 0x0, 65, -1, 1255, 0, 1, 130 }, + { 0x0, 0x0, 65, -1, 1256, 0, 1, 130 }, { 0x0, 0x0, 107, 859, 1854, 0, 0, -1 }, - { 0x0, 0x0, 107, 860, 2289, 0, 1, 31 }, + { 0x0, 0x0, 107, 860, 2289, 0, 1, 26 }, { 0x0, 0x0, 107, 861, 1891, 0, 0, -1 }, - { 0x0, 0x0, 107, 862, 2293, 0, 1, 31 }, + { 0x0, 0x0, 107, 862, 2293, 0, 1, 26 }, { 0x0, 0x0, 109, -1, 1856, 0, 0, -1 }, - { 0x1, 0x1, 109, -1, 2290, 27, 1, 31 }, + { 0x1, 0x1, 109, -1, 2290, 27, 1, 26 }, { 0x0, 0x0, 109, -1, 1893, 0, 0, -1 }, - { 0x1, 0x1, 109, -1, 2294, 27, 1, 31 }, - { 0x0, 0x0, 110, 864, -1, 0, 1, 118 }, - { 0x1, 0x1, 111, -1, -1, 27, 1, 118 }, - { 0x0, 0x0, 112, 877, 2312, 0, 1, 3 }, + { 0x1, 0x1, 109, -1, 2294, 27, 1, 26 }, + { 0x0, 0x0, 110, 864, -1, 0, 1, 110 }, + { 0x1, 0x1, 111, -1, -1, 27, 1, 110 }, + { 0x0, 0x0, 112, 877, 2312, 0, 1, 4 }, { 0x0, 0x0, 112, 969, 285, 0, 0, -1 }, { 0x0, 0x0, 112, -1, 332, 0, 0, -1 }, - { 0x0, 0x0, 112, 878, 2320, 0, 1, 3 }, + { 0x0, 0x0, 112, 878, 2320, 0, 1, 4 }, { 0x0, 0x0, 112, -1, 294, 0, 0, -1 }, - { 0x0, 0x0, 112, 879, 2332, 0, 1, 3 }, + { 0x0, 0x0, 112, 879, 2332, 0, 1, 4 }, { 0x0, 0x0, 112, 974, 301, 0, 0, -1 }, { 0x0, 0x0, 112, -1, 348, 0, 0, -1 }, - { 0x0, 0x0, 112, 1106, 2339, 0, 1, 3 }, + { 0x0, 0x0, 112, 1106, 2339, 0, 1, 4 }, { 0x0, 0x0, 112, -1, 310, 0, 0, -1 }, { 0x0, 0x0, 112, -1, 1840, 0, 0, -1 }, - { 0x1, 0x9, 112, -1, 2358, 33, 1, 56 }, - { 0x1, 0x1, 114, 1095, 2313, 37, 1, 3 }, - { 0x1, 0x1, 114, 1098, 2321, 37, 1, 3 }, - { 0x1, 0x1, 114, 1103, 2333, 37, 1, 3 }, - { 0x0, 0x0, 114, -1, 2344, 0, 1, 3 }, - { 0x0, 0x0, 115, 896, 2310, 0, 1, 3 }, + { 0x1, 0x9, 112, -1, 2358, 33, 1, 51 }, + { 0x1, 0x1, 114, 1095, 2313, 37, 1, 4 }, + { 0x1, 0x1, 114, 1098, 2321, 37, 1, 4 }, + { 0x1, 0x1, 114, 1103, 2333, 37, 1, 4 }, + { 0x0, 0x0, 114, -1, 2344, 0, 1, 4 }, + { 0x0, 0x0, 115, 896, 2310, 0, 1, 4 }, { 0x0, 0x0, 115, 949, 283, 0, 0, -1 }, { 0x0, 0x0, 115, 970, 330, 0, 0, -1 }, - { 0x0, 0x0, 115, -1, 2319, 0, 1, 3 }, + { 0x0, 0x0, 115, -1, 2319, 0, 1, 4 }, { 0x0, 0x0, 115, 972, 292, 0, 0, -1 }, - { 0x0, 0x0, 115, 898, 2330, 0, 1, 3 }, + { 0x0, 0x0, 115, 898, 2330, 0, 1, 4 }, { 0x0, 0x0, 115, 954, 299, 0, 0, -1 }, { 0x0, 0x0, 115, 975, 346, 0, 0, -1 }, - { 0x0, 0x0, 115, -1, 2338, 0, 1, 3 }, + { 0x0, 0x0, 115, -1, 2338, 0, 1, 4 }, { 0x0, 0x0, 115, 977, 308, 0, 0, -1 }, { 0x0, 0x0, 115, 875, 1838, 0, 0, -1 }, - { 0x0, 0x0, 115, 876, 2357, 0, 1, 56 }, + { 0x0, 0x0, 115, 876, 2357, 0, 1, 51 }, { 0x1, 0x1, 115, -1, -1, 27, 1, 0 }, { 0x1, 0x1, 115, -1, -1, 27, 1, 0 }, { 0x1, 0x1, 115, -1, -1, 27, 1, 0 }, - { 0x1, 0x1, 116, -1, 2311, 37, 1, 3 }, - { 0x0, 0x0, 116, -1, 2324, 0, 1, 3 }, - { 0x1, 0x1, 116, -1, 2331, 37, 1, 3 }, - { 0x0, 0x0, 116, -1, 2343, 0, 1, 3 }, - { 0x0, 0x0, 117, 943, -1, 0, 1, 0 }, - { 0x0, 0x0, 117, 944, -1, 0, 1, 0 }, - { 0x0, 0x0, 117, 945, -1, 0, 1, 0 }, - { 0x3, 0x3, 117, 905, -1, 34, 1, 35 }, - { 0x3, 0x3, 117, 906, -1, 34, 1, 42 }, - { 0x1, 0x1, 118, -1, -1, 35, 1, 35 }, - { 0x1, 0x1, 118, -1, -1, 35, 1, 42 }, - { 0x0, 0x0, 119, -1, -1, 0, 1, 42 }, - { 0x0, 0x0, 119, -1, -1, 0, 1, 69 }, - { 0x1, 0x1, 119, -1, -1, 27, 1, 99 }, - { 0x0, 0x0, 119, -1, -1, 0, 1, 108 }, - { 0x0, 0x0, 119, -1, -1, 0, 1, 76 }, - { 0x0, 0x0, 119, -1, -1, 0, 1, 76 }, - { 0x0, 0x0, 119, -1, -1, 0, 1, 77 }, - { 0x0, 0x0, 119, -1, -1, 0, 1, 42 }, - { 0x1, 0x1, 119, -1, -1, 27, 1, 120 }, - { 0x1, 0x1, 119, -1, -1, 27, 1, 42 }, - { 0x0, 0x0, 119, -1, -1, 0, 1, 42 }, + { 0x1, 0x1, 116, -1, 2311, 37, 1, 4 }, + { 0x0, 0x0, 116, -1, 2324, 0, 1, 4 }, + { 0x1, 0x1, 116, -1, 2331, 37, 1, 4 }, + { 0x0, 0x0, 116, -1, 2343, 0, 1, 4 }, + { 0x0, 0x0, 117, 943, -1, 0, 1, 2 }, + { 0x0, 0x0, 117, 944, -1, 0, 1, 2 }, + { 0x0, 0x0, 117, 945, -1, 0, 1, 2 }, + { 0x3, 0x3, 117, 905, -1, 34, 1, 30 }, + { 0x3, 0x3, 117, 906, -1, 34, 1, 2 }, + { 0x1, 0x1, 118, -1, -1, 35, 1, 30 }, + { 0x1, 0x1, 118, -1, -1, 35, 1, 2 }, + { 0x0, 0x0, 119, -1, -1, 0, 1, 37 }, + { 0x0, 0x0, 119, -1, -1, 0, 1, 58 }, + { 0x1, 0x1, 119, -1, -1, 27, 1, 91 }, + { 0x0, 0x0, 119, -1, -1, 0, 1, 100 }, + { 0x0, 0x0, 119, -1, -1, 0, 1, 65 }, + { 0x0, 0x0, 119, -1, -1, 0, 1, 65 }, + { 0x0, 0x0, 119, -1, -1, 0, 1, 66 }, + { 0x0, 0x0, 119, -1, -1, 0, 1, 37 }, + { 0x1, 0x1, 119, -1, -1, 27, 1, 112 }, + { 0x1, 0x1, 119, -1, -1, 27, 1, 37 }, + { 0x0, 0x0, 119, -1, -1, 0, 1, 37 }, { 0x0, 0x0, 120, -1, 2245, 0, 0, -1 }, { 0x0, 0x0, 120, -1, 2248, 0, 0, -1 }, - { 0x1, 0x1, 121, -1, -1, 35, 1, 18 }, - { 0x1, 0x1, 121, -1, -1, 35, 1, 18 }, - { 0x1, 0x1, 121, -1, -1, 35, 1, 18 }, - { 0x1, 0x1, 121, -1, -1, 35, 1, 18 }, - { 0x1, 0x1, 121, -1, -1, 35, 1, 24 }, - { 0x1, 0x1, 121, -1, -1, 35, 1, 24 }, - { 0x1, 0x1, 121, -1, -1, 35, 1, 24 }, - { 0x1, 0x1, 121, -1, -1, 35, 1, 24 }, - { 0x1, 0x1, 121, -1, -1, 23, 1, 70 }, - { 0x1, 0x1, 121, -1, -1, 23, 1, 70 }, - { 0x1, 0x1, 121, -1, -1, 23, 1, 70 }, - { 0x1, 0x1, 121, -1, -1, 23, 1, 70 }, - { 0x1, 0x1, 121, 741, -1, 23, 1, 70 }, - { 0x9, 0x9, 121, 742, -1, 20, 1, 70 }, + { 0x1, 0x1, 121, -1, -1, 35, 1, 19 }, + { 0x1, 0x1, 121, -1, -1, 35, 1, 19 }, + { 0x1, 0x1, 121, -1, -1, 35, 1, 19 }, + { 0x1, 0x1, 121, -1, -1, 35, 1, 19 }, + { 0x1, 0x1, 121, -1, -1, 35, 1, 2 }, + { 0x1, 0x1, 121, -1, -1, 35, 1, 2 }, + { 0x1, 0x1, 121, -1, -1, 35, 1, 2 }, + { 0x1, 0x1, 121, -1, -1, 35, 1, 2 }, + { 0x1, 0x1, 121, -1, -1, 23, 1, 59 }, + { 0x1, 0x1, 121, -1, -1, 23, 1, 59 }, + { 0x1, 0x1, 121, -1, -1, 23, 1, 59 }, + { 0x1, 0x1, 121, -1, -1, 23, 1, 59 }, + { 0x1, 0x1, 121, 741, -1, 23, 1, 59 }, + { 0x9, 0x9, 121, 742, -1, 20, 1, 59 }, { 0x0, 0x0, 125, 1740, -1, 0, 1, 0 }, { 0x0, 0x0, 125, 1741, -1, 0, 1, 0 }, - { 0x1, 0x1, 125, -1, -1, 28, 1, 35 }, - { 0x1, 0x1, 125, -1, -1, 27, 1, 35 }, + { 0x1, 0x1, 125, -1, -1, 28, 1, 30 }, + { 0x1, 0x1, 125, -1, -1, 27, 1, 30 }, { 0x1, 0x1, 125, -1, -1, 29, 1, 0 }, { 0x1, 0x1, 125, -1, -1, 29, 1, 0 }, { 0x1, 0x1, 125, -1, -1, 29, 1, 0 }, { 0x1, 0x1, 125, -1, -1, 29, 1, 0 }, - { 0x0, 0x0, 125, -1, -1, 0, 1, 117 }, - { 0x1, 0x1, 125, -1, -1, 29, 1, 0 }, - { 0x1, 0x1, 125, -1, -1, 29, 1, 0 }, - { 0x1, 0x1, 125, -1, -1, 29, 1, 0 }, - { 0x0, 0x0, 125, 903, -1, 0, 1, 35 }, - { 0x0, 0x0, 125, 987, -1, 0, 1, 42 }, - { 0x0, 0x0, 138, 962, 2308, 0, 1, 3 }, + { 0x0, 0x0, 125, -1, -1, 0, 1, 109 }, + { 0x1, 0x1, 125, -1, -1, 29, 1, 2 }, + { 0x1, 0x1, 125, -1, -1, 29, 1, 2 }, + { 0x1, 0x1, 125, -1, -1, 29, 1, 2 }, + { 0x0, 0x0, 125, 903, -1, 0, 1, 30 }, + { 0x0, 0x0, 125, 987, -1, 0, 1, 2 }, + { 0x0, 0x0, 138, 962, 2308, 0, 1, 4 }, { 0x0, 0x0, 138, 866, 284, 0, 0, -1 }, { 0x0, 0x0, 138, 883, 329, 0, 0, -1 }, - { 0x0, 0x0, 138, -1, 2318, 0, 1, 3 }, + { 0x0, 0x0, 138, -1, 2318, 0, 1, 4 }, { 0x0, 0x0, 138, 885, 291, 0, 0, -1 }, - { 0x0, 0x0, 138, 964, 2328, 0, 1, 3 }, + { 0x0, 0x0, 138, 964, 2328, 0, 1, 4 }, { 0x0, 0x0, 138, 871, 300, 0, 0, -1 }, { 0x0, 0x0, 138, 888, 345, 0, 0, -1 }, - { 0x0, 0x0, 138, -1, 2337, 0, 1, 3 }, + { 0x0, 0x0, 138, -1, 2337, 0, 1, 4 }, { 0x0, 0x0, 138, 890, 307, 0, 0, -1 }, { 0x0, 0x0, 138, 2375, 1834, 0, 0, -1 }, - { 0x1, 0x1, 138, 2376, 2353, 33, 1, 56 }, + { 0x1, 0x1, 138, 2376, 2353, 33, 1, 51 }, { 0x0, 0x0, 138, 2377, 1884, 0, 0, -1 }, - { 0x1, 0x1, 138, 2378, -1, 28, 1, 51 }, - { 0x1, 0x1, 139, -1, 2309, 37, 1, 3 }, - { 0x0, 0x0, 139, -1, 2323, 0, 1, 3 }, - { 0x1, 0x1, 139, -1, 2329, 37, 1, 3 }, - { 0x0, 0x0, 139, -1, 2342, 0, 1, 3 }, - { 0x1, 0x1, 142, 740, 925, 3, 1, 24 }, - { 0x0, 0x0, 143, 1742, -1, 0, 1, 35 }, - { 0x0, 0x0, 144, 746, 2305, 0, 1, 3 }, + { 0x1, 0x1, 138, 2378, -1, 28, 1, 46 }, + { 0x1, 0x1, 139, -1, 2309, 37, 1, 4 }, + { 0x0, 0x0, 139, -1, 2323, 0, 1, 4 }, + { 0x1, 0x1, 139, -1, 2329, 37, 1, 4 }, + { 0x0, 0x0, 139, -1, 2342, 0, 1, 4 }, + { 0x1, 0x1, 142, 740, 925, 3, 1, 2 }, + { 0x0, 0x0, 143, 1742, -1, 0, 1, 30 }, + { 0x0, 0x0, 144, 746, 2305, 0, 1, 4 }, { 0x0, 0x0, 144, -1, 286, 0, 0, -1 }, { 0x0, 0x0, 144, 867, 331, 0, 0, -1 }, - { 0x0, 0x0, 144, 748, 2315, 0, 1, 3 }, + { 0x0, 0x0, 144, 748, 2315, 0, 1, 4 }, { 0x0, 0x0, 144, 869, 293, 0, 0, -1 }, - { 0x0, 0x0, 144, 752, 2325, 0, 1, 3 }, + { 0x0, 0x0, 144, 752, 2325, 0, 1, 4 }, { 0x0, 0x0, 144, -1, 302, 0, 0, -1 }, { 0x0, 0x0, 144, 872, 347, 0, 0, -1 }, - { 0x0, 0x0, 144, 754, 2335, 0, 1, 3 }, + { 0x0, 0x0, 144, 754, 2335, 0, 1, 4 }, { 0x0, 0x0, 144, 874, 309, 0, 0, -1 }, { 0x0, 0x0, 144, 958, 1832, 0, 0, -1 }, - { 0x1, 0x1, 144, 959, 2352, 36, 1, 56 }, + { 0x1, 0x1, 144, 959, 2352, 36, 1, 51 }, { 0x0, 0x0, 144, 960, 1883, 0, 0, -1 }, - { 0x1, 0x1, 144, 961, -1, 27, 1, 51 }, - { 0x1, 0x1, 145, -1, 2307, 37, 1, 3 }, - { 0x1, 0x1, 145, -1, 2317, 37, 1, 3 }, - { 0x1, 0x1, 145, -1, 2327, 37, 1, 3 }, - { 0x0, 0x0, 145, -1, 2341, 0, 1, 3 }, - { 0x0, 0x0, 146, -1, -1, 0, 1, 35 }, - { 0x0, 0x0, 146, 904, -1, 0, 1, 42 }, - { 0x0, 0x0, 147, -1, -1, 0, 1, 42 }, - { 0x0, 0x0, 147, -1, -1, 0, 1, 69 }, - { 0x0, 0x0, 147, -1, 2345, 0, 1, 65 }, - { 0x0, 0x0, 147, -1, -1, 0, 1, 84 }, - { 0x0, 0x0, 147, -1, -1, 0, 1, 84 }, - { 0x0, 0x0, 147, -1, -1, 0, 1, 88 }, - { 0x0, 0x0, 147, -1, -1, 0, 1, 42 }, - { 0x1, 0x1, 148, -1, 416, 12, 1, 8 }, - { 0x1, 0x1, 148, -1, 419, 12, 1, 8 }, - { 0x200001, 0x200001, 148, -1, 421, 12, 1, 8 }, - { 0x400001, 0x400001, 148, -1, 423, 12, 1, 8 }, - { 0x600001, 0x600001, 148, -1, 425, 12, 1, 8 }, - { 0x1, 0x1, 148, -1, 427, 12, 1, 8 }, - { 0x200001, 0x200001, 148, -1, 429, 12, 1, 8 }, - { 0x400001, 0x400001, 148, -1, 431, 12, 1, 8 }, - { 0x600001, 0x600001, 148, -1, 433, 12, 1, 8 }, - { 0x41, 0x41, 148, -1, 435, 6, 1, 9 }, - { 0x8000041, 0x8000041, 148, -1, 437, 6, 1, 9 }, - { 0x10000041, 0x10000041, 148, -1, 439, 6, 1, 9 }, - { 0x18000041, 0x18000041, 148, -1, 441, 6, 1, 9 }, - { 0x1, 0x1, 148, -1, 455, 12, 1, 10 }, - { 0x200001, 0x200001, 148, -1, 457, 12, 1, 10 }, - { 0x400001, 0x400001, 148, -1, 459, 12, 1, 10 }, - { 0x600001, 0x600001, 148, -1, 461, 12, 1, 10 }, - { 0x1, 0x1, 148, -1, 467, 12, 1, 17 }, - { 0x200001, 0x200001, 148, -1, 469, 12, 1, 17 }, - { 0x400001, 0x400001, 148, -1, 471, 12, 1, 17 }, - { 0x600001, 0x600001, 148, -1, 473, 12, 1, 17 }, - { 0x1, 0x1, 148, -1, 479, 12, 1, 19 }, - { 0x1, 0x1, 148, -1, 482, 12, 1, 19 }, - { 0x200001, 0x200001, 148, -1, 484, 12, 1, 19 }, - { 0x400001, 0x400001, 148, -1, 486, 12, 1, 19 }, - { 0x600001, 0x600001, 148, -1, 488, 12, 1, 19 }, - { 0x1, 0x1, 148, -1, 490, 12, 1, 19 }, - { 0x200001, 0x200001, 148, -1, 492, 12, 1, 19 }, - { 0x400001, 0x400001, 148, -1, 494, 12, 1, 19 }, - { 0x600001, 0x600001, 148, -1, 496, 12, 1, 19 }, - { 0x1, 0x1, 148, -1, 506, 12, 1, 20 }, - { 0x200001, 0x200001, 148, -1, 508, 12, 1, 20 }, - { 0x400001, 0x400001, 148, -1, 510, 12, 1, 20 }, - { 0x600001, 0x600001, 148, -1, 512, 12, 1, 20 }, - { 0x41, 0x41, 148, -1, 514, 6, 1, 20 }, - { 0x8000041, 0x8000041, 148, -1, 516, 6, 1, 20 }, - { 0x10000041, 0x10000041, 148, -1, 518, 6, 1, 20 }, - { 0x18000041, 0x18000041, 148, -1, 520, 6, 1, 20 }, - { 0x1, 0x1, 148, -1, 530, 12, 1, 21 }, - { 0x200001, 0x200001, 148, -1, 532, 12, 1, 21 }, - { 0x400001, 0x400001, 148, -1, 534, 12, 1, 21 }, - { 0x600001, 0x600001, 148, -1, 536, 12, 1, 21 }, - { 0x1, 0x1, 148, -1, 542, 12, 1, 22 }, - { 0x200001, 0x200001, 148, -1, 544, 12, 1, 22 }, - { 0x400001, 0x400001, 148, -1, 546, 12, 1, 22 }, - { 0x600001, 0x600001, 148, -1, 548, 12, 1, 22 }, - { 0x41, 0x41, 148, -1, 550, 6, 1, 22 }, - { 0x8000041, 0x8000041, 148, -1, 552, 6, 1, 22 }, - { 0x10000041, 0x10000041, 148, -1, 554, 6, 1, 22 }, - { 0x18000041, 0x18000041, 148, -1, 556, 6, 1, 22 }, - { 0x1, 0x1, 148, -1, 566, 12, 1, 23 }, - { 0x200001, 0x200001, 148, -1, 568, 12, 1, 23 }, - { 0x400001, 0x400001, 148, -1, 570, 12, 1, 23 }, - { 0x600001, 0x600001, 148, -1, 572, 12, 1, 23 }, - { 0x1, 0x1, 148, -1, 578, 12, 1, 19 }, - { 0x1, 0x1, 148, -1, 581, 12, 1, 19 }, - { 0x200001, 0x200001, 148, -1, 583, 12, 1, 19 }, - { 0x400001, 0x400001, 148, -1, 585, 12, 1, 19 }, - { 0x600001, 0x600001, 148, -1, 587, 12, 1, 19 }, - { 0x1, 0x1, 148, -1, 589, 12, 1, 19 }, - { 0x200001, 0x200001, 148, -1, 591, 12, 1, 19 }, - { 0x400001, 0x400001, 148, -1, 593, 12, 1, 19 }, - { 0x600001, 0x600001, 148, -1, 595, 12, 1, 19 }, - { 0x1, 0x1, 148, -1, 605, 12, 1, 23 }, - { 0x200001, 0x200001, 148, -1, 607, 12, 1, 23 }, - { 0x400001, 0x400001, 148, -1, 609, 12, 1, 23 }, - { 0x600001, 0x600001, 148, -1, 611, 12, 1, 23 }, - { 0x0, 0x0, 157, 616, -1, 0, 1, 78 }, - { 0x0, 0x0, 157, 617, -1, 0, 1, 78 }, - { 0x9, 0x9, 157, -1, 1150, 32, 1, 132 }, - { 0x9, 0x9, 157, -1, 1159, 32, 1, 132 }, - { 0x9, 0x9, 157, -1, 1168, 32, 1, 132 }, - { 0x9, 0x9, 157, -1, 1177, 32, 1, 132 }, - { 0x9, 0x9, 157, -1, 1186, 32, 1, 132 }, - { 0x9, 0x9, 157, -1, 1195, 32, 1, 132 }, - { 0x9, 0x9, 157, -1, 1204, 32, 1, 132 }, - { 0x9, 0x9, 157, -1, 1213, 32, 1, 132 }, - { 0x9, 0x9, 157, -1, 1222, 32, 1, 132 }, - { 0x9, 0x9, 157, -1, 1232, 32, 1, 132 }, - { 0x9, 0x9, 157, -1, 1242, 32, 1, 132 }, - { 0x9, 0x9, 157, -1, 1252, 32, 1, 132 }, - { 0x9, 0x9, 157, -1, 1261, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1267, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1273, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1279, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1285, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1291, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1297, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1303, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1309, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1315, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1321, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1327, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1333, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1339, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1345, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1351, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1357, 32, 1, 142 }, - { 0x9, 0x9, 157, -1, 1363, 32, 1, 142 }, + { 0x1, 0x1, 144, 961, -1, 27, 1, 46 }, + { 0x1, 0x1, 145, -1, 2307, 37, 1, 4 }, + { 0x1, 0x1, 145, -1, 2317, 37, 1, 4 }, + { 0x1, 0x1, 145, -1, 2327, 37, 1, 4 }, + { 0x0, 0x0, 145, -1, 2341, 0, 1, 4 }, + { 0x0, 0x0, 146, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 146, 904, -1, 0, 1, 2 }, + { 0x0, 0x0, 147, -1, -1, 0, 1, 37 }, + { 0x0, 0x0, 147, -1, -1, 0, 1, 58 }, + { 0x0, 0x0, 147, -1, 2345, 0, 1, 55 }, + { 0x0, 0x0, 147, -1, -1, 0, 1, 78 }, + { 0x0, 0x0, 147, -1, -1, 0, 1, 78 }, + { 0x0, 0x0, 147, -1, -1, 0, 1, 82 }, + { 0x0, 0x0, 147, -1, -1, 0, 1, 37 }, + { 0x1, 0x1, 148, -1, 416, 12, 1, 9 }, + { 0x1, 0x1, 148, -1, 419, 12, 1, 9 }, + { 0x200001, 0x200001, 148, -1, 421, 12, 1, 9 }, + { 0x400001, 0x400001, 148, -1, 423, 12, 1, 9 }, + { 0x600001, 0x600001, 148, -1, 425, 12, 1, 9 }, + { 0x1, 0x1, 148, -1, 427, 12, 1, 9 }, + { 0x200001, 0x200001, 148, -1, 429, 12, 1, 9 }, + { 0x400001, 0x400001, 148, -1, 431, 12, 1, 9 }, + { 0x600001, 0x600001, 148, -1, 433, 12, 1, 9 }, + { 0x41, 0x41, 148, -1, 435, 6, 1, 10 }, + { 0x8000041, 0x8000041, 148, -1, 437, 6, 1, 10 }, + { 0x10000041, 0x10000041, 148, -1, 439, 6, 1, 10 }, + { 0x18000041, 0x18000041, 148, -1, 441, 6, 1, 10 }, + { 0x1, 0x1, 148, -1, 455, 12, 1, 11 }, + { 0x200001, 0x200001, 148, -1, 457, 12, 1, 11 }, + { 0x400001, 0x400001, 148, -1, 459, 12, 1, 11 }, + { 0x600001, 0x600001, 148, -1, 461, 12, 1, 11 }, + { 0x1, 0x1, 148, -1, 467, 12, 1, 18 }, + { 0x200001, 0x200001, 148, -1, 469, 12, 1, 18 }, + { 0x400001, 0x400001, 148, -1, 471, 12, 1, 18 }, + { 0x600001, 0x600001, 148, -1, 473, 12, 1, 18 }, + { 0x1, 0x1, 148, -1, 479, 12, 1, 20 }, + { 0x1, 0x1, 148, -1, 482, 12, 1, 20 }, + { 0x200001, 0x200001, 148, -1, 484, 12, 1, 20 }, + { 0x400001, 0x400001, 148, -1, 486, 12, 1, 20 }, + { 0x600001, 0x600001, 148, -1, 488, 12, 1, 20 }, + { 0x1, 0x1, 148, -1, 490, 12, 1, 20 }, + { 0x200001, 0x200001, 148, -1, 492, 12, 1, 20 }, + { 0x400001, 0x400001, 148, -1, 494, 12, 1, 20 }, + { 0x600001, 0x600001, 148, -1, 496, 12, 1, 20 }, + { 0x1, 0x1, 148, -1, 506, 12, 1, 21 }, + { 0x200001, 0x200001, 148, -1, 508, 12, 1, 21 }, + { 0x400001, 0x400001, 148, -1, 510, 12, 1, 21 }, + { 0x600001, 0x600001, 148, -1, 512, 12, 1, 21 }, + { 0x41, 0x41, 148, -1, 514, 6, 1, 21 }, + { 0x8000041, 0x8000041, 148, -1, 516, 6, 1, 21 }, + { 0x10000041, 0x10000041, 148, -1, 518, 6, 1, 21 }, + { 0x18000041, 0x18000041, 148, -1, 520, 6, 1, 21 }, + { 0x1, 0x1, 148, -1, 530, 12, 1, 22 }, + { 0x200001, 0x200001, 148, -1, 532, 12, 1, 22 }, + { 0x400001, 0x400001, 148, -1, 534, 12, 1, 22 }, + { 0x600001, 0x600001, 148, -1, 536, 12, 1, 22 }, + { 0x1, 0x1, 148, -1, 542, 12, 1, 23 }, + { 0x200001, 0x200001, 148, -1, 544, 12, 1, 23 }, + { 0x400001, 0x400001, 148, -1, 546, 12, 1, 23 }, + { 0x600001, 0x600001, 148, -1, 548, 12, 1, 23 }, + { 0x41, 0x41, 148, -1, 550, 6, 1, 23 }, + { 0x8000041, 0x8000041, 148, -1, 552, 6, 1, 23 }, + { 0x10000041, 0x10000041, 148, -1, 554, 6, 1, 23 }, + { 0x18000041, 0x18000041, 148, -1, 556, 6, 1, 23 }, + { 0x1, 0x1, 148, -1, 566, 12, 1, 24 }, + { 0x200001, 0x200001, 148, -1, 568, 12, 1, 24 }, + { 0x400001, 0x400001, 148, -1, 570, 12, 1, 24 }, + { 0x600001, 0x600001, 148, -1, 572, 12, 1, 24 }, + { 0x1, 0x1, 148, -1, 578, 12, 1, 20 }, + { 0x1, 0x1, 148, -1, 581, 12, 1, 20 }, + { 0x200001, 0x200001, 148, -1, 583, 12, 1, 20 }, + { 0x400001, 0x400001, 148, -1, 585, 12, 1, 20 }, + { 0x600001, 0x600001, 148, -1, 587, 12, 1, 20 }, + { 0x1, 0x1, 148, -1, 589, 12, 1, 20 }, + { 0x200001, 0x200001, 148, -1, 591, 12, 1, 20 }, + { 0x400001, 0x400001, 148, -1, 593, 12, 1, 20 }, + { 0x600001, 0x600001, 148, -1, 595, 12, 1, 20 }, + { 0x1, 0x1, 148, -1, 605, 12, 1, 24 }, + { 0x200001, 0x200001, 148, -1, 607, 12, 1, 24 }, + { 0x400001, 0x400001, 148, -1, 609, 12, 1, 24 }, + { 0x600001, 0x600001, 148, -1, 611, 12, 1, 24 }, + { 0x0, 0x0, 157, 616, -1, 0, 1, 72 }, + { 0x0, 0x0, 157, 617, -1, 0, 1, 72 }, + { 0x9, 0x9, 157, -1, 1150, 32, 1, 125 }, + { 0x9, 0x9, 157, -1, 1159, 32, 1, 125 }, + { 0x9, 0x9, 157, -1, 1168, 32, 1, 125 }, + { 0x9, 0x9, 157, -1, 1177, 32, 1, 125 }, + { 0x9, 0x9, 157, -1, 1186, 32, 1, 125 }, + { 0x9, 0x9, 157, -1, 1195, 32, 1, 125 }, + { 0x9, 0x9, 157, -1, 1204, 32, 1, 125 }, + { 0x9, 0x9, 157, -1, 1213, 32, 1, 125 }, + { 0x9, 0x9, 157, -1, 1222, 32, 1, 125 }, + { 0x9, 0x9, 157, -1, 1232, 32, 1, 125 }, + { 0x9, 0x9, 157, -1, 1242, 32, 1, 125 }, + { 0x9, 0x9, 157, -1, 1252, 32, 1, 125 }, + { 0x9, 0x9, 157, -1, 1261, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1267, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1273, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1279, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1285, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1291, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1297, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1303, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1309, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1315, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1321, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1327, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1333, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1339, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1345, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1351, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1357, 32, 1, 134 }, + { 0x9, 0x9, 157, -1, 1363, 32, 1, 134 }, { 0x0, 0x0, 158, 982, 282, 0, 0, -1 }, - { 0x1, 0x1, 158, -1, 2314, 38, 1, 3 }, + { 0x1, 0x1, 158, -1, 2314, 38, 1, 4 }, { 0x0, 0x0, 158, 747, 323, 0, 0, -1 }, { 0x0, 0x0, 158, 983, 288, 0, 0, -1 }, - { 0x1, 0x1, 158, -1, 2322, 38, 1, 3 }, + { 0x1, 0x1, 158, -1, 2322, 38, 1, 4 }, { 0x0, 0x0, 158, 749, 335, 0, 0, -1 }, { 0x0, 0x0, 158, 750, 289, 0, 0, -1 }, { 0x0, 0x0, 158, 751, 295, 0, 0, -1 }, { 0x0, 0x0, 158, 984, 298, 0, 0, -1 }, - { 0x1, 0x1, 158, -1, 2334, 38, 1, 3 }, + { 0x1, 0x1, 158, -1, 2334, 38, 1, 4 }, { 0x0, 0x0, 158, 753, 339, 0, 0, -1 }, { 0x0, 0x0, 158, -1, 304, 0, 0, -1 }, - { 0x1, 0x1, 158, -1, 2340, 38, 1, 3 }, + { 0x1, 0x1, 158, -1, 2340, 38, 1, 4 }, { 0x0, 0x0, 158, 755, 351, 0, 0, -1 }, { 0x0, 0x0, 158, 756, 305, 0, 0, -1 }, { 0x0, 0x0, 158, 757, 311, 0, 0, -1 }, { 0x0, 0x0, 159, 1123, 1842, 0, 0, -1 }, - { 0x0, 0x0, 159, 1124, 2363, 0, 1, 56 }, + { 0x0, 0x0, 159, 1124, 2363, 0, 1, 51 }, { 0x0, 0x0, 159, 1125, 1886, 0, 0, -1 }, - { 0x1, 0x1, 159, 1126, -1, 29, 1, 51 }, + { 0x1, 0x1, 159, 1126, -1, 29, 1, 46 }, { 0x0, 0x0, 160, -1, 1852, 0, 0, -1 }, - { 0x1, 0x9, 160, -1, 2370, 33, 1, 56 }, + { 0x1, 0x9, 160, -1, 2370, 33, 1, 51 }, { 0x0, 0x0, 161, 1114, 1850, 0, 0, -1 }, - { 0x0, 0x0, 161, 1115, 2369, 0, 1, 56 }, - { 0x1, 0x1, 162, 1128, -1, 27, 1, 35 }, + { 0x0, 0x0, 161, 1115, 2369, 0, 1, 51 }, + { 0x1, 0x1, 162, 1128, -1, 27, 1, 30 }, { 0x0, 0x0, 163, 1735, 1846, 0, 0, -1 }, - { 0x1, 0x1, 163, 1736, 2365, 33, 1, 56 }, + { 0x1, 0x1, 163, 1736, 2365, 33, 1, 51 }, { 0x0, 0x0, 163, 1737, 1888, 0, 0, -1 }, - { 0x3, 0x3, 163, 1738, -1, 28, 1, 51 }, + { 0x3, 0x3, 163, 1738, -1, 28, 1, 46 }, { 0x0, 0x0, 164, 1119, 1844, 0, 0, -1 }, - { 0x1, 0x1, 164, 1120, 2364, 36, 1, 56 }, + { 0x1, 0x1, 164, 1120, 2364, 36, 1, 51 }, { 0x0, 0x0, 164, 1121, 1887, 0, 0, -1 }, - { 0x5, 0x5, 164, 1122, -1, 27, 1, 51 }, - { 0x0, 0x0, 165, -1, 2346, 0, 1, 65 }, - { 0x1, 0x1, 167, -1, -1, 28, 1, 35 }, - { 0x1, 0x1, 168, 2204, -1, 27, 1, 35 }, - { 0x1, 0x1, 168, 2205, -1, 27, 1, 35 }, - { 0x1, 0x1, 169, 1393, -1, 28, 1, 135 }, - { 0x1, 0x1, 169, 1394, -1, 28, 1, 135 }, - { 0x1, 0x1, 169, 1395, -1, 28, 1, 135 }, - { 0x1, 0x1, 169, 1396, -1, 28, 1, 135 }, - { 0x1, 0x1, 169, 1397, -1, 28, 1, 135 }, - { 0x1, 0x1, 169, 1398, -1, 28, 1, 135 }, - { 0x1, 0x1, 169, 1399, -1, 28, 1, 135 }, - { 0x1, 0x1, 169, 1400, -1, 28, 1, 135 }, - { 0x1, 0x1, 169, 1401, -1, 28, 1, 136 }, - { 0x1, 0x1, 169, 1402, -1, 28, 1, 136 }, - { 0x1, 0x1, 169, 1403, -1, 28, 1, 136 }, - { 0x1, 0x1, 169, 1404, -1, 28, 1, 136 }, - { 0x1, 0x1, 169, 1405, -1, 28, 1, 128 }, - { 0x1, 0x1, 169, 1406, -1, 28, 1, 129 }, - { 0x1, 0x1, 169, 1407, -1, 28, 1, 130 }, - { 0x1, 0x1, 169, 1408, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1409, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1410, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1411, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1412, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1413, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1414, -1, 28, 1, 128 }, - { 0x1, 0x1, 169, 1415, -1, 28, 1, 129 }, - { 0x1, 0x1, 169, 1416, -1, 28, 1, 130 }, - { 0x1, 0x1, 169, 1417, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1418, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1419, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1420, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1421, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1422, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1423, -1, 28, 1, 128 }, - { 0x1, 0x1, 169, 1424, -1, 28, 1, 129 }, - { 0x1, 0x1, 169, 1425, -1, 28, 1, 130 }, - { 0x1, 0x1, 169, 1426, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1427, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1428, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1429, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1430, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1431, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1432, -1, 28, 1, 128 }, - { 0x1, 0x1, 169, 1433, -1, 28, 1, 129 }, - { 0x1, 0x1, 169, 1434, -1, 28, 1, 130 }, - { 0x1, 0x1, 169, 1435, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1436, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1437, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1438, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1439, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1440, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1441, -1, 28, 1, 128 }, - { 0x1, 0x1, 169, 1442, -1, 28, 1, 129 }, - { 0x1, 0x1, 169, 1443, -1, 28, 1, 130 }, - { 0x1, 0x1, 169, 1444, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1445, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1446, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1447, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1448, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1449, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1450, -1, 28, 1, 128 }, - { 0x1, 0x1, 169, 1451, -1, 28, 1, 129 }, - { 0x1, 0x1, 169, 1452, -1, 28, 1, 130 }, - { 0x1, 0x1, 169, 1453, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1454, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1455, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1456, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1457, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1458, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1459, -1, 28, 1, 128 }, - { 0x1, 0x1, 169, 1460, -1, 28, 1, 129 }, - { 0x1, 0x1, 169, 1461, -1, 28, 1, 130 }, - { 0x1, 0x1, 169, 1462, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1463, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1464, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1465, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1466, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1467, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1468, -1, 28, 1, 128 }, - { 0x1, 0x1, 169, 1469, -1, 28, 1, 129 }, - { 0x1, 0x1, 169, 1470, -1, 28, 1, 130 }, - { 0x1, 0x1, 169, 1471, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1472, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1473, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1474, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1475, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1476, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1477, -1, 28, 1, 128 }, - { 0x1, 0x1, 169, 1478, -1, 28, 1, 129 }, - { 0x1, 0x1, 169, 1479, -1, 28, 1, 130 }, - { 0x1, 0x1, 169, 1480, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1481, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1482, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1483, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1484, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1485, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1486, -1, 28, 1, 128 }, - { 0x1, 0x1, 169, 1487, -1, 28, 1, 129 }, - { 0x1, 0x1, 169, 1488, -1, 28, 1, 130 }, - { 0x1, 0x1, 169, 1489, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1490, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1491, -1, 28, 1, 131 }, - { 0x1, 0x1, 169, 1492, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1493, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1494, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1495, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1496, -1, 28, 1, 128 }, - { 0x1, 0x1, 169, 1497, -1, 28, 1, 129 }, - { 0x1, 0x1, 169, 1498, -1, 28, 1, 130 }, - { 0x1, 0x1, 169, 1499, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1500, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1501, -1, 28, 1, 131 }, - { 0x1, 0x1, 169, 1502, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1503, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1504, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1505, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1506, -1, 28, 1, 128 }, - { 0x1, 0x1, 169, 1507, -1, 28, 1, 129 }, - { 0x1, 0x1, 169, 1508, -1, 28, 1, 130 }, - { 0x1, 0x1, 169, 1509, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1510, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1511, -1, 28, 1, 131 }, - { 0x1, 0x1, 169, 1512, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1513, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1514, -1, 28, 1, 132 }, - { 0x1, 0x1, 169, 1515, -1, 28, 1, 127 }, - { 0x1, 0x1, 169, 1516, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1517, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1518, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1519, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1520, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1521, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1522, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1523, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1524, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1525, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1526, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1527, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1528, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1529, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1530, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1531, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1532, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1533, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1534, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1535, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1536, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1537, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1538, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1539, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1540, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1541, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1542, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1543, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1544, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1545, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1546, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1547, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1548, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1549, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1550, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1551, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1552, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1553, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1554, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1555, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1556, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1557, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1558, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1559, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1560, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1561, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1562, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1563, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1564, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1565, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1566, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1567, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1568, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1569, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1570, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1571, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1572, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1573, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1574, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1575, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1576, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1577, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1578, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1579, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1580, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1581, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1582, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1583, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1584, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1585, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1586, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1587, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1588, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1589, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1590, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1591, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1592, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1593, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1594, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1595, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1596, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1597, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1598, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1599, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1600, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1601, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1602, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1603, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1604, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1605, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1606, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1607, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1608, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1609, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1610, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1611, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1612, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1613, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1614, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1615, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1616, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1617, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1618, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1619, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1620, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1621, -1, 28, 1, 139 }, - { 0x1, 0x1, 169, 1622, -1, 28, 1, 140 }, - { 0x1, 0x1, 169, 1623, -1, 28, 1, 141 }, - { 0x1, 0x1, 169, 1624, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1625, -1, 28, 1, 142 }, - { 0x1, 0x1, 169, 1626, -1, 28, 1, 138 }, - { 0x1, 0x1, 169, 1381, -1, 28, 1, 143 }, - { 0x1, 0x1, 169, 1382, -1, 28, 1, 144 }, - { 0x1, 0x1, 169, 1383, -1, 28, 1, 144 }, - { 0x1, 0x1, 169, 1384, -1, 28, 1, 143 }, - { 0x1, 0x1, 169, 1385, -1, 28, 1, 145 }, - { 0x1, 0x1, 169, 1386, -1, 28, 1, 146 }, - { 0x1, 0x1, 169, 1387, -1, 28, 1, 146 }, - { 0x1, 0x1, 169, 1388, -1, 28, 1, 145 }, - { 0x1, 0x1, 169, 1389, -1, 28, 1, 145 }, - { 0x1, 0x1, 169, 1390, -1, 28, 1, 146 }, - { 0x1, 0x1, 169, 1391, -1, 28, 1, 146 }, - { 0x1, 0x1, 169, 1392, -1, 28, 1, 145 }, - { 0x1, 0x1, 169, 1667, -1, 28, 1, 136 }, - { 0x1, 0x1, 169, 1668, -1, 28, 1, 136 }, - { 0x1, 0x1, 169, 1669, -1, 28, 1, 136 }, - { 0x1, 0x1, 169, 1670, -1, 28, 1, 136 }, - { 0x1, 0x1, 170, 1627, -1, 29, 1, 143 }, - { 0x1, 0x1, 170, 1628, -1, 29, 1, 144 }, - { 0x1, 0x1, 170, 1629, -1, 29, 1, 144 }, - { 0x1, 0x1, 170, 1630, -1, 29, 1, 143 }, - { 0x1, 0x1, 170, 1631, -1, 29, 1, 145 }, - { 0x1, 0x1, 170, 1632, -1, 29, 1, 146 }, - { 0x1, 0x1, 170, 1633, -1, 29, 1, 146 }, - { 0x1, 0x1, 170, 1634, -1, 29, 1, 145 }, - { 0x1, 0x1, 170, 1635, -1, 29, 1, 145 }, - { 0x1, 0x1, 170, 1636, -1, 29, 1, 146 }, - { 0x1, 0x1, 170, 1637, -1, 29, 1, 146 }, - { 0x1, 0x1, 170, 1638, -1, 29, 1, 145 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 135 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 135 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 135 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 135 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 135 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 135 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 135 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 135 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 136 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 136 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 136 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 136 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 128 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 129 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 130 }, + { 0x5, 0x5, 164, 1122, -1, 27, 1, 46 }, + { 0x0, 0x0, 165, -1, 2346, 0, 1, 55 }, + { 0x1, 0x1, 167, -1, -1, 28, 1, 30 }, + { 0x1, 0x1, 168, 2204, -1, 27, 1, 30 }, + { 0x1, 0x1, 168, 2205, -1, 27, 1, 30 }, + { 0x1, 0x1, 169, 1393, -1, 28, 1, 127 }, + { 0x1, 0x1, 169, 1394, -1, 28, 1, 127 }, + { 0x1, 0x1, 169, 1395, -1, 28, 1, 127 }, + { 0x1, 0x1, 169, 1396, -1, 28, 1, 127 }, + { 0x1, 0x1, 169, 1397, -1, 28, 1, 127 }, + { 0x1, 0x1, 169, 1398, -1, 28, 1, 127 }, + { 0x1, 0x1, 169, 1399, -1, 28, 1, 127 }, + { 0x1, 0x1, 169, 1400, -1, 28, 1, 127 }, + { 0x1, 0x1, 169, 1401, -1, 28, 1, 128 }, + { 0x1, 0x1, 169, 1402, -1, 28, 1, 128 }, + { 0x1, 0x1, 169, 1403, -1, 28, 1, 128 }, + { 0x1, 0x1, 169, 1404, -1, 28, 1, 128 }, + { 0x1, 0x1, 169, 1405, -1, 28, 1, 121 }, + { 0x1, 0x1, 169, 1406, -1, 28, 1, 122 }, + { 0x1, 0x1, 169, 1407, -1, 28, 1, 123 }, + { 0x1, 0x1, 169, 1408, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1409, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1410, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1411, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1412, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1413, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1414, -1, 28, 1, 121 }, + { 0x1, 0x1, 169, 1415, -1, 28, 1, 122 }, + { 0x1, 0x1, 169, 1416, -1, 28, 1, 123 }, + { 0x1, 0x1, 169, 1417, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1418, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1419, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1420, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1421, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1422, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1423, -1, 28, 1, 121 }, + { 0x1, 0x1, 169, 1424, -1, 28, 1, 122 }, + { 0x1, 0x1, 169, 1425, -1, 28, 1, 123 }, + { 0x1, 0x1, 169, 1426, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1427, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1428, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1429, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1430, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1431, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1432, -1, 28, 1, 121 }, + { 0x1, 0x1, 169, 1433, -1, 28, 1, 122 }, + { 0x1, 0x1, 169, 1434, -1, 28, 1, 123 }, + { 0x1, 0x1, 169, 1435, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1436, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1437, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1438, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1439, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1440, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1441, -1, 28, 1, 121 }, + { 0x1, 0x1, 169, 1442, -1, 28, 1, 122 }, + { 0x1, 0x1, 169, 1443, -1, 28, 1, 123 }, + { 0x1, 0x1, 169, 1444, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1445, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1446, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1447, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1448, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1449, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1450, -1, 28, 1, 121 }, + { 0x1, 0x1, 169, 1451, -1, 28, 1, 122 }, + { 0x1, 0x1, 169, 1452, -1, 28, 1, 123 }, + { 0x1, 0x1, 169, 1453, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1454, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1455, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1456, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1457, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1458, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1459, -1, 28, 1, 121 }, + { 0x1, 0x1, 169, 1460, -1, 28, 1, 122 }, + { 0x1, 0x1, 169, 1461, -1, 28, 1, 123 }, + { 0x1, 0x1, 169, 1462, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1463, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1464, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1465, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1466, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1467, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1468, -1, 28, 1, 121 }, + { 0x1, 0x1, 169, 1469, -1, 28, 1, 122 }, + { 0x1, 0x1, 169, 1470, -1, 28, 1, 123 }, + { 0x1, 0x1, 169, 1471, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1472, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1473, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1474, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1475, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1476, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1477, -1, 28, 1, 121 }, + { 0x1, 0x1, 169, 1478, -1, 28, 1, 122 }, + { 0x1, 0x1, 169, 1479, -1, 28, 1, 123 }, + { 0x1, 0x1, 169, 1480, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1481, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1482, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1483, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1484, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1485, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1486, -1, 28, 1, 121 }, + { 0x1, 0x1, 169, 1487, -1, 28, 1, 122 }, + { 0x1, 0x1, 169, 1488, -1, 28, 1, 123 }, + { 0x1, 0x1, 169, 1489, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1490, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1491, -1, 28, 1, 124 }, + { 0x1, 0x1, 169, 1492, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1493, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1494, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1495, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1496, -1, 28, 1, 121 }, + { 0x1, 0x1, 169, 1497, -1, 28, 1, 122 }, + { 0x1, 0x1, 169, 1498, -1, 28, 1, 123 }, + { 0x1, 0x1, 169, 1499, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1500, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1501, -1, 28, 1, 124 }, + { 0x1, 0x1, 169, 1502, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1503, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1504, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1505, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1506, -1, 28, 1, 121 }, + { 0x1, 0x1, 169, 1507, -1, 28, 1, 122 }, + { 0x1, 0x1, 169, 1508, -1, 28, 1, 123 }, + { 0x1, 0x1, 169, 1509, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1510, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1511, -1, 28, 1, 124 }, + { 0x1, 0x1, 169, 1512, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1513, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1514, -1, 28, 1, 125 }, + { 0x1, 0x1, 169, 1515, -1, 28, 1, 120 }, + { 0x1, 0x1, 169, 1516, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1517, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1518, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1519, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1520, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1521, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1522, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1523, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1524, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1525, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1526, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1527, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1528, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1529, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1530, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1531, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1532, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1533, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1534, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1535, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1536, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1537, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1538, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1539, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1540, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1541, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1542, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1543, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1544, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1545, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1546, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1547, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1548, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1549, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1550, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1551, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1552, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1553, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1554, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1555, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1556, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1557, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1558, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1559, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1560, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1561, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1562, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1563, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1564, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1565, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1566, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1567, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1568, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1569, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1570, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1571, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1572, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1573, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1574, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1575, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1576, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1577, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1578, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1579, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1580, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1581, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1582, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1583, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1584, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1585, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1586, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1587, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1588, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1589, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1590, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1591, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1592, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1593, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1594, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1595, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1596, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1597, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1598, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1599, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1600, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1601, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1602, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1603, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1604, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1605, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1606, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1607, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1608, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1609, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1610, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1611, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1612, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1613, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1614, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1615, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1616, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1617, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1618, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1619, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1620, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1621, -1, 28, 1, 131 }, + { 0x1, 0x1, 169, 1622, -1, 28, 1, 132 }, + { 0x1, 0x1, 169, 1623, -1, 28, 1, 133 }, + { 0x1, 0x1, 169, 1624, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1625, -1, 28, 1, 134 }, + { 0x1, 0x1, 169, 1626, -1, 28, 1, 130 }, + { 0x1, 0x1, 169, 1381, -1, 28, 1, 136 }, + { 0x1, 0x1, 169, 1382, -1, 28, 1, 137 }, + { 0x1, 0x1, 169, 1383, -1, 28, 1, 137 }, + { 0x1, 0x1, 169, 1384, -1, 28, 1, 136 }, + { 0x1, 0x1, 169, 1385, -1, 28, 1, 138 }, + { 0x1, 0x1, 169, 1386, -1, 28, 1, 139 }, + { 0x1, 0x1, 169, 1387, -1, 28, 1, 139 }, + { 0x1, 0x1, 169, 1388, -1, 28, 1, 138 }, + { 0x1, 0x1, 169, 1389, -1, 28, 1, 138 }, + { 0x1, 0x1, 169, 1390, -1, 28, 1, 139 }, + { 0x1, 0x1, 169, 1391, -1, 28, 1, 139 }, + { 0x1, 0x1, 169, 1392, -1, 28, 1, 138 }, + { 0x1, 0x1, 169, 1667, -1, 28, 1, 2 }, + { 0x1, 0x1, 169, 1668, -1, 28, 1, 2 }, + { 0x1, 0x1, 169, 1669, -1, 28, 1, 2 }, + { 0x1, 0x1, 169, 1670, -1, 28, 1, 2 }, + { 0x1, 0x1, 170, 1627, -1, 29, 1, 136 }, + { 0x1, 0x1, 170, 1628, -1, 29, 1, 137 }, + { 0x1, 0x1, 170, 1629, -1, 29, 1, 137 }, + { 0x1, 0x1, 170, 1630, -1, 29, 1, 136 }, + { 0x1, 0x1, 170, 1631, -1, 29, 1, 138 }, + { 0x1, 0x1, 170, 1632, -1, 29, 1, 139 }, + { 0x1, 0x1, 170, 1633, -1, 29, 1, 139 }, + { 0x1, 0x1, 170, 1634, -1, 29, 1, 138 }, + { 0x1, 0x1, 170, 1635, -1, 29, 1, 138 }, + { 0x1, 0x1, 170, 1636, -1, 29, 1, 139 }, + { 0x1, 0x1, 170, 1637, -1, 29, 1, 139 }, + { 0x1, 0x1, 170, 1638, -1, 29, 1, 138 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 257, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 1791, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 128 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 129 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 130 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 259, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 1792, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 128 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 129 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 130 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 261, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 1793, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 128 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 129 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 130 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 263, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 1794, -1, 28, 1, 127 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 128 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 129 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 130 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 265, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 1795, -1, 28, 1, 127 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 128 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 129 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 130 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 267, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 1796, -1, 28, 1, 127 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 128 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 129 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 130 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 269, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 1797, -1, 28, 1, 127 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 128 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 129 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 121 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 122 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 123 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 257, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 1791, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 121 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 122 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 123 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 259, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 1792, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 121 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 122 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 123 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 261, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 1793, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 121 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 122 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 123 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 263, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 1794, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 121 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 122 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 123 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 265, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 1795, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 121 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 122 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 123 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 267, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 1796, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 121 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 122 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 123 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 269, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 1797, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 121 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 122 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 123 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 271, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 1798, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 121 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 122 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 123 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 273, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 1799, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 121 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 122 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 123 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 124 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 275, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 1800, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 121 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 122 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 123 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 124 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 277, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 1801, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 121 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 122 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 123 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 120 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 124 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 279, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 125 }, + { 0x3, 0x3, 171, 1802, -1, 28, 1, 120 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 130 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 271, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 1798, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 128 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 129 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 130 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 273, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 1799, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 128 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 129 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 130 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 275, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 1800, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 128 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 129 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 130 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1803, -1, 28, 1, 130 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 277, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 1801, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 128 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 129 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 130 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 127 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1804, -1, 28, 1, 130 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 279, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, - { 0x3, 0x3, 171, 1802, -1, 28, 1, 127 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1803, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1804, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1805, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1806, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1807, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1808, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1809, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1810, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1811, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1812, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1813, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1814, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1815, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1816, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1817, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1818, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1819, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 140 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 141 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 142 }, - { 0x3, 0x3, 171, 1820, -1, 28, 1, 138 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 143 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 144 }, - { 0x3, 0x3, 171, 765, -1, 28, 1, 144 }, - { 0x3, 0x3, 171, 766, -1, 28, 1, 143 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 145 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 146 }, - { 0x3, 0x3, 171, 767, -1, 28, 1, 146 }, - { 0x3, 0x3, 171, 768, -1, 28, 1, 145 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 145 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 146 }, - { 0x3, 0x3, 171, 769, -1, 28, 1, 146 }, - { 0x3, 0x3, 171, 770, -1, 28, 1, 145 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, - { 0x3, 0x3, 171, 1759, -1, 28, 1, 133 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, - { 0x3, 0x3, 171, 1760, -1, 28, 1, 133 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, - { 0x3, 0x3, 171, 1761, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1805, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, - { 0x3, 0x3, 171, 1762, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1806, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, - { 0x3, 0x3, 171, 1763, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1807, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, - { 0x3, 0x3, 171, 1764, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1808, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, - { 0x3, 0x3, 171, 1765, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1809, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, - { 0x3, 0x3, 171, 1766, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1810, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1811, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1812, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1813, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1814, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1815, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1816, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1817, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1818, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1819, -1, 28, 1, 130 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 131 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 132 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 133 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 134 }, + { 0x3, 0x3, 171, 1820, -1, 28, 1, 130 }, { 0x3, 0x3, 171, -1, -1, 28, 1, 136 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 136 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 136 }, - { 0x3, 0x3, 171, -1, -1, 28, 1, 136 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 137 }, + { 0x3, 0x3, 171, 765, -1, 28, 1, 137 }, + { 0x3, 0x3, 171, 766, -1, 28, 1, 136 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 138 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, + { 0x3, 0x3, 171, 767, -1, 28, 1, 139 }, + { 0x3, 0x3, 171, 768, -1, 28, 1, 138 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 138 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 139 }, + { 0x3, 0x3, 171, 769, -1, 28, 1, 139 }, + { 0x3, 0x3, 171, 770, -1, 28, 1, 138 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, 1759, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, 1760, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, 1761, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, 1762, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, 1763, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, 1764, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 126 }, + { 0x3, 0x3, 171, 1765, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 126 }, + { 0x3, 0x3, 171, 1766, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 135 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 135 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, + { 0x3, 0x3, 171, -1, -1, 28, 1, 2 }, { 0x0, 0x0, 172, -1, 314, 0, 0, -1 }, - { 0x0, 0x0, 172, 2402, 2372, 0, 1, 3 }, + { 0x0, 0x0, 172, 2402, 2372, 0, 1, 67 }, { 0x0, 0x0, 172, -1, 318, 0, 0, -1 }, - { 0x0, 0x0, 172, 2404, 2374, 0, 1, 3 }, - { 0x11, 0x31, 173, 2306, 321, 33, 1, 6 }, - { 0x2200001, 0x2200001, 173, -1, 322, 12, 1, 6 }, - { 0x1, 0x1, 173, -1, 325, 37, 1, 6 }, - { 0x2000001, 0x2000001, 173, -1, 326, 12, 1, 6 }, - { 0x11, 0x11, 173, -1, 327, 33, 1, 6 }, - { 0x2200001, 0x2200001, 173, -1, 328, 12, 1, 6 }, - { 0x11, 0x31, 173, 2316, 333, 33, 1, 6 }, - { 0x2200001, 0x2200001, 173, -1, 334, 12, 1, 6 }, - { 0x11, 0x31, 173, 2326, 337, 33, 1, 6 }, - { 0x2200001, 0x2200001, 173, -1, 338, 12, 1, 6 }, - { 0x1, 0x1, 173, -1, 341, 37, 1, 6 }, - { 0x2000001, 0x2000001, 173, -1, 342, 12, 1, 6 }, - { 0x11, 0x11, 173, -1, 343, 33, 1, 6 }, - { 0x2200001, 0x2200001, 173, -1, 344, 12, 1, 6 }, - { 0x11, 0x31, 173, 2336, 349, 33, 1, 6 }, - { 0x2200001, 0x2200001, 173, -1, 350, 12, 1, 6 }, - { 0x1, 0x1, 173, -1, 353, 33, 1, 6 }, - { 0x200001, 0x200001, 173, -1, 354, 12, 1, 6 }, - { 0x1, 0x1, 173, -1, 357, 33, 1, 6 }, - { 0x200001, 0x200001, 173, -1, 358, 12, 1, 6 }, - { 0x1, 0x1, 174, -1, -1, 37, 1, 6 }, - { 0x2000001, 0x2000001, 174, -1, -1, 12, 1, 6 }, - { 0x1, 0x1, 174, -1, -1, 37, 1, 6 }, - { 0x2000001, 0x2000001, 174, -1, -1, 12, 1, 6 }, - { 0x11, 0x11, 174, -1, -1, 33, 1, 6 }, - { 0x2200001, 0x2200001, 174, -1, -1, 12, 1, 6 }, - { 0x1, 0x1, 174, -1, -1, 37, 1, 6 }, - { 0x2000001, 0x2000001, 174, -1, -1, 12, 1, 6 }, - { 0x0, 0x0, 174, -1, -1, 0, 1, 7 }, - { 0x1, 0x1, 174, -1, -1, 12, 1, 7 }, - { 0x0, 0x0, 174, -1, -1, 0, 1, 7 }, - { 0x1, 0x1, 174, -1, -1, 12, 1, 7 }, - { 0x1, 0x1, 174, -1, -1, 33, 1, 7 }, - { 0x200001, 0x200001, 174, -1, -1, 12, 1, 7 }, - { 0x0, 0x0, 174, -1, -1, 0, 1, 7 }, - { 0x1, 0x1, 174, -1, -1, 12, 1, 7 }, - { 0x1, 0x1, 174, -1, -1, 37, 1, 6 }, - { 0x2000001, 0x2000001, 174, -1, -1, 12, 1, 6 }, - { 0x1, 0x1, 174, -1, -1, 37, 1, 6 }, - { 0x2000001, 0x2000001, 174, -1, -1, 12, 1, 6 }, - { 0x11, 0x11, 174, -1, -1, 33, 1, 6 }, - { 0x2200001, 0x2200001, 174, -1, -1, 12, 1, 6 }, - { 0x1, 0x1, 174, -1, -1, 37, 1, 6 }, - { 0x2000001, 0x2000001, 174, -1, -1, 12, 1, 6 }, - { 0x0, 0x0, 174, -1, -1, 0, 1, 7 }, - { 0x1, 0x1, 174, -1, -1, 12, 1, 7 }, - { 0x0, 0x0, 174, -1, -1, 0, 1, 7 }, - { 0x1, 0x1, 174, -1, -1, 12, 1, 7 }, - { 0x1, 0x1, 174, -1, -1, 33, 1, 7 }, - { 0x200001, 0x200001, 174, -1, -1, 12, 1, 7 }, - { 0x0, 0x0, 174, -1, -1, 0, 1, 7 }, - { 0x1, 0x1, 174, -1, -1, 12, 1, 7 }, - { 0x9, 0x9, 174, -1, -1, 33, 1, 7 }, - { 0x1, 0x1, 174, 315, -1, 33, 1, 6 }, - { 0x1200001, 0x1200001, 174, -1, -1, 12, 1, 7 }, - { 0x200001, 0x200001, 174, 316, -1, 12, 1, 6 }, - { 0x9, 0x9, 174, -1, -1, 33, 1, 7 }, - { 0x1, 0x1, 174, 319, -1, 33, 1, 6 }, - { 0x1200001, 0x1200001, 174, -1, -1, 12, 1, 7 }, - { 0x200001, 0x200001, 174, 320, -1, 12, 1, 6 }, + { 0x0, 0x0, 172, 2404, 2374, 0, 1, 67 }, + { 0x11, 0x31, 173, 2306, 321, 33, 1, 7 }, + { 0x2200001, 0x2200001, 173, -1, 322, 12, 1, 7 }, + { 0x1, 0x1, 173, -1, 325, 37, 1, 7 }, + { 0x2000001, 0x2000001, 173, -1, 326, 12, 1, 7 }, + { 0x11, 0x11, 173, -1, 327, 33, 1, 7 }, + { 0x2200001, 0x2200001, 173, -1, 328, 12, 1, 7 }, + { 0x11, 0x31, 173, 2316, 333, 33, 1, 7 }, + { 0x2200001, 0x2200001, 173, -1, 334, 12, 1, 7 }, + { 0x11, 0x31, 173, 2326, 337, 33, 1, 7 }, + { 0x2200001, 0x2200001, 173, -1, 338, 12, 1, 7 }, + { 0x1, 0x1, 173, -1, 341, 37, 1, 7 }, + { 0x2000001, 0x2000001, 173, -1, 342, 12, 1, 7 }, + { 0x11, 0x11, 173, -1, 343, 33, 1, 7 }, + { 0x2200001, 0x2200001, 173, -1, 344, 12, 1, 7 }, + { 0x11, 0x31, 173, 2336, 349, 33, 1, 7 }, + { 0x2200001, 0x2200001, 173, -1, 350, 12, 1, 7 }, + { 0x1, 0x1, 173, -1, 353, 33, 1, 70 }, + { 0x200001, 0x200001, 173, -1, 354, 12, 1, 70 }, + { 0x1, 0x1, 173, -1, 357, 33, 1, 70 }, + { 0x200001, 0x200001, 173, -1, 358, 12, 1, 70 }, + { 0x1, 0x1, 174, -1, -1, 37, 1, 7 }, + { 0x2000001, 0x2000001, 174, -1, -1, 12, 1, 7 }, + { 0x1, 0x1, 174, -1, -1, 37, 1, 7 }, + { 0x2000001, 0x2000001, 174, -1, -1, 12, 1, 7 }, + { 0x11, 0x11, 174, -1, -1, 33, 1, 7 }, + { 0x2200001, 0x2200001, 174, -1, -1, 12, 1, 7 }, + { 0x1, 0x1, 174, -1, -1, 37, 1, 7 }, + { 0x2000001, 0x2000001, 174, -1, -1, 12, 1, 7 }, + { 0x0, 0x0, 174, -1, -1, 0, 1, 8 }, + { 0x1, 0x1, 174, -1, -1, 12, 1, 8 }, + { 0x0, 0x0, 174, -1, -1, 0, 1, 8 }, + { 0x1, 0x1, 174, -1, -1, 12, 1, 8 }, + { 0x1, 0x1, 174, -1, -1, 33, 1, 8 }, + { 0x200001, 0x200001, 174, -1, -1, 12, 1, 8 }, + { 0x0, 0x0, 174, -1, -1, 0, 1, 8 }, + { 0x1, 0x1, 174, -1, -1, 12, 1, 8 }, + { 0x1, 0x1, 174, -1, -1, 37, 1, 7 }, + { 0x2000001, 0x2000001, 174, -1, -1, 12, 1, 7 }, + { 0x1, 0x1, 174, -1, -1, 37, 1, 7 }, + { 0x2000001, 0x2000001, 174, -1, -1, 12, 1, 7 }, + { 0x11, 0x11, 174, -1, -1, 33, 1, 7 }, + { 0x2200001, 0x2200001, 174, -1, -1, 12, 1, 7 }, + { 0x1, 0x1, 174, -1, -1, 37, 1, 7 }, + { 0x2000001, 0x2000001, 174, -1, -1, 12, 1, 7 }, + { 0x0, 0x0, 174, -1, -1, 0, 1, 8 }, + { 0x1, 0x1, 174, -1, -1, 12, 1, 8 }, + { 0x0, 0x0, 174, -1, -1, 0, 1, 8 }, + { 0x1, 0x1, 174, -1, -1, 12, 1, 8 }, + { 0x1, 0x1, 174, -1, -1, 33, 1, 8 }, + { 0x200001, 0x200001, 174, -1, -1, 12, 1, 8 }, + { 0x0, 0x0, 174, -1, -1, 0, 1, 8 }, + { 0x1, 0x1, 174, -1, -1, 12, 1, 8 }, + { 0x9, 0x9, 174, -1, -1, 33, 1, 71 }, + { 0x1, 0x1, 174, 315, -1, 33, 1, 70 }, + { 0x1200001, 0x1200001, 174, -1, -1, 12, 1, 71 }, + { 0x200001, 0x200001, 174, 316, -1, 12, 1, 70 }, + { 0x9, 0x9, 174, -1, -1, 33, 1, 71 }, + { 0x1, 0x1, 174, 319, -1, 33, 1, 70 }, + { 0x1200001, 0x1200001, 174, -1, -1, 12, 1, 71 }, + { 0x200001, 0x200001, 174, 320, -1, 12, 1, 70 }, { 0x0, 0x0, 175, -1, 1848, 0, 0, -1 }, - { 0x9, 0x9, 175, -1, 2366, 33, 1, 51 }, + { 0x9, 0x9, 175, -1, 2366, 33, 1, 46 }, { 0x0, 0x0, 175, -1, 1889, 0, 0, -1 }, - { 0x7, 0x7, 175, -1, -1, 27, 1, 51 }, - { 0x1, 0x1, 195, -1, -1, 27, 1, 12 }, + { 0x7, 0x7, 175, -1, -1, 27, 1, 46 }, + { 0x1, 0x1, 195, -1, -1, 27, 1, 13 }, { 0x1, 0x1, 209, -1, -1, 29, 1, 0 }, { 0x1, 0x1, 209, -1, -1, 29, 1, 0 }, - { 0x2, 0x3, 209, 936, -1, 27, 1, 35 }, - { 0x0, 0x0, 209, 937, -1, 0, 1, 35 }, + { 0x2, 0x3, 209, 936, -1, 27, 1, 30 }, + { 0x0, 0x0, 209, 937, -1, 0, 1, 30 }, { 0x0, 0x0, 209, 938, -1, 0, 1, 0 }, { 0x0, 0x0, 209, 939, -1, 0, 1, 0 }, { 0x0, 0x0, 209, 940, -1, 0, 1, 0 }, { 0x0, 0x0, 209, 941, -1, 0, 1, 0 }, - { 0x0, 0x0, 209, 2388, -1, 0, 1, 96 }, - { 0x0, 0x0, 209, 2389, -1, 0, 1, 96 }, + { 0x0, 0x0, 209, 2388, -1, 0, 1, 2 }, + { 0x0, 0x0, 209, 2389, -1, 0, 1, 2 }, { 0x0, 0x0, 209, 2390, 780, 0, 0, -1 }, { 0x1, 0x1, 210, -1, -1, 27, 1, 0 }, { 0x1, 0x1, 210, -1, -1, 27, 1, 0 }, - { 0x1, 0x1, 211, -1, 1132, 32, 1, 135 }, - { 0x1, 0x1, 211, -1, 1134, 32, 1, 135 }, - { 0x1, 0x1, 211, -1, 1136, 32, 1, 135 }, - { 0x1, 0x1, 211, -1, 1138, 32, 1, 135 }, - { 0x1, 0x1, 211, -1, 1140, 32, 1, 136 }, - { 0x1, 0x1, 211, -1, 1142, 32, 1, 136 }, - { 0x1, 0x1, 211, -1, 1639, 32, 1, 133 }, - { 0x1, 0x1, 211, -1, 1641, 32, 1, 133 }, - { 0x1, 0x1, 211, -1, 1643, 32, 1, 133 }, - { 0x1, 0x1, 211, -1, 1645, 32, 1, 133 }, - { 0x1, 0x1, 211, -1, 1647, 32, 1, 133 }, - { 0x1, 0x1, 211, -1, 1649, 32, 1, 133 }, - { 0x1, 0x1, 211, 2208, 1651, 32, 1, 133 }, - { 0x1, 0x1, 211, 2209, 1654, 32, 1, 133 }, + { 0x1, 0x1, 211, -1, 1132, 32, 1, 127 }, + { 0x1, 0x1, 211, -1, 1134, 32, 1, 127 }, + { 0x1, 0x1, 211, -1, 1136, 32, 1, 127 }, + { 0x1, 0x1, 211, -1, 1138, 32, 1, 127 }, + { 0x1, 0x1, 211, -1, 1140, 32, 1, 128 }, + { 0x1, 0x1, 211, -1, 1142, 32, 1, 128 }, + { 0x1, 0x1, 211, -1, 1639, 32, 1, 2 }, + { 0x1, 0x1, 211, -1, 1641, 32, 1, 2 }, + { 0x1, 0x1, 211, -1, 1643, 32, 1, 2 }, + { 0x1, 0x1, 211, -1, 1645, 32, 1, 2 }, + { 0x1, 0x1, 211, -1, 1647, 32, 1, 2 }, + { 0x1, 0x1, 211, -1, 1649, 32, 1, 2 }, + { 0x1, 0x1, 211, 2208, 1651, 32, 1, 2 }, + { 0x1, 0x1, 211, 2209, 1654, 32, 1, 2 }, { 0x0, 0x0, 212, -1, 2250, 0, 0, -1 }, { 0x0, 0x0, 212, -1, 2251, 0, 0, -1 }, { 0x0, 0x0, 212, -1, 2276, 0, 0, -1 }, - { 0x5, 0x5, 212, -1, 2279, 20, 1, 70 }, + { 0x5, 0x5, 212, -1, 2279, 20, 1, 59 }, { 0x0, 0x0, 216, 1750, 779, 0, 0, -1 }, { 0x0, 0x0, 217, -1, 908, 0, 0, -1 }, { 0x0, 0x0, 217, -1, 989, 0, 0, -1 }, - { 0x0, 0x0, 217, -1, -1, 0, 1, 124 }, - { 0x0, 0x0, 217, -1, -1, 0, 1, 69 }, - { 0x1, 0x1, 217, 656, 1822, 36, 1, 67 }, - { 0x1, 0x1, 217, 657, 1857, 36, 1, 67 }, + { 0x0, 0x0, 217, -1, -1, 0, 1, 117 }, + { 0x0, 0x0, 217, -1, -1, 0, 1, 58 }, + { 0x1, 0x1, 217, 656, 1822, 36, 1, 57 }, + { 0x1, 0x1, 217, 657, 1857, 36, 1, 57 }, { 0x0, 0x0, 217, 658, 1860, 0, 0, -1 }, - { 0x1, 0x1, 217, 659, -1, 36, 1, 67 }, - { 0x0, 0x0, 217, 1129, -1, 0, 1, 35 }, - { 0x1, 0x1, 217, 660, 1865, 36, 1, 67 }, + { 0x1, 0x1, 217, 659, -1, 36, 1, 57 }, + { 0x0, 0x0, 217, 1129, -1, 0, 1, 30 }, + { 0x1, 0x1, 217, 660, 1865, 36, 1, 57 }, { 0x0, 0x0, 217, 661, 1868, 0, 0, -1 }, - { 0x1, 0x1, 217, 662, -1, 36, 1, 67 }, + { 0x1, 0x1, 217, 662, -1, 36, 1, 57 }, { 0x0, 0x0, 217, 663, 1871, 0, 0, -1 }, - { 0x1, 0x1, 217, 664, -1, 36, 1, 67 }, - { 0x1, 0x1, 217, 665, 1874, 36, 1, 67 }, - { 0x1, 0x1, 217, 666, 1877, 36, 1, 67 }, - { 0x0, 0x0, 217, 1130, -1, 0, 1, 35 }, - { 0x1, 0x1, 217, 667, 1907, 36, 1, 67 }, - { 0x1, 0x1, 217, 668, -1, 31, 1, 137 }, - { 0x1, 0x1, 217, 220, 1143, 32, 1, 128 }, - { 0x1, 0x1, 217, 221, 1152, 32, 1, 128 }, - { 0x1, 0x1, 217, 222, 1161, 32, 1, 128 }, - { 0x1, 0x1, 217, 223, 1170, 32, 1, 128 }, - { 0x1, 0x1, 217, 224, 1179, 32, 1, 128 }, - { 0x1, 0x1, 217, 225, 1188, 32, 1, 128 }, - { 0x1, 0x1, 217, 226, 1197, 32, 1, 128 }, - { 0x1, 0x1, 217, 227, 1206, 32, 1, 128 }, - { 0x1, 0x1, 217, 228, 1215, 32, 1, 128 }, - { 0x1, 0x1, 217, 229, 1224, 32, 1, 128 }, - { 0x1, 0x1, 217, 230, 1234, 32, 1, 128 }, - { 0x1, 0x1, 217, 231, 1244, 32, 1, 128 }, - { 0x1, 0x1, 217, 232, 1257, 32, 1, 139 }, - { 0x1, 0x1, 217, 233, 1263, 32, 1, 139 }, - { 0x1, 0x1, 217, 234, 1269, 32, 1, 139 }, - { 0x1, 0x1, 217, 235, 1275, 32, 1, 139 }, - { 0x1, 0x1, 217, 236, 1281, 32, 1, 139 }, - { 0x1, 0x1, 217, 237, 1287, 32, 1, 139 }, - { 0x1, 0x1, 217, 238, 1293, 32, 1, 139 }, - { 0x1, 0x1, 217, 239, 1299, 32, 1, 139 }, - { 0x1, 0x1, 217, 240, 1305, 32, 1, 139 }, - { 0x1, 0x1, 217, 241, 1311, 32, 1, 139 }, - { 0x1, 0x1, 217, 242, 1317, 32, 1, 139 }, - { 0x1, 0x1, 217, 243, 1323, 32, 1, 139 }, - { 0x1, 0x1, 217, 244, 1329, 32, 1, 139 }, - { 0x1, 0x1, 217, 245, 1335, 32, 1, 139 }, - { 0x1, 0x1, 217, 246, 1341, 32, 1, 139 }, - { 0x1, 0x1, 217, 247, 1347, 32, 1, 139 }, - { 0x1, 0x1, 217, 248, 1353, 32, 1, 139 }, - { 0x1, 0x1, 217, 249, 1359, 32, 1, 139 }, - { 0x1, 0x1, 217, 672, -1, 31, 1, 147 }, - { 0x0, 0x0, 218, 1910, -1, 0, 1, 67 }, - { 0x0, 0x0, 218, 1911, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 23, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1913, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1914, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1915, -1, 0, 1, 46 }, - { 0x0, 0x0, 218, 1916, -1, 0, 1, 41 }, - { 0x1, 0x1, 218, 1917, -1, 12, 1, 60 }, - { 0x0, 0x0, 218, 1918, -1, 0, 1, 55 }, - { 0x1000001, 0x1000001, 218, 1919, -1, 12, 1, 60 }, - { 0x1, 0x1, 218, 1920, -1, 36, 1, 55 }, - { 0x200001, 0x200001, 218, 1921, -1, 12, 1, 60 }, - { 0x1, 0x1, 218, 1922, -1, 33, 1, 55 }, - { 0x1200001, 0x1200001, 218, 1923, -1, 12, 1, 50 }, - { 0x9, 0x9, 218, 1924, -1, 33, 1, 50 }, - { 0x1, 0x1, 218, 1925, -1, 12, 1, 60 }, - { 0x0, 0x0, 218, 1926, -1, 0, 1, 55 }, - { 0x200001, 0x1200001, 218, 1927, -1, 12, 1, 60 }, - { 0x1, 0x9, 218, 1928, -1, 33, 1, 55 }, - { 0x1, 0x1, 218, 1929, -1, 12, 1, 60 }, - { 0x0, 0x0, 218, 1930, -1, 0, 1, 55 }, - { 0x1000001, 0x1000001, 218, 1931, -1, 12, 1, 60 }, - { 0x1, 0x1, 218, 1932, -1, 36, 1, 55 }, - { 0x200001, 0x200001, 218, 1933, -1, 12, 1, 60 }, - { 0x1, 0x1, 218, 1934, -1, 33, 1, 55 }, - { 0x1200001, 0x1200001, 218, 1935, -1, 12, 1, 50 }, - { 0x9, 0x9, 218, 1936, -1, 33, 1, 50 }, - { 0x1, 0x1, 218, 1937, -1, 12, 1, 60 }, - { 0x0, 0x0, 218, 1938, -1, 0, 1, 55 }, - { 0x200001, 0x1200001, 218, 1939, -1, 12, 1, 60 }, - { 0x1, 0x9, 218, 1940, -1, 33, 1, 55 }, - { 0x1, 0x1, 218, 1941, -1, 28, 1, 30 }, - { 0x0, 0x0, 218, 1942, -1, 0, 1, 30 }, - { 0x3, 0x3, 218, 1943, -1, 27, 1, 30 }, - { 0x1, 0x1, 218, 1944, -1, 27, 1, 30 }, - { 0x0, 0x0, 218, 1945, -1, 0, 1, 67 }, - { 0x0, 0x0, 218, 1946, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1947, -1, 0, 1, 30 }, - { 0x1, 0x1, 218, 1948, -1, 36, 1, 67 }, - { 0x1, 0x1, 218, 1949, -1, 37, 1, 30 }, - { 0x0, 0x0, 218, 1950, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1951, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1952, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1953, -1, 0, 1, 67 }, - { 0x0, 0x0, 218, 1954, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 35, -1, 0, 1, 30 }, - { 0x1, 0x1, 218, 1956, -1, 36, 1, 67 }, - { 0x1, 0x1, 218, 1957, -1, 37, 1, 30 }, - { 0x0, 0x0, 218, 1958, -1, 0, 1, 30 }, - { 0x1, 0x1, 218, 1959, -1, 36, 1, 67 }, - { 0x1, 0x1, 218, 1960, -1, 37, 1, 30 }, - { 0x0, 0x0, 218, 1961, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1962, -1, 0, 1, 67 }, - { 0x0, 0x0, 218, 1963, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 40, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1965, -1, 0, 1, 67 }, - { 0x0, 0x0, 218, 1966, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 41, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1968, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1969, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1970, -1, 0, 1, 50 }, - { 0x1, 0x1, 218, 1971, -1, 27, 1, 50 }, - { 0x1, 0x1, 218, 1972, -1, 28, 1, 50 }, - { 0x3, 0x3, 218, 1973, -1, 27, 1, 50 }, - { 0x1, 0x1, 218, 1974, -1, 29, 1, 50 }, - { 0x5, 0x5, 218, 1975, -1, 27, 1, 50 }, - { 0x3, 0x3, 218, 1976, -1, 28, 1, 50 }, - { 0x7, 0x7, 218, 1977, -1, 27, 1, 50 }, - { 0x1, 0x1, 218, 1978, -1, 28, 1, 30 }, - { 0x0, 0x0, 218, 1979, -1, 0, 1, 30 }, - { 0x3, 0x3, 218, 1980, -1, 27, 1, 30 }, - { 0x1, 0x1, 218, 1981, -1, 27, 1, 30 }, - { 0x0, 0x0, 218, 1982, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1983, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1984, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 50, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1986, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 1987, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 55, -1, 0, 1, 30 }, + { 0x1, 0x1, 217, 664, -1, 36, 1, 57 }, + { 0x1, 0x1, 217, 665, 1874, 36, 1, 57 }, + { 0x1, 0x1, 217, 666, 1877, 36, 1, 57 }, + { 0x0, 0x0, 217, 1130, -1, 0, 1, 30 }, + { 0x1, 0x1, 217, 667, 1907, 36, 1, 57 }, + { 0x1, 0x1, 217, 668, -1, 31, 1, 129 }, + { 0x1, 0x1, 217, 220, 1143, 32, 1, 121 }, + { 0x1, 0x1, 217, 221, 1152, 32, 1, 121 }, + { 0x1, 0x1, 217, 222, 1161, 32, 1, 121 }, + { 0x1, 0x1, 217, 223, 1170, 32, 1, 121 }, + { 0x1, 0x1, 217, 224, 1179, 32, 1, 121 }, + { 0x1, 0x1, 217, 225, 1188, 32, 1, 121 }, + { 0x1, 0x1, 217, 226, 1197, 32, 1, 121 }, + { 0x1, 0x1, 217, 227, 1206, 32, 1, 121 }, + { 0x1, 0x1, 217, 228, 1215, 32, 1, 121 }, + { 0x1, 0x1, 217, 229, 1224, 32, 1, 121 }, + { 0x1, 0x1, 217, 230, 1234, 32, 1, 121 }, + { 0x1, 0x1, 217, 231, 1244, 32, 1, 121 }, + { 0x1, 0x1, 217, 232, 1257, 32, 1, 131 }, + { 0x1, 0x1, 217, 233, 1263, 32, 1, 131 }, + { 0x1, 0x1, 217, 234, 1269, 32, 1, 131 }, + { 0x1, 0x1, 217, 235, 1275, 32, 1, 131 }, + { 0x1, 0x1, 217, 236, 1281, 32, 1, 131 }, + { 0x1, 0x1, 217, 237, 1287, 32, 1, 131 }, + { 0x1, 0x1, 217, 238, 1293, 32, 1, 131 }, + { 0x1, 0x1, 217, 239, 1299, 32, 1, 131 }, + { 0x1, 0x1, 217, 240, 1305, 32, 1, 131 }, + { 0x1, 0x1, 217, 241, 1311, 32, 1, 131 }, + { 0x1, 0x1, 217, 242, 1317, 32, 1, 131 }, + { 0x1, 0x1, 217, 243, 1323, 32, 1, 131 }, + { 0x1, 0x1, 217, 244, 1329, 32, 1, 131 }, + { 0x1, 0x1, 217, 245, 1335, 32, 1, 131 }, + { 0x1, 0x1, 217, 246, 1341, 32, 1, 131 }, + { 0x1, 0x1, 217, 247, 1347, 32, 1, 131 }, + { 0x1, 0x1, 217, 248, 1353, 32, 1, 131 }, + { 0x1, 0x1, 217, 249, 1359, 32, 1, 131 }, + { 0x1, 0x1, 217, 672, -1, 31, 1, 5 }, + { 0x0, 0x0, 218, 1910, -1, 0, 1, 57 }, + { 0x0, 0x0, 218, 1911, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 23, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1913, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1914, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1915, -1, 0, 1, 41 }, + { 0x0, 0x0, 218, 1916, -1, 0, 1, 36 }, + { 0x1, 0x1, 218, 1917, -1, 12, 1, 45 }, + { 0x0, 0x0, 218, 1918, -1, 0, 1, 50 }, + { 0x1000001, 0x1000001, 218, 1919, -1, 12, 1, 45 }, + { 0x1, 0x1, 218, 1920, -1, 36, 1, 50 }, + { 0x200001, 0x200001, 218, 1921, -1, 12, 1, 45 }, + { 0x1, 0x1, 218, 1922, -1, 33, 1, 50 }, + { 0x1200001, 0x1200001, 218, 1923, -1, 12, 1, 45 }, + { 0x9, 0x9, 218, 1924, -1, 33, 1, 45 }, + { 0x1, 0x1, 218, 1925, -1, 12, 1, 45 }, + { 0x0, 0x0, 218, 1926, -1, 0, 1, 50 }, + { 0x200001, 0x1200001, 218, 1927, -1, 12, 1, 45 }, + { 0x1, 0x9, 218, 1928, -1, 33, 1, 50 }, + { 0x1, 0x1, 218, 1929, -1, 12, 1, 45 }, + { 0x0, 0x0, 218, 1930, -1, 0, 1, 50 }, + { 0x1000001, 0x1000001, 218, 1931, -1, 12, 1, 45 }, + { 0x1, 0x1, 218, 1932, -1, 36, 1, 50 }, + { 0x200001, 0x200001, 218, 1933, -1, 12, 1, 45 }, + { 0x1, 0x1, 218, 1934, -1, 33, 1, 50 }, + { 0x1200001, 0x1200001, 218, 1935, -1, 12, 1, 45 }, + { 0x9, 0x9, 218, 1936, -1, 33, 1, 45 }, + { 0x1, 0x1, 218, 1937, -1, 12, 1, 45 }, + { 0x0, 0x0, 218, 1938, -1, 0, 1, 50 }, + { 0x200001, 0x1200001, 218, 1939, -1, 12, 1, 45 }, + { 0x1, 0x9, 218, 1940, -1, 33, 1, 50 }, + { 0x1, 0x1, 218, 1941, -1, 28, 1, 25 }, + { 0x0, 0x0, 218, 1942, -1, 0, 1, 25 }, + { 0x3, 0x3, 218, 1943, -1, 27, 1, 25 }, + { 0x1, 0x1, 218, 1944, -1, 27, 1, 25 }, + { 0x0, 0x0, 218, 1945, -1, 0, 1, 57 }, + { 0x0, 0x0, 218, 1946, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1947, -1, 0, 1, 25 }, + { 0x1, 0x1, 218, 1948, -1, 36, 1, 57 }, + { 0x1, 0x1, 218, 1949, -1, 37, 1, 25 }, + { 0x0, 0x0, 218, 1950, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1951, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1952, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1953, -1, 0, 1, 57 }, + { 0x0, 0x0, 218, 1954, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 35, -1, 0, 1, 25 }, + { 0x1, 0x1, 218, 1956, -1, 36, 1, 57 }, + { 0x1, 0x1, 218, 1957, -1, 37, 1, 25 }, + { 0x0, 0x0, 218, 1958, -1, 0, 1, 25 }, + { 0x1, 0x1, 218, 1959, -1, 36, 1, 57 }, + { 0x1, 0x1, 218, 1960, -1, 37, 1, 25 }, + { 0x0, 0x0, 218, 1961, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1962, -1, 0, 1, 57 }, + { 0x0, 0x0, 218, 1963, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 40, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1965, -1, 0, 1, 57 }, + { 0x0, 0x0, 218, 1966, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 41, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1968, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1969, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1970, -1, 0, 1, 45 }, + { 0x1, 0x1, 218, 1971, -1, 27, 1, 45 }, + { 0x1, 0x1, 218, 1972, -1, 28, 1, 45 }, + { 0x3, 0x3, 218, 1973, -1, 27, 1, 45 }, + { 0x1, 0x1, 218, 1974, -1, 29, 1, 45 }, + { 0x5, 0x5, 218, 1975, -1, 27, 1, 45 }, + { 0x3, 0x3, 218, 1976, -1, 28, 1, 45 }, + { 0x7, 0x7, 218, 1977, -1, 27, 1, 45 }, + { 0x1, 0x1, 218, 1978, -1, 28, 1, 25 }, + { 0x0, 0x0, 218, 1979, -1, 0, 1, 25 }, + { 0x3, 0x3, 218, 1980, -1, 27, 1, 25 }, + { 0x1, 0x1, 218, 1981, -1, 27, 1, 25 }, + { 0x0, 0x0, 218, 1982, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1983, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1984, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 50, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1986, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 1987, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 55, -1, 0, 1, 25 }, { 0x0, 0x0, 218, 1989, -1, 0, 1, 25 }, { 0x0, 0x0, 218, 1990, -1, 0, 1, 25 }, - { 0x0, 0x0, 218, 58, -1, 0, 1, 68 }, + { 0x0, 0x0, 218, 58, -1, 0, 1, 2 }, { 0x0, 0x0, 218, 1992, -1, 0, 1, 25 }, { 0x0, 0x0, 218, 1993, -1, 0, 1, 25 }, - { 0x0, 0x0, 218, 1994, -1, 0, 1, 36 }, - { 0x0, 0x0, 218, 1995, -1, 0, 1, 67 }, - { 0x0, 0x0, 218, 1996, -1, 0, 1, 30 }, - { 0x0, 0x0, 218, 63, -1, 0, 1, 30 }, - { 0x1, 0x1, 219, 1998, -1, 34, 1, 67 }, - { 0x1, 0x1, 219, 1999, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2000, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2001, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2002, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2003, -1, 34, 1, 47 }, - { 0x1, 0x1, 219, 2004, -1, 34, 1, 43 }, - { 0x400001, 0x400001, 219, 2005, -1, 12, 1, 62 }, - { 0x1, 0x1, 219, 2006, -1, 34, 1, 57 }, - { 0x1400001, 0x1400001, 219, 2007, -1, 12, 1, 62 }, - { 0x5, 0x5, 219, 2008, -1, 34, 1, 57 }, - { 0x600001, 0x600001, 219, 2009, -1, 12, 1, 62 }, - { 0x3, 0x3, 219, 2010, -1, 33, 1, 57 }, - { 0x1600001, 0x1600001, 219, 2011, -1, 12, 1, 52 }, - { 0xb, 0xb, 219, 2012, -1, 33, 1, 52 }, - { 0x400001, 0x400001, 219, 2013, -1, 12, 1, 62 }, - { 0x1, 0x1, 219, 2014, -1, 34, 1, 57 }, - { 0x600001, 0x1600001, 219, 2015, -1, 12, 1, 62 }, - { 0x3, 0xb, 219, 2016, -1, 33, 1, 57 }, - { 0x400001, 0x400001, 219, 2017, -1, 12, 1, 62 }, - { 0x1, 0x1, 219, 2018, -1, 34, 1, 57 }, - { 0x1400001, 0x1400001, 219, 2019, -1, 12, 1, 62 }, - { 0x5, 0x5, 219, 2020, -1, 34, 1, 57 }, - { 0x600001, 0x600001, 219, 2021, -1, 12, 1, 62 }, - { 0x3, 0x3, 219, 2022, -1, 33, 1, 57 }, - { 0x1600001, 0x1600001, 219, 2023, -1, 12, 1, 52 }, - { 0xb, 0xb, 219, 2024, -1, 33, 1, 52 }, - { 0x400001, 0x400001, 219, 2025, -1, 12, 1, 62 }, - { 0x1, 0x1, 219, 2026, -1, 34, 1, 57 }, - { 0x600001, 0x1600001, 219, 2027, -1, 12, 1, 62 }, - { 0x3, 0xb, 219, 2028, -1, 33, 1, 57 }, - { 0x41, 0x41, 219, 2029, -1, 28, 1, 32 }, - { 0x1, 0x1, 219, 2030, -1, 34, 1, 32 }, - { 0x83, 0x83, 219, 2031, -1, 27, 1, 32 }, - { 0x81, 0x81, 219, 2032, -1, 27, 1, 32 }, - { 0x1, 0x1, 219, 2033, -1, 34, 1, 67 }, - { 0x1, 0x1, 219, 2034, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2035, -1, 34, 1, 32 }, - { 0x5, 0x5, 219, 2036, -1, 34, 1, 67 }, - { 0x9, 0x9, 219, 2037, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2038, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2039, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2040, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2041, -1, 34, 1, 67 }, - { 0x1, 0x1, 219, 2042, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2043, -1, 34, 1, 32 }, - { 0x5, 0x5, 219, 2044, -1, 34, 1, 67 }, - { 0x9, 0x9, 219, 2045, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2046, -1, 34, 1, 32 }, - { 0x5, 0x5, 219, 2047, -1, 34, 1, 67 }, - { 0x9, 0x9, 219, 2048, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2049, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2050, -1, 34, 1, 67 }, - { 0x1, 0x1, 219, 2051, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2052, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2053, -1, 34, 1, 67 }, - { 0x1, 0x1, 219, 2054, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2055, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2056, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2057, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2058, -1, 34, 1, 52 }, - { 0x81, 0x81, 219, 2059, -1, 27, 1, 52 }, - { 0x41, 0x41, 219, 2060, -1, 28, 1, 52 }, - { 0x83, 0x83, 219, 2061, -1, 27, 1, 52 }, - { 0x21, 0x21, 219, 2062, -1, 29, 1, 52 }, - { 0x85, 0x85, 219, 2063, -1, 27, 1, 52 }, - { 0x43, 0x43, 219, 2064, -1, 28, 1, 52 }, - { 0x87, 0x87, 219, 2065, -1, 27, 1, 52 }, - { 0x41, 0x41, 219, 2066, -1, 28, 1, 32 }, - { 0x1, 0x1, 219, 2067, -1, 34, 1, 32 }, - { 0x83, 0x83, 219, 2068, -1, 27, 1, 32 }, - { 0x81, 0x81, 219, 2069, -1, 27, 1, 32 }, - { 0x1, 0x1, 219, 2070, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2071, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2072, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2073, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2074, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2075, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2076, -1, 34, 1, 32 }, + { 0x0, 0x0, 218, 1994, -1, 0, 1, 31 }, + { 0x0, 0x0, 218, 1995, -1, 0, 1, 57 }, + { 0x0, 0x0, 218, 1996, -1, 0, 1, 25 }, + { 0x0, 0x0, 218, 63, -1, 0, 1, 25 }, + { 0x1, 0x1, 219, 1998, -1, 34, 1, 57 }, + { 0x1, 0x1, 219, 1999, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2000, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2001, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2002, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2003, -1, 34, 1, 42 }, + { 0x1, 0x1, 219, 2004, -1, 34, 1, 38 }, + { 0x400001, 0x400001, 219, 2005, -1, 12, 1, 47 }, + { 0x1, 0x1, 219, 2006, -1, 34, 1, 52 }, + { 0x1400001, 0x1400001, 219, 2007, -1, 12, 1, 47 }, + { 0x5, 0x5, 219, 2008, -1, 34, 1, 52 }, + { 0x600001, 0x600001, 219, 2009, -1, 12, 1, 47 }, + { 0x3, 0x3, 219, 2010, -1, 33, 1, 52 }, + { 0x1600001, 0x1600001, 219, 2011, -1, 12, 1, 47 }, + { 0xb, 0xb, 219, 2012, -1, 33, 1, 47 }, + { 0x400001, 0x400001, 219, 2013, -1, 12, 1, 47 }, + { 0x1, 0x1, 219, 2014, -1, 34, 1, 52 }, + { 0x600001, 0x1600001, 219, 2015, -1, 12, 1, 47 }, + { 0x3, 0xb, 219, 2016, -1, 33, 1, 52 }, + { 0x400001, 0x400001, 219, 2017, -1, 12, 1, 47 }, + { 0x1, 0x1, 219, 2018, -1, 34, 1, 52 }, + { 0x1400001, 0x1400001, 219, 2019, -1, 12, 1, 47 }, + { 0x5, 0x5, 219, 2020, -1, 34, 1, 52 }, + { 0x600001, 0x600001, 219, 2021, -1, 12, 1, 47 }, + { 0x3, 0x3, 219, 2022, -1, 33, 1, 52 }, + { 0x1600001, 0x1600001, 219, 2023, -1, 12, 1, 47 }, + { 0xb, 0xb, 219, 2024, -1, 33, 1, 47 }, + { 0x400001, 0x400001, 219, 2025, -1, 12, 1, 47 }, + { 0x1, 0x1, 219, 2026, -1, 34, 1, 52 }, + { 0x600001, 0x1600001, 219, 2027, -1, 12, 1, 47 }, + { 0x3, 0xb, 219, 2028, -1, 33, 1, 52 }, + { 0x41, 0x41, 219, 2029, -1, 28, 1, 27 }, + { 0x1, 0x1, 219, 2030, -1, 34, 1, 27 }, + { 0x83, 0x83, 219, 2031, -1, 27, 1, 27 }, + { 0x81, 0x81, 219, 2032, -1, 27, 1, 27 }, + { 0x1, 0x1, 219, 2033, -1, 34, 1, 57 }, + { 0x1, 0x1, 219, 2034, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2035, -1, 34, 1, 27 }, + { 0x5, 0x5, 219, 2036, -1, 34, 1, 57 }, + { 0x9, 0x9, 219, 2037, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2038, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2039, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2040, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2041, -1, 34, 1, 57 }, + { 0x1, 0x1, 219, 2042, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2043, -1, 34, 1, 27 }, + { 0x5, 0x5, 219, 2044, -1, 34, 1, 57 }, + { 0x9, 0x9, 219, 2045, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2046, -1, 34, 1, 27 }, + { 0x5, 0x5, 219, 2047, -1, 34, 1, 57 }, + { 0x9, 0x9, 219, 2048, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2049, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2050, -1, 34, 1, 57 }, + { 0x1, 0x1, 219, 2051, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2052, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2053, -1, 34, 1, 57 }, + { 0x1, 0x1, 219, 2054, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2055, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2056, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2057, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2058, -1, 34, 1, 47 }, + { 0x81, 0x81, 219, 2059, -1, 27, 1, 47 }, + { 0x41, 0x41, 219, 2060, -1, 28, 1, 47 }, + { 0x83, 0x83, 219, 2061, -1, 27, 1, 47 }, + { 0x21, 0x21, 219, 2062, -1, 29, 1, 47 }, + { 0x85, 0x85, 219, 2063, -1, 27, 1, 47 }, + { 0x43, 0x43, 219, 2064, -1, 28, 1, 47 }, + { 0x87, 0x87, 219, 2065, -1, 27, 1, 47 }, + { 0x41, 0x41, 219, 2066, -1, 28, 1, 27 }, + { 0x1, 0x1, 219, 2067, -1, 34, 1, 27 }, + { 0x83, 0x83, 219, 2068, -1, 27, 1, 27 }, + { 0x81, 0x81, 219, 2069, -1, 27, 1, 27 }, + { 0x1, 0x1, 219, 2070, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2071, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2072, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2073, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2074, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2075, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2076, -1, 34, 1, 27 }, { 0x1, 0x1, 219, 2077, -1, 34, 1, 27 }, { 0x1, 0x1, 219, 2078, -1, 34, 1, 27 }, - { 0x1, 0x1, 219, 2079, -1, 34, 1, 68 }, + { 0x1, 0x1, 219, 2079, -1, 34, 1, 2 }, { 0x1, 0x1, 219, 2080, -1, 34, 1, 27 }, { 0x1, 0x1, 219, 2081, -1, 34, 1, 27 }, - { 0x1, 0x1, 219, 2082, -1, 34, 1, 38 }, - { 0x1, 0x1, 219, 2083, -1, 34, 1, 67 }, - { 0x1, 0x1, 219, 2084, -1, 34, 1, 32 }, - { 0x1, 0x1, 219, 2085, -1, 34, 1, 32 }, - { 0x1, 0x1, 220, 2086, -1, 35, 1, 67 }, - { 0x1, 0x1, 220, 2087, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2088, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2089, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2090, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2091, -1, 35, 1, 48 }, - { 0x1, 0x1, 220, 2092, -1, 35, 1, 44 }, - { 0x800001, 0x800001, 220, 2093, -1, 12, 1, 63 }, - { 0x1, 0x1, 220, 2094, -1, 35, 1, 58 }, - { 0x1800001, 0x1800001, 220, 2095, -1, 12, 1, 63 }, - { 0x3, 0x3, 220, 2096, -1, 35, 1, 58 }, - { 0xa00001, 0xa00001, 220, 2097, -1, 12, 1, 63 }, - { 0x5, 0x5, 220, 2098, -1, 33, 1, 58 }, - { 0x1a00001, 0x1a00001, 220, 2099, -1, 12, 1, 53 }, - { 0xd, 0xd, 220, 2100, -1, 33, 1, 53 }, - { 0x800001, 0x800001, 220, 2101, -1, 12, 1, 63 }, - { 0x1, 0x1, 220, 2102, -1, 35, 1, 58 }, - { 0xa00001, 0x1a00001, 220, 2103, -1, 12, 1, 63 }, - { 0x5, 0xd, 220, 2104, -1, 33, 1, 58 }, - { 0x800001, 0x800001, 220, 2105, -1, 12, 1, 63 }, - { 0x1, 0x1, 220, 2106, -1, 35, 1, 58 }, - { 0x1800001, 0x1800001, 220, 2107, -1, 12, 1, 63 }, - { 0x3, 0x3, 220, 2108, -1, 35, 1, 58 }, - { 0xa00001, 0xa00001, 220, 2109, -1, 12, 1, 63 }, - { 0x5, 0x5, 220, 2110, -1, 33, 1, 58 }, - { 0x1a00001, 0x1a00001, 220, 2111, -1, 12, 1, 53 }, - { 0xd, 0xd, 220, 2112, -1, 33, 1, 53 }, - { 0x800001, 0x800001, 220, 2113, -1, 12, 1, 63 }, - { 0x1, 0x1, 220, 2114, -1, 35, 1, 58 }, - { 0xa00001, 0x1a00001, 220, 2115, -1, 12, 1, 63 }, - { 0x5, 0xd, 220, 2116, -1, 33, 1, 58 }, - { 0x81, 0x81, 220, 2117, -1, 28, 1, 33 }, - { 0x1, 0x1, 220, 2118, -1, 35, 1, 33 }, - { 0x103, 0x103, 220, 2119, -1, 27, 1, 33 }, - { 0x101, 0x101, 220, 2120, -1, 27, 1, 33 }, - { 0x1, 0x1, 220, 2121, -1, 35, 1, 67 }, - { 0x1, 0x1, 220, 2122, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2123, -1, 35, 1, 33 }, - { 0x3, 0x3, 220, 2124, -1, 35, 1, 67 }, - { 0x5, 0x5, 220, 2125, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2126, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2127, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2128, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2129, -1, 35, 1, 67 }, - { 0x1, 0x1, 220, 2130, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2131, -1, 35, 1, 33 }, - { 0x3, 0x3, 220, 2132, -1, 35, 1, 67 }, - { 0x5, 0x5, 220, 2133, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2134, -1, 35, 1, 33 }, - { 0x3, 0x3, 220, 2135, -1, 35, 1, 67 }, - { 0x5, 0x5, 220, 2136, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2137, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2138, -1, 35, 1, 67 }, - { 0x1, 0x1, 220, 2139, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2140, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2141, -1, 35, 1, 67 }, - { 0x1, 0x1, 220, 2142, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2143, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2144, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2145, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2146, -1, 35, 1, 53 }, - { 0x101, 0x101, 220, 2147, -1, 27, 1, 53 }, - { 0x81, 0x81, 220, 2148, -1, 28, 1, 53 }, - { 0x103, 0x103, 220, 2149, -1, 27, 1, 53 }, - { 0x41, 0x41, 220, 2150, -1, 29, 1, 53 }, - { 0x105, 0x105, 220, 2151, -1, 27, 1, 53 }, - { 0x83, 0x83, 220, 2152, -1, 28, 1, 53 }, - { 0x107, 0x107, 220, 2153, -1, 27, 1, 53 }, - { 0x81, 0x81, 220, 2154, -1, 28, 1, 33 }, - { 0x1, 0x1, 220, 2155, -1, 35, 1, 33 }, - { 0x103, 0x103, 220, 2156, -1, 27, 1, 33 }, - { 0x101, 0x101, 220, 2157, -1, 27, 1, 33 }, - { 0x1, 0x1, 220, 2158, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2159, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2160, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2161, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2162, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2163, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2164, -1, 35, 1, 33 }, + { 0x1, 0x1, 219, 2082, -1, 34, 1, 33 }, + { 0x1, 0x1, 219, 2083, -1, 34, 1, 57 }, + { 0x1, 0x1, 219, 2084, -1, 34, 1, 27 }, + { 0x1, 0x1, 219, 2085, -1, 34, 1, 27 }, + { 0x1, 0x1, 220, 2086, -1, 35, 1, 57 }, + { 0x1, 0x1, 220, 2087, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2088, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2089, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2090, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2091, -1, 35, 1, 43 }, + { 0x1, 0x1, 220, 2092, -1, 35, 1, 39 }, + { 0x800001, 0x800001, 220, 2093, -1, 12, 1, 48 }, + { 0x1, 0x1, 220, 2094, -1, 35, 1, 53 }, + { 0x1800001, 0x1800001, 220, 2095, -1, 12, 1, 48 }, + { 0x3, 0x3, 220, 2096, -1, 35, 1, 53 }, + { 0xa00001, 0xa00001, 220, 2097, -1, 12, 1, 48 }, + { 0x5, 0x5, 220, 2098, -1, 33, 1, 53 }, + { 0x1a00001, 0x1a00001, 220, 2099, -1, 12, 1, 48 }, + { 0xd, 0xd, 220, 2100, -1, 33, 1, 48 }, + { 0x800001, 0x800001, 220, 2101, -1, 12, 1, 48 }, + { 0x1, 0x1, 220, 2102, -1, 35, 1, 53 }, + { 0xa00001, 0x1a00001, 220, 2103, -1, 12, 1, 48 }, + { 0x5, 0xd, 220, 2104, -1, 33, 1, 53 }, + { 0x800001, 0x800001, 220, 2105, -1, 12, 1, 48 }, + { 0x1, 0x1, 220, 2106, -1, 35, 1, 53 }, + { 0x1800001, 0x1800001, 220, 2107, -1, 12, 1, 48 }, + { 0x3, 0x3, 220, 2108, -1, 35, 1, 53 }, + { 0xa00001, 0xa00001, 220, 2109, -1, 12, 1, 48 }, + { 0x5, 0x5, 220, 2110, -1, 33, 1, 53 }, + { 0x1a00001, 0x1a00001, 220, 2111, -1, 12, 1, 48 }, + { 0xd, 0xd, 220, 2112, -1, 33, 1, 48 }, + { 0x800001, 0x800001, 220, 2113, -1, 12, 1, 48 }, + { 0x1, 0x1, 220, 2114, -1, 35, 1, 53 }, + { 0xa00001, 0x1a00001, 220, 2115, -1, 12, 1, 48 }, + { 0x5, 0xd, 220, 2116, -1, 33, 1, 53 }, + { 0x81, 0x81, 220, 2117, -1, 28, 1, 28 }, + { 0x1, 0x1, 220, 2118, -1, 35, 1, 28 }, + { 0x103, 0x103, 220, 2119, -1, 27, 1, 28 }, + { 0x101, 0x101, 220, 2120, -1, 27, 1, 28 }, + { 0x1, 0x1, 220, 2121, -1, 35, 1, 57 }, + { 0x1, 0x1, 220, 2122, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2123, -1, 35, 1, 28 }, + { 0x3, 0x3, 220, 2124, -1, 35, 1, 57 }, + { 0x5, 0x5, 220, 2125, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2126, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2127, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2128, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2129, -1, 35, 1, 57 }, + { 0x1, 0x1, 220, 2130, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2131, -1, 35, 1, 28 }, + { 0x3, 0x3, 220, 2132, -1, 35, 1, 57 }, + { 0x5, 0x5, 220, 2133, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2134, -1, 35, 1, 28 }, + { 0x3, 0x3, 220, 2135, -1, 35, 1, 57 }, + { 0x5, 0x5, 220, 2136, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2137, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2138, -1, 35, 1, 57 }, + { 0x1, 0x1, 220, 2139, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2140, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2141, -1, 35, 1, 57 }, + { 0x1, 0x1, 220, 2142, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2143, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2144, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2145, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2146, -1, 35, 1, 48 }, + { 0x101, 0x101, 220, 2147, -1, 27, 1, 48 }, + { 0x81, 0x81, 220, 2148, -1, 28, 1, 48 }, + { 0x103, 0x103, 220, 2149, -1, 27, 1, 48 }, + { 0x41, 0x41, 220, 2150, -1, 29, 1, 48 }, + { 0x105, 0x105, 220, 2151, -1, 27, 1, 48 }, + { 0x83, 0x83, 220, 2152, -1, 28, 1, 48 }, + { 0x107, 0x107, 220, 2153, -1, 27, 1, 48 }, + { 0x81, 0x81, 220, 2154, -1, 28, 1, 28 }, + { 0x1, 0x1, 220, 2155, -1, 35, 1, 28 }, + { 0x103, 0x103, 220, 2156, -1, 27, 1, 28 }, + { 0x101, 0x101, 220, 2157, -1, 27, 1, 28 }, + { 0x1, 0x1, 220, 2158, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2159, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2160, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2161, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2162, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2163, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2164, -1, 35, 1, 28 }, { 0x1, 0x1, 220, 2165, -1, 35, 1, 28 }, { 0x1, 0x1, 220, 2166, -1, 35, 1, 28 }, - { 0x1, 0x1, 220, 2167, -1, 35, 1, 68 }, + { 0x1, 0x1, 220, 2167, -1, 35, 1, 2 }, { 0x1, 0x1, 220, 2168, -1, 35, 1, 28 }, { 0x1, 0x1, 220, 2169, -1, 35, 1, 28 }, - { 0x1, 0x1, 220, 2170, -1, 35, 1, 39 }, - { 0x1, 0x1, 220, 2171, -1, 35, 1, 67 }, - { 0x1, 0x1, 220, 2172, -1, 35, 1, 33 }, - { 0x1, 0x1, 220, 2173, -1, 35, 1, 33 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 67 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, 1776, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, + { 0x1, 0x1, 220, 2170, -1, 35, 1, 34 }, + { 0x1, 0x1, 220, 2171, -1, 35, 1, 57 }, + { 0x1, 0x1, 220, 2172, -1, 35, 1, 28 }, + { 0x1, 0x1, 220, 2173, -1, 35, 1, 28 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 57 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, 1776, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 44 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 40 }, + { 0xc00001, 0xc00001, 221, -1, -1, 12, 1, 49 }, + { 0x3, 0x3, 221, 2347, -1, 34, 1, 54 }, + { 0x1c00001, 0x1c00001, 221, -1, -1, 12, 1, 49 }, + { 0x7, 0x7, 221, 2348, -1, 34, 1, 54 }, + { 0xe00001, 0xe00001, 221, -1, -1, 12, 1, 49 }, + { 0x7, 0x7, 221, 2349, -1, 33, 1, 54 }, + { 0x1e00001, 0x1e00001, 221, -1, -1, 12, 1, 49 }, + { 0xf, 0xf, 221, 2350, -1, 33, 1, 49 }, + { 0xc00001, 0xc00001, 221, -1, -1, 12, 1, 49 }, + { 0x3, 0x3, 221, 2355, -1, 34, 1, 54 }, + { 0xe00001, 0x1e00001, 221, -1, -1, 12, 1, 49 }, + { 0x7, 0xf, 221, 2356, -1, 33, 1, 54 }, + { 0xc00001, 0xc00001, 221, -1, -1, 12, 1, 49 }, + { 0x3, 0x3, 221, 2359, -1, 34, 1, 54 }, + { 0x1c00001, 0x1c00001, 221, -1, -1, 12, 1, 49 }, + { 0x7, 0x7, 221, 2360, -1, 34, 1, 54 }, + { 0xe00001, 0xe00001, 221, -1, -1, 12, 1, 49 }, + { 0x7, 0x7, 221, 2361, -1, 33, 1, 54 }, + { 0x1e00001, 0x1e00001, 221, -1, -1, 12, 1, 49 }, + { 0xf, 0xf, 221, 2362, -1, 33, 1, 49 }, + { 0xc00001, 0xc00001, 221, -1, -1, 12, 1, 49 }, + { 0x3, 0x3, 221, 2367, -1, 34, 1, 54 }, + { 0xe00001, 0x1e00001, 221, -1, -1, 12, 1, 49 }, + { 0x7, 0xf, 221, 2368, -1, 33, 1, 54 }, + { 0xc1, 0xc1, 221, -1, -1, 28, 1, 29 }, + { 0x3, 0x3, 221, 2287, -1, 34, 1, 29 }, + { 0x183, 0x183, 221, -1, -1, 27, 1, 29 }, + { 0x181, 0x181, 221, 2288, -1, 27, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 57 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, 1777, -1, 34, 1, 29 }, + { 0x7, 0x7, 221, -1, -1, 34, 1, 57 }, + { 0xb, 0xb, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, 1778, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 57 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, 1781, -1, 34, 1, 29 }, + { 0x7, 0x7, 221, -1, -1, 34, 1, 57 }, + { 0xb, 0xb, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, 1782, -1, 34, 1, 29 }, + { 0x7, 0x7, 221, -1, -1, 34, 1, 57 }, + { 0xb, 0xb, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, 1784, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 57 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, 1786, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 57 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, 1787, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, { 0x3, 0x3, 221, -1, -1, 34, 1, 49 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 45 }, - { 0xc00001, 0xc00001, 221, -1, -1, 12, 1, 64 }, - { 0x3, 0x3, 221, 2347, -1, 34, 1, 59 }, - { 0x1c00001, 0x1c00001, 221, -1, -1, 12, 1, 64 }, - { 0x7, 0x7, 221, 2348, -1, 34, 1, 59 }, - { 0xe00001, 0xe00001, 221, -1, -1, 12, 1, 64 }, - { 0x7, 0x7, 221, 2349, -1, 33, 1, 59 }, - { 0x1e00001, 0x1e00001, 221, -1, -1, 12, 1, 54 }, - { 0xf, 0xf, 221, 2350, -1, 33, 1, 54 }, - { 0xc00001, 0xc00001, 221, -1, -1, 12, 1, 64 }, - { 0x3, 0x3, 221, 2355, -1, 34, 1, 59 }, - { 0xe00001, 0x1e00001, 221, -1, -1, 12, 1, 64 }, - { 0x7, 0xf, 221, 2356, -1, 33, 1, 59 }, - { 0xc00001, 0xc00001, 221, -1, -1, 12, 1, 64 }, - { 0x3, 0x3, 221, 2359, -1, 34, 1, 59 }, - { 0x1c00001, 0x1c00001, 221, -1, -1, 12, 1, 64 }, - { 0x7, 0x7, 221, 2360, -1, 34, 1, 59 }, - { 0xe00001, 0xe00001, 221, -1, -1, 12, 1, 64 }, - { 0x7, 0x7, 221, 2361, -1, 33, 1, 59 }, - { 0x1e00001, 0x1e00001, 221, -1, -1, 12, 1, 54 }, - { 0xf, 0xf, 221, 2362, -1, 33, 1, 54 }, - { 0xc00001, 0xc00001, 221, -1, -1, 12, 1, 64 }, - { 0x3, 0x3, 221, 2367, -1, 34, 1, 59 }, - { 0xe00001, 0x1e00001, 221, -1, -1, 12, 1, 64 }, - { 0x7, 0xf, 221, 2368, -1, 33, 1, 59 }, - { 0xc1, 0xc1, 221, -1, -1, 28, 1, 34 }, - { 0x3, 0x3, 221, 2287, -1, 34, 1, 34 }, - { 0x183, 0x183, 221, -1, -1, 27, 1, 34 }, - { 0x181, 0x181, 221, 2288, -1, 27, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 67 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, 1777, -1, 34, 1, 34 }, - { 0x7, 0x7, 221, -1, -1, 34, 1, 67 }, - { 0xb, 0xb, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, 1778, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 67 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, 1781, -1, 34, 1, 34 }, - { 0x7, 0x7, 221, -1, -1, 34, 1, 67 }, - { 0xb, 0xb, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, 1782, -1, 34, 1, 34 }, - { 0x7, 0x7, 221, -1, -1, 34, 1, 67 }, - { 0xb, 0xb, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, 1784, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 67 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, 1786, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 67 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, 1787, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 54 }, - { 0x181, 0x181, 221, -1, -1, 27, 1, 54 }, - { 0xc1, 0xc1, 221, -1, -1, 28, 1, 54 }, - { 0x183, 0x183, 221, -1, -1, 27, 1, 54 }, - { 0x61, 0x61, 221, -1, -1, 29, 1, 54 }, - { 0x185, 0x185, 221, -1, -1, 27, 1, 54 }, - { 0xc3, 0xc3, 221, -1, -1, 28, 1, 54 }, - { 0x187, 0x187, 221, -1, -1, 27, 1, 54 }, - { 0xc1, 0xc1, 221, -1, -1, 28, 1, 34 }, - { 0x3, 0x3, 221, 2291, -1, 34, 1, 34 }, - { 0x183, 0x183, 221, -1, -1, 27, 1, 34 }, - { 0x181, 0x181, 221, 2292, -1, 27, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, + { 0x181, 0x181, 221, -1, -1, 27, 1, 49 }, + { 0xc1, 0xc1, 221, -1, -1, 28, 1, 49 }, + { 0x183, 0x183, 221, -1, -1, 27, 1, 49 }, + { 0x61, 0x61, 221, -1, -1, 29, 1, 49 }, + { 0x185, 0x185, 221, -1, -1, 27, 1, 49 }, + { 0xc3, 0xc3, 221, -1, -1, 28, 1, 49 }, + { 0x187, 0x187, 221, -1, -1, 27, 1, 49 }, + { 0xc1, 0xc1, 221, -1, -1, 28, 1, 29 }, + { 0x3, 0x3, 221, 2291, -1, 34, 1, 29 }, + { 0x183, 0x183, 221, -1, -1, 27, 1, 29 }, + { 0x181, 0x181, 221, 2292, -1, 27, 1, 29 }, { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 68 }, { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 40 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 67 }, - { 0x3, 0x3, 221, -1, -1, 34, 1, 34 }, - { 0x3, 0x3, 221, 1789, -1, 34, 1, 34 }, - { 0x3, 0x3, 222, 363, 1145, 32, 1, 130 }, - { 0x3, 0x3, 222, 364, 1154, 32, 1, 130 }, - { 0x3, 0x3, 222, 365, 1163, 32, 1, 130 }, - { 0x3, 0x3, 222, 366, 1172, 32, 1, 130 }, - { 0x3, 0x3, 222, 367, 1181, 32, 1, 130 }, - { 0x3, 0x3, 222, 368, 1190, 32, 1, 130 }, - { 0x3, 0x3, 222, 369, 1199, 32, 1, 130 }, - { 0x3, 0x3, 222, 370, 1208, 32, 1, 130 }, - { 0x3, 0x3, 222, 371, 1217, 32, 1, 130 }, - { 0x3, 0x3, 222, 372, 1226, 32, 1, 130 }, - { 0x3, 0x3, 222, 373, 1236, 32, 1, 130 }, - { 0x3, 0x3, 222, 374, 1246, 32, 1, 130 }, - { 0x3, 0x3, 222, 387, 1259, 32, 1, 141 }, - { 0x3, 0x3, 222, 388, 1265, 32, 1, 141 }, - { 0x3, 0x3, 222, 389, 1271, 32, 1, 141 }, - { 0x3, 0x3, 222, 390, 1277, 32, 1, 141 }, - { 0x3, 0x3, 222, 391, 1283, 32, 1, 141 }, - { 0x3, 0x3, 222, 392, 1289, 32, 1, 141 }, - { 0x3, 0x3, 222, 393, 1295, 32, 1, 141 }, - { 0x3, 0x3, 222, 394, 1301, 32, 1, 141 }, - { 0x3, 0x3, 222, 395, 1307, 32, 1, 141 }, - { 0x3, 0x3, 222, 396, 1313, 32, 1, 141 }, - { 0x3, 0x3, 222, 397, 1319, 32, 1, 141 }, - { 0x3, 0x3, 222, 398, 1325, 32, 1, 141 }, - { 0x3, 0x3, 222, 399, 1331, 32, 1, 141 }, - { 0x3, 0x3, 222, 400, 1337, 32, 1, 141 }, - { 0x3, 0x3, 222, 401, 1343, 32, 1, 141 }, - { 0x3, 0x3, 222, 402, 1349, 32, 1, 141 }, - { 0x3, 0x3, 222, 403, 1355, 32, 1, 141 }, - { 0x3, 0x3, 222, 404, 1361, 32, 1, 141 }, - { 0x1, 0x1, 223, -1, -1, 28, 1, 35 }, - { 0x1, 0x1, 223, -1, -1, 28, 1, 35 }, - { 0x0, 0x0, 230, 772, -1, 0, 1, 137 }, - { 0x0, 0x0, 230, 773, -1, 0, 1, 147 }, - { 0x1, 0x1, 231, -1, 1652, 33, 1, 134 }, - { 0x1, 0x1, 231, -1, 1655, 33, 1, 134 }, - { 0x0, 0x0, 231, -1, 1657, 0, 1, 133 }, - { 0x0, 0x0, 231, -1, 1658, 0, 1, 133 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 2 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 35 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 57 }, + { 0x3, 0x3, 221, -1, -1, 34, 1, 29 }, + { 0x3, 0x3, 221, 1789, -1, 34, 1, 29 }, + { 0x3, 0x3, 222, 363, 1145, 32, 1, 123 }, + { 0x3, 0x3, 222, 364, 1154, 32, 1, 123 }, + { 0x3, 0x3, 222, 365, 1163, 32, 1, 123 }, + { 0x3, 0x3, 222, 366, 1172, 32, 1, 123 }, + { 0x3, 0x3, 222, 367, 1181, 32, 1, 123 }, + { 0x3, 0x3, 222, 368, 1190, 32, 1, 123 }, + { 0x3, 0x3, 222, 369, 1199, 32, 1, 123 }, + { 0x3, 0x3, 222, 370, 1208, 32, 1, 123 }, + { 0x3, 0x3, 222, 371, 1217, 32, 1, 123 }, + { 0x3, 0x3, 222, 372, 1226, 32, 1, 123 }, + { 0x3, 0x3, 222, 373, 1236, 32, 1, 123 }, + { 0x3, 0x3, 222, 374, 1246, 32, 1, 123 }, + { 0x3, 0x3, 222, 387, 1259, 32, 1, 133 }, + { 0x3, 0x3, 222, 388, 1265, 32, 1, 133 }, + { 0x3, 0x3, 222, 389, 1271, 32, 1, 133 }, + { 0x3, 0x3, 222, 390, 1277, 32, 1, 133 }, + { 0x3, 0x3, 222, 391, 1283, 32, 1, 133 }, + { 0x3, 0x3, 222, 392, 1289, 32, 1, 133 }, + { 0x3, 0x3, 222, 393, 1295, 32, 1, 133 }, + { 0x3, 0x3, 222, 394, 1301, 32, 1, 133 }, + { 0x3, 0x3, 222, 395, 1307, 32, 1, 133 }, + { 0x3, 0x3, 222, 396, 1313, 32, 1, 133 }, + { 0x3, 0x3, 222, 397, 1319, 32, 1, 133 }, + { 0x3, 0x3, 222, 398, 1325, 32, 1, 133 }, + { 0x3, 0x3, 222, 399, 1331, 32, 1, 133 }, + { 0x3, 0x3, 222, 400, 1337, 32, 1, 133 }, + { 0x3, 0x3, 222, 401, 1343, 32, 1, 133 }, + { 0x3, 0x3, 222, 402, 1349, 32, 1, 133 }, + { 0x3, 0x3, 222, 403, 1355, 32, 1, 133 }, + { 0x3, 0x3, 222, 404, 1361, 32, 1, 133 }, + { 0x1, 0x1, 223, -1, -1, 28, 1, 30 }, + { 0x1, 0x1, 223, -1, -1, 28, 1, 30 }, + { 0x0, 0x0, 230, 772, -1, 0, 1, 129 }, + { 0x0, 0x0, 230, 773, -1, 0, 1, 5 }, + { 0x1, 0x1, 231, -1, 1652, 33, 1, 126 }, + { 0x1, 0x1, 231, -1, 1655, 33, 1, 126 }, + { 0x0, 0x0, 231, -1, 1657, 0, 1, 135 }, + { 0x0, 0x0, 231, -1, 1658, 0, 1, 135 }, { 0x0, 0x0, 232, 706, 784, 0, 0, -1 }, { 0x0, 0x0, 232, 707, 792, 0, 0, -1 }, { 0x0, 0x0, 232, 708, 788, 0, 0, -1 }, - { 0x1, 0x1, 232, 709, 443, 33, 1, 8 }, - { 0x8000001, 0x8000001, 232, 710, 451, 6, 1, 9 }, - { 0x1, 0x1, 232, 711, 447, 33, 1, 8 }, + { 0x1, 0x1, 232, 709, 443, 33, 1, 9 }, + { 0x8000001, 0x8000001, 232, 710, 451, 6, 1, 10 }, + { 0x1, 0x1, 232, 711, 447, 33, 1, 9 }, { 0x0, 0x0, 232, 712, 796, 0, 0, -1 }, - { 0x1, 0x1, 232, 713, 463, 33, 1, 10 }, + { 0x1, 0x1, 232, 713, 463, 33, 1, 11 }, { 0x0, 0x0, 232, 714, 800, 0, 0, -1 }, - { 0x1, 0x1, 232, 715, 475, 33, 1, 17 }, + { 0x1, 0x1, 232, 715, 475, 33, 1, 18 }, { 0x0, 0x0, 232, 716, 805, 0, 0, -1 }, { 0x0, 0x0, 232, 717, 809, 0, 0, -1 }, - { 0x1, 0x1, 232, 718, 498, 33, 1, 19 }, - { 0x1, 0x1, 232, 719, 502, 33, 1, 19 }, + { 0x1, 0x1, 232, 718, 498, 33, 1, 20 }, + { 0x1, 0x1, 232, 719, 502, 33, 1, 20 }, { 0x0, 0x0, 232, 720, 813, 0, 0, -1 }, { 0x0, 0x0, 232, 721, 817, 0, 0, -1 }, - { 0x1, 0x1, 232, 722, 522, 33, 1, 20 }, - { 0x8000001, 0x8000001, 232, 723, 526, 6, 1, 20 }, + { 0x1, 0x1, 232, 722, 522, 33, 1, 21 }, + { 0x8000001, 0x8000001, 232, 723, 526, 6, 1, 21 }, { 0x0, 0x0, 232, 724, 821, 0, 0, -1 }, - { 0x1, 0x1, 232, 725, 538, 33, 1, 21 }, + { 0x1, 0x1, 232, 725, 538, 33, 1, 22 }, { 0x0, 0x0, 232, 726, 825, 0, 0, -1 }, { 0x0, 0x0, 232, 727, 829, 0, 0, -1 }, - { 0x1, 0x1, 232, 728, 558, 33, 1, 22 }, - { 0x8000001, 0x8000001, 232, 729, 562, 6, 1, 22 }, + { 0x1, 0x1, 232, 728, 558, 33, 1, 23 }, + { 0x8000001, 0x8000001, 232, 729, 562, 6, 1, 23 }, { 0x0, 0x0, 232, 730, 833, 0, 0, -1 }, - { 0x1, 0x1, 232, 731, 574, 33, 1, 23 }, + { 0x1, 0x1, 232, 731, 574, 33, 1, 24 }, { 0x0, 0x0, 232, 732, 838, 0, 0, -1 }, { 0x0, 0x0, 232, 733, 842, 0, 0, -1 }, - { 0x1, 0x1, 232, 734, 597, 33, 1, 19 }, - { 0x1, 0x1, 232, 735, 601, 33, 1, 19 }, + { 0x1, 0x1, 232, 734, 597, 33, 1, 20 }, + { 0x1, 0x1, 232, 735, 601, 33, 1, 20 }, { 0x0, 0x0, 232, 736, 846, 0, 0, -1 }, - { 0x1, 0x1, 232, 737, 613, 33, 1, 23 }, + { 0x1, 0x1, 232, 737, 613, 33, 1, 24 }, { 0x0, 0x0, 233, 2212, 783, 0, 0, -1 }, { 0x0, 0x0, 233, 2213, 791, 0, 0, -1 }, { 0x0, 0x0, 233, 2214, 787, 0, 0, -1 }, - { 0x0, 0x0, 233, 2215, 442, 0, 1, 8 }, - { 0x1, 0x1, 233, 2216, 450, 6, 1, 9 }, - { 0x0, 0x0, 233, 2217, 446, 0, 1, 8 }, + { 0x0, 0x0, 233, 2215, 442, 0, 1, 9 }, + { 0x1, 0x1, 233, 2216, 450, 6, 1, 10 }, + { 0x0, 0x0, 233, 2217, 446, 0, 1, 9 }, { 0x0, 0x0, 233, 2218, 795, 0, 0, -1 }, - { 0x0, 0x0, 233, 2219, 462, 0, 1, 10 }, + { 0x0, 0x0, 233, 2219, 462, 0, 1, 11 }, { 0x0, 0x0, 233, 2220, 799, 0, 0, -1 }, - { 0x0, 0x0, 233, 2221, 474, 0, 1, 17 }, + { 0x0, 0x0, 233, 2221, 474, 0, 1, 18 }, { 0x0, 0x0, 233, 2222, 804, 0, 0, -1 }, { 0x0, 0x0, 233, 2223, 808, 0, 0, -1 }, - { 0x0, 0x0, 233, 2224, 497, 0, 1, 19 }, - { 0x0, 0x0, 233, 2225, 501, 0, 1, 19 }, + { 0x0, 0x0, 233, 2224, 497, 0, 1, 20 }, + { 0x0, 0x0, 233, 2225, 501, 0, 1, 20 }, { 0x0, 0x0, 233, 2226, 812, 0, 0, -1 }, { 0x0, 0x0, 233, 2227, 816, 0, 0, -1 }, - { 0x0, 0x0, 233, 2228, 521, 0, 1, 20 }, - { 0x1, 0x1, 233, 2229, 525, 6, 1, 20 }, + { 0x0, 0x0, 233, 2228, 521, 0, 1, 21 }, + { 0x1, 0x1, 233, 2229, 525, 6, 1, 21 }, { 0x0, 0x0, 233, 2230, 820, 0, 0, -1 }, - { 0x0, 0x0, 233, 2231, 537, 0, 1, 21 }, + { 0x0, 0x0, 233, 2231, 537, 0, 1, 22 }, { 0x0, 0x0, 233, 2232, 824, 0, 0, -1 }, { 0x0, 0x0, 233, 2233, 828, 0, 0, -1 }, - { 0x0, 0x0, 233, 2234, 557, 0, 1, 22 }, - { 0x1, 0x1, 233, 2235, 561, 6, 1, 22 }, + { 0x0, 0x0, 233, 2234, 557, 0, 1, 23 }, + { 0x1, 0x1, 233, 2235, 561, 6, 1, 23 }, { 0x0, 0x0, 233, 2236, 832, 0, 0, -1 }, - { 0x0, 0x0, 233, 2237, 573, 0, 1, 23 }, + { 0x0, 0x0, 233, 2237, 573, 0, 1, 24 }, { 0x0, 0x0, 233, 2238, 837, 0, 0, -1 }, { 0x0, 0x0, 233, 2239, 841, 0, 0, -1 }, - { 0x0, 0x0, 233, 2240, 596, 0, 1, 19 }, - { 0x0, 0x0, 233, 2241, 600, 0, 1, 19 }, + { 0x0, 0x0, 233, 2240, 596, 0, 1, 20 }, + { 0x0, 0x0, 233, 2241, 600, 0, 1, 20 }, { 0x0, 0x0, 233, 2242, 845, 0, 0, -1 }, - { 0x0, 0x0, 233, 2243, 612, 0, 1, 23 }, - { 0x1, 0x1, 233, 738, 922, 27, 1, 18 }, - { 0x0, 0x0, 233, 739, 920, 0, 1, 18 }, - { 0x0, 0x0, 233, 966, 924, 0, 1, 24 }, - { 0x0, 0x1, 233, 932, 930, 20, 1, 70 }, - { 0x0, 0x0, 233, 108, 928, 0, 1, 70 }, + { 0x0, 0x0, 233, 2243, 612, 0, 1, 24 }, + { 0x1, 0x1, 233, 738, 922, 27, 1, 19 }, + { 0x0, 0x0, 233, 739, 920, 0, 1, 19 }, + { 0x0, 0x0, 233, 966, 924, 0, 1, 2 }, + { 0x0, 0x1, 233, 932, 930, 20, 1, 59 }, + { 0x0, 0x0, 233, 108, 928, 0, 1, 59 }, { 0x1, 0x1, 236, -1, -1, 29, 1, 0 }, { 0x0, 0x0, 236, -1, -1, 0, 1, 0 }, { 0x1, 0x1, 236, 2384, -1, 27, 1, 0 }, { 0x1, 0x1, 236, 2385, -1, 27, 1, 0 }, - { 0x1, 0x1, 236, 2386, -1, 27, 1, 0 }, - { 0x1, 0x1, 236, 2387, -1, 27, 1, 0 }, + { 0x1, 0x1, 236, 2386, -1, 27, 1, 2 }, + { 0x1, 0x1, 236, 2387, -1, 27, 1, 2 }, { 0x0, 0x0, 257, -1, 1853, 0, 0, -1 }, { 0x0, 0x0, 257, -1, 1855, 0, 0, -1 }, - { 0x1, 0x1, 257, -1, -1, 28, 1, 31 }, - { 0x1, 0x1, 257, -1, -1, 28, 1, 31 }, + { 0x1, 0x1, 257, -1, -1, 28, 1, 26 }, + { 0x1, 0x1, 257, -1, -1, 28, 1, 26 }, { 0x0, 0x0, 257, -1, 1890, 0, 0, -1 }, { 0x0, 0x0, 257, -1, 1892, 0, 0, -1 }, - { 0x1, 0x1, 257, -1, -1, 28, 1, 31 }, - { 0x1, 0x1, 257, -1, -1, 28, 1, 31 }, + { 0x1, 0x1, 257, -1, -1, 28, 1, 26 }, + { 0x1, 0x1, 257, -1, -1, 28, 1, 26 }, { 0x0, 0x0, 259, 21, -1, 0, 1, 0 }, { 0x0, 0x0, 259, -1, -1, 0, 1, 0 }, { 0x0, 0x0, 259, -1, -1, 0, 1, 0 }, { 0x0, 0x1, 259, -1, -1, 29, 1, 0 }, - { 0x0, 0x1, 259, -1, -1, 29, 1, 0 }, - { 0x0, 0x1, 259, -1, -1, 29, 1, 0 }, - { 0x0, 0x1, 259, -1, -1, 29, 1, 0 }, - { 0x0, 0x1, 259, -1, -1, 29, 1, 0 }, + { 0x0, 0x1, 259, -1, -1, 29, 1, 2 }, + { 0x0, 0x1, 259, -1, -1, 29, 1, 2 }, + { 0x0, 0x1, 259, -1, -1, 29, 1, 2 }, + { 0x0, 0x1, 259, -1, -1, 29, 1, 2 }, { 0x0, 0x0, 259, 176, -1, 0, 1, 0 }, { 0x0, 0x1, 259, -1, -1, 29, 1, 0 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 66 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 66 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 5 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 56 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 56 }, { 0x0, 0x0, 260, -1, 1829, 0, 0, -1 }, { 0x0, 0x0, 260, -1, 1831, 0, 0, -1 }, { 0x0, 0x0, 260, -1, 1833, 0, 0, -1 }, { 0x0, 0x0, 260, -1, 1835, 0, 0, -1 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 61 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 61 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 61 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 51 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 46 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 46 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 46 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 46 }, { 0x0, 0x0, 260, -1, 1837, 0, 0, -1 }, { 0x0, 0x0, 260, -1, 1839, 0, 0, -1 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 61 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 61 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 46 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 46 }, { 0x0, 0x0, 260, -1, 1841, 0, 0, -1 }, { 0x0, 0x0, 260, -1, 1843, 0, 0, -1 }, { 0x0, 0x0, 260, -1, 1845, 0, 0, -1 }, { 0x0, 0x0, 260, -1, 1847, 0, 0, -1 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 61 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 61 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 61 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 51 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 46 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 46 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 46 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 46 }, { 0x0, 0x0, 260, -1, 1849, 0, 0, -1 }, { 0x0, 0x0, 260, -1, 1851, 0, 0, -1 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 61 }, - { 0x1, 0x1, 260, -1, -1, 12, 1, 61 }, - { 0x1, 0x1, 260, 313, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, 355, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, 317, -1, 12, 1, 4 }, - { 0x1, 0x1, 260, 359, -1, 12, 1, 4 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 46 }, + { 0x1, 0x1, 260, -1, -1, 12, 1, 46 }, + { 0x1, 0x1, 260, 313, -1, 12, 1, 68 }, + { 0x1, 0x1, 260, 355, -1, 12, 1, 68 }, + { 0x1, 0x1, 260, 317, -1, 12, 1, 68 }, + { 0x1, 0x1, 260, 359, -1, 12, 1, 68 }, { 0x0, 0x0, 261, -1, 1836, 0, 0, -1 }, - { 0x9, 0x9, 261, -1, 2354, 33, 1, 51 }, + { 0x9, 0x9, 261, -1, 2354, 33, 1, 46 }, { 0x0, 0x0, 261, 1112, 1885, 0, 0, -1 }, - { 0x3, 0x3, 261, 1113, -1, 27, 1, 51 }, + { 0x3, 0x3, 261, 1113, -1, 27, 1, 46 }, { 0x0, 0x0, 265, 2281, -1, 0, 1, 0 }, { 0x3, 0x3, 266, -1, -1, 27, 1, 0 }, { 0x3, 0x3, 266, -1, -1, 27, 1, 0 }, - { 0x3, 0x3, 266, -1, -1, 27, 1, 0 }, - { 0x3, 0x3, 266, -1, -1, 27, 1, 0 }, + { 0x3, 0x3, 266, -1, -1, 27, 1, 2 }, + { 0x3, 0x3, 266, -1, -1, 27, 1, 2 }, { 0x1, 0x1, 267, 2380, -1, 28, 1, 0 }, { 0x1, 0x1, 267, 2381, -1, 28, 1, 0 }, - { 0x1, 0x1, 267, 2382, -1, 28, 1, 0 }, - { 0x1, 0x1, 267, 2383, -1, 28, 1, 0 }, - { 0x1, 0x1, 268, -1, -1, 27, 1, 96 }, - { 0x1, 0x1, 268, -1, -1, 27, 1, 96 }, + { 0x1, 0x1, 267, 2382, -1, 28, 1, 2 }, + { 0x1, 0x1, 267, 2383, -1, 28, 1, 2 }, + { 0x1, 0x1, 268, -1, -1, 27, 1, 2 }, + { 0x1, 0x1, 268, -1, -1, 27, 1, 2 }, { 0x0, 0x0, 268, -1, 781, 0, 0, -1 }, { 0x0, 0x0, 269, 2393, 2258, 0, 0, -1 }, { 0x0, 0x0, 269, 2394, 2260, 0, 0, -1 }, { 0x0, 0x0, 270, -1, 2259, 0, 0, -1 }, { 0x0, 0x0, 270, -1, 2261, 0, 0, -1 }, - { 0x0, 0x0, 271, -1, -1, 0, 1, 42 }, - { 0x0, 0x0, 271, -1, -1, 0, 1, 42 }, - { 0x0, 0x0, 276, -1, -1, 0, 1, 35 }, - { 0x0, 0x0, 280, -1, 1859, 0, 1, 31 }, - { 0x0, 0x0, 281, -1, -1, 0, 1, 74 }, - { 0x0, 0x0, 281, -1, -1, 0, 1, 74 }, - { 0x0, 0x0, 281, 1671, 2371, 0, 1, 3 }, + { 0x0, 0x0, 271, -1, -1, 0, 1, 37 }, + { 0x0, 0x0, 271, -1, -1, 0, 1, 37 }, + { 0x0, 0x0, 276, -1, -1, 0, 1, 30 }, + { 0x0, 0x0, 280, -1, 1859, 0, 1, 26 }, + { 0x0, 0x0, 281, -1, -1, 0, 1, 63 }, + { 0x0, 0x0, 281, -1, -1, 0, 1, 63 }, + { 0x0, 0x0, 281, 1671, 2371, 0, 1, 67 }, { 0x0, 0x0, 281, -1, 356, 0, 0, -1 }, - { 0x0, 0x0, 281, 1673, 2373, 0, 1, 3 }, + { 0x0, 0x0, 281, 1673, 2373, 0, 1, 67 }, { 0x0, 0x0, 281, -1, 360, 0, 0, -1 }, }; diff -upr --new-file binutils-2.9.5.0.42/opcodes/ia64-gen.c binutils-2.9.5.0.46/opcodes/ia64-gen.c --- binutils-2.9.5.0.42/opcodes/ia64-gen.c Sun Apr 23 09:39:53 2000 +++ binutils-2.9.5.0.46/opcodes/ia64-gen.c Tue May 30 13:57:52 2000 @@ -800,8 +800,8 @@ irf_operand (int op, const char *field) if (!field) { return op == IA64_OPND_RR_R3 || op == IA64_OPND_DBR_R3 - || op == IA64_OPND_IBR_R3 || op == IA64_OPND_PKR_R3 - || op == IA64_OPND_PMC_R3 || op == IA64_OPND_PMD_R3 + || op == IA64_OPND_IBR_R3 || op == IA64_OPND_PKR_R3 + || op == IA64_OPND_PMC_R3 || op == IA64_OPND_PMD_R3 || op == IA64_OPND_MSR_R3 || op == IA64_OPND_CPUID_R3; } else @@ -1710,6 +1710,7 @@ add_dis_entry (first, opcode, mask, opco { abort (); } + while (ent != NULL) { ia64_insn newopcode = (opcode & (~ ent->mask)) | ent->bits; @@ -2550,7 +2551,6 @@ insert_completer_entry (opc, tabent, ord (*ptr)->is_terminal = 1; (*ptr)->mask = (ia64_insn)-1; (*ptr)->bits = opc->opcode; - (*ptr)->dependencies = insert_opcode_dependencies (opc, *ptr); (*ptr)->order = order; } @@ -2684,6 +2684,7 @@ add_opcode_entry (opc) } ordered_table[otlen++] = nent; } + insert_completer_entry (opc, *place, opcode_count++); } diff -upr --new-file binutils-2.9.5.0.42/opcodes/m10300-dis.c binutils-2.9.5.0.46/opcodes/m10300-dis.c --- binutils-2.9.5.0.42/opcodes/m10300-dis.c Sun Apr 23 09:39:50 2000 +++ binutils-2.9.5.0.46/opcodes/m10300-dis.c Tue May 30 13:57:49 2000 @@ -1,5 +1,5 @@ /* Disassemble MN10300 instructions. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -484,6 +484,8 @@ disassemble (memaddr, info, insn, size) temp = extension >> operand->shift; temp &= ((1 << (32 - operand->bits)) - 1); value |= temp; + value = ((value ^ (((unsigned long)1) << 31)) + - (((unsigned long)1) << 31)); } else if ((operand->flags & MN10300_OPERAND_24BIT) != 0) { @@ -494,7 +496,7 @@ disassemble (memaddr, info, insn, size) temp &= ((1 << (24 - operand->bits)) - 1); value |= temp; if ((operand->flags & MN10300_OPERAND_SIGNED) != 0) - value = ((value & 0xffffff) ^ (~0x7fffff)) + 0x800000; + value = ((value & 0xffffff) ^ 0x800000) - 0x800000; } else if ((operand->flags & MN10300_OPERAND_EXTENDED) != 0) { @@ -508,11 +510,10 @@ disassemble (memaddr, info, insn, size) } if ((operand->flags & MN10300_OPERAND_SIGNED) != 0 - /* These are properly extended by the code above. */ - && ((operand->flags & MN10300_OPERAND_24BIT) == 0) - ) - value = ((long)(value << (32 - operand->bits)) - >> (32 - operand->bits)); + /* These are properly extended by the code above. */ + && ((operand->flags & MN10300_OPERAND_24BIT) == 0)) + value = ((value ^ (((unsigned long)1) << (operand->bits - 1))) + - (((unsigned long)1) << (operand->bits - 1))); if (!nocomma && (!paren @@ -525,14 +526,14 @@ disassemble (memaddr, info, insn, size) { value = ((insn >> (operand->shift + extra_shift)) & ((1 << operand->bits) - 1)); - (*info->fprintf_func) (info->stream, "d%d", value); + (*info->fprintf_func) (info->stream, "d%d", (int)value); } else if ((operand->flags & MN10300_OPERAND_AREG) != 0) { value = ((insn >> (operand->shift + extra_shift)) & ((1 << operand->bits) - 1)); - (*info->fprintf_func) (info->stream, "a%d", value); + (*info->fprintf_func) (info->stream, "a%d", (int)value); } else if ((operand->flags & MN10300_OPERAND_SP) != 0) @@ -549,11 +550,11 @@ disassemble (memaddr, info, insn, size) value = ((insn >> (operand->shift + extra_shift)) & ((1 << operand->bits) - 1)); if (value < 8) - (*info->fprintf_func) (info->stream, "r%d", value); + (*info->fprintf_func) (info->stream, "r%d", (int)value); else if (value < 12) - (*info->fprintf_func) (info->stream, "a%d", value - 8); + (*info->fprintf_func) (info->stream, "a%d", (int)value - 8); else - (*info->fprintf_func) (info->stream, "d%d", value - 12); + (*info->fprintf_func) (info->stream, "d%d", (int)value - 12); } else if ((operand->flags & MN10300_OPERAND_XRREG) != 0) @@ -563,7 +564,7 @@ disassemble (memaddr, info, insn, size) if (value == 0) (*info->fprintf_func) (info->stream, "sp", value); else - (*info->fprintf_func) (info->stream, "xr%d", value); + (*info->fprintf_func) (info->stream, "xr%d", (int)value); } else if ((operand->flags & MN10300_OPERAND_USP) != 0) @@ -670,7 +671,7 @@ disassemble (memaddr, info, insn, size) } else - (*info->fprintf_func) (info->stream, "%d", value); + (*info->fprintf_func) (info->stream, "%ld", (long)value); } /* All done. */ break; diff -upr --new-file binutils-2.9.5.0.42/opcodes/m32r-desc.h binutils-2.9.5.0.46/opcodes/m32r-desc.h --- binutils-2.9.5.0.42/opcodes/m32r-desc.h Thu Feb 24 11:10:46 2000 +++ binutils-2.9.5.0.46/opcodes/m32r-desc.h Thu May 18 14:20:34 2000 @@ -44,18 +44,16 @@ with this program; if not, write to the #define CGEN_INT_INSN_P 1 -/* FIXME: Need to compute CGEN_MAX_SYNTAX_BYTES. */ +/* Maximum number of syntax bytes in an instruction. */ +#define CGEN_ACTUAL_MAX_SYNTAX_BYTES 15 /* CGEN_MNEMONIC_OPERANDS is defined if mnemonics have operands. e.g. In "b,a foo" the ",a" is an operand. If mnemonics have operands we can't hash on everything up to the space. */ #define CGEN_MNEMONIC_OPERANDS -/* Maximum number of operands any insn or macro-insn has. */ -#define CGEN_MAX_INSN_OPERANDS 16 - /* Maximum number of fields in an instruction. */ -#define CGEN_MAX_IFMT_OPERANDS 7 +#define CGEN_ACTUAL_MAX_IFMT_OPERANDS 7 /* Enums. */ diff -upr --new-file binutils-2.9.5.0.42/opcodes/mcore-dis.c binutils-2.9.5.0.46/opcodes/mcore-dis.c --- binutils-2.9.5.0.42/opcodes/mcore-dis.c Sun Apr 16 10:13:54 2000 +++ binutils-2.9.5.0.46/opcodes/mcore-dis.c Tue May 30 14:05:15 2000 @@ -169,7 +169,7 @@ print_insn_mcore (memaddr, info) if (strcmp (op->name, "bsr") == 0) { - /* for bsr, we'll try to get a symbol for the target */ + /* For bsr, we'll try to get a symbol for the target. */ val = memaddr + 2 + (val << 1); if (info->print_address_func && val != 0) @@ -268,12 +268,12 @@ print_insn_mcore (memaddr, info) break; default: - /* if the disassembler lags the instruction set */ + /* If the disassembler lags the instruction set. */ fprintf (stream, "\tundecoded operands, inst is 0x%04x", inst); break; } } - /* Say how many bytes we consumed? */ + /* Say how many bytes we consumed. */ return 2; } diff -upr --new-file binutils-2.9.5.0.42/opcodes/mips-dis.c binutils-2.9.5.0.46/opcodes/mips-dis.c --- binutils-2.9.5.0.42/opcodes/mips-dis.c Fri May 12 08:03:10 2000 +++ binutils-2.9.5.0.46/opcodes/mips-dis.c Mon May 29 22:34:58 2000 @@ -50,7 +50,7 @@ static int _print_insn_mips PARAMS ((bfd /* FIXME: This should be shared with gdb somehow. */ -#define REGISTER_NAMES \ +#define STD_REGISTER_NAMES \ { "zero", "at", "v0", "v1", "a0", "a1", "a2", "a3", \ "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", \ "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7", \ @@ -64,13 +64,17 @@ static int _print_insn_mips PARAMS ((bfd "epc", "prid"\ } -static CONST char * CONST reg_names[] = REGISTER_NAMES; +static CONST char * CONST std_reg_names[] = STD_REGISTER_NAMES; /* The mips16 register names. */ static const char * const mips16_reg_names[] = { "s0", "s1", "v0", "v1", "a0", "a1", "a2", "a3" }; + +/* Scalar register names. set_mips_isa_type() decides which register name + table to use. */ +static CONST char * CONST *reg_names = NULL; /* subroutine */ static void @@ -254,6 +258,9 @@ set_mips_isa_type (mach, isa, cputype) { int target_processor = 0; int mips_isa = 0; + + /* Use standard MIPS register names by default. */ + reg_names = std_reg_names; switch (mach) { diff -upr --new-file binutils-2.9.5.0.42/opcodes/mips-opc.c binutils-2.9.5.0.46/opcodes/mips-opc.c --- binutils-2.9.5.0.42/opcodes/mips-opc.c Sun Apr 16 10:07:30 2000 +++ binutils-2.9.5.0.46/opcodes/mips-opc.c Tue May 30 13:57:50 2000 @@ -155,9 +155,9 @@ const struct mips_opcode mips_builtin_op {"bc0t", "p", 0x41010000, 0xffff0000, CBD|RD_CC, I1 }, {"bc0tl", "p", 0x41030000, 0xffff0000, CBL|RD_CC, I2|T3 }, {"bc1t", "p", 0x45010000, 0xffff0000, CBD|RD_CC|FP_S, I1 }, -{"bc1t", "N,p", 0x45010000, 0xffe30000, CBD|RD_CC|FP_S, I4 }, +{"bc1t", "N,p", 0x45010000, 0xffe30000, CBD|RD_CC|FP_S, I4|M1 }, {"bc1tl", "p", 0x45030000, 0xffff0000, CBL|RD_CC|FP_S, I2|T3 }, -{"bc1tl", "N,p", 0x45030000, 0xffe30000, CBL|RD_CC|FP_S, I4 }, +{"bc1tl", "N,p", 0x45030000, 0xffe30000, CBL|RD_CC|FP_S, I4|M1 }, {"bc2t", "p", 0x49010000, 0xffff0000, CBD|RD_CC, I1 }, {"bc2tl", "p", 0x49030000, 0xffff0000, CBL|RD_CC, I2|T3 }, {"bc3t", "p", 0x4d010000, 0xffff0000, CBD|RD_CC, I1 }, @@ -222,99 +222,99 @@ const struct mips_opcode mips_builtin_op {"break", "c", 0x0000000d, 0xfc00ffff, TRAP, I1 }, {"break", "c,q", 0x0000000d, 0xfc00003f, TRAP, I1 }, {"c.f.d", "S,T", 0x46200030, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.f.d", "M,S,T", 0x46200030, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.f.d", "M,S,T", 0x46200030, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.f.s", "S,T", 0x46000030, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.f.s", "M,S,T", 0x46000030, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.f.s", "M,S,T", 0x46000030, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.f.ps", "S,T", 0x46c00030, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.f.ps", "M,S,T", 0x46c00030, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.un.d", "S,T", 0x46200031, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.un.d", "M,S,T", 0x46200031, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.un.d", "M,S,T", 0x46200031, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.un.s", "S,T", 0x46000031, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.un.s", "M,S,T", 0x46000031, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.un.s", "M,S,T", 0x46000031, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.un.ps", "S,T", 0x46c00031, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.un.ps", "M,S,T", 0x46c00031, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.eq.d", "S,T", 0x46200032, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.eq.d", "M,S,T", 0x46200032, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.eq.d", "M,S,T", 0x46200032, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.eq.s", "S,T", 0x46000032, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.eq.s", "M,S,T", 0x46000032, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.eq.s", "M,S,T", 0x46000032, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.eq.ps", "S,T", 0x46c00032, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.eq.ps", "M,S,T", 0x46c00032, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.ueq.d", "S,T", 0x46200033, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.ueq.d", "M,S,T", 0x46200033, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.ueq.d", "M,S,T", 0x46200033, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.ueq.s", "S,T", 0x46000033, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.ueq.s", "M,S,T", 0x46000033, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.ueq.s", "M,S,T", 0x46000033, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.ueq.ps","S,T", 0x46c00033, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.ueq.ps","M,S,T", 0x46c00033, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.lt.s", "S,T", 0x4600003c, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.lt.s", "M,S,T", 0x4600003c, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.lt.s", "M,S,T", 0x4600003c, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.olt.d", "S,T", 0x46200034, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.olt.d", "M,S,T", 0x46200034, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.olt.d", "M,S,T", 0x46200034, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.olt.s", "S,T", 0x46000034, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.olt.s", "M,S,T", 0x46000034, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.olt.s", "M,S,T", 0x46000034, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.olt.ps","S,T", 0x46c00034, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.olt.ps","M,S,T", 0x46c00034, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.ult.d", "S,T", 0x46200035, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.ult.d", "M,S,T", 0x46200035, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.ult.d", "M,S,T", 0x46200035, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.ult.s", "S,T", 0x46000035, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.ult.s", "M,S,T", 0x46000035, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.ult.s", "M,S,T", 0x46000035, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.ult.ps","S,T", 0x46c00035, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.ult.ps","M,S,T", 0x46c00035, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.le.s", "S,T", 0x4600003e, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.le.s", "M,S,T", 0x4600003e, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.le.s", "M,S,T", 0x4600003e, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.ole.d", "S,T", 0x46200036, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.ole.d", "M,S,T", 0x46200036, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.ole.d", "M,S,T", 0x46200036, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.ole.s", "S,T", 0x46000036, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.ole.s", "M,S,T", 0x46000036, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.ole.s", "M,S,T", 0x46000036, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.ole.ps","S,T", 0x46c00036, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.ole.ps","M,S,T", 0x46c00036, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.ule.d", "S,T", 0x46200037, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.ule.d", "M,S,T", 0x46200037, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.ule.d", "M,S,T", 0x46200037, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.ule.s", "S,T", 0x46000037, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.ule.s", "M,S,T", 0x46000037, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.ule.s", "M,S,T", 0x46000037, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.ule.ps","S,T", 0x46c00037, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.ule.ps","M,S,T", 0x46c00037, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.sf.d", "S,T", 0x46200038, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.sf.d", "M,S,T", 0x46200038, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.sf.d", "M,S,T", 0x46200038, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.sf.s", "S,T", 0x46000038, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.sf.s", "M,S,T", 0x46000038, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.sf.s", "M,S,T", 0x46000038, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.sf.ps", "S,T", 0x46c00038, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.sf.ps", "M,S,T", 0x46c00038, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.ngle.d","S,T", 0x46200039, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.ngle.d","M,S,T", 0x46200039, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.ngle.d","M,S,T", 0x46200039, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.ngle.s","S,T", 0x46000039, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.ngle.s","M,S,T", 0x46000039, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.ngle.s","M,S,T", 0x46000039, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.ngle.ps","S,T", 0x46c00039, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.ngle.ps","M,S,T", 0x46c00039, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.seq.d", "S,T", 0x4620003a, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.seq.d", "M,S,T", 0x4620003a, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.seq.d", "M,S,T", 0x4620003a, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.seq.s", "S,T", 0x4600003a, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.seq.s", "M,S,T", 0x4600003a, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.seq.s", "M,S,T", 0x4600003a, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.seq.ps","S,T", 0x46c0003a, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.seq.ps","M,S,T", 0x46c0003a, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.ngl.d", "S,T", 0x4620003b, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.ngl.d", "M,S,T", 0x4620003b, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.ngl.d", "M,S,T", 0x4620003b, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.ngl.s", "S,T", 0x4600003b, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.ngl.s", "M,S,T", 0x4600003b, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.ngl.s", "M,S,T", 0x4600003b, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.ngl.ps","S,T", 0x46c0003b, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.ngl.ps","M,S,T", 0x46c0003b, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.lt.d", "S,T", 0x4620003c, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.lt.d", "M,S,T", 0x4620003c, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.lt.d", "M,S,T", 0x4620003c, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.lt.ps", "S,T", 0x46c0003c, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.lt.ps", "M,S,T", 0x46c0003c, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.nge.d", "S,T", 0x4620003d, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.nge.d", "M,S,T", 0x4620003d, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.nge.d", "M,S,T", 0x4620003d, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.nge.s", "S,T", 0x4600003d, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.nge.s", "M,S,T", 0x4600003d, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.nge.s", "M,S,T", 0x4600003d, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.nge.ps","S,T", 0x46c0003d, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.nge.ps","M,S,T", 0x46c0003d, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.le.d", "S,T", 0x4620003e, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.le.d", "M,S,T", 0x4620003e, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.le.d", "M,S,T", 0x4620003e, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.le.ps", "S,T", 0x46c0003e, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.le.ps", "M,S,T", 0x46c0003e, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.ngt.d", "S,T", 0x4620003f, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I1 }, -{"c.ngt.d", "M,S,T", 0x4620003f, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4 }, +{"c.ngt.d", "M,S,T", 0x4620003f, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I4|M1 }, {"c.ngt.s", "S,T", 0x4600003f, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S, I1 }, -{"c.ngt.s", "M,S,T", 0x4600003f, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4 }, +{"c.ngt.s", "M,S,T", 0x4600003f, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S, I4|M1 }, {"c.ngt.ps","S,T", 0x46c0003f, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"c.ngt.ps","M,S,T", 0x46c0003f, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D, I5 }, {"cache", "k,o(b)", 0xbc000000, 0xfc000000, RD_b, I3|T3|M1 }, @@ -539,8 +539,8 @@ const struct mips_opcode mips_builtin_op {"maddu", "d,s,t", 0x70000001, 0xfc0007ff, RD_s|RD_t|WR_HI|WR_LO|WR_d|IS_M, G1}, {"madd16", "s,t", 0x00000028, 0xfc00ffff, RD_s|RD_t|WR_HI|WR_LO|RD_HI|RD_LO, V1 }, {"mfc0", "t,G", 0x40000000, 0xffe007ff, LCD|WR_t|RD_C0, I1 }, -{"mfc1", "t,S", 0x44000000, 0xffe007ff, LCD|WR_t|RD_S|FP_S, I1 }, -{"mfc1", "t,G", 0x44000000, 0xffe007ff, LCD|WR_t|RD_S|FP_S, I1 }, +{"mfc1", "t,S", 0x44000000, 0xffe007ff, LCD|WR_t|RD_S|FP_S, I1}, +{"mfc1", "t,G", 0x44000000, 0xffe007ff, LCD|WR_t|RD_S|FP_S, I1}, {"mfc2", "t,G", 0x48000000, 0xffe007ff, LCD|WR_t|RD_C2, I1 }, {"mfc3", "t,G", 0x4c000000, 0xffe007ff, LCD|WR_t|RD_C3, I1 }, {"mfhi", "d", 0x00000010, 0xffff07ff, WR_d|RD_HI, I1 }, diff -upr --new-file binutils-2.9.5.0.42/opcodes/opintl.h binutils-2.9.5.0.46/opcodes/opintl.h --- binutils-2.9.5.0.42/opcodes/opintl.h Thu Jun 3 11:02:12 1999 +++ binutils-2.9.5.0.46/opcodes/opintl.h Thu Jun 1 11:09:08 2000 @@ -12,6 +12,19 @@ #ifdef ENABLE_NLS # include +/* Note the use of dgetext() and PACKAGE here, rather than gettext(). + + This is because the code in this directory is used to build a library which + will be linked with code in other directories to form programs. We want to + maintain a seperate translation file for this directory however, rather + than being forced to merge it with that of any program linked to + libopcodes. This is a library, so it cannot depend on the catalog + currently loaded. + + In order to do this, we have to make sure that when we extract messages we + use the OPCODES domain rather than the domain of the program that included + the opcodes library, (eg OBJDUMP). Hence we use dgettext (PACKAGE, String) + and define PACKAGE to be 'opcodes'. (See the code in configure). */ # define _(String) dgettext (PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) @@ -19,12 +32,11 @@ # define N_(String) (String) # endif #else -/* Stubs that do something close enough. */ -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) +# define gettext(Msgid) (Msgid) +# define dgettext(Domainname, Msgid) (Msgid) +# define dcgettext(Domainname, Msgid, Category) (Msgid) +# define textdomain(Domainname) while (0) /* nothing */ +# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */ # define _(String) (String) # define N_(String) (String) #endif diff -upr --new-file binutils-2.9.5.0.42/opcodes/po/POTFILES.in binutils-2.9.5.0.46/opcodes/po/POTFILES.in --- binutils-2.9.5.0.42/opcodes/po/POTFILES.in Tue Feb 29 10:59:59 2000 +++ binutils-2.9.5.0.46/opcodes/po/POTFILES.in Tue May 30 13:57:53 2000 @@ -5,6 +5,7 @@ arc-dis.c arc-opc.c arm-dis.c arm-opc.h +avr-dis.c cgen-asm.c cgen-dis.c cgen-opc.c @@ -12,8 +13,8 @@ d10v-dis.c d10v-opc.c d30v-dis.c d30v-opc.c -dis-buf.c disassemble.c +dis-buf.c fr30-asm.c fr30-desc.c fr30-desc.h @@ -29,6 +30,18 @@ i370-dis.c i370-opc.c i386-dis.c i960-dis.c +ia64-asmtab.c +ia64-asmtab.h +ia64-dis.c +ia64-gen.c +ia64-opc-a.c +ia64-opc-b.c +ia64-opc.c +ia64-opc-d.c +ia64-opc-f.c +ia64-opc.h +ia64-opc-i.c +ia64-opc-m.c m10200-dis.c m10200-opc.c m10300-dis.c @@ -46,9 +59,9 @@ m68k-opc.c m88k-dis.c mcore-dis.c mcore-opc.h +mips16-opc.c mips-dis.c mips-opc.c -mips16-opc.c ns32k-dis.c pj-dis.c pj-opc.c @@ -60,6 +73,8 @@ sparc-dis.c sparc-opc.c sysdep.h tic30-dis.c +tic54x-dis.c +tic54x-opc.c tic80-dis.c tic80-opc.c v850-dis.c @@ -68,5 +83,5 @@ vax-dis.c w65-dis.c w65-opc.h z8k-dis.c -z8k-opc.h z8kgen.c +z8k-opc.h diff -upr --new-file binutils-2.9.5.0.42/opcodes/po/opcodes.pot binutils-2.9.5.0.46/opcodes/po/opcodes.pot --- binutils-2.9.5.0.42/opcodes/po/opcodes.pot Tue Apr 4 09:29:15 2000 +++ binutils-2.9.5.0.46/opcodes/po/opcodes.pot Tue May 30 13:57:53 2000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-04-04 23:21+0930\n" +"POT-Creation-Date: 2000-05-30 11:33-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,7 +22,7 @@ msgstr "" msgid "jump hint unaligned" msgstr "" -#: arc-dis.c:231 +#: arc-dis.c:232 msgid "*unknown*" msgstr "" @@ -48,21 +48,21 @@ msgstr "" msgid "branch address not on 4 byte boundary" msgstr "" -#: arm-dis.c:470 +#: arm-dis.c:476 msgid "" msgstr "" -#: arm-dis.c:882 +#: arm-dis.c:888 #, c-format msgid "Unrecognised register name set: %s\n" msgstr "" -#: arm-dis.c:889 +#: arm-dis.c:895 #, c-format msgid "Unrecognised disassembler option: %s\n" msgstr "" -#: arm-dis.c:1053 +#: arm-dis.c:1059 msgid "" "\n" "The following ARM specific disassembler options are supported for use with\n" @@ -83,7 +83,7 @@ msgstr "" msgid "operand out of range (%lu not between %lu and %lu)" msgstr "" -#: d30v-dis.c:305 +#: d30v-dis.c:306 #, c-format msgid "" msgstr "" @@ -171,23 +171,23 @@ msgstr "" msgid "Unrecognized field %d while setting vma operand.\n" msgstr "" -#: h8300-dis.c:404 +#: h8300-dis.c:405 #, c-format msgid "Hmmmm %x" msgstr "" -#: h8300-dis.c:416 +#: h8300-dis.c:417 #, c-format msgid "Don't understand %x \n" msgstr "" -#: h8500-dis.c:139 +#: h8500-dis.c:140 #, c-format msgid "can't cope with insert %d\n" msgstr "" #. Couldn't understand anything -#: h8500-dis.c:344 +#: h8500-dis.c:345 #, c-format msgid "%02x\t\t*unknown*" msgstr "" @@ -202,27 +202,27 @@ msgstr "" msgid "unknown\t0x%04lx" msgstr "" -#: m10300-dis.c:680 +#: m10300-dis.c:685 #, c-format msgid "unknown\t0x%04x" msgstr "" -#: m68k-dis.c:410 +#: m68k-dis.c:412 #, c-format msgid "\n" msgstr "" -#: m68k-dis.c:988 +#: m68k-dis.c:990 #, c-format msgid "" msgstr "" -#: m88k-dis.c:273 +#: m88k-dis.c:274 #, c-format msgid "# " msgstr "" -#: mips-dis.c:237 +#: mips-dis.c:242 #, c-format msgid "# internal error, undefined modifier(%c)" msgstr "" @@ -237,50 +237,50 @@ msgstr "" msgid "$" msgstr "" -#: ppc-opc.c:586 ppc-opc.c:617 +#: ppc-opc.c:619 ppc-opc.c:650 msgid "invalid conditional option" msgstr "" -#: ppc-opc.c:619 +#: ppc-opc.c:652 msgid "attempt to set y bit when using + or - modifier" msgstr "" -#: ppc-opc.c:674 +#: ppc-opc.c:707 msgid "ignoring least significant bits in branch offset" msgstr "" -#: ppc-opc.c:709 ppc-opc.c:746 +#: ppc-opc.c:742 ppc-opc.c:779 msgid "illegal bitmask" msgstr "" -#: ppc-opc.c:815 +#: ppc-opc.c:848 msgid "value out of range" msgstr "" -#: ppc-opc.c:889 +#: ppc-opc.c:922 msgid "index register in load range" msgstr "" -#: ppc-opc.c:904 +#: ppc-opc.c:937 msgid "invalid register operand when updating" msgstr "" #. Mark as non-valid instruction -#: sparc-dis.c:744 +#: sparc-dis.c:743 msgid "unknown" msgstr "" -#: sparc-dis.c:816 +#: sparc-dis.c:815 #, c-format msgid "Internal error: bad sparc-opcode.h: \"%s\", %#.8lx, %#.8lx\n" msgstr "" -#: sparc-dis.c:827 +#: sparc-dis.c:826 #, c-format msgid "Internal error: bad sparc-opcode.h: \"%s\", %#.8lx, %#.8lx\n" msgstr "" -#: sparc-dis.c:876 +#: sparc-dis.c:875 #, c-format msgid "Internal error: bad sparc-opcode.h: \"%s\" == \"%s\"\n" msgstr "" diff -upr --new-file binutils-2.9.5.0.42/opcodes/tic54x-dis.c binutils-2.9.5.0.46/opcodes/tic54x-dis.c --- binutils-2.9.5.0.42/opcodes/tic54x-dis.c Fri May 12 08:03:13 2000 +++ binutils-2.9.5.0.46/opcodes/tic54x-dis.c Tue May 30 13:57:53 2000 @@ -20,7 +20,7 @@ #include #include #include -#include +#include "sysdep.h" #include "dis-asm.h" #include "opcode/tic54x.h" #include "coff/tic54x.h" diff -upr --new-file binutils-2.9.5.0.42/opcodes/tic54x-opc.c binutils-2.9.5.0.46/opcodes/tic54x-opc.c --- binutils-2.9.5.0.42/opcodes/tic54x-opc.c Fri May 12 08:03:13 2000 +++ binutils-2.9.5.0.46/opcodes/tic54x-opc.c Tue May 30 13:57:53 2000 @@ -17,8 +17,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include "ansidecl.h" +#include "sysdep.h" #include "opcode/tic54x.h" /* these are the only register names not found in mmregs */ diff -upr --new-file binutils-2.9.5.0.42/texinfo/texinfo.tex binutils-2.9.5.0.46/texinfo/texinfo.tex --- binutils-2.9.5.0.42/texinfo/texinfo.tex Sun Jun 20 10:05:19 1999 +++ binutils-2.9.5.0.46/texinfo/texinfo.tex Thu Jun 1 11:11:18 2000 @@ -1,7 +1,11 @@ % texinfo.tex -- TeX macros to handle Texinfo files. -% $Id: texinfo.tex,v 1.1 1999/06/12 09:59:55 ian Exp $ % -% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98 +% Load plain if necessary, i.e., if running under initex. +\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi +% +\def\texinfoversion{1999-09-25.10} +% +% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99 % Free Software Foundation, Inc. % % This texinfo.tex file is free software; you can redistribute it and/or @@ -25,50 +29,44 @@ % % Please try the latest version of texinfo.tex before submitting bug % reports; you can get the latest version from: -% ftp://ftp.gnu.org/pub/gnu/texinfo.tex -% /home/gd/gnu/doc/texinfo.tex on the GNU machines. +% ftp://ftp.gnu.org/gnu/texinfo.tex % (and all GNU mirrors, see http://www.gnu.org/order/ftp.html) -% ftp://tug.org/tex/texinfo.tex -% ftp://ctan.org/macros/texinfo/texinfo.tex -% (and all CTAN mirrors, finger ctan@ctan.org for a list). -% The texinfo.tex in the texinfo distribution itself could well be out +% ftp://texinfo.org/tex/texinfo.tex +% ftp://us.ctan.org/macros/texinfo/texinfo.tex +% (and all CTAN mirrors, finger ctan@us.ctan.org for a list). +% /home/gd/gnu/doc/texinfo.tex on the GNU machines. +% The texinfo.tex in any given Texinfo distribution could well be out % of date, so if that's what you're using, please check. -% -% Send bug reports to bug-texinfo@gnu.org. -% Please include a precise test case in each bug report, -% including a complete document with which we can reproduce the problem. -% +% Texinfo has a small home page at http://texinfo.org/. +% +% Send bug reports to bug-texinfo@gnu.org. Please include including a +% complete document in each bug report with which we can reproduce the +% problem. Patches are, of course, greatly appreciated. +% % To process a Texinfo manual with TeX, it's most reliable to use the -% texi2dvi shell script that comes with the distribution. For simple -% manuals, however, you can get away with: +% texi2dvi shell script that comes with the distribution. For a simple +% manual foo.texi, however, you can get away with this: % tex foo.texi % texindex foo.?? % tex foo.texi % tex foo.texi -% dvips foo.dvi -o # or whatever, to process the dvi file. +% dvips foo.dvi -o # or whatever, to process the dvi file; this makes foo.ps. % The extra runs of TeX get the cross-reference information correct. % Sometimes one run after texindex suffices, and sometimes you need more % than two; texi2dvi does it as many times as necessary. +% +% It is possible to adapt texinfo.tex for other languages. You can get +% the existing language-specific files from ftp://ftp.gnu.org/gnu/texinfo/. - -% Make it possible to create a .fmt file just by loading this file: -% if the underlying format is not loaded, start by loading it now. -% Added by gildea November 1993. -\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi - -% This automatically updates the version number based on RCS. -\def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}} -\deftexinfoversion$Revision: 1.1 $ -\message{Loading texinfo package [Version \texinfoversion]:} +\message{Loading texinfo [version \texinfoversion]:} % If in a .fmt file, print the version number % and turn on active characters that we couldn't do earlier because % they might have appeared in the input file name. -\everyjob{\message{[Texinfo version \texinfoversion]}\message{} +\everyjob{\message{[Texinfo version \texinfoversion]}% \catcode`+=\active \catcode`\_=\active} % Save some parts of plain tex whose names we will redefine. - \let\ptexb=\b \let\ptexbullet=\bullet \let\ptexc=\c @@ -88,7 +86,6 @@ % For @tex, we can use \tabalign. \let\+ = \relax - \message{Basics,} \chardef\other=12 @@ -97,19 +94,46 @@ \newlinechar = `^^J % Set up fixed words for English if not already set. -\ifx\putwordAppendix\undefined \gdef\putwordAppendix{Appendix}\fi -\ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi -\ifx\putwordfile\undefined \gdef\putwordfile{file}\fi -\ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi -\ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi -\ifx\putwordon\undefined \gdef\putwordon{on}\fi -\ifx\putwordpage\undefined \gdef\putwordpage{page}\fi -\ifx\putwordsection\undefined \gdef\putwordsection{section}\fi -\ifx\putwordSection\undefined \gdef\putwordSection{Section}\fi -\ifx\putwordsee\undefined \gdef\putwordsee{see}\fi -\ifx\putwordSee\undefined \gdef\putwordSee{See}\fi -\ifx\putwordShortContents\undefined \gdef\putwordShortContents{Short Contents}\fi -\ifx\putwordTableofContents\undefined\gdef\putwordTableofContents{Table of Contents}\fi +\ifx\putwordAppendix\undefined \gdef\putwordAppendix{Appendix}\fi +\ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi +\ifx\putwordfile\undefined \gdef\putwordfile{file}\fi +\ifx\putwordin\undefined \gdef\putwordin{in}\fi +\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi +\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi +\ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi +\ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi +\ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi +\ifx\putwordNoTitle\undefined \gdef\putwordNoTitle{No Title}\fi +\ifx\putwordof\undefined \gdef\putwordof{of}\fi +\ifx\putwordon\undefined \gdef\putwordon{on}\fi +\ifx\putwordpage\undefined \gdef\putwordpage{page}\fi +\ifx\putwordsection\undefined \gdef\putwordsection{section}\fi +\ifx\putwordSection\undefined \gdef\putwordSection{Section}\fi +\ifx\putwordsee\undefined \gdef\putwordsee{see}\fi +\ifx\putwordSee\undefined \gdef\putwordSee{See}\fi +\ifx\putwordShortTOC\undefined \gdef\putwordShortTOC{Short Contents}\fi +\ifx\putwordTOC\undefined \gdef\putwordTOC{Table of Contents}\fi +% +\ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi +\ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi +\ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi +\ifx\putwordMApr\undefined \gdef\putwordMApr{April}\fi +\ifx\putwordMMay\undefined \gdef\putwordMMay{May}\fi +\ifx\putwordMJun\undefined \gdef\putwordMJun{June}\fi +\ifx\putwordMJul\undefined \gdef\putwordMJul{July}\fi +\ifx\putwordMAug\undefined \gdef\putwordMAug{August}\fi +\ifx\putwordMSep\undefined \gdef\putwordMSep{September}\fi +\ifx\putwordMOct\undefined \gdef\putwordMOct{October}\fi +\ifx\putwordMNov\undefined \gdef\putwordMNov{November}\fi +\ifx\putwordMDec\undefined \gdef\putwordMDec{December}\fi +% +\ifx\putwordDefmac\undefined \gdef\putwordDefmac{Macro}\fi +\ifx\putwordDefspec\undefined \gdef\putwordDefspec{Special Form}\fi +\ifx\putwordDefvar\undefined \gdef\putwordDefvar{Variable}\fi +\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi +\ifx\putwordDeftypevar\undefined\gdef\putwordDeftypevar{Variable}\fi +\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi +\ifx\putwordDeftypefun\undefined\gdef\putwordDeftypefun{Function}\fi % Ignore a token. % @@ -148,7 +172,7 @@ % For @cropmarks command. % Do @cropmarks to get crop marks. -% +% \newif\ifcropmarks \let\cropmarks = \cropmarkstrue % @@ -192,13 +216,16 @@ \shipout\vbox{% \ifcropmarks \vbox to \outervsize\bgroup \hsize = \outerhsize - \line{\ewtop\hfil\ewtop}% - \nointerlineskip - \line{% - \vbox{\moveleft\cornerthick\nstop}% - \hfill - \vbox{\moveright\cornerthick\nstop}% - }% + \vskip-\topandbottommargin + \vtop to0pt{% + \line{\ewtop\hfil\ewtop}% + \nointerlineskip + \line{% + \vbox{\moveleft\cornerthick\nstop}% + \hfill + \vbox{\moveright\cornerthick\nstop}% + }% + \vss}% \vskip\topandbottommargin \line\bgroup \hfil % center the page within the outer (page) hsize. @@ -216,18 +243,22 @@ \unvbox\footlinebox \fi % + \ifpdfmakepagedest \pdfmkdest{\the\pageno} \fi + % \ifcropmarks \egroup % end of \vbox\bgroup \hfil\egroup % end of (centering) \line\bgroup \vskip\topandbottommargin plus1fill minus1fill \boxmaxdepth = \cornerthick - \line{% - \vbox{\moveleft\cornerthick\nsbot}% - \hfill - \vbox{\moveright\cornerthick\nsbot}% + \vbox to0pt{\vss + \line{% + \vbox{\moveleft\cornerthick\nsbot}% + \hfill + \vbox{\moveright\cornerthick\nsbot}% + }% + \nointerlineskip + \line{\ewbot\hfil\ewbot}% }% - \nointerlineskip - \line{\ewbot\hfil\ewbot}% \egroup % \vbox from first cropmarks clause \fi }% end of \shipout\vbox @@ -568,36 +599,42 @@ where each line of input produces a line %}} \def\needx#1{% - % Go into vertical mode, so we don't make a big box in the middle of a + % Ensure vertical mode, so we don't make a big box in the middle of a % paragraph. \par % - % Don't add any leading before our big empty box, but allow a page - % break, since the best break might be right here. - \allowbreak - \nointerlineskip - \vtop to #1\mil{\vfil}% - % - % TeX does not even consider page breaks if a penalty added to the - % main vertical list is 10000 or more. But in order to see if the - % empty box we just added fits on the page, we must make it consider - % page breaks. On the other hand, we don't want to actually break the - % page after the empty box. So we use a penalty of 9999. - % - % There is an extremely small chance that TeX will actually break the - % page at this \penalty, if there are no other feasible breakpoints in - % sight. (If the user is using lots of big @group commands, which - % almost-but-not-quite fill up a page, TeX will have a hard time doing - % good page breaking, for example.) However, I could not construct an - % example where a page broke at this \penalty; if it happens in a real - % document, then we can reconsider our strategy. - \penalty9999 - % - % Back up by the size of the box, whether we did a page break or not. - \kern -#1\mil - % - % Do not allow a page break right after this kern. - \nobreak + % If the @need value is less than one line space, it's useless. + \dimen0 = #1\mil + \dimen2 = \ht\strutbox + \advance\dimen2 by \dp\strutbox + \ifdim\dimen0 > \dimen2 + % + % Do a \strut just to make the height of this box be normal, so the + % normal leading is inserted relative to the preceding line. + % And a page break here is fine. + \vtop to #1\mil{\strut\vfil}% + % + % TeX does not even consider page breaks if a penalty added to the + % main vertical list is 10000 or more. But in order to see if the + % empty box we just added fits on the page, we must make it consider + % page breaks. On the other hand, we don't want to actually break the + % page after the empty box. So we use a penalty of 9999. + % + % There is an extremely small chance that TeX will actually break the + % page at this \penalty, if there are no other feasible breakpoints in + % sight. (If the user is using lots of big @group commands, which + % almost-but-not-quite fill up a page, TeX will have a hard time doing + % good page breaking, for example.) However, I could not construct an + % example where a page broke at this \penalty; if it happens in a real + % document, then we can reconsider our strategy. + \penalty9999 + % + % Back up by the size of the box, whether we did a page break or not. + \kern -#1\mil + % + % Do not allow a page break right after this kern. + \nobreak + \fi } % @br forces paragraph break @@ -618,7 +655,7 @@ where each line of input produces a line } % @enddots{} is an end-of-sentence ellipsis. -% +% \def\enddots{% \leavevmode \hbox to 2em{% @@ -705,420 +742,282 @@ where each line of input produces a line \let\c=\comment -% @paragraphindent is defined for the Info formatting commands only. -\let\paragraphindent=\comment - -% Prevent errors for section commands. -% Used in @ignore and in failing conditionals. -\def\ignoresections{% -\let\chapter=\relax -\let\unnumbered=\relax -\let\top=\relax -\let\unnumberedsec=\relax -\let\unnumberedsection=\relax -\let\unnumberedsubsec=\relax -\let\unnumberedsubsection=\relax -\let\unnumberedsubsubsec=\relax -\let\unnumberedsubsubsection=\relax -\let\section=\relax -\let\subsec=\relax -\let\subsubsec=\relax -\let\subsection=\relax -\let\subsubsection=\relax -\let\appendix=\relax -\let\appendixsec=\relax -\let\appendixsection=\relax -\let\appendixsubsec=\relax -\let\appendixsubsection=\relax -\let\appendixsubsubsec=\relax -\let\appendixsubsubsection=\relax -\let\contents=\relax -\let\smallbook=\relax -\let\titlepage=\relax +% @paragraphindent NCHARS +% We'll use ems for NCHARS, close enough. +% We cannot implement @paragraphindent asis, though. +% +\def\asisword{asis} % no translation, these are keywords +\def\noneword{none} +% +\def\paragraphindent{\parsearg\doparagraphindent} +\def\doparagraphindent#1{% + \def\temp{#1}% + \ifx\temp\asisword + \else + \ifx\temp\noneword + \defaultparindent = 0pt + \else + \defaultparindent = #1em + \fi + \fi + \parindent = \defaultparindent } -% Used in nested conditionals, where we have to parse the Texinfo source -% and so want to turn off most commands, in case they are used -% incorrectly. -% -\def\ignoremorecommands{% - \let\defcodeindex = \relax - \let\defcv = \relax - \let\deffn = \relax - \let\deffnx = \relax - \let\defindex = \relax - \let\defivar = \relax - \let\defmac = \relax - \let\defmethod = \relax - \let\defop = \relax - \let\defopt = \relax - \let\defspec = \relax - \let\deftp = \relax - \let\deftypefn = \relax - \let\deftypefun = \relax - \let\deftypevar = \relax - \let\deftypevr = \relax - \let\defun = \relax - \let\defvar = \relax - \let\defvr = \relax - \let\ref = \relax - \let\xref = \relax - \let\printindex = \relax - \let\pxref = \relax - \let\settitle = \relax - \let\setchapternewpage = \relax - \let\setchapterstyle = \relax - \let\everyheading = \relax - \let\evenheading = \relax - \let\oddheading = \relax - \let\everyfooting = \relax - \let\evenfooting = \relax - \let\oddfooting = \relax - \let\headings = \relax - \let\include = \relax - \let\lowersections = \relax - \let\down = \relax - \let\raisesections = \relax - \let\up = \relax - \let\set = \relax - \let\clear = \relax - \let\item = \relax +% @exampleindent NCHARS +% We'll use ems for NCHARS like @paragraphindent. +% It seems @exampleindent asis isn't necessary, but +% I preserve it to make it similar to @paragraphindent. +\def\exampleindent{\parsearg\doexampleindent} +\def\doexampleindent#1{% + \def\temp{#1}% + \ifx\temp\asisword + \else + \ifx\temp\noneword + \lispnarrowing = 0pt + \else + \lispnarrowing = #1em + \fi + \fi } -% Ignore @ignore ... @end ignore. +% @asis just yields its argument. Used with @table, for example. % -\def\ignore{\doignore{ignore}} +\def\asis#1{#1} -% Ignore @ifinfo, @ifhtml, @ifnottex, @html, @menu, and @direntry text. +% @math means output in math mode. +% We don't use $'s directly in the definition of \math because control +% sequences like \math are expanded when the toc file is written. Then, +% we read the toc file back, the $'s will be normal characters (as they +% should be, according to the definition of Texinfo). So we must use a +% control sequence to switch into and out of math mode. % -\def\ifinfo{\doignore{ifinfo}} -\def\ifhtml{\doignore{ifhtml}} -\def\ifnottex{\doignore{ifnottex}} -\def\html{\doignore{html}} -\def\menu{\doignore{menu}} -\def\direntry{\doignore{direntry}} +% This isn't quite enough for @math to work properly in indices, but it +% seems unlikely it will ever be needed there. +% +\let\implicitmath = $ +\def\math#1{\implicitmath #1\implicitmath} -% @dircategory CATEGORY -- specify a category of the dir file -% which this file should belong to. Ignore this in TeX. -\let\dircategory = \comment +% @bullet and @minus need the same treatment as @math, just above. +\def\bullet{\implicitmath\ptexbullet\implicitmath} +\def\minus{\implicitmath-\implicitmath} -% Ignore text until a line `@end #1'. +% @refill is a no-op. +\let\refill=\relax + +% If working on a large document in chapters, it is convenient to +% be able to disable indexing, cross-referencing, and contents, for test runs. +% This is done with @novalidate (before @setfilename). % -\def\doignore#1{\begingroup - % Don't complain about control sequences we have declared \outer. - \ignoresections - % - % Define a command to swallow text until we reach `@end #1'. - % This @ is a catcode 12 token (that is the normal catcode of @ in - % this texinfo.tex file). We change the catcode of @ below to match. - \long\def\doignoretext##1@end #1{\enddoignore}% - % - % Make sure that spaces turn into tokens that match what \doignoretext wants. - \catcode32 = 10 - % - % Ignore braces, too, so mismatched braces don't cause trouble. - \catcode`\{ = 9 - \catcode`\} = 9 - % - % We must not have @c interpreted as a control sequence. - \catcode`\@ = 12 - % - % Make the letter c a comment character so that the rest of the line - % will be ignored. This way, the document can have (for example) - % @c @end ifinfo - % and the @end ifinfo will be properly ignored. - % (We've just changed @ to catcode 12.) - \catcode`\c = 14 - % - % And now expand that command. - \doignoretext +\newif\iflinks \linkstrue % by default we want the aux files. +\let\novalidate = \linksfalse + +% @setfilename is done at the beginning of every texinfo file. +% So open here the files we need to have open while reading the input. +% This makes it possible to make a .fmt file for texinfo. +\def\setfilename{% + \iflinks + \readauxfile + \fi % \openindices needs to do some work in any case. + \openindices + \fixbackslash % Turn off hack to swallow `\input texinfo'. + \global\let\setfilename=\comment % Ignore extra @setfilename cmds. + % + % If texinfo.cnf is present on the system, read it. + % Useful for site-wide @afourpaper, etc. + % Just to be on the safe side, close the input stream before the \input. + \openin 1 texinfo.cnf + \ifeof1 \let\temp=\relax \else \def\temp{\input texinfo.cnf }\fi + \closein1 + \temp + % + \comment % Ignore the actual filename. } -% What we do to finish off ignored text. +% Called from \setfilename. % -\def\enddoignore{\endgroup\ignorespaces}% +\def\openindices{% + \newindex{cp}% + \newcodeindex{fn}% + \newcodeindex{vr}% + \newcodeindex{tp}% + \newcodeindex{ky}% + \newcodeindex{pg}% +} -\newif\ifwarnedobs\warnedobsfalse -\def\obstexwarn{% - \ifwarnedobs\relax\else - % We need to warn folks that they may have trouble with TeX 3.0. - % This uses \immediate\write16 rather than \message to get newlines. - \immediate\write16{} - \immediate\write16{***WARNING*** for users of Unix TeX 3.0!} - \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).} - \immediate\write16{If you are running another version of TeX, relax.} - \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.} - \immediate\write16{ Then upgrade your TeX installation if you can.} - \immediate\write16{ (See ftp://ftp.gnu.ai.mit.edu/pub/gnu/TeX.README.)} - \immediate\write16{If you are stuck with version 3.0, run the} - \immediate\write16{ script ``tex3patch'' from the Texinfo distribution} - \immediate\write16{ to use a workaround.} - \immediate\write16{} - \global\warnedobstrue +% @bye. +\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend} + + +\message{pdf,} +% adobe `portable' document format +\newcount\tempnum +\newcount\lnkcount +\newtoks\filename +\newcount\filenamelength +\newcount\pgn +\newtoks\toksA +\newtoks\toksB +\newtoks\toksC +\newtoks\toksD +\newbox\boxA +\newcount\countA +\newif\ifpdf +\newif\ifpdfmakepagedest + +\ifx\pdfoutput\undefined + \pdffalse + \let\pdfmkdest = \gobble + \let\pdfurl = \gobble + \let\endlink = \relax + \let\linkcolor = \relax + \let\pdfmakeoutlines = \relax +\else + \pdftrue + \pdfoutput = 1 + \input pdfcolor + \def\dopdfimage#1#2#3{% + \def\imagewidth{#2}% + \def\imageheight{#3}% + \ifnum\pdftexversion < 14 + \pdfimage + \else + \pdfximage \fi -} - -% **In TeX 3.0, setting text in \nullfont hangs tex. For a -% workaround (which requires the file ``dummy.tfm'' to be installed), -% uncomment the following line: -%%%%%\font\nullfont=dummy\let\obstexwarn=\relax - -% Ignore text, except that we keep track of conditional commands for -% purposes of nesting, up to an `@end #1' command. -% -\def\nestedignore#1{% - \obstexwarn - % We must actually expand the ignored text to look for the @end - % command, so that nested ignore constructs work. Thus, we put the - % text into a \vbox and then do nothing with the result. To minimize - % the change of memory overflow, we follow the approach outlined on - % page 401 of the TeXbook: make the current font be a dummy font. - % - \setbox0 = \vbox\bgroup - % Don't complain about control sequences we have declared \outer. - \ignoresections - % - % Define `@end #1' to end the box, which will in turn undefine the - % @end command again. - \expandafter\def\csname E#1\endcsname{\egroup\ignorespaces}% - % - % We are going to be parsing Texinfo commands. Most cause no - % trouble when they are used incorrectly, but some commands do - % complicated argument parsing or otherwise get confused, so we - % undefine them. - % - % We can't do anything about stray @-signs, unfortunately; - % they'll produce `undefined control sequence' errors. - \ignoremorecommands - % - % Set the current font to be \nullfont, a TeX primitive, and define - % all the font commands to also use \nullfont. We don't use - % dummy.tfm, as suggested in the TeXbook, because not all sites - % might have that installed. Therefore, math mode will still - % produce output, but that should be an extremely small amount of - % stuff compared to the main input. - % - \nullfont - \let\tenrm = \nullfont \let\tenit = \nullfont \let\tensl = \nullfont - \let\tenbf = \nullfont \let\tentt = \nullfont \let\smallcaps = \nullfont - \let\tensf = \nullfont - % Similarly for index fonts (mostly for their use in - % smallexample) - \let\indrm = \nullfont \let\indit = \nullfont \let\indsl = \nullfont - \let\indbf = \nullfont \let\indtt = \nullfont \let\indsc = \nullfont - \let\indsf = \nullfont - % - % Don't complain when characters are missing from the fonts. - \tracinglostchars = 0 - % - % Don't bother to do space factor calculations. - \frenchspacing - % - % Don't report underfull hboxes. - \hbadness = 10000 - % - % Do minimal line-breaking. - \pretolerance = 10000 - % - % Do not execute instructions in @tex - \def\tex{\doignore{tex}}% - % Do not execute macro definitions. - % `c' is a comment character, so the word `macro' will get cut off. - \def\macro{\doignore{ma}}% -} - -% @set VAR sets the variable VAR to an empty value. -% @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE. -% -% Since we want to separate VAR from REST-OF-LINE (which might be -% empty), we can't just use \parsearg; we have to insert a space of our -% own to delimit the rest of the line, and then take it out again if we -% didn't need it. Make sure the catcode of space is correct to avoid -% losing inside @example, for instance. -% -\def\set{\begingroup\catcode` =10 - \catcode`\-=12 \catcode`\_=12 % Allow - and _ in VAR. - \parsearg\setxxx} -\def\setxxx#1{\setyyy#1 \endsetyyy} -\def\setyyy#1 #2\endsetyyy{% - \def\temp{#2}% - \ifx\temp\empty \global\expandafter\let\csname SET#1\endcsname = \empty - \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted. - \fi - \endgroup -} -% Can't use \xdef to pre-expand #2 and save some time, since \temp or -% \next or other control sequences that we've defined might get us into -% an infinite loop. Consider `@set foo @cite{bar}'. -\def\setzzz#1#2 \endsetzzz{\expandafter\gdef\csname SET#1\endcsname{#2}} - -% @clear VAR clears (i.e., unsets) the variable VAR. -% -\def\clear{\parsearg\clearxxx} -\def\clearxxx#1{\global\expandafter\let\csname SET#1\endcsname=\relax} - -% @value{foo} gets the text saved in variable foo. -% -{ - \catcode`\_ = \active - % - % We might end up with active _ or - characters in the argument if - % we're called from @code, as @code{@value{foo-bar_}}. So \let any - % such active characters to their normal equivalents. - \gdef\value{\begingroup - \catcode`\-=12 \catcode`\_=12 - \indexbreaks \let_\normalunderscore - \valuexxx} -} -\def\valuexxx#1{\expandablevalue{#1}\endgroup} - -% We have this subroutine so that we can handle at least some @value's -% properly in indexes (we \let\value to this in \indexdummies). Ones -% whose names contain - or _ still won't work, but we can't do anything -% about that. The command has to be fully expandable, since the result -% winds up in the index file. This means that if the variable's value -% contains other Texinfo commands, it's almost certain it will fail -% (although perhaps we could fix that with sufficient work to do a -% one-level expansion on the result, instead of complete). -% -\def\expandablevalue#1{% - \expandafter\ifx\csname SET#1\endcsname\relax - {[No value for ``#1'']v}% - \else - \csname SET#1\endcsname - \fi -} - -% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined -% with @set. -% -\def\ifset{\parsearg\ifsetxxx} -\def\ifsetxxx #1{% - \expandafter\ifx\csname SET#1\endcsname\relax - \expandafter\ifsetfail - \else - \expandafter\ifsetsucceed - \fi -} -\def\ifsetsucceed{\conditionalsucceed{ifset}} -\def\ifsetfail{\nestedignore{ifset}} -\defineunmatchedend{ifset} - -% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been -% defined with @set, or has been undefined with @clear. -% -\def\ifclear{\parsearg\ifclearxxx} -\def\ifclearxxx #1{% - \expandafter\ifx\csname SET#1\endcsname\relax - \expandafter\ifclearsucceed - \else - \expandafter\ifclearfail - \fi -} -\def\ifclearsucceed{\conditionalsucceed{ifclear}} -\def\ifclearfail{\nestedignore{ifclear}} -\defineunmatchedend{ifclear} - -% @iftex, @ifnothtml, @ifnotinfo always succeed; we read the text -% following, through the first @end iftex (etc.). Make `@end iftex' -% (etc.) valid only after an @iftex. -% -\def\iftex{\conditionalsucceed{iftex}} -\def\ifnothtml{\conditionalsucceed{ifnothtml}} -\def\ifnotinfo{\conditionalsucceed{ifnotinfo}} -\defineunmatchedend{iftex} -\defineunmatchedend{ifnothtml} -\defineunmatchedend{ifnotinfo} - -% We can't just want to start a group at @iftex (for example) and end it -% at @end iftex, since then @set commands inside the conditional have no -% effect (they'd get reverted at the end of the group). So we must -% define \Eiftex to redefine itself to be its previous value. (We can't -% just define it to fail again with an ``unmatched end'' error, since -% the @ifset might be nested.) -% -\def\conditionalsucceed#1{% - \edef\temp{% - % Remember the current value of \E#1. - \let\nece{prevE#1} = \nece{E#1}% - % - % At the `@end #1', redefine \E#1 to be its previous value. - \def\nece{E#1}{\let\nece{E#1} = \nece{prevE#1}}% - }% - \temp -} - -% We need to expand lots of \csname's, but we don't want to expand the -% control sequences after we've constructed them. -% -\def\nece#1{\expandafter\noexpand\csname#1\endcsname} - -% @asis just yields its argument. Used with @table, for example. -% -\def\asis#1{#1} - -% @math means output in math mode. -% We don't use $'s directly in the definition of \math because control -% sequences like \math are expanded when the toc file is written. Then, -% we read the toc file back, the $'s will be normal characters (as they -% should be, according to the definition of Texinfo). So we must use a -% control sequence to switch into and out of math mode. -% -% This isn't quite enough for @math to work properly in indices, but it -% seems unlikely it will ever be needed there. -% -\let\implicitmath = $ -\def\math#1{\implicitmath #1\implicitmath} - -% @bullet and @minus need the same treatment as @math, just above. -\def\bullet{\implicitmath\ptexbullet\implicitmath} -\def\minus{\implicitmath-\implicitmath} - -% @refill is a no-op. -\let\refill=\relax - -% If working on a large document in chapters, it is convenient to -% be able to disable indexing, cross-referencing, and contents, for test runs. -% This is done with @novalidate (before @setfilename). -% -\newif\iflinks \linkstrue % by default we want the aux files. -\let\novalidate = \linksfalse - -% @setfilename is done at the beginning of every texinfo file. -% So open here the files we need to have open while reading the input. -% This makes it possible to make a .fmt file for texinfo. -\def\setfilename{% - \iflinks - \readauxfile - \fi % \openindices needs to do some work in any case. - \openindices - \fixbackslash % Turn off hack to swallow `\input texinfo'. - \global\let\setfilename=\comment % Ignore extra @setfilename cmds. - % - % If texinfo.cnf is present on the system, read it. - % Useful for site-wide @afourpaper, etc. - % Just to be on the safe side, close the input stream before the \input. - \openin 1 texinfo.cnf - \ifeof1 \let\temp=\relax \else \def\temp{\input texinfo.cnf }\fi - \closein1 - \temp - % - \comment % Ignore the actual filename. -} - -% Called from \setfilename. -% -\def\openindices{% - \newindex{cp}% - \newcodeindex{fn}% - \newcodeindex{vr}% - \newcodeindex{tp}% - \newcodeindex{ky}% - \newcodeindex{pg}% -} - -% @bye. -\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend} + \ifx\empty\imagewidth\else width \imagewidth \fi + \ifx\empty\imageheight\else height \imageheight \fi + {#1.pdf}% + \ifnum\pdftexversion < 14 \else + \pdfrefximage \pdflastximage + \fi} + \def\pdfmkdest#1{\pdfdest name{#1@} xyz} + \def\pdfmkpgn#1{#1@} + \let\linkcolor = \Cyan + \def\endlink{\Black\pdfendlink} + % Adding outlines to PDF; macros for calculating structure of outlines + % come from Petr Olsak + \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0% + \else \csname#1\endcsname \fi} + \def\advancenumber#1{\tempnum=\expnumber{#1}\relax + \advance\tempnum by1 + \expandafter\xdef\csname#1\endcsname{\the\tempnum}} + \def\pdfmakeoutlines{{% + \openin 1 \jobname.toc + \ifeof 1\else\bgroup + \closein 1 + \indexnofonts + \def\tt{} + % thanh's hack / proper braces in bookmarks + \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace + \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace + % + \def\chapentry ##1##2##3{} + \def\unnumbchapentry ##1##2{} + \def\secentry ##1##2##3##4{\advancenumber{chap##2}} + \def\unnumbsecentry ##1##2{} + \def\subsecentry ##1##2##3##4##5{\advancenumber{sec##2.##3}} + \def\unnumbsubsecentry ##1##2{} + \def\subsubsecentry ##1##2##3##4##5##6{\advancenumber{subsec##2.##3.##4}} + \def\unnumbsubsubsecentry ##1##2{} + \input \jobname.toc + \def\chapentry ##1##2##3{% + \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}} + \def\unnumbchapentry ##1##2{% + \pdfoutline goto name{\pdfmkpgn{##2}}{##1}} + \def\secentry ##1##2##3##4{% + \pdfoutline goto name{\pdfmkpgn{##4}}count-\expnumber{sec##2.##3}{##1}} + \def\unnumbsecentry ##1##2{% + \pdfoutline goto name{\pdfmkpgn{##2}}{##1}} + \def\subsecentry ##1##2##3##4##5{% + \pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}} + \def\unnumbsubsecentry ##1##2{% + \pdfoutline goto name{\pdfmkpgn{##2}}{##1}} + \def\subsubsecentry ##1##2##3##4##5##6{% + \pdfoutline goto name{\pdfmkpgn{##6}}{##1}} + \def\unnumbsubsubsecentry ##1##2{% + \pdfoutline goto name{\pdfmkpgn{##2}}{##1}} + \input \jobname.toc + \egroup\fi + }} + \def\makelinks #1,{% + \def\params{#1}\def\E{END}% + \ifx\params\E + \let\nextmakelinks=\relax + \else + \let\nextmakelinks=\makelinks + \ifnum\lnkcount>0,\fi + \picknum{#1}% + \startlink attr{/Border [0 0 0]} + goto name{\pdfmkpgn{\the\pgn}}% + \linkcolor #1% + \advance\lnkcount by 1% + \endlink + \fi + \nextmakelinks + } + \def\picknum#1{\expandafter\pn#1} + \def\pn#1{% + \def\p{#1}% + \ifx\p\lbrace + \let\nextpn=\ppn + \else + \let\nextpn=\ppnn + \def\first{#1} + \fi + \nextpn + } + \def\ppn#1{\pgn=#1\gobble} + \def\ppnn{\pgn=\first} + \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,} + \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} + \def\skipspaces#1{\def\PP{#1}\def\D{|}% + \ifx\PP\D\let\nextsp\relax + \else\let\nextsp\skipspaces + \ifx\p\space\else\addtokens{\filename}{\PP}% + \advance\filenamelength by 1 + \fi + \fi + \nextsp} + \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax} + \ifnum\pdftexversion < 14 + \let \startlink \pdfannotlink + \else + \let \startlink \pdfstartlink + \fi + \def\pdfurl#1{% + \begingroup + \normalturnoffactive\def\@{@}% + \leavevmode\Red + \startlink attr{/Border [0 0 0]}% + user{/Subtype /Link /A << /S /URI /URI (#1) >>}% + % #1 + \endgroup} + \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}} + \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} + \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks} + \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}} + \def\maketoks{% + \expandafter\poptoks\the\toksA|ENDTOKS| + \ifx\first0\adn0 + \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3 + \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6 + \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9 + \else + \ifnum0=\countA\else\makelink\fi + \ifx\first.\let\next=\done\else + \let\next=\maketoks + \addtokens{\toksB}{\the\toksD} + \ifx\first,\addtokens{\toksB}{\space}\fi + \fi + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi + \next} + \def\makelink{\addtokens{\toksB}% + {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} + \def\pdflink#1{% + \startlink attr{/Border [0 0 0]} goto name{\mkpgn{#1}} + \linkcolor #1\endlink} + \def\mkpgn#1{#1@} + \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} +\fi % \ifx\pdfoutput \message{fonts,} @@ -1190,23 +1089,17 @@ where each line of input produces a line \setfont\deftt\ttshape{10}{\magstep1} \def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf} -% Fonts for indices and small examples (9pt). -% We actually use the slanted font rather than the italic, -% because texinfo normally uses the slanted fonts for that. -% Do not make many font distinctions in general in the index, since they -% aren't very useful. -\setfont\ninett\ttshape{9}{1000} -\setfont\ninettsl\ttslshape{10}{900} -\setfont\indrm\rmshape{9}{1000} -\setfont\indit\itshape{9}{1000} -\setfont\indsl\slshape{9}{1000} -\let\indtt=\ninett -\let\indttsl=\ninettsl -\let\indsf=\indrm -\let\indbf=\indrm -\setfont\indsc\scshape{10}{900} -\font\indi=cmmi9 -\font\indsy=cmsy9 +% Fonts for indices, footnotes, small examples (9pt). +\setfont\smallrm\rmshape{9}{1000} +\setfont\smalltt\ttshape{9}{1000} +\setfont\smallbf\bfshape{10}{900} +\setfont\smallit\itshape{9}{1000} +\setfont\smallsl\slshape{9}{1000} +\setfont\smallsf\sfshape{9}{1000} +\setfont\smallsc\scshape{10}{900} +\setfont\smallttsl\ttslshape{10}{900} +\font\smalli=cmmi9 +\font\smallsy=cmsy9 % Fonts for title page: \setfont\titlerm\rmbshape{12}{\magstep3} @@ -1320,11 +1213,12 @@ where each line of input produces a line \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy \let\tenttsl=\ssecttsl \resetmathfonts \setleading{15pt}} \let\subsubsecfonts = \subsecfonts % Maybe make sssec fonts scaled magstephalf? -\def\indexfonts{% - \let\tenrm=\indrm \let\tenit=\indit \let\tensl=\indsl - \let\tenbf=\indbf \let\tentt=\indtt \let\smallcaps=\indsc - \let\tensf=\indsf \let\teni=\indi \let\tensy=\indsy \let\tenttsl=\indttsl - \resetmathfonts \setleading{12pt}} +\def\smallfonts{% + \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl + \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc + \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy + \let\tenttsl=\smallttsl + \resetmathfonts \setleading{11pt}} % Set up the default fonts, so we can use them for creating boxes. % @@ -1373,9 +1267,9 @@ where each line of input produces a line } \let\ttfont=\t \def\samp#1{`\tclose{#1}'\null} -\setfont\smallrm\rmshape{8}{1000} -\font\smallsy=cmsy9 -\def\key#1{{\smallrm\textfont2=\smallsy \leavevmode\hbox{% +\setfont\keyrm\rmshape{8}{1000} +\font\keysy=cmsy9 +\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% \vbox{\hrule\kern-0.4pt \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% @@ -1479,24 +1373,50 @@ where each line of input produces a line \let\env=\code \let\command=\code -% @uref (abbreviation for `urlref') takes an optional second argument -% specifying the text to display. First (mandatory) arg is the url. -% Perhaps eventually put in a hypertex \special here. -% -\def\uref#1{\urefxxx #1,,\finish} -\def\urefxxx#1,#2,#3\finish{% - \setbox0 = \hbox{\ignorespaces #2}% +% @uref (abbreviation for `urlref') takes an optional (comma-separated) +% second argument specifying the text to display and an optional third +% arg as text to display instead of (rather than in addition to) the url +% itself. First (mandatory) arg is the url. Perhaps eventually put in +% a hypertex \special here. +% +\def\uref#1{\douref #1,,,\finish} +\def\douref#1,#2,#3,#4\finish{\begingroup + \unsepspaces + \pdfurl{#1}% + \setbox0 = \hbox{\ignorespaces #3}% \ifdim\wd0 > 0pt - \unhbox0\ (\code{#1})% + \unhbox0 % third arg given, show only that \else - \code{#1}% + \setbox0 = \hbox{\ignorespaces #2}% + \ifdim\wd0 > 0pt + \ifpdf + \unhbox0 % PDF: 2nd arg given, show only it + \else + \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url + \fi + \else + \code{#1}% only url given, so show it + \fi \fi -} + \endlink +\endgroup} -% rms does not like the angle brackets --karl, 17may97. -% So now @email is just like @uref. +% rms does not like angle brackets --karl, 17may97. +% So now @email is just like @uref, unless we are pdf. +% %\def\email#1{\angleleft{\tt #1}\angleright} -\let\email=\uref +\ifpdf + \def\email#1{\doemail#1,,\finish} + \def\doemail#1,#2,#3\finish{\begingroup + \unsepspaces + \pdfurl{mailto:#1}% + \setbox0 = \hbox{\ignorespaces #2}% + \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi + \endlink + \endgroup} +\else + \let\email=\uref +\fi % Check if we are currently using a typewriter font. Since all the % Computer Modern typewriter fonts have zero interword stretch (and @@ -1539,8 +1459,8 @@ where each line of input produces a line \newif\iffinishedtitlepage % Do an implicit @contents or @shortcontents after @end titlepage if the -% user says @contentsaftertitlepage or @shortcontentsaftertitlepage. -% +% user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage. +% \newif\ifsetcontentsaftertitlepage \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue \newif\ifsetshortcontentsaftertitlepage @@ -1615,6 +1535,8 @@ where each line of input produces a line \global\let\shortcontents = \relax \fi % + \ifpdf \pdfmakepagedesttrue \fi + % \HEADINGSon } @@ -1749,22 +1671,18 @@ where each line of input produces a line % Subroutines used in generating headings % Produces Day Month Year style of output. -\def\today{\number\day\space -\ifcase\month\or -January\or February\or March\or April\or May\or June\or -July\or August\or September\or October\or November\or December\fi -\space\number\year} - -% Use this if you want the Month Day, Year style of output. -%\def\today{\ifcase\month\or -%January\or February\or March\or April\or May\or June\or -%July\or August\or September\or October\or November\or December\fi -%\space\number\day, \number\year} - -% @settitle line... specifies the title of the document, for headings -% It generates no output of its own +\def\today{% + \number\day\space + \ifcase\month + \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr + \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug + \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec + \fi + \space\number\year} -\def\thistitle{No Title} +% @settitle line... specifies the title of the document, for headings. +% It generates no output of its own. +\def\thistitle{\putwordNoTitle} \def\settitle{\parsearg\settitlezzz} \def\settitlezzz #1{\gdef\thistitle{#1}} @@ -1841,7 +1759,7 @@ July\or August\or September\or October\o \itemxneedsnegativevskipfalse \else % The item text fits into the space. Start a paragraph, so that the - % following text (if any) will end up on the same line. + % following text (if any) will end up on the same line. \noindent % Do this with kerns and \unhbox so that if there is a footnote in % the item text, it can migrate to the main vertical list and @@ -2138,46 +2056,60 @@ July\or August\or September\or October\o \multitablelinespace=0pt % Macros used to set up halign preamble: -% +% \let\endsetuptable\relax \def\xendsetuptable{\endsetuptable} \let\columnfractions\relax \def\xcolumnfractions{\columnfractions} \newif\ifsetpercent -% 2/1/96, to allow fractions to be given with more than one digit. -\def\pickupwholefraction#1 {\global\advance\colcount by1 % -\expandafter\xdef\csname col\the\colcount\endcsname{.#1\hsize}% -\setuptable} +% #1 is the part of the @columnfraction before the decimal point, which +% is presumably either 0 or the empty string (but we don't check, we +% just throw it away). #2 is the decimal part, which we use as the +% percent of \hsize for this column. +\def\pickupwholefraction#1.#2 {% + \global\advance\colcount by 1 + \expandafter\xdef\csname col\the\colcount\endcsname{.#2\hsize}% + \setuptable +} \newcount\colcount -\def\setuptable#1{\def\firstarg{#1}% -\ifx\firstarg\xendsetuptable\let\go\relax% -\else - \ifx\firstarg\xcolumnfractions\global\setpercenttrue% +\def\setuptable#1{% + \def\firstarg{#1}% + \ifx\firstarg\xendsetuptable + \let\go = \relax \else - \ifsetpercent - \let\go\pickupwholefraction % In this case arg of setuptable - % is the decimal point before the - % number given in percent of hsize. - % We don't need this so we don't use it. + \ifx\firstarg\xcolumnfractions + \global\setpercenttrue + \else + \ifsetpercent + \let\go\pickupwholefraction + \else + \global\advance\colcount by 1 + \setbox0=\hbox{#1\unskip }% Add a normal word space as a separator; + % typically that is always in the input, anyway. + \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}% + \fi + \fi + \ifx\go\pickupwholefraction + % Put the argument back for the \pickupwholefraction call, so + % we'll always have a period there to be parsed. + \def\go{\pickupwholefraction#1}% \else - \global\advance\colcount by1 - \setbox0=\hbox{#1 }% Add a normal word space as a separator; - % typically that is always in the input, anyway. - \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}% + \let\go = \setuptable \fi% - \fi% -\ifx\go\pickupwholefraction\else\let\go\setuptable\fi% -\fi\go} + \fi + \go +} -% multitable syntax -\def\tab{&\hskip1sp\relax} % 2/2/96 - % tiny skip here makes sure this column space is - % maintained, even if it is never used. +% This used to have \hskip1sp. But then the space in a template line is +% not enough. That is bad. So let's go back to just & until we +% encounter the problem it was intended to solve again. +% --karl, nathan@acm.org, 20apr99. +\def\tab{&} % @multitable ... @end multitable definitions: - +% \def\multitable{\parsearg\dotable} \def\dotable#1{\bgroup \vskip\parskip @@ -2216,64 +2148,417 @@ July\or August\or September\or October\o % In order to keep entries from bumping into each other % we will add a \leftskip of \multitablecolspace to all columns after % the first one. - % + % % If a template has been used, we will add \multitablecolspace % to the width of each template entry. - % + % % If the user has set preamble in terms of percent of \hsize we will % use that dimension as the width of the column, and the \leftskip % will keep entries from bumping into each other. Table will start at % left margin and final column will justify at right margin. - % + % % Make sure we don't inherit \rightskip from the outer environment. \rightskip=0pt \ifnum\colcount=1 % The first column will be indented with the surrounding text. \advance\hsize by\leftskip \else - \ifsetpercent \else - % If user has not set preamble in terms of percent of \hsize - % we will advance \hsize by \multitablecolspace. - \advance\hsize by \multitablecolspace - \fi - % In either case we will make \leftskip=\multitablecolspace: - \leftskip=\multitablecolspace + \ifsetpercent \else + % If user has not set preamble in terms of percent of \hsize + % we will advance \hsize by \multitablecolspace. + \advance\hsize by \multitablecolspace + \fi + % In either case we will make \leftskip=\multitablecolspace: + \leftskip=\multitablecolspace + \fi + % Ignoring space at the beginning and end avoids an occasional spurious + % blank line, when TeX decides to break the line at the space before the + % box from the multistrut, so the strut ends up on a line by itself. + % For example: + % @multitable @columnfractions .11 .89 + % @item @code{#} + % @tab Legal holiday which is valid in major parts of the whole country. + % Is automatically provided with highlighting sequences respectively marking + % characters. + \noindent\ignorespaces##\unskip\multistrut}\cr +} + +\def\setmultitablespacing{% test to see if user has set \multitablelinespace. +% If so, do nothing. If not, give it an appropriate dimension based on +% current baselineskip. +\ifdim\multitablelinespace=0pt +\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip +\global\advance\multitablelinespace by-\ht0 +%% strut to put in table in case some entry doesn't have descenders, +%% to keep lines equally spaced +\let\multistrut = \strut +\else +%% FIXME: what is \box0 supposed to be? +\gdef\multistrut{\vrule height\multitablelinespace depth\dp0 +width0pt\relax} \fi +%% Test to see if parskip is larger than space between lines of +%% table. If not, do nothing. +%% If so, set to same dimension as multitablelinespace. +\ifdim\multitableparskip>\multitablelinespace +\global\multitableparskip=\multitablelinespace +\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller + %% than skip between lines in the table. +\fi% +\ifdim\multitableparskip=0pt +\global\multitableparskip=\multitablelinespace +\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller + %% than skip between lines in the table. +\fi} + + +\message{conditionals,} +% Prevent errors for section commands. +% Used in @ignore and in failing conditionals. +\def\ignoresections{% + \let\chapter=\relax + \let\unnumbered=\relax + \let\top=\relax + \let\unnumberedsec=\relax + \let\unnumberedsection=\relax + \let\unnumberedsubsec=\relax + \let\unnumberedsubsection=\relax + \let\unnumberedsubsubsec=\relax + \let\unnumberedsubsubsection=\relax + \let\section=\relax + \let\subsec=\relax + \let\subsubsec=\relax + \let\subsection=\relax + \let\subsubsection=\relax + \let\appendix=\relax + \let\appendixsec=\relax + \let\appendixsection=\relax + \let\appendixsubsec=\relax + \let\appendixsubsection=\relax + \let\appendixsubsubsec=\relax + \let\appendixsubsubsection=\relax + \let\contents=\relax + \let\smallbook=\relax + \let\titlepage=\relax +} + +% Used in nested conditionals, where we have to parse the Texinfo source +% and so want to turn off most commands, in case they are used +% incorrectly. +% +\def\ignoremorecommands{% + \let\defcodeindex = \relax + \let\defcv = \relax + \let\deffn = \relax + \let\deffnx = \relax + \let\defindex = \relax + \let\defivar = \relax + \let\defmac = \relax + \let\defmethod = \relax + \let\defop = \relax + \let\defopt = \relax + \let\defspec = \relax + \let\deftp = \relax + \let\deftypefn = \relax + \let\deftypefun = \relax + \let\deftypeivar = \relax + \let\deftypeop = \relax + \let\deftypevar = \relax + \let\deftypevr = \relax + \let\defun = \relax + \let\defvar = \relax + \let\defvr = \relax + \let\ref = \relax + \let\xref = \relax + \let\printindex = \relax + \let\pxref = \relax + \let\settitle = \relax + \let\setchapternewpage = \relax + \let\setchapterstyle = \relax + \let\everyheading = \relax + \let\evenheading = \relax + \let\oddheading = \relax + \let\everyfooting = \relax + \let\evenfooting = \relax + \let\oddfooting = \relax + \let\headings = \relax + \let\include = \relax + \let\lowersections = \relax + \let\down = \relax + \let\raisesections = \relax + \let\up = \relax + \let\set = \relax + \let\clear = \relax + \let\item = \relax +} + +% Ignore @ignore ... @end ignore. +% +\def\ignore{\doignore{ignore}} + +% Ignore @ifinfo, @ifhtml, @ifnottex, @html, @menu, and @direntry text. +% +\def\ifinfo{\doignore{ifinfo}} +\def\ifhtml{\doignore{ifhtml}} +\def\ifnottex{\doignore{ifnottex}} +\def\html{\doignore{html}} +\def\menu{\doignore{menu}} +\def\direntry{\doignore{direntry}} + +% @dircategory CATEGORY -- specify a category of the dir file +% which this file should belong to. Ignore this in TeX. +\let\dircategory = \comment + +% Ignore text until a line `@end #1'. +% +\def\doignore#1{\begingroup + % Don't complain about control sequences we have declared \outer. + \ignoresections + % + % Define a command to swallow text until we reach `@end #1'. + % This @ is a catcode 12 token (that is the normal catcode of @ in + % this texinfo.tex file). We change the catcode of @ below to match. + \long\def\doignoretext##1@end #1{\enddoignore}% + % + % Make sure that spaces turn into tokens that match what \doignoretext wants. + \catcode32 = 10 + % + % Ignore braces, too, so mismatched braces don't cause trouble. + \catcode`\{ = 9 + \catcode`\} = 9 + % + % We must not have @c interpreted as a control sequence. + \catcode`\@ = 12 + % + % Make the letter c a comment character so that the rest of the line + % will be ignored. This way, the document can have (for example) + % @c @end ifinfo + % and the @end ifinfo will be properly ignored. + % (We've just changed @ to catcode 12.) + \catcode`\c = 14 + % + % And now expand that command. + \doignoretext +} + +% What we do to finish off ignored text. +% +\def\enddoignore{\endgroup\ignorespaces}% + +\newif\ifwarnedobs\warnedobsfalse +\def\obstexwarn{% + \ifwarnedobs\relax\else + % We need to warn folks that they may have trouble with TeX 3.0. + % This uses \immediate\write16 rather than \message to get newlines. + \immediate\write16{} + \immediate\write16{WARNING: for users of Unix TeX 3.0!} + \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).} + \immediate\write16{If you are running another version of TeX, relax.} + \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.} + \immediate\write16{ Then upgrade your TeX installation if you can.} + \immediate\write16{ (See ftp://ftp.gnu.org/pub/gnu/TeX.README.)} + \immediate\write16{If you are stuck with version 3.0, run the} + \immediate\write16{ script ``tex3patch'' from the Texinfo distribution} + \immediate\write16{ to use a workaround.} + \immediate\write16{} + \global\warnedobstrue + \fi +} + +% **In TeX 3.0, setting text in \nullfont hangs tex. For a +% workaround (which requires the file ``dummy.tfm'' to be installed), +% uncomment the following line: +%%%%%\font\nullfont=dummy\let\obstexwarn=\relax + +% Ignore text, except that we keep track of conditional commands for +% purposes of nesting, up to an `@end #1' command. +% +\def\nestedignore#1{% + \obstexwarn + % We must actually expand the ignored text to look for the @end + % command, so that nested ignore constructs work. Thus, we put the + % text into a \vbox and then do nothing with the result. To minimize + % the change of memory overflow, we follow the approach outlined on + % page 401 of the TeXbook: make the current font be a dummy font. + % + \setbox0 = \vbox\bgroup + % Don't complain about control sequences we have declared \outer. + \ignoresections + % + % Define `@end #1' to end the box, which will in turn undefine the + % @end command again. + \expandafter\def\csname E#1\endcsname{\egroup\ignorespaces}% + % + % We are going to be parsing Texinfo commands. Most cause no + % trouble when they are used incorrectly, but some commands do + % complicated argument parsing or otherwise get confused, so we + % undefine them. + % + % We can't do anything about stray @-signs, unfortunately; + % they'll produce `undefined control sequence' errors. + \ignoremorecommands + % + % Set the current font to be \nullfont, a TeX primitive, and define + % all the font commands to also use \nullfont. We don't use + % dummy.tfm, as suggested in the TeXbook, because not all sites + % might have that installed. Therefore, math mode will still + % produce output, but that should be an extremely small amount of + % stuff compared to the main input. + % + \nullfont + \let\tenrm=\nullfont \let\tenit=\nullfont \let\tensl=\nullfont + \let\tenbf=\nullfont \let\tentt=\nullfont \let\smallcaps=\nullfont + \let\tensf=\nullfont + % Similarly for index fonts (mostly for their use in smallexample). + \let\smallrm=\nullfont \let\smallit=\nullfont \let\smallsl=\nullfont + \let\smallbf=\nullfont \let\smalltt=\nullfont \let\smallsc=\nullfont + \let\smallsf=\nullfont + % + % Don't complain when characters are missing from the fonts. + \tracinglostchars = 0 + % + % Don't bother to do space factor calculations. + \frenchspacing + % + % Don't report underfull hboxes. + \hbadness = 10000 + % + % Do minimal line-breaking. + \pretolerance = 10000 + % + % Do not execute instructions in @tex + \def\tex{\doignore{tex}}% + % Do not execute macro definitions. + % `c' is a comment character, so the word `macro' will get cut off. + \def\macro{\doignore{ma}}% +} + +% @set VAR sets the variable VAR to an empty value. +% @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE. +% +% Since we want to separate VAR from REST-OF-LINE (which might be +% empty), we can't just use \parsearg; we have to insert a space of our +% own to delimit the rest of the line, and then take it out again if we +% didn't need it. Make sure the catcode of space is correct to avoid +% losing inside @example, for instance. +% +\def\set{\begingroup\catcode` =10 + \catcode`\-=12 \catcode`\_=12 % Allow - and _ in VAR. + \parsearg\setxxx} +\def\setxxx#1{\setyyy#1 \endsetyyy} +\def\setyyy#1 #2\endsetyyy{% + \def\temp{#2}% + \ifx\temp\empty \global\expandafter\let\csname SET#1\endcsname = \empty + \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted. + \fi + \endgroup +} +% Can't use \xdef to pre-expand #2 and save some time, since \temp or +% \next or other control sequences that we've defined might get us into +% an infinite loop. Consider `@set foo @cite{bar}'. +\def\setzzz#1#2 \endsetzzz{\expandafter\gdef\csname SET#1\endcsname{#2}} + +% @clear VAR clears (i.e., unsets) the variable VAR. +% +\def\clear{\parsearg\clearxxx} +\def\clearxxx#1{\global\expandafter\let\csname SET#1\endcsname=\relax} + +% @value{foo} gets the text saved in variable foo. +{ + \catcode`\_ = \active + % + % We might end up with active _ or - characters in the argument if + % we're called from @code, as @code{@value{foo-bar_}}. So \let any + % such active characters to their normal equivalents. + \gdef\value{\begingroup + \catcode`\-=12 \catcode`\_=12 + \indexbreaks \let_\normalunderscore + \valuexxx} +} +\def\valuexxx#1{\expandablevalue{#1}\endgroup} + +% We have this subroutine so that we can handle at least some @value's +% properly in indexes (we \let\value to this in \indexdummies). Ones +% whose names contain - or _ still won't work, but we can't do anything +% about that. The command has to be fully expandable, since the result +% winds up in the index file. This means that if the variable's value +% contains other Texinfo commands, it's almost certain it will fail +% (although perhaps we could fix that with sufficient work to do a +% one-level expansion on the result, instead of complete). +% +\def\expandablevalue#1{% + \expandafter\ifx\csname SET#1\endcsname\relax + {[No value for ``#1'']}% + \else + \csname SET#1\endcsname + \fi +} + +% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined +% with @set. +% +\def\ifset{\parsearg\ifsetxxx} +\def\ifsetxxx #1{% + \expandafter\ifx\csname SET#1\endcsname\relax + \expandafter\ifsetfail + \else + \expandafter\ifsetsucceed + \fi +} +\def\ifsetsucceed{\conditionalsucceed{ifset}} +\def\ifsetfail{\nestedignore{ifset}} +\defineunmatchedend{ifset} + +% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been +% defined with @set, or has been undefined with @clear. +% +\def\ifclear{\parsearg\ifclearxxx} +\def\ifclearxxx #1{% + \expandafter\ifx\csname SET#1\endcsname\relax + \expandafter\ifclearsucceed + \else + \expandafter\ifclearfail \fi - % Ignoring space at the beginning and end avoids an occasional spurious - % blank line, when TeX decides to break the line at the space before the - % box from the multistrut, so the strut ends up on a line by itself. - % For example: - % @multitable @columnfractions .11 .89 - % @item @code{#} - % @tab Legal holiday which is valid in major parts of the whole country. - % Is automatically provided with highlighting sequences respectively marking - % characters. - \noindent\ignorespaces##\unskip\multistrut}\cr } +\def\ifclearsucceed{\conditionalsucceed{ifclear}} +\def\ifclearfail{\nestedignore{ifclear}} +\defineunmatchedend{ifclear} -\def\setmultitablespacing{% test to see if user has set \multitablelinespace. -% If so, do nothing. If not, give it an appropriate dimension based on -% current baselineskip. -\ifdim\multitablelinespace=0pt -%% strut to put in table in case some entry doesn't have descenders, -%% to keep lines equally spaced -\let\multistrut = \strut -%% Test to see if parskip is larger than space between lines of -%% table. If not, do nothing. -%% If so, set to same dimension as multitablelinespace. -\else -\gdef\multistrut{\vrule height\multitablelinespace depth\dp0 -width0pt\relax} \fi -\ifdim\multitableparskip>\multitablelinespace -\global\multitableparskip=\multitablelinespace -\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller - %% than skip between lines in the table. -\fi% -\ifdim\multitableparskip=0pt -\global\multitableparskip=\multitablelinespace -\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller - %% than skip between lines in the table. -\fi} +% @iftex, @ifnothtml, @ifnotinfo always succeed; we read the text +% following, through the first @end iftex (etc.). Make `@end iftex' +% (etc.) valid only after an @iftex. +% +\def\iftex{\conditionalsucceed{iftex}} +\def\ifnothtml{\conditionalsucceed{ifnothtml}} +\def\ifnotinfo{\conditionalsucceed{ifnotinfo}} +\defineunmatchedend{iftex} +\defineunmatchedend{ifnothtml} +\defineunmatchedend{ifnotinfo} + +% We can't just want to start a group at @iftex (for example) and end it +% at @end iftex, since then @set commands inside the conditional have no +% effect (they'd get reverted at the end of the group). So we must +% define \Eiftex to redefine itself to be its previous value. (We can't +% just define it to fail again with an ``unmatched end'' error, since +% the @ifset might be nested.) +% +\def\conditionalsucceed#1{% + \edef\temp{% + % Remember the current value of \E#1. + \let\nece{prevE#1} = \nece{E#1}% + % + % At the `@end #1', redefine \E#1 to be its previous value. + \def\nece{E#1}{\let\nece{E#1} = \nece{prevE#1}}% + }% + \temp +} + +% We need to expand lots of \csname's, but we don't want to expand the +% control sequences after we've constructed them. +% +\def\nece#1{\expandafter\noexpand\csname#1\endcsname} + +% @defininfoenclose. +\let\definfoenclose=\comment \message{indexing,} @@ -2388,8 +2673,11 @@ width0pt\relax} \fi % (Must be a way to avoid doing expansion at all, and thus not have to % laboriously list every single command here.) \def\@{@}% will be @@ when we switch to @ as escape char. -%\let\{ = \lbracecmd -%\let\} = \rbracecmd +% Need these in case \tex is in effect and \{ is a \delimiter again. +% But can't use \lbracecmd and \rbracecmd because texindex assumes +% braces and backslashes are used only as delimiters. +\let\{ = \mylbrace +\let\} = \myrbrace \def\_{{\realbackslash _}}% \def\w{\realbackslash w }% \def\bf{\realbackslash bf }% @@ -2411,6 +2699,11 @@ width0pt\relax} \fi \def\copyright{\realbackslash copyright}% \def\tclose##1{\realbackslash tclose {##1}}% \def\code##1{\realbackslash code {##1}}% +\def\uref##1{\realbackslash uref {##1}}% +\def\url##1{\realbackslash url {##1}}% +\def\env##1{\realbackslash env {##1}}% +\def\command##1{\realbackslash command {##1}}% +\def\option##1{\realbackslash option {##1}}% \def\dotless##1{\realbackslash dotless {##1}}% \def\samp##1{\realbackslash samp {##1}}% \def\,##1{\realbackslash ,{##1}}% @@ -2426,6 +2719,7 @@ width0pt\relax} \fi \def\kbd##1{\realbackslash kbd {##1}}% \def\dfn##1{\realbackslash dfn {##1}}% \def\emph##1{\realbackslash emph {##1}}% +\def\acronym##1{\realbackslash acronym {##1}}% % % Handle some cases of @value -- where the variable name does not % contain - or _, and the value does not contain any @@ -2433,6 +2727,8 @@ width0pt\relax} \fi \let\value = \expandablevalue % \unsepspaces +% Turn off macro expansion +\turnoffmacros } % If an index command is used in an @example environment, any spaces @@ -2489,6 +2785,12 @@ width0pt\relax} \fi %\let\tt=\indexdummyfont \let\tclose=\indexdummyfont \let\code=\indexdummyfont +\let\url=\indexdummyfont +\let\uref=\indexdummyfont +\let\env=\indexdummyfont +\let\acronym=\indexdummyfont +\let\command=\indexdummyfont +\let\option=\indexdummyfont \let\file=\indexdummyfont \let\samp=\indexdummyfont \let\kbd=\indexdummyfont @@ -2513,14 +2815,14 @@ width0pt\relax} \fi \def\emptymacro{\empty} % Most index entries go through here, but \dosubind is the general case. -% +% \def\doind#1#2{\dosubind{#1}{#2}\empty} % Workhorse for all \fooindexes. % #1 is name of index, #2 is stuff to put there, #3 is subentry -- % \empty if called from \doind, as we usually are. The main exception % is with defuns, which call us directly. -% +% \def\dosubind#1#2#3{% % Put the index entry in the margin if desired. \ifx\SETmarginindex\relax\else @@ -2545,24 +2847,28 @@ width0pt\relax} \fi \def\subentry{ #3}% \fi % - % First process the index-string with all font commands turned off - % to get the string to sort by. + % First process the index entry with all font commands turned + % off to get the string to sort by. {\indexnofonts \xdef\indexsorttmp{#2\subentry}}% % - % Now produce the complete index entry, with both the sort key and the - % original text, including any font commands. + % Now the real index entry with the fonts. \toks0 = {#2}% + % + % If third (subentry) arg is present, add it to the index + % string. And include a space. + \ifx\thirdarg\emptymacro \else + \toks0 = \expandafter{\the\toks0 \space #3}% + \fi + % + % Set up the complete index entry, with both the sort key + % and the original text, including any font commands. We write + % three arguments to \entry to the .?? file, texindex reduces to + % two when writing the .??s sorted result. \edef\temp{% \write\csname#1indfile\endcsname{% \realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}% }% % - % If third (subentry) arg is present, add it to the index string. - \ifx\thirdarg\emptymacro \else - \toks0 = {#3}% - \edef\temp{\temp{\the\toks0}}% - \fi - % % If a skip is the last thing on the list now, preserve it % by backing up by \lastskip, doing the \write, then inserting % the skip again. Otherwise, the whatsit generated by the @@ -2574,12 +2880,12 @@ width0pt\relax} \fi % will have extra space inserted, because the \medbreak in the % start of the @defun won't see the skip inserted by the @end of % the previous defun. - % + % % But don't do any of this if we're not in vertical mode. We % don't want to do a \vskip and prematurely end a paragraph. - % + % % Avoid page breaks due to these extra skips, too. - % + % \iflinks \ifvmode \skip0 = \lastskip @@ -2588,7 +2894,7 @@ width0pt\relax} \fi % \temp % do the write % - % + % \ifvmode \ifdim\skip0 = 0pt \else \nobreak\vskip\skip0 \fi \fi \fi }% @@ -2636,7 +2942,7 @@ width0pt\relax} \fi \def\doprintindex#1{\begingroup \dobreak \chapheadingskip{10000}% % - \indexfonts \rm + \smallfonts \rm \tolerance = 9500 \indexbreaks % @@ -2652,7 +2958,7 @@ width0pt\relax} \fi % and it loses the chapter title and the aux file entries for the % index. The easiest way to prevent this problem is to make sure % there is some text. - (Index is nonexistent) + \putwordIndexNonexistent \else % % If the index file exists but is empty, then \openin leaves \ifeof @@ -2660,7 +2966,7 @@ width0pt\relax} \fi % it can discover if there is anything in it. \read 1 to \temp \ifeof 1 - (Index is empty) + \putwordIndexIsEmpty \else % Index files are almost Texinfo source, but we use \ as the escape % character. It would be better to use @, but that's too big a change @@ -2685,7 +2991,7 @@ width0pt\relax} \fi % % Remove any glue we may have, we'll be inserting our own. \removelastskip - % + % % We like breaks before the index initials, so insert a bonus. \penalty -300 % @@ -2693,7 +2999,7 @@ width0pt\relax} \fi % baselineskips increases the chance of the dots lining up from column % to column. It still won't often be perfect, because of the stretch % we need before each entry, but it's better. - % + % % No shrink because it confuses \balancecolumns. \vskip 1.67\baselineskip plus .5\baselineskip \leftline{\secbf #1}% @@ -2763,7 +3069,11 @@ width0pt\relax} \fi % The `\ ' here is removed by the implicit \unskip that TeX does as % part of (the primitive) \par. Without it, a spurious underfull % \hbox ensues. - \ #2% The page number ends the paragraph. + \ifpdf + \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. + \else + \ #2% The page number ends the paragraph. + \fi \fi% \par \endgroup} @@ -2792,24 +3102,26 @@ width0pt\relax} \fi \def\begindoublecolumns{\begingroup % ended by \enddoublecolumns % Grab any single-column material above us. - \output = {\global\setbox\partialpage = \vbox{% - % + \output = {% + % % Here is a possibility not foreseen in manmac: if we accumulate a % whole lot of material, we might end up calling this \output % routine twice in a row (see the doublecol-lose test, which is % essentially a couple of indexes with @setchapternewpage off). In - % that case, we must prevent the second \partialpage from - % simply overwriting the first, causing us to lose the page. - % This will preserve it until a real output routine can ship it - % out. Generally, \partialpage will be empty when this runs and - % this will be a no-op. - \unvbox\partialpage + % that case we just ship out what is in \partialpage with the normal + % output routine. Generally, \partialpage will be empty when this + % runs and this will be a no-op. See the indexspread.tex test case. + \ifvoid\partialpage \else + \onepageout{\pagecontents\partialpage}% + \fi % - % Unvbox the main output page. - \unvbox255 - \kern-\topskip \kern\baselineskip - }}% - \eject + \global\setbox\partialpage = \vbox{% + % Unvbox the main output page. + \unvbox\PAGE + \kern-\topskip \kern\baselineskip + }% + }% + \eject % run that output routine to set \partialpage % % Use the double-column output routine for subsequent pages. \output = {\doublecolumnout}% @@ -2843,7 +3155,7 @@ width0pt\relax} \fi % The double-column output routine for all double-column pages except % the last. -% +% \def\doublecolumnout{% \splittopskip=\topskip \splitmaxdepth=\maxdepth % Get the available space for the double columns -- the normal @@ -2861,7 +3173,6 @@ width0pt\relax} \fi \def\pagesofar{% % Re-output the contents of the output page -- any previous material, % followed by the two boxes we just split, in box0 and box2. - \advance\vsize by \ht\partialpage \unvbox\partialpage % \hsize = \doublecolumnhsize @@ -2870,7 +3181,7 @@ width0pt\relax} \fi } \def\enddoublecolumns{% \output = {% - % Split the last of the double-column material. Leave on the + % Split the last of the double-column material. Leave it on the % current page, no automatic page break. \balancecolumns % @@ -2882,14 +3193,15 @@ width0pt\relax} \fi % called on to balance too much material, but if it is, this makes % the output somewhat more palatable.) \global\output = {\onepageout{\pagecontents\PAGE}}% - % - % \pagegoal was set to the doubled \vsize above, since we restarted - % the current page. We're now back to normal single-column - % typesetting, so reset \pagegoal to the normal \vsize. - \pagegoal = \vsize }% \eject \endgroup % started in \begindoublecolumns + % + % \pagegoal was set to the doubled \vsize above, since we restarted + % the current page. We're now back to normal single-column + % typesetting, so reset \pagegoal to the normal \vsize (after the + % \endgroup where \vsize got restored). + \pagegoal = \vsize } \def\balancecolumns{% % Called at the end of the double column material. @@ -2920,7 +3232,7 @@ width0pt\relax} \fi \message{sectioning,} -% Define chapters, sections, etc. +% Chapters, sections, etc. \newcount\chapno \newcount\secno \secno=0 @@ -2929,7 +3241,43 @@ width0pt\relax} \fi % This counter is funny since it counts through charcodes of letters A, B, ... \newcount\appendixno \appendixno = `\@ -\def\appendixletter{\char\the\appendixno} +% \def\appendixletter{\char\the\appendixno} +% We do the following for the sake of pdftex, which needs the actual +% letter in the expansion, not just typeset. +\def\appendixletter{% + \ifnum\appendixno=`A A% + \else\ifnum\appendixno=`B B% + \else\ifnum\appendixno=`C C% + \else\ifnum\appendixno=`D D% + \else\ifnum\appendixno=`E E% + \else\ifnum\appendixno=`F F% + \else\ifnum\appendixno=`G G% + \else\ifnum\appendixno=`H H% + \else\ifnum\appendixno=`I I% + \else\ifnum\appendixno=`J J% + \else\ifnum\appendixno=`K K% + \else\ifnum\appendixno=`L L% + \else\ifnum\appendixno=`M M% + \else\ifnum\appendixno=`N N% + \else\ifnum\appendixno=`O O% + \else\ifnum\appendixno=`P P% + \else\ifnum\appendixno=`Q Q% + \else\ifnum\appendixno=`R R% + \else\ifnum\appendixno=`S S% + \else\ifnum\appendixno=`T T% + \else\ifnum\appendixno=`U U% + \else\ifnum\appendixno=`V V% + \else\ifnum\appendixno=`W W% + \else\ifnum\appendixno=`X X% + \else\ifnum\appendixno=`Y Y% + \else\ifnum\appendixno=`Z Z% + % The \the is necessary, despite appearances, because \appendixletter is + % expanded while writing the .toc file. \char\appendixno is not + % expandable, thus it is written literally, thus all appendixes come out + % with the same letter (or @) in the toc without it. + \else\char\the\appendixno + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} % Each @chapter defines this as the name of the chapter. % page headings and footings can use it. @section does likewise. @@ -3402,15 +3750,16 @@ width0pt\relax} \fi \message{toc,} +% Table of contents. \newwrite\tocfile % Write an entry to the toc file, opening it if necessary. % Called from @chapter, etc. We supply {\folio} at the end of the % argument, which will end up as the last argument to the \...entry macro. -% +% % We open the .toc file here instead of at @setfilename or any other % given time so that @contents can be put in the document anywhere. -% +% \newif\iftocfileopened \def\writetocentry#1{% \iftocfileopened\else @@ -3426,7 +3775,7 @@ width0pt\relax} \fi % Finish up the main text and prepare to read what we've written % to \tocfile. -% +% \def\startcontents#1{% % If @setchapternewpage on, and @headings double, the contents should % start on an odd page, unlike chapters. Thus, we maintain @@ -3454,13 +3803,15 @@ width0pt\relax} \fi % Normal (long) toc. \def\contents{% - \startcontents{\putwordTableofContents}% + \startcontents{\putwordTOC}% \openin 1 \jobname.toc \ifeof 1 \else \closein 1 \input \jobname.toc \fi \vfill \eject + \contentsalignmacro % in case @setchapternewpage odd is in effect + \pdfmakeoutlines \endgroup \lastnegativepageno = \pageno \pageno = \savepageno @@ -3468,7 +3819,7 @@ width0pt\relax} \fi % And just the chapters. \def\summarycontents{% - \startcontents{\putwordShortContents}% + \startcontents{\putwordShortTOC}% % \let\chapentry = \shortchapentry \let\unnumbchapentry = \shortunnumberedentry @@ -3490,12 +3841,17 @@ width0pt\relax} \fi \input \jobname.toc \fi \vfill \eject + \contentsalignmacro % in case @setchapternewpage odd is in effect \endgroup \lastnegativepageno = \pageno \pageno = \savepageno } \let\shortcontents = \summarycontents +\ifpdf + \pdfcatalog{/PageMode /UseOutlines}% +\fi + % These macros generate individual entries in the table of contents. % The first argument is the chapter or section name. % The last argument is the page number. @@ -3506,7 +3862,7 @@ width0pt\relax} \fi % See comments in \dochapentry re vbox and related settings \def\shortchapentry#1#2#3{% - \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno{#3}}% + \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#3\egroup}% } % Typeset the label for a chapter or appendix for the short contents. @@ -3514,10 +3870,14 @@ width0pt\relax} \fi % We could simplify the code here by writing out an \appendixentry % command in the toc file for appendices, instead of using \chapentry % for both, but it doesn't seem worth it. -\setbox0 = \hbox{\shortcontrm \putwordAppendix } -\newdimen\shortappendixwidth \shortappendixwidth = \wd0 - +% +\newdimen\shortappendixwidth +% \def\shortchaplabel#1{% + % Compute width of word "Appendix", may change with language. + \setbox0 = \hbox{\shortcontrm \putwordAppendix}% + \shortappendixwidth = \wd0 + % % We typeset #1 in a box of constant width, regardless of the text of % #1, so the chapter titles will come out aligned. \setbox0 = \hbox{#1}% @@ -3532,7 +3892,7 @@ width0pt\relax} \fi } \def\unnumbchapentry#1#2{\dochapentry{#1}{#2}} -\def\shortunnumberedentry#1#2{\tocentry{#1}{\doshortpageno{#2}}} +\def\shortunnumberedentry#1#2{\tocentry{#1}{\doshortpageno\bgroup#2\egroup}} % Sections. \def\secentry#1#2#3#4{\dosecentry{#2.#3\labelspace#1}{#4}} @@ -3559,24 +3919,24 @@ width0pt\relax} \fi \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip \begingroup \chapentryfonts - \tocentry{#1}{\dopageno{#2}}% + \tocentry{#1}{\dopageno\bgroup#2\egroup}% \endgroup \nobreak\vskip .25\baselineskip plus.1\baselineskip } \def\dosecentry#1#2{\begingroup \secentryfonts \leftskip=\tocindent - \tocentry{#1}{\dopageno{#2}}% + \tocentry{#1}{\dopageno\bgroup#2\egroup}% \endgroup} \def\dosubsecentry#1#2{\begingroup \subsecentryfonts \leftskip=2\tocindent - \tocentry{#1}{\dopageno{#2}}% + \tocentry{#1}{\dopageno\bgroup#2\egroup}% \endgroup} \def\dosubsubsecentry#1#2{\begingroup \subsubsecentryfonts \leftskip=3\tocindent - \tocentry{#1}{\dopageno{#2}}% + \tocentry{#1}{\dopageno\bgroup#2\egroup}% \endgroup} % Final typesetting of a toc entry; we use the same \entry macro as for @@ -3604,6 +3964,7 @@ width0pt\relax} \fi \message{environments,} +% @foo ... @end foo. % Since these characters are used in examples, it should be an even number of % \tt widths. Each \tt character is 1en, so two makes it 1em. @@ -3814,7 +4175,7 @@ width0pt\relax} \fi % Define the \E... control sequence only if we are inside the particular % environment, so the error checking in \end will work. -% +% % To end an @example-like environment, we first end the paragraph (via % \afterenvbreak's vertical glue), and then the group. That way we keep % the zero \parskip that the environments set -- \parskip glue will be @@ -3839,7 +4200,7 @@ width0pt\relax} \fi % redefines). We must call \example (or whatever) last in the % definition, since it reads the return following the @example (or % whatever) command. -% +% % This actually allows (for example) @end display inside an % @smalldisplay. Too bad, but makeinfo will catch the error anyway. % @@ -3853,7 +4214,7 @@ width0pt\relax} \fi \def\smalllispx{\begingroup \def\Esmalllisp{\nonfillfinish\endgroup}% \def\Esmallexample{\nonfillfinish\endgroup}% - \indexfonts + \smallfonts \lisp } @@ -3869,7 +4230,7 @@ width0pt\relax} \fi % \def\smalldisplayx{\begingroup \def\Esmalldisplay{\nonfillfinish\endgroup}% - \indexfonts \rm + \smallfonts \rm \display } @@ -3886,7 +4247,7 @@ width0pt\relax} \fi % \def\smallformatx{\begingroup \def\Esmallformat{\nonfillfinish\endgroup}% - \indexfonts \rm + \smallfonts \rm \format } @@ -3895,7 +4256,7 @@ width0pt\relax} \fi \def\flushleft{\begingroup \def\Eflushleft{\nonfillfinish\endgroup}\format} % @flushright. -% +% \def\flushright{\begingroup \let\nonarrowing = t \nonfillstart @@ -3927,8 +4288,9 @@ width0pt\relax} \fi \message{defuns,} -% Define formatter for defuns -% First, allow user to change definition object font (\df) internally +% @defun etc. + +% Allow user to change definition object font (\df) internally \def\setdeffont #1 {\csname DEF#1\endcsname} \newskip\defbodyindent \defbodyindent=.4in @@ -3982,10 +4344,16 @@ width0pt\relax} \fi %% contained text. This is especially needed for [ and ] \def\opnr{{\sf\char`\(}\global\advance\parencount by 1 } \def\clnr{{\sf\char`\)}\global\advance\parencount by -1 } -\def\ampnr{\&} +\let\ampnr = \& \def\lbrb{{\bf\char`\[}} \def\rbrb{{\bf\char`\]}} +% Active &'s sneak into the index arguments, so make sure it's defined. +{ + \catcode`& = 13 + \global\let& = \ampnr +} + % First, defname, which formats the header line itself. % #1 should be the function name. % #2 should be the type of definition, such as "Function". @@ -4037,7 +4405,7 @@ width0pt\relax} \fi % #2 is the \...x control sequence for consecutive fns (which we define). % #3 is the control sequence to call to resume processing. % #4, delimited by the space, is the class name. -% +% \def\defmethparsebody#1#2#3#4 {\begingroup\inENV % \medbreak % % Define the end token that this defining construct specifies @@ -4049,23 +4417,39 @@ width0pt\relax} \fi \exdentamount=\defbodyindent \begingroup\obeylines\activeparens\spacesplit{#3{#4}}} -% @deftypemethod has an extra argument that nothing else does. Sigh. +% Used for @deftypemethod and @deftypeivar. % #1 is the \E... control sequence to end the definition (which we define). % #2 is the \...x control sequence for consecutive fns (which we define). % #3 is the control sequence to call to resume processing. -% #4, delimited by the space, is the class name. +% #4, delimited by a space, is the class name. % #5 is the method's return type. +% +\def\deftypemethparsebody#1#2#3#4 #5 {\begingroup\inENV + \medbreak + \def#1{\endgraf\endgroup\medbreak}% + \def#2##1 ##2 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}{##2}}}% + \parindent=0in + \advance\leftskip by \defbodyindent + \exdentamount=\defbodyindent + \begingroup\obeylines\activeparens\spacesplit{#3{#4}{#5}}} + +% Used for @deftypeop. The change from \deftypemethparsebody is an +% extra argument at the beginning which is the `category', instead of it +% being the hardwired string `Method' or `Instance Variable'. We have +% to account for this both in the \...x definition and in parsing the +% input at hand. Thus also need a control sequence (passed as #5) for +% the \E... definition to assign the category name to. % -\def\deftypemethparsebody#1#2#3#4 #5 {\begingroup\inENV % -\medbreak % -% Define the end token that this defining construct specifies -% so that it will exit this group. -\def#1{\endgraf\endgroup\medbreak}% -\def#2##1 ##2 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}{##2}}}% -\parindent=0in -\advance\leftskip by \defbodyindent -\exdentamount=\defbodyindent -\begingroup\obeylines\activeparens\spacesplit{#3{#4}{#5}}} +\def\deftypeopparsebody#1#2#3#4#5 #6 {\begingroup\inENV + \medbreak + \def#1{\endgraf\endgroup\medbreak}% + \def#2##1 ##2 ##3 {% + \def#4{##1}% + \begingroup\obeylines\activeparens\spacesplit{#3{##2}{##3}}}% + \parindent=0in + \advance\leftskip by \defbodyindent + \exdentamount=\defbodyindent + \begingroup\obeylines\activeparens\spacesplit{#3{#5}{#6}}} \def\defopparsebody #1#2#3#4#5 {\begingroup\inENV % \medbreak % @@ -4176,12 +4560,13 @@ width0pt\relax} \fi % First, define the processing that is wanted for arguments of \defun % Use this to expand the args and terminate the paragraph they make up -\def\defunargs #1{\functionparens \sl +\def\defunargs#1{\functionparens \sl % Expand, preventing hyphenation at `-' chars. % Note that groups don't affect changes in \hyphenchar. -\hyphenchar\tensl=0 +% Set the font temporarily and use \font in case \setfont made \tensl a macro. +{\tensl\hyphenchar\font=0}% #1% -\hyphenchar\tensl=45 +{\tensl\hyphenchar\font=45}% \ifnum\parencount=0 \else \errmessage{Unbalanced parentheses in @def}\fi% \interlinepenalty=10000 \advance\rightskip by 0pt plus 1fil @@ -4215,7 +4600,7 @@ width0pt\relax} \fi \def\defun{\defparsebody\Edefun\defunx\defunheader} \def\defunheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index -\begingroup\defname {#1}{Function}% +\begingroup\defname {#1}{\putwordDeffunc}% \defunargs {#2}\endgroup % \catcode 61=\other % Turn off change made in \defparsebody } @@ -4229,7 +4614,7 @@ width0pt\relax} \fi % #1 is the data type, #2 the name, #3 the args. \def\deftypefunheaderx #1#2 #3\relax{% \doind {fn}{\code{#2}}% Make entry in function index -\begingroup\defname {\defheaderxcond#1\relax$$$#2}{Function}% +\begingroup\defname {\defheaderxcond#1\relax$$$#2}{\putwordDeftypefun}% \deftypefunargs {#3}\endgroup % \catcode 61=\other % Turn off change made in \defparsebody } @@ -4260,7 +4645,7 @@ width0pt\relax} \fi \def\defmac{\defparsebody\Edefmac\defmacx\defmacheader} \def\defmacheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index -\begingroup\defname {#1}{Macro}% +\begingroup\defname {#1}{\putwordDefmac}% \defunargs {#2}\endgroup % \catcode 61=\other % Turn off change made in \defparsebody } @@ -4270,36 +4655,39 @@ width0pt\relax} \fi \def\defspec{\defparsebody\Edefspec\defspecx\defspecheader} \def\defspecheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index -\begingroup\defname {#1}{Special Form}% +\begingroup\defname {#1}{\putwordDefspec}% \defunargs {#2}\endgroup % \catcode 61=\other % Turn off change made in \defparsebody } -% This definition is run if you use @defunx -% anywhere other than immediately after a @defun or @defunx. - -\def\deffnx #1 {\errmessage{@deffnx in invalid context}} -\def\defunx #1 {\errmessage{@defunx in invalid context}} -\def\defmacx #1 {\errmessage{@defmacx in invalid context}} -\def\defspecx #1 {\errmessage{@defspecx in invalid context}} -\def\deftypefnx #1 {\errmessage{@deftypefnx in invalid context}} -\def\deftypemethodx #1 {\errmessage{@deftypemethodx in invalid context}} -\def\deftypefunx #1 {\errmessage{@deftypefunx in invalid context}} - -% @defmethod, and so on - % @defop CATEGORY CLASS OPERATION ARG... - +% \def\defop #1 {\def\defoptype{#1}% \defopparsebody\Edefop\defopx\defopheader\defoptype} - -\def\defopheader #1#2#3{% +% +\def\defopheader#1#2#3{% \dosubind {fn}{\code{#2}}{\putwordon\ #1}% Make entry in function index -\begingroup\defname {#2}{\defoptype{} on #1}% +\begingroup\defname {#2}{\defoptype\ \putwordon\ #1}% \defunargs {#3}\endgroup % } -% @deftypemethod CLASS RETURN-TYPE METHOD ARG... +% @deftypeop CATEGORY CLASS TYPE OPERATION ARG... +% +\def\deftypeop #1 {\def\deftypeopcategory{#1}% + \deftypeopparsebody\Edeftypeop\deftypeopx\deftypeopheader + \deftypeopcategory} +% +% #1 is the class name, #2 the data type, #3 the operation name, #4 the args. +\def\deftypeopheader#1#2#3#4{% + \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index + \begingroup + \defname{\defheaderxcond#2\relax$$$#3} + {\deftypeopcategory\ \putwordon\ \code{#1}}% + \deftypefunargs{#4}% + \endgroup +} + +% @deftypemethod CLASS TYPE METHOD ARG... % \def\deftypemethod{% \deftypemethparsebody\Edeftypemethod\deftypemethodx\deftypemethodheader} @@ -4313,6 +4701,20 @@ width0pt\relax} \fi \endgroup } +% @deftypeivar CLASS TYPE VARNAME +% +\def\deftypeivar{% + \deftypemethparsebody\Edeftypeivar\deftypeivarx\deftypeivarheader} +% +% #1 is the class name, #2 the data type, #3 the variable name. +\def\deftypeivarheader#1#2#3{% + \dosubind{vr}{\code{#3}}{\putwordof\ \code{#1}}% entry in variable index + \begingroup + \defname{#3}{\putwordInstanceVariableof\ \code{#1}}% + \defvarargs{#3}% + \endgroup +} + % @defmethod == @defop Method % \def\defmethod{\defmethparsebody\Edefmethod\defmethodx\defmethodheader} @@ -4332,31 +4734,24 @@ width0pt\relax} \fi \defopvarparsebody\Edefcv\defcvx\defcvarheader\defcvtype} \def\defcvarheader #1#2#3{% -\dosubind {vr}{\code{#2}}{of #1}% Make entry in var index -\begingroup\defname {#2}{\defcvtype{} of #1}% +\dosubind {vr}{\code{#2}}{\putwordof\ #1}% Make entry in var index +\begingroup\defname {#2}{\defcvtype\ \putwordof\ #1}% \defvarargs {#3}\endgroup % } -% @defivar == @defcv {Instance Variable} - +% @defivar CLASS VARNAME == @defcv {Instance Variable} CLASS VARNAME +% \def\defivar{\defvrparsebody\Edefivar\defivarx\defivarheader} - -\def\defivarheader #1#2#3{% -\dosubind {vr}{\code{#2}}{of #1}% Make entry in var index -\begingroup\defname {#2}{Instance Variable of #1}% -\defvarargs {#3}\endgroup % +% +\def\defivarheader#1#2#3{% + \dosubind {vr}{\code{#2}}{\putwordof\ #1}% entry in var index + \begingroup + \defname{#2}{\putwordInstanceVariableof\ #1}% + \defvarargs{#3}% + \endgroup } -% These definitions are run if you use @defmethodx, etc., -% anywhere other than immediately after a @defmethod, etc. - -\def\defopx #1 {\errmessage{@defopx in invalid context}} -\def\defmethodx #1 {\errmessage{@defmethodx in invalid context}} -\def\defcvx #1 {\errmessage{@defcvx in invalid context}} -\def\defivarx #1 {\errmessage{@defivarx in invalid context}} - -% Now @defvar - +% @defvar % First, define the processing that is wanted for arguments of @defvar. % This is actually simple: just print them in roman. % This must expand the args and terminate the paragraph they make up @@ -4376,7 +4771,7 @@ width0pt\relax} \fi \def\defvar{\defvarparsebody\Edefvar\defvarx\defvarheader} \def\defvarheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index -\begingroup\defname {#1}{Variable}% +\begingroup\defname {#1}{\putwordDefvar}% \defvarargs {#2}\endgroup % } @@ -4385,7 +4780,7 @@ width0pt\relax} \fi \def\defopt{\defvarparsebody\Edefopt\defoptx\defoptheader} \def\defoptheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index -\begingroup\defname {#1}{User Option}% +\begingroup\defname {#1}{\putwordDefopt}% \defvarargs {#2}\endgroup % } @@ -4397,7 +4792,7 @@ width0pt\relax} \fi % is actually part of the data type, which should not be put into the index. \def\deftypevarheader #1#2{% \dovarind#2 \relax% Make entry in variables index -\begingroup\defname {\defheaderxcond#1\relax$$$#2}{Variable}% +\begingroup\defname {\defheaderxcond#1\relax$$$#2}{\putwordDeftypevar}% \interlinepenalty=10000 \endgraf\nobreak\vskip -\parskip\nobreak \endgroup} @@ -4413,15 +4808,6 @@ width0pt\relax} \fi \endgraf\nobreak\vskip -\parskip\nobreak \endgroup} -% This definition is run if you use @defvarx -% anywhere other than immediately after a @defvar or @defvarx. - -\def\defvrx #1 {\errmessage{@defvrx in invalid context}} -\def\defvarx #1 {\errmessage{@defvarx in invalid context}} -\def\defoptx #1 {\errmessage{@defoptx in invalid context}} -\def\deftypevarx #1 {\errmessage{@deftypevarx in invalid context}} -\def\deftypevrx #1 {\errmessage{@deftypevrx in invalid context}} - % Now define @deftp % Args are printed in bold, a slight difference from @defvar. @@ -4434,23 +4820,45 @@ width0pt\relax} \fi \def\deftpheader #1#2#3{\doind {tp}{\code{#2}}% \begingroup\defname {#2}{#1}\deftpargs{#3}\endgroup} -% This definition is run if you use @deftpx, etc -% anywhere other than immediately after a @deftp, etc. - -\def\deftpx #1 {\errmessage{@deftpx in invalid context}} +% These definitions are used if you use @defunx (etc.) +% anywhere other than immediately after a @defun or @defunx. +% +\def\defcvx#1 {\errmessage{@defcvx in invalid context}} +\def\deffnx#1 {\errmessage{@deffnx in invalid context}} +\def\defivarx#1 {\errmessage{@defivarx in invalid context}} +\def\defmacx#1 {\errmessage{@defmacx in invalid context}} +\def\defmethodx#1 {\errmessage{@defmethodx in invalid context}} +\def\defoptx #1 {\errmessage{@defoptx in invalid context}} +\def\defopx#1 {\errmessage{@defopx in invalid context}} +\def\defspecx#1 {\errmessage{@defspecx in invalid context}} +\def\deftpx#1 {\errmessage{@deftpx in invalid context}} +\def\deftypefnx#1 {\errmessage{@deftypefnx in invalid context}} +\def\deftypefunx#1 {\errmessage{@deftypefunx in invalid context}} +\def\deftypeivarx#1 {\errmessage{@deftypeivarx in invalid context}} +\def\deftypemethodx#1 {\errmessage{@deftypemethodx in invalid context}} +\def\deftypeopx#1 {\errmessage{@deftypeopx in invalid context}} +\def\deftypevarx#1 {\errmessage{@deftypevarx in invalid context}} +\def\deftypevrx#1 {\errmessage{@deftypevrx in invalid context}} +\def\defunx#1 {\errmessage{@defunx in invalid context}} +\def\defvarx#1 {\errmessage{@defvarx in invalid context}} +\def\defvrx#1 {\errmessage{@defvrx in invalid context}} \message{macros,} % @macro. -% To do this right we need a feature of e-TeX, \scantokens, +% To do this right we need a feature of e-TeX, \scantokens, % which we arrange to emulate with a temporary file in ordinary TeX. \ifx\eTeXversion\undefined \newwrite\macscribble \def\scanmacro#1{% \begingroup \newlinechar`\^^M + % Undo catcode changes of \startcontents and \doprintindex + \catcode`\@=0 \catcode`\\=12 \escapechar=`\@ + % Append \endinput to make sure that TeX does not see the ending newline. + \toks0={#1\endinput}% \immediate\openout\macscribble=\jobname.tmp - \immediate\write\macscribble{#1}% + \immediate\write\macscribble{\the\toks0}% \immediate\closeout\macscribble \let\xeatspaces\eatspaces \input \jobname.tmp @@ -4459,12 +4867,16 @@ width0pt\relax} \fi \else \def\scanmacro#1{% \begingroup \newlinechar`\^^M -\let\xeatspaces\eatspaces\scantokens{#1}\endgroup} +% Undo catcode changes of \startcontents and \doprintindex +\catcode`\@=0 \catcode`\\=12 \escapechar=`\@ +\let\xeatspaces\eatspaces\scantokens{#1\endinput}\endgroup} \fi \newcount\paramno % Count of parameters \newtoks\macname % Macro name \newif\ifrecursive % Is it recursive? +\def\macrolist{} % List of all defined macros in the form + % \do\macro1\do\macro2... % Utility routines. % Thisdoes \let #1 = #2, except with \csnames. @@ -4496,8 +4908,8 @@ width0pt\relax} \fi % all characters are catcode 10, 11 or 12, except \ which is active % (as in normal texinfo). It is necessary to change the definition of \. -% It's necessary to have hard CRs when the macro is executed. This is -% done by making ^^M (\endlinechar) catcode 12 when reading the macro +% It's necessary to have hard CRs when the macro is executed. This is +% done by making ^^M (\endlinechar) catcode 12 when reading the macro % body, and then making it the \newlinechar in \scanmacro. \def\macrobodyctxt{% @@ -4514,8 +4926,19 @@ width0pt\relax} \fi \catcode`\^^M=12 \usembodybackslash} +\def\macroargctxt{% + \catcode`\~=12 + \catcode`\^=12 + \catcode`\_=12 + \catcode`\|=12 + \catcode`\<=12 + \catcode`\>=12 + \catcode`\+=12 + \catcode`\@=12 + \catcode`\\=12} + % \mbodybackslash is the definition of \ in @macro bodies. -% It maps \foo\ => \csname macarg.foo\endcsname => #N +% It maps \foo\ => \csname macarg.foo\endcsname => #N % where N is the macro parameter number. % We define \csname macarg.\endcsname to be \realbackslash, so % \\ in macro replacement text gets you a backslash. @@ -4534,25 +4957,48 @@ width0pt\relax} \fi \ifx\argl\empty % no arguments \paramno=0% \else - \expandafter\parsemargdef \argl;% + \expandafter\parsemargdef \argl;% \fi - \expandafter\ifx \csname macsave.\the\macname\endcsname \relax - \cslet{macsave.\the\macname}{\the\macname}% - \else + \if1\csname ismacro.\the\macname\endcsname \message{Warning: redefining \the\macname}% + \else + \expandafter\ifx\csname \the\macname\endcsname \relax + \else \errmessage{The name \the\macname\space is reserved}\fi + \global\cslet{macsave.\the\macname}{\the\macname}% + \global\expandafter\let\csname ismacro.\the\macname\endcsname=1% + % Add the macroname to \macrolist + \toks0 = \expandafter{\macrolist\do}% + \xdef\macrolist{\the\toks0 + \expandafter\noexpand\csname\the\macname\endcsname}% \fi \begingroup \macrobodyctxt \ifrecursive \expandafter\parsermacbody - \else \expandafter\parsemacbody + \else \expandafter\parsemacbody \fi} \def\unmacro{\parsearg\unmacroxxx} \def\unmacroxxx#1{% - \expandafter\ifx \csname macsave.\the\macname\endcsname \relax - \errmessage{Macro \the\macname\ not defined.}% + \if1\csname ismacro.#1\endcsname + \global\cslet{#1}{macsave.#1}% + \global\expandafter\let \csname ismacro.#1\endcsname=0% + % Remove the macro name from \macrolist + \begingroup + \edef\tempa{\expandafter\noexpand\csname#1\endcsname}% + \def\do##1{% + \def\tempb{##1}% + \ifx\tempa\tempb + % remove this + \else + \toks0 = \expandafter{\newmacrolist\do}% + \edef\newmacrolist{\the\toks0\expandafter\noexpand\tempa}% + \fi}% + \def\newmacrolist{}% + % Execute macro list to define \newmacrolist + \macrolist + \global\let\macrolist\newmacrolist + \endgroup \else - \cslet{#1}{macsave.#1}% - \expandafter\let \csname macsave.\the\macname\endcsname \undefined + \errmessage{Macro #1 not defined}% \fi } @@ -4610,17 +5056,22 @@ width0pt\relax} \fi \noexpand\scanmacro{\temp}}% \or % 1 \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\braceorline\csname\the\macname xxx\endcsname}% + \bgroup\noexpand\macroargctxt + \noexpand\braceorline + \expandafter\noexpand\csname\the\macname xxx\endcsname}% \expandafter\xdef\csname\the\macname xxx\endcsname##1{% - \noexpand\scanmacro{\temp}}% + \egroup\noexpand\scanmacro{\temp}}% \else % many - \expandafter\xdef\csname\the\macname\endcsname##1{% - \csname\the\macname xxx\endcsname ##1,}% + \expandafter\xdef\csname\the\macname\endcsname{% + \bgroup\noexpand\macroargctxt + \noexpand\csname\the\macname xx\endcsname}% + \expandafter\xdef\csname\the\macname xx\endcsname##1{% + \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% \expandafter\expandafter \expandafter\xdef \expandafter\expandafter - \csname\the\macname xxx\endcsname - \paramlist{\noexpand\scanmacro{\temp}}% + \csname\the\macname xxx\endcsname + \paramlist{\egroup\noexpand\scanmacro{\temp}}% \fi \else \ifcase\paramno @@ -4630,18 +5081,25 @@ width0pt\relax} \fi \noexpand\scanmacro{\temp}\egroup}% \or % 1 \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\braceorline\csname\the\macname xxx\endcsname}% + \bgroup\noexpand\macroargctxt + \noexpand\braceorline + \expandafter\noexpand\csname\the\macname xxx\endcsname}% \expandafter\xdef\csname\the\macname xxx\endcsname##1{% + \egroup \noexpand\norecurse{\the\macname}% \noexpand\scanmacro{\temp}\egroup}% \else % many - \expandafter\xdef\csname\the\macname\endcsname##1{% - \csname\the\macname xxx\endcsname ##1,}% + \expandafter\xdef\csname\the\macname\endcsname{% + \bgroup\noexpand\macroargctxt + \expandafter\noexpand\csname\the\macname xx\endcsname}% + \expandafter\xdef\csname\the\macname xx\endcsname##1{% + \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% \expandafter\expandafter \expandafter\xdef \expandafter\expandafter \csname\the\macname xxx\endcsname \paramlist{% + \egroup \noexpand\norecurse{\the\macname}% \noexpand\scanmacro{\temp}\egroup}% \fi @@ -4656,11 +5114,29 @@ width0pt\relax} \fi \def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx} \def\braceorlinexxx{% \ifx\nchar\bgroup\else - \expandafter\parsearg + \expandafter\parsearg \fi \next} +% We mant to disable all macros during \shipout so that they are not +% expanded by \write. +\def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}% + \edef\next{\macrolist}\expandafter\endgroup\next} + + +% @alias. +% We need some trickery to remove the optional spaces around the equal +% sign. Just make them active and then expand them all to nothing. +\def\alias{\begingroup\obeyspaces\parsearg\aliasxxx} +\def\aliasxxx #1{\aliasyyy#1\relax} +\def\aliasyyy #1=#2\relax{\ignoreactivespaces +\edef\next{\global\let\expandafter\noexpand\csname#1\endcsname=% + \expandafter\noexpand\csname#2\endcsname}% +\expandafter\endgroup\next} + \message{cross references,} +% @xref etc. + \newwrite\auxfile \newif\ifhavexrefs % True if xref values are known. @@ -4702,21 +5178,24 @@ width0pt\relax} \fi % @anchor{NAME} -- define xref target at arbitrary point. -% -\def\anchor#1{\setref{#1}{Ynothing}} - +% +\newcount\savesfregister +\gdef\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi} +\gdef\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi} +\gdef\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces} % \setref{NAME}{SNT} defines a cross-reference point NAME, namely % NAME-title, NAME-pg, and NAME-SNT. Called from \foonoderef. We have % to set \indexdummies so commands such as @code in a section title % aren't expanded. It would be nicer not to expand the titles in the % first place, but there's so many layers that that is hard to do. -% +% \def\setref#1#2{{% \indexdummies + \pdfmkdest{#1}% \dosetq{#1-title}{Ytitle}% \dosetq{#1-pg}{Ypagenumber}% - \dosetq{#1-snt}{#2} + \dosetq{#1-snt}{#2}% }} % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is @@ -4728,6 +5207,7 @@ width0pt\relax} \fi \def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]} \def\ref#1{\xrefX[#1,,,,,,,]} \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup + \unsepspaces \def\printedmanual{\ignorespaces #5}% \def\printednodename{\ignorespaces #3}% \setbox1=\hbox{\printedmanual}% @@ -4761,8 +5241,21 @@ width0pt\relax} \fi % are best written with fairly long node names, containing hyphens, this % is a loss. Therefore, we give the text of the node name again, so it % is as if TeX is seeing it for the first time. + \ifpdf + \leavevmode + \getfilename{#4}% + \ifnum\filenamelength>0 + \startlink attr{/Border [0 0 0]}% + goto file{\the\filename.pdf} name{#1@}% + \else + \startlink attr{/Border [0 0 0]}% + goto name{#1@}% + \fi + \linkcolor + \fi + % \ifdim \wd1 > 0pt - \putwordsection{} ``\printednodename'' in \cite{\printedmanual}% + \putwordsection{} ``\printednodename'' \putwordin{} \cite{\printedmanual}% \else % _ (for example) has to be the character _ for the purposes of the % control sequence corresponding to the node, but it has to expand @@ -4775,11 +5268,12 @@ width0pt\relax} \fi \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi }% - % [mynode], + % [mynode], [\printednodename],\space % page 3 \turnoffactive \putwordpage\tie\refx{#1-pg}{}% \fi + \endlink \endgroup} % \dosetq is the interface for calls from other macros @@ -4787,7 +5281,7 @@ width0pt\relax} \fi % Use \normalturnoffactive so that punctuation chars such as underscore % and backslash work in node names. (\turnoffactive doesn't do \.) \def\dosetq#1#2{% - {\let\folio=0 + {\let\folio=0% \normalturnoffactive \edef\next{\write\auxfile{\internalsetq{#1}{#2}}}% \iflinks @@ -4864,7 +5358,7 @@ width0pt\relax} \fi } % This is the macro invoked by entries in the aux file. -% +% \def\xrdef#1{\begingroup % Reenable \ as an escape while reading the second argument. \catcode`\\ = 0 @@ -5016,6 +5510,8 @@ width0pt\relax} \fi \xspaceskip\z@skip \parindent\defaultparindent % + \smallfonts \rm + % % Hang the footnote text off the number. \hang \textindent{\thisfootno}% @@ -5030,7 +5526,7 @@ width0pt\relax} \fi \else\let\next\f@t\fi \next} \def\f@@t{\bgroup\aftergroup\@foot\let\next} \def\f@t#1{#1\@foot} -\def\@foot{\strut\egroup} +\def\@foot{\strut\par\egroup} }%end \catcode `\@=11 @@ -5089,7 +5585,7 @@ width0pt\relax} \fi % @image. We use the macros from epsf.tex to support this. % If epsf.tex is not installed and @image is used, we complain. -% +% % Check for and read epsf.tex up front. If we read it only at @image % time, we might be inside a group, and then its definitions would get % undone and the next image would fail. @@ -5102,12 +5598,12 @@ width0pt\relax} \fi \input epsf.tex \fi % +% We will only complain once about lack of epsf.tex. \newif\ifwarnednoepsf \newhelp\noepsfhelp{epsf.tex must be installed for images to work. It is also included in the Texinfo distribution, or you can get - it from ftp://ftp.tug.org/tex/epsf.tex.} + it from ftp://tug.org/tex/epsf.tex.} % -% Only complain once about lack of epsf.tex. \def\image#1{% \ifx\epsfbox\undefined \ifwarnednoepsf \else @@ -5125,24 +5621,68 @@ width0pt\relax} \fi % #2 is (optional) width, #3 is (optional) height. % #4 is just the usual extra ignored arg for parsing this stuff. \def\imagexxx#1,#2,#3,#4\finish{% - % \epsfbox itself resets \epsf?size at each figure. - \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi - \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi - % If the image is by itself, center it. - \ifvmode - \nobreak\medskip - \nobreak - \centerline{\epsfbox{#1.eps}}% - \bigbreak + \ifpdf + \centerline{\dopdfimage{#1}{#2}{#3}}% + \else + % \epsfbox itself resets \epsf?size at each figure. + \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi + \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi + \begingroup + \catcode`\^^M = 5 % in case we're inside an example + % If the image is by itself, center it. + \ifvmode + \nobreak\bigskip + % Usually we'll have text after the image which will insert + % \parskip glue, so insert it here too to equalize the space + % above and below. + \nobreak\vskip\parskip + \nobreak + \centerline{\epsfbox{#1.eps}}% + \bigbreak + \else + % In the middle of a paragraph, no extra space. + \epsfbox{#1.eps}% + \fi + \endgroup + \fi +} + + +\message{localization,} +% and i18n. + +% @documentlanguage is usually given very early, just after +% @setfilename. If done too late, it may not override everything +% properly. Single argument is the language abbreviation. +% It would be nice if we could set up a hyphenation file here. +% +\def\documentlanguage{\parsearg\dodocumentlanguage} +\def\dodocumentlanguage#1{% + \tex % read txi-??.tex file in plain TeX. + % Read the file if it exists. + \openin 1 txi-#1.tex + \ifeof1 + \errhelp = \nolanghelp + \errmessage{Cannot read language file txi-#1.tex}% + \let\temp = \relax \else - \epsfbox{#1.eps}% + \def\temp{\input txi-#1.tex }% \fi + \temp + \endgroup } +\newhelp\nolanghelp{The given language definition file cannot be found or +is empty. Maybe you need to install it? In the current directory +should work if nowhere else does.} -\message{paper sizes,} -% And other related parameters. +% @documentencoding should change something in TeX eventually, most +% likely, but for now just recognize it. +\let\documentencoding = \comment + +% Page size parameters. +% \newdimen\defaultparindent \defaultparindent = 15pt \chapheadingskip = 15pt plus 4pt minus 2pt @@ -5162,16 +5702,14 @@ width0pt\relax} \fi % Use TeX 3.0's \emergencystretch to help line breaking, but if we're % using an old version of TeX, don't do anything. We want the amount of % stretch added to depend on the line length, hence the dependence on -% \hsize. This makes it come to about 9pt for the 8.5x11 format. We -% call this whenever the paper size is set. +% \hsize. We call this whenever the paper size is set. % \def\setemergencystretch{% \ifx\emergencystretch\thisisundefined % Allow us to assign to \emergencystretch anyway. \def\emergencystretch{\dimen0}% \else - \emergencystretch = \hsize - \divide\emergencystretch by 45 + \emergencystretch = .15\hsize \fi } @@ -5187,7 +5725,7 @@ width0pt\relax} \fi \vsize = #1\relax \advance\vsize by \topskip \outervsize = \vsize - \advance\outervsize by 0.6in + \advance\outervsize by 2\topandbottommargin \pageheight = \vsize % \hsize = #2\relax @@ -5264,7 +5802,7 @@ width0pt\relax} \fi % @pagesizes TEXTHEIGHT[,TEXTWIDTH] % Perhaps we should allow setting the margins, \topskip, \parskip, % and/or leading, also. Or perhaps we should compute them somehow. -% +% \def\pagesizes{\parsearg\pagesizesxxx} \def\pagesizesxxx#1{\pagesizesyyy #1,,\finish} \def\pagesizesyyy#1,#2,#3\finish{{% @@ -5278,9 +5816,10 @@ width0pt\relax} \fi }} % Set default to letter. -% +% \letterpaper + \message{and turning on texinfo input format.} % Define macros to output various characters with catcode for normal text. @@ -5292,6 +5831,7 @@ width0pt\relax} \fi \catcode`\<=\other \catcode`\>=\other \catcode`\+=\other +\catcode`\$=\other \def\normaldoublequote{"} \def\normaltilde{~} \def\normalcaret{^} @@ -5300,6 +5840,7 @@ width0pt\relax} \fi \def\normalless{<} \def\normalgreater{>} \def\normalplus{+} +\def\normaldollar{$} % This macro is used to make a character print one way in ttfont % where it can probably just be output, and another way in other fonts, @@ -5310,7 +5851,13 @@ width0pt\relax} \fi % interword stretch (and shrink), and it is reasonable to expect all % typewriter fonts to have this, we can check that font parameter. % -\def\ifusingtt#1#2{\ifdim \fontdimen3\the\font=0pt #1\else #2\fi} +\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi} + +% Same as above, but check for italic font. Actually this also catches +% non-italic slanted fonts since it is impossible to distinguish them from +% italic fonts. But since this is only used by $ and it uses \sl anyway +% this is not a problem. +\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi} % Turn off all special characters except @ % (and those which the user can use as if they were ordinary). @@ -5341,6 +5888,8 @@ width0pt\relax} \fi \def>{{\tt \gtr}} \catcode`\+=\active \def+{{\tt \char 43}} +\catcode`\$=\active +\def${\ifusingit{{\sl\$}}\normaldollar} %\catcode 27=\active %\def^^[{$\diamondsuit$} @@ -5371,9 +5920,6 @@ width0pt\relax} \fi % \normalbackslash outputs one backslash in fixed width font. \def\normalbackslash{{\tt\rawbackslashxx}} -% Say @foo, not \foo, in error messages. -\escapechar=`\@ - % \catcode 17=0 % Define control-q \catcode`\\=\active @@ -5387,7 +5933,8 @@ width0pt\relax} \fi @let|=@normalverticalbar @let<=@normalless @let>=@normalgreater -@let+=@normalplus} +@let+=@normalplus +@let$=@normaldollar} @def@normalturnoffactive{@let"=@normaldoublequote @let\=@normalbackslash @@ -5397,7 +5944,8 @@ width0pt\relax} \fi @let|=@normalverticalbar @let<=@normalless @let>=@normalgreater -@let+=@normalplus} +@let+=@normalplus +@let$=@normaldollar} % Make _ and + \other characters, temporarily. % This is canceled by @fixbackslash. @@ -5416,16 +5964,29 @@ width0pt\relax} \fi % Also back turn on active characters that might appear in the input % file name, in case not using a pre-dumped format. % -@gdef@fixbackslash{@ifx\@eatinput @let\ = @normalbackslash @fi - @catcode`+=@active @catcode`@_=@active} +@gdef@fixbackslash{% + @ifx\@eatinput @let\ = @normalbackslash @fi + @catcode`+=@active + @catcode`@_=@active +} + +% Say @foo, not \foo, in error messages. +@escapechar = `@@ -% These look ok in all fonts, so just make them not special. The @rm below -% makes sure that the current font starts out as the newly loaded cmr10 -@catcode`@$=@other @catcode`@%=@other @catcode`@&=@other @catcode`@#=@other +% These look ok in all fonts, so just make them not special. +@catcode`@& = @other +@catcode`@# = @other +@catcode`@% = @other +@c Set initial fonts. @textfonts @rm + @c Local variables: +@c eval: (add-hook 'write-file-hooks 'time-stamp) @c page-delimiter: "^\\\\message" +@c time-stamp-start: "def\\\\texinfoversion{" +@c time-stamp-format: "%:y-%02m-%02d.%02H" +@c time-stamp-end: "}" @c End: