diff options
| author | obrien <obrien@FreeBSD.org> | 2000-06-20 06:20:42 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2000-06-20 06:20:42 +0000 |
| commit | 813b11648e223be167ed3d9c1b234eb99ab9006e (patch) | |
| tree | 3f2e79c5a66aac2f8eb0a069744251ab05fcc87d /contrib | |
| parent | 4e16f4e9862f75bc9baf95241e1ed357017bfdb9 (diff) | |
| download | FreeBSD-src-813b11648e223be167ed3d9c1b234eb99ab9006e.zip FreeBSD-src-813b11648e223be167ed3d9c1b234eb99ab9006e.tar.gz | |
Import a virgin (but trimed) Binutils 2.10 release.
Diffstat (limited to 'contrib')
69 files changed, 4429 insertions, 3041 deletions
diff --git a/contrib/binutils/Makefile.in b/contrib/binutils/Makefile.in index beab8be..9a45e4f 100644 --- a/contrib/binutils/Makefile.in +++ b/contrib/binutils/Makefile.in @@ -711,7 +711,6 @@ INSTALL_MODULES = \ install-shellutils \ install-sim \ install-tar \ - install-texinfo \ install-textutils \ install-tgas \ install-time \ diff --git a/contrib/binutils/bfd/ChangeLog b/contrib/binutils/bfd/ChangeLog index b877c08..b460bb8 100644 --- a/contrib/binutils/bfd/ChangeLog +++ b/contrib/binutils/bfd/ChangeLog @@ -1,3 +1,54 @@ +2000-05-31 Mark Kettenis <kettenis@gnu.org> + + Add support for FreeBSD/Alpha. + * configure.in: Add alpha*-*-freebsd* entry to prevent including + OSF core file support. + * configure: Regenerate. + +2000-05-29 Philip Blundell <philb@gnu.org> + + * ppcboot.c: Add packed attribute if compiling with GCC. + +2000-05-29 Anatoly Vorobey <mellon@pobox.com> + + * elf.c (_bfd_elf_link_hash_table_init): Initialize dynlocal. + +2000-05-26 Alan Modra <alan@linuxcare.com.au> + + * sysdep.h (gettext, dgettext, dcgettext, textdomain, + bindtextdomain): Replace defines with those from intl/libgettext.h + to quieten gcc warnings. + +2000-05-26 Eli Zaretskii <eliz@is.elta.co.il> + + * 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 <alan@linuxcare.com.au> + + * opncls.c (bfd_close_all_done): Mask file perms with 0777 not 0x777. + +2000-05-23 Philip Blundell <pb@futuretv.com> + + * configure.in: Set version to 2.10. + * configure: Regenerate. + +Sat Jul 3 10:35:19 CDT 1999 Joel Sherrill <joel@OARcorp.com> + + * config.bfd (sparc-rtemself): Added. + (sparc-rtemsaout): Added as alternate name for current sparc-rtems. + (sparc-rtems): Switched to ELF from a.out + (i386-rtemscoff): Added as alternate name for current i386-rtems. + (i386-rtems): Switched to ELF. + 2000-05-09 Alan Modra <alan@linuxcare.com.au> * elf.c (bfd_section_from_shdr): Don't set use_rela_p if rela @@ -33,6 +84,11 @@ the .bss section. * bfd/coff-stgo32.c (COFF_SECTION_ALIGNMENT_ENTRIES): Likewise. +2000-05-02 H.J. Lu <hjl@gnu.org> + + * elf.c (prep_headers): Use ELFOSABI_NONE instead of + ELFOSABI_SYSV. + 2000-04-29 Andreas Jaeger <aj@suse.de> * libbfd-in.h: Correctly check GCC version. @@ -137,9 +193,9 @@ Wed Mar 30 15:28:00 2000 Donald Lindsay <dlindsay@cygnus.com> "boolean overflow" with "bfd_reloc_status_type flag". 2000-03-14 Doug Evans <dje@casey.transmeta.com> - - * elf32-m32r.c (m32r_elf_lo16_reloc): Rewrite. - + + * elf32-m32r.c (m32r_elf_lo16_reloc): Rewrite. + 2000-03-14 Kazu Hirata <kazu@hxi.com> * reloc16.c (bfd_coff_reloc16_relax_section): Count the total number @@ -160,7 +216,7 @@ Wed Mar 30 15:28:00 2000 Donald Lindsay <dlindsay@cygnus.com> * 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 <geoffk@cygnus.com> @@ -251,7 +307,7 @@ Wed Mar 30 15:28:00 2000 Donald Lindsay <dlindsay@cygnus.com> * 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. @@ -461,10 +517,10 @@ Fri Feb 25 18:39:26 2000 Rodney Brown (RodneyBrown@pmsc.com) * 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 <alan@spri.levels.unisa.edu.au> @@ -659,28 +715,28 @@ Thu Feb 10 20:07:50 GMT 2000 Toshiyasu Morita (toshi.morita@sega.com) 2000-02-08 Mark Elbrecht <snowball3@bigfoot.com> * coff-go32.c: Update comment. Update copyright. - + 2000-01-27 Thomas de Lellis <tdel@windriver.com> - * 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. @@ -698,7 +754,7 @@ Thu Feb 10 20:07:50 GMT 2000 Toshiyasu Morita (toshi.morita@sega.com) 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 <nickc@cygnus.com> @@ -875,8 +931,8 @@ Thu Feb 10 20:07:50 GMT 2000 Toshiyasu Morita (toshi.morita@sega.com) 1999-12-09 Nick Clifton <nickc@cygnus.com> * 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. @@ -1037,7 +1093,7 @@ Tue Nov 2 01:44:41 1999 Jeffrey A Law (law@cygnus.com) Sat Oct 23 17:36:12 1999 Andrew Cagney <cagney@b1.cygnus.com> * 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. @@ -1060,8 +1116,8 @@ Fri Oct 8 13:03:45 1999 Geoffrey Keating <geoffk@cygnus.com> * 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. @@ -1519,7 +1575,7 @@ Tue Sep 7 17:25:12 1999 Jeffrey A Law (law@cygnus.com) (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 @@ -1986,9 +2042,9 @@ Wed Aug 4 18:08:07 1999 Jeffrey A Law (law@cygnus.com) Mon Jul 19 14:03:44 1999 Mark P. Mitchell <mark@codesourcery.com> * 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 <ian@zembu.com> @@ -2016,8 +2072,8 @@ Mon Jul 19 14:03:44 1999 Mark P. Mitchell <mark@codesourcery.com> * 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. @@ -3177,7 +3233,7 @@ Wed Jun 2 11:51:12 1999 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> 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. @@ -3196,7 +3252,7 @@ Wed Jun 2 11:51:12 1999 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> 1999-05-24 Philip Blundell <pb@nexus.co.uk> * 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 <scox@cygnus.com> @@ -3229,7 +3285,7 @@ Mon May 17 13:35:35 1999 Stan Cox <scox@cygnus.com> Fri May 14 10:59:55 1999 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * 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) @@ -3818,8 +3874,8 @@ Fri Jan 29 00:47:21 1999 H.J. Lu <hjl@gnu.org> Thu Jan 28 20:05:22 1999 Ian Lance Taylor <ian@cygnus.com> * 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 <macro@ds2.pg.gda.pl>. 1999-01-28 Nick Clifton <nickc@cygnus.com> @@ -3829,8 +3885,8 @@ Thu Jan 28 20:05:22 1999 Ian Lance Taylor <ian@cygnus.com> Thu Jan 28 11:08:16 1999 Catherine Moore <clm@cygnus.com> - * 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 <scox@cygnus.com> @@ -3969,32 +4025,32 @@ Tue Dec 8 16:21:35 1998 Ian Lance Taylor <ian@cygnus.com> Wed Dec 2 15:03:59 1998 David Taylor <taylor@texas.cygnus.com> The following changes were made by David Taylor - <taylor@texas.cygnus.com>, Edith Epstein - <eepstein@sophia.cygnus.com>, Jim Blandy - <jimb@zwingli.cygnus.com>, and Elena Zannoni - <ezannoni@kwikemart.cygnus.com> as part of the project to merge in - changes originally made by HP; HP did not create ChangeLog - entries. + <taylor@texas.cygnus.com>, Edith Epstein + <eepstein@sophia.cygnus.com>, Jim Blandy + <jimb@zwingli.cygnus.com>, and Elena Zannoni + <ezannoni@kwikemart.cygnus.com> 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. @@ -4175,15 +4231,15 @@ Tue Nov 17 15:28:31 1998 Nick Clifton <nickc@cygnus.com> Mon Nov 16 22:19:21 1998 DJ Delorie <dj@cygnus.com> * 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 <brolley@cygnus.com> @@ -4224,8 +4280,8 @@ Tue Nov 10 15:13:59 1998 Nick Clifton <nickc@cygnus.com> Tue Nov 10 13:37:36 1998 Felix Lee <flee@cygnus.com> * 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 <clm@cygnus.com> @@ -4336,13 +4392,13 @@ Mon Oct 19 16:57:05 1998 Felix Lee <flee@cygnus.com> Mon Oct 19 01:47:21 1998 Felix Lee <flee@cygnus.com> * 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 <clm@cygnus.com> @@ -4523,20 +4579,20 @@ Wed Sep 16 11:26:49 CDT 1998 Catherine Moore <clm@cygnus.com> Tue Sep 15 12:40:05 1998 Catherine Moore <clm@cygnus.com> - * 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 <clm@cygnus.com> - * 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 <geoffk@ozemail.com.au> @@ -4677,28 +4733,28 @@ Fri Aug 14 09:12:28 1998 Stan Cox <scox@cygnus.com> Thu Aug 13 14:02:02 1998 Catherine Moore <clm@cygnus.com> - * 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 <geoffk@ozemail.com.au> @@ -4712,16 +4768,16 @@ Wed Aug 12 14:48:33 1998 Ian Lance Taylor <ian@cygnus.com> Wed Aug 12 08:10:11 1998 Catherine Moore <clm@cygnus.com> - * 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 <clm@cygnus.com> - * 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 <rth@cygnus.com> @@ -5106,7 +5162,7 @@ Wed Jul 1 17:05:53 1998 Nick Clifton <nickc@cygnus.com> Wed Jul 1 16:58:50 1998 Ian Lance Taylor <ian@cygnus.com> * 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) @@ -5177,7 +5233,7 @@ Thu Jun 25 18:31:41 1998 Richard Henderson <rth@cygnus.com> (ppc_elf_howto_raw): Handle them. (ppc_elf_reloc_type_lookup): Likewise. (ppc_elf_relocate_section): Likewise. - (ppc_elf_check_relocs): Reference count .got and .plt entires. + (ppc_elf_check_relocs): Reference count .got and .plt entries. Handle new vtable relocs. (ppc_elf_adjust_dynamic_symbol): Recognize unused .plt entries. (ppc_elf_gc_mark_hook, ppc_elf_gc_sweep_hook): New. @@ -5224,8 +5280,8 @@ Fri Jun 19 17:08:18 1998 Ian Lance Taylor <ian@cygnus.com> Tue Jun 16 11:55:55 1998 Ian Lance Taylor <ian@cygnus.com> * 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 <tromey@cygnus.com> @@ -5287,7 +5343,7 @@ Tue Jun 2 15:29:35 1998 Ian Lance Taylor <ian@cygnus.com> * 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 @@ -5351,7 +5407,7 @@ Tue May 19 18:41:19 1998 Ian Lance Taylor <ian@cygnus.com> * 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 <nickc@cygnus.com> @@ -5631,8 +5687,8 @@ Thu Apr 16 13:49:00 1998 Richard Henderson <rth@cygnus.com> Thu Apr 16 11:43:33 1998 Ian Lance Taylor <ian@cygnus.com> * 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. @@ -5976,10 +6032,10 @@ Wed Mar 25 11:19:28 1998 Ian Lance Taylor <ian@cygnus.com> From Yan Meroth <YAN.MEROTH@st.com>: * 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 <manfred@s-direktnet.de> @@ -6038,7 +6094,7 @@ Mon Feb 23 19:31:19 1998 Ian Lance Taylor <ian@cygnus.com> 1998-02-23 15:53 Richard Henderson <rth@cygnus.com> * elf32-i386.c (elf_i386_relocate_section): A pc-relative - relocation against a now-local symbol should not have a dynamic + relocation against a non-local symbol should not have a dynamic relocation. Mon Feb 23 16:17:08 1998 Ian Lance Taylor <ian@cygnus.com> @@ -6051,8 +6107,8 @@ Mon Feb 23 16:17:08 1998 Ian Lance Taylor <ian@cygnus.com> Sun Feb 22 20:39:00 1998 Richard Henderson <rth@cygnus.com> * 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 <rth@cygnus.com> @@ -6116,7 +6172,7 @@ Thu Feb 12 17:31:11 1998 Ian Lance Taylor <ian@cygnus.com> 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. @@ -6181,8 +6237,8 @@ Thu Feb 5 11:51:05 1998 Ian Lance Taylor <ian@cygnus.com> 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 - <luked@cse.unsw.edu.au>. + rather than swapping out r_offset twice. From Luke Deller + <luked@cse.unsw.edu.au>. Wed Feb 4 19:11:28 1998 Ian Lance Taylor <ian@cygnus.com> @@ -6265,7 +6321,7 @@ Fri Jan 30 19:07:07 1998 Geoff Keating <geoffk@ozemail.com.au> * 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. @@ -6343,10 +6399,10 @@ Thu Jan 22 21:13:39 1998 Richard Henderson <rth@cygnus.com> Wed Jan 21 21:19:03 1998 Ian Lance Taylor <ian@cygnus.com> * coff-i386.c (coff_i386_rtype_to_howto): If COFF_WITH_PE, don't - adjust addend for an output common symbol (from Jimmy Blair - <jimmyb@wrs.com>). 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 + <jimmyb@wrs.com>). 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 --git a/contrib/binutils/bfd/aoutx.h b/contrib/binutils/bfd/aoutx.h index fa107a7..920661b 100644 --- a/contrib/binutils/bfd/aoutx.h +++ b/contrib/binutils/bfd/aoutx.h @@ -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. @@ -2822,7 +2822,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 @@ -2846,7 +2846,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 --git a/contrib/binutils/bfd/archive.c b/contrib/binutils/bfd/archive.c index 19293af..27dfd39 100644 --- a/contrib/binutils/bfd/archive.c +++ b/contrib/binutils/bfd/archive.c @@ -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 @@ -1515,6 +1526,17 @@ bfd_bsd_truncate_arname (abfd, pathname, arhdr) 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 @@ -1555,6 +1577,17 @@ bfd_gnu_truncate_arname (abfd, pathname, arhdr) 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 diff --git a/contrib/binutils/bfd/cache.c b/contrib/binutils/bfd/cache.c index ad3140e..91b6c61 100644 --- a/contrib/binutils/bfd/cache.c +++ b/contrib/binutils/bfd/cache.c @@ -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 --git a/contrib/binutils/bfd/config.bfd b/contrib/binutils/bfd/config.bfd index d8f91d2..d70207e 100755 --- a/contrib/binutils/bfd/config.bfd +++ b/contrib/binutils/bfd/config.bfd @@ -246,10 +246,6 @@ case "${targ}" in targ_defvec=bfd_elf32_i386_vec targ_selvecs=i386coff_vec ;; - i[3456]86-*-rtemself*) - targ_defvec=bfd_elf32_i386_vec - targ_selvecs="i386coff_vec i386aout_vec" - ;; i[3456]86-*-msdosdjgpp* | i[3456]*-*-go32* | i[3456]86-go32-rtems* ) targ_defvec=go32coff_vec targ_selvecs="go32stubbedcoff_vec i386aout_vec" @@ -258,10 +254,14 @@ case "${targ}" in i[3456]86-*-aix*) targ_defvec=i386coff_vec ;; - i[3456]86*-*-rtems*) + i[3456]86-*-rtemscoff*) targ_defvec=i386coff_vec targ_selvecs="bfd_elf32_i386_vec i386aout_vec" ;; + i[3456]86-*-rtemself* | i[3456]86*-*-rtems*) + targ_defvec=bfd_elf32_i386_vec + targ_selvecs="i386coff_vec i386aout_vec" + ;; i[3456]86-sequent-bsd*) targ_defvec=i386dynix_vec targ_underscore=yes @@ -362,7 +362,12 @@ case "${targ}" in targ_selvecs="b_out_vec_big_host icoff_little_vec icoff_big_vec ieee_vec" targ_underscore=yes ;; - i960-*-vxworks5.* | i960-*-coff* | i960-*-sysv* | i960-*-rtems*) + i960-*-rtemself*) + targ_defvec=bfd_elf32_i960_vec + targ_selvecs="icoff_big_vec b_out_vec_little_host b_out_vec_big_host ieee_vec" + targ_underscore=yes + ;; + i960-*-vxworks5.* | i960-*-coff* | i960-*-sysv* | i960-*-rtemscoff* | i960-*-rtems*) targ_defvec=icoff_little_vec targ_selvecs="icoff_big_vec b_out_vec_little_host b_out_vec_big_host ieee_vec" targ_underscore=yes @@ -407,10 +412,16 @@ case "${targ}" in targ_defvec=bfd_elf32_m68k_vec targ_selvecs="m68kcoff_vec ieee_vec" ;; - m68*-*-rtems*) + m68*-*-rtemscoff*) + # same as m68k-coff with some extra targets targ_defvec=m68kcoff_vec targ_selvecs="m68kcoff_vec versados_vec ieee_vec aout0_big_vec" ;; + m68*-*-rtems* | m68*-*-rtemself*) + # same as m68k-elf with some extra targets + targ_defvec=bfd_elf32_m68k_vec + targ_selvecs="m68kcoff_vec versados_vec ieee_vec aout0_big_vec" + ;; m68*-*-coff* | m68*-*-sysv*) targ_defvec=m68kcoff_vec targ_selvecs="m68kcoff_vec versados_vec ieee_vec" @@ -643,7 +654,7 @@ case "${targ}" in targ_selvecs="shlpe_vec shlpei_vec" targ_underscore=yes ;; - sh-*-* | sh-*-rtems*) + sh-*-* | sh-*-rtemscoff* | sh-*-rtems*) targ_defvec=shcoff_vec targ_selvecs="shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec" targ_underscore=yes @@ -721,7 +732,16 @@ case "${targ}" in sparc*-*-coff*) targ_defvec=sparccoff_vec ;; - sparc*-*-* | sparc*-*-rtems*) + sparc*-*-rtemsaout*) + targ_defvec=sunos_big_vec + targ_selvecs="bfd_elf32_sparc_vec sparccoff_vec" + targ_underscore=yes + ;; + sparc*-*-rtems* | sparc*-*-rtemself*) + targ_defvec=bfd_elf32_sparc_vec + targ_selvecs="sunos_big_vec sparccoff_vec" + ;; + sparc*-*-*) targ_defvec=sunos_big_vec targ_underscore=yes ;; diff --git a/contrib/binutils/bfd/configure b/contrib/binutils/bfd/configure index 33ca150..532ea55 100755 --- a/contrib/binutils/bfd/configure +++ b/contrib/binutils/bfd/configure @@ -53,7 +53,6 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -168,7 +167,6 @@ 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 @@ -339,11 +337,6 @@ 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=*) @@ -509,16 +502,12 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -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 +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 -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -605,7 +594,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:609: checking host system type" >&5 +echo "configure:598: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -626,7 +615,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:630: checking target system type" >&5 +echo "configure:619: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -644,7 +633,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:648: checking build system type" >&5 +echo "configure:637: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -669,7 +658,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:673: checking for $ac_word" >&5 +echo "configure:662: 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 @@ -699,7 +688,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:703: checking for $ac_word" >&5 +echo "configure:692: 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 @@ -750,7 +739,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:754: checking for $ac_word" >&5 +echo "configure:743: 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 @@ -782,7 +771,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:786: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:775: 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. @@ -793,12 +782,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 797 "configure" +#line 786 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:791: \"$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 @@ -824,12 +813,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:828: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:817: 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:833: checking whether we are using GNU C" >&5 +echo "configure:822: 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 @@ -838,7 +827,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:842: \"$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:831: \"$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 @@ -857,7 +846,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:861: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:850: 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 @@ -889,7 +878,7 @@ else fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:893: checking for POSIXized ISC" >&5 +echo "configure:882: 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 @@ -922,7 +911,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:926: checking for a BSD compatible install" >&5 +echo "configure:915: 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 @@ -975,7 +964,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:979: checking whether build environment is sane" >&5 +echo "configure:968: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -1032,7 +1021,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:1036: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1025: 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 @@ -1061,7 +1050,7 @@ fi PACKAGE=bfd -VERSION=2.9.5 +VERSION=2.10 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; } @@ -1078,7 +1067,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1082: checking for working aclocal" >&5 +echo "configure:1071: 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. @@ -1091,7 +1080,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1095: checking for working autoconf" >&5 +echo "configure:1084: 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. @@ -1104,7 +1093,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1108: checking for working automake" >&5 +echo "configure:1097: 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. @@ -1117,7 +1106,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1121: checking for working autoheader" >&5 +echo "configure:1110: 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. @@ -1130,7 +1119,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1134: checking for working makeinfo" >&5 +echo "configure:1123: 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. @@ -1153,7 +1142,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:1157: checking for $ac_word" >&5 +echo "configure:1146: 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 @@ -1185,7 +1174,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:1189: checking for $ac_word" >&5 +echo "configure:1178: 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 @@ -1217,7 +1206,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:1221: checking for $ac_word" >&5 +echo "configure:1210: 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 @@ -1323,7 +1312,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:1327: checking for $ac_word" >&5 +echo "configure:1316: 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 @@ -1362,7 +1351,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:1366: checking for ld used by GCC" >&5 +echo "configure:1355: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1386,10 +1375,10 @@ echo "configure:1366: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1390: checking for GNU ld" >&5 +echo "configure:1379: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1393: checking for non-GNU ld" >&5 +echo "configure:1382: 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 @@ -1424,7 +1413,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:1428: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1417: 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 @@ -1440,7 +1429,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:1444: checking for BSD-compatible nm" >&5 +echo "configure:1433: 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 @@ -1476,7 +1465,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:1480: checking whether ln -s works" >&5 +echo "configure:1469: 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 @@ -1525,8 +1514,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1529 "configure"' > conftest.$ac_ext - if { (eval echo configure:1530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1518 "configure"' > conftest.$ac_ext + if { (eval echo configure:1519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1547,19 +1536,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:1551: checking whether the C compiler needs -belf" >&5 +echo "configure:1540: 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 <<EOF -#line 1556 "configure" +#line 1545 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:1563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1552: \"$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 @@ -1731,7 +1720,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1735: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1724: 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" @@ -1754,12 +1743,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1758: checking for Cygwin environment" >&5 +echo "configure:1747: 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 <<EOF -#line 1763 "configure" +#line 1752 "configure" #include "confdefs.h" int main() { @@ -1770,7 +1759,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:1774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1787,19 +1776,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:1791: checking for mingw32 environment" >&5 +echo "configure:1780: 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 <<EOF -#line 1796 "configure" +#line 1785 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:1803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1818,7 +1807,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1822: checking for executable suffix" >&5 +echo "configure:1811: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1828,10 +1817,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -1857,7 +1846,7 @@ target64=false # 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:1861: checking for $ac_word" >&5 +echo "configure:1850: 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 @@ -1887,7 +1876,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:1891: checking for $ac_word" >&5 +echo "configure:1880: 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 @@ -1938,7 +1927,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:1942: checking for $ac_word" >&5 +echo "configure:1931: 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 @@ -1970,7 +1959,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1974: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1963: 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. @@ -1981,12 +1970,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1985 "configure" +#line 1974 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1979: \"$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 @@ -2012,12 +2001,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:2016: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2005: 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:2021: checking whether we are using GNU C" >&5 +echo "configure:2010: 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 @@ -2026,7 +2015,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2030: \"$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:2019: \"$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 @@ -2045,7 +2034,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:2049: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2038: 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 @@ -2079,7 +2068,7 @@ fi ALL_LINGUAS= echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2083: checking how to run the C preprocessor" >&5 +echo "configure:2072: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2094,13 +2083,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2098 "configure" +#line 2087 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2093: \"$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 : @@ -2111,13 +2100,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2115 "configure" +#line 2104 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2110: \"$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 : @@ -2128,13 +2117,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2132 "configure" +#line 2121 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2127: \"$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 : @@ -2159,12 +2148,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2163: checking for ANSI C header files" >&5 +echo "configure:2152: 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 <<EOF -#line 2168 "configure" +#line 2157 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2172,7 +2161,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2165: \"$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* @@ -2189,7 +2178,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 -#line 2193 "configure" +#line 2182 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2207,7 +2196,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 -#line 2211 "configure" +#line 2200 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2228,7 +2217,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2232 "configure" +#line 2221 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2239,7 +2228,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2263,18 +2252,18 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2267: checking for working const" >&5 +echo "configure:2256: 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 <<EOF -#line 2272 "configure" +#line 2261 "configure" #include "confdefs.h" int main() { /* Ultrix mips cc rejects this. */ -typedef int charset[2]; const charset x; +typedef int charset[2]; const charset x = {0,0}; /* SunOS 4.1.1 cc rejects this. */ char const *const *ccp; char **p; @@ -2317,7 +2306,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:2321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2338,21 +2327,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2342: checking for inline" >&5 +echo "configure:2331: 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 <<EOF -#line 2349 "configure" +#line 2338 "configure" #include "confdefs.h" int main() { -} $ac_kw foo() { +} int $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:2356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2378,12 +2367,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2382: checking for off_t" >&5 +echo "configure:2371: 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 <<EOF -#line 2387 "configure" +#line 2376 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2411,12 +2400,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2415: checking for size_t" >&5 +echo "configure:2404: 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 <<EOF -#line 2420 "configure" +#line 2409 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2446,19 +2435,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:2450: checking for working alloca.h" >&5 +echo "configure:2439: 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 <<EOF -#line 2455 "configure" +#line 2444 "configure" #include "confdefs.h" #include <alloca.h> int main() { -char *p = alloca(2 * sizeof(int)); +void *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2451: \"$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 @@ -2479,12 +2468,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2483: checking for alloca" >&5 +echo "configure:2472: 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 <<EOF -#line 2488 "configure" +#line 2477 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -2512,7 +2501,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:2516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2505: \"$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 @@ -2544,12 +2533,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2548: checking whether alloca needs Cray hooks" >&5 +echo "configure:2537: 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 <<EOF -#line 2553 "configure" +#line 2542 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -2574,12 +2563,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&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:2578: checking for $ac_func" >&5 +echo "configure:2567: 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 <<EOF -#line 2583 "configure" +#line 2572 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2602,7 +2591,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2595: \"$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 @@ -2629,7 +2618,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2633: checking stack direction for C alloca" >&5 +echo "configure:2622: 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 @@ -2637,7 +2626,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 2641 "configure" +#line 2630 "configure" #include "confdefs.h" find_stack_direction () { @@ -2656,7 +2645,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:2660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2649: \"$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 @@ -2681,17 +2670,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:2685: checking for $ac_hdr" >&5 +echo "configure:2674: 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 -#line 2690 "configure" +#line 2679 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2684: \"$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* @@ -2720,12 +2709,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2724: checking for $ac_func" >&5 +echo "configure:2713: 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 <<EOF -#line 2729 "configure" +#line 2718 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2748,7 +2737,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2741: \"$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 @@ -2773,7 +2762,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2777: checking for working mmap" >&5 +echo "configure:2766: 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 @@ -2781,7 +2770,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 2785 "configure" +#line 2774 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -2808,12 +2797,15 @@ else #include <sys/types.h> #include <fcntl.h> #include <sys/mman.h> +#include <stdlib.h> +#include <sys/stat.h> + +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif /* This mess was copied from the GNU getpagesize.h. */ #ifndef HAVE_GETPAGESIZE -# ifdef HAVE_UNISTD_H -# include <unistd.h> -# endif /* Assume that all systems that can run configure have sys/param.h. */ # ifndef HAVE_SYS_PARAM_H @@ -2868,7 +2860,7 @@ main() /* * First, make a file with some known garbage in it. */ - data = malloc(pagesize); + data = (char*)malloc(pagesize); if (!data) exit(1); for (i = 0; i < pagesize; ++i) @@ -2889,7 +2881,7 @@ main() fd = open("conftestmmap", O_RDWR); if (fd < 0) exit(1); - data2 = malloc(2 * pagesize); + data2 = (char*)malloc(2 * pagesize); if (!data2) exit(1); data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); @@ -2907,7 +2899,7 @@ main() */ for (i = 0; i < pagesize; ++i) *(data2 + i) = *(data2 + i) + 1; - data3 = malloc(pagesize); + data3 = (char*)malloc(pagesize); if (!data3) exit(1); if (read(fd, data3, pagesize) != pagesize) @@ -2921,7 +2913,7 @@ main() } EOF -if { (eval echo configure:2925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2917: \"$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 @@ -2949,17 +2941,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:2953: checking for $ac_hdr" >&5 +echo "configure:2945: 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 -#line 2958 "configure" +#line 2950 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2955: \"$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* @@ -2989,12 +2981,12 @@ done __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2993: checking for $ac_func" >&5 +echo "configure:2985: 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 <<EOF -#line 2998 "configure" +#line 2990 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3017,7 +3009,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3013: \"$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 @@ -3046,12 +3038,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3050: checking for $ac_func" >&5 +echo "configure:3042: 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 <<EOF -#line 3055 "configure" +#line 3047 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3074,7 +3066,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3070: \"$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 @@ -3108,19 +3100,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3112: checking for LC_MESSAGES" >&5 +echo "configure:3104: 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 <<EOF -#line 3117 "configure" +#line 3109 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:3124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3116: \"$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 @@ -3141,7 +3133,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3145: checking whether NLS is requested" >&5 +echo "configure:3137: 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" @@ -3161,7 +3153,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3165: checking whether included gettext is requested" >&5 +echo "configure:3157: 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" @@ -3180,17 +3172,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3184: checking for libintl.h" >&5 +echo "configure:3176: 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 -#line 3189 "configure" +#line 3181 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3186: \"$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* @@ -3207,19 +3199,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:3211: checking for gettext in libc" >&5 +echo "configure:3203: 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 <<EOF -#line 3216 "configure" +#line 3208 "configure" #include "confdefs.h" #include <libintl.h> int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:3223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3215: \"$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 @@ -3235,7 +3227,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3239: checking for bindtextdomain in -lintl" >&5 +echo "configure:3231: 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 @@ -3243,7 +3235,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3247 "configure" +#line 3239 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3254,7 +3246,7 @@ int main() { bindtextdomain() ; return 0; } EOF -if { (eval echo configure:3258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3250: \"$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 @@ -3270,19 +3262,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:3274: checking for gettext in libintl" >&5 +echo "configure:3266: 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 <<EOF -#line 3279 "configure" +#line 3271 "configure" #include "confdefs.h" int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:3286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3278: \"$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 @@ -3310,7 +3302,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:3314: checking for $ac_word" >&5 +echo "configure:3306: 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 @@ -3344,12 +3336,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3348: checking for $ac_func" >&5 +echo "configure:3340: 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 <<EOF -#line 3353 "configure" +#line 3345 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3372,7 +3364,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3368: \"$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 @@ -3399,7 +3391,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:3403: checking for $ac_word" >&5 +echo "configure:3395: 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 @@ -3435,7 +3427,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:3439: checking for $ac_word" >&5 +echo "configure:3431: 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 @@ -3467,7 +3459,7 @@ else fi cat > conftest.$ac_ext <<EOF -#line 3471 "configure" +#line 3463 "configure" #include "confdefs.h" int main() { @@ -3475,7 +3467,7 @@ extern int _nl_msg_cat_cntr; return _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -3507,7 +3499,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:3511: checking for $ac_word" >&5 +echo "configure:3503: 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 @@ -3541,7 +3533,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:3545: checking for $ac_word" >&5 +echo "configure:3537: 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 @@ -3577,7 +3569,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:3581: checking for $ac_word" >&5 +echo "configure:3573: 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 @@ -3667,7 +3659,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3671: checking for catalogs to be installed" >&5 +echo "configure:3663: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -3695,17 +3687,17 @@ echo "configure:3671: checking for catalogs to be installed" >&5 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:3699: checking for linux/version.h" >&5 +echo "configure:3691: 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 -#line 3704 "configure" +#line 3696 "configure" #include "confdefs.h" #include <linux/version.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3701: \"$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* @@ -3783,7 +3775,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:3787: checking for a BSD compatible install" >&5 +echo "configure:3779: 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 @@ -3866,7 +3858,7 @@ if test "x$cross_compiling" = "xno"; then EXEEXT_FOR_BUILD='$(EXEEXT)' else echo $ac_n "checking for build system executable suffix""... $ac_c" 1>&6 -echo "configure:3870: checking for build system executable suffix" >&5 +echo "configure:3862: checking for build system executable suffix" >&5 if eval "test \"`echo '$''{'bfd_cv_build_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3894,17 +3886,17 @@ for ac_hdr in stddef.h string.h strings.h stdlib.h time.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3898: checking for $ac_hdr" >&5 +echo "configure:3890: 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 -#line 3903 "configure" +#line 3895 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3900: \"$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* @@ -3934,17 +3926,17 @@ for ac_hdr in fcntl.h sys/file.h sys/time.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3938: checking for $ac_hdr" >&5 +echo "configure:3930: 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 -#line 3943 "configure" +#line 3935 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3940: \"$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* @@ -3971,12 +3963,12 @@ fi done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3975: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3967: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3980 "configure" +#line 3972 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -3985,7 +3977,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4010,12 +4002,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:4014: checking for $ac_hdr that defines DIR" >&5 +echo "configure:4006: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4019 "configure" +#line 4011 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -4023,7 +4015,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:4027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -4048,7 +4040,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:4052: checking for opendir in -ldir" >&5 +echo "configure:4044: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4056,7 +4048,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 4060 "configure" +#line 4052 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4067,7 +4059,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:4071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4063: \"$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 @@ -4089,7 +4081,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:4093: checking for opendir in -lx" >&5 +echo "configure:4085: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4097,7 +4089,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 4101 "configure" +#line 4093 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4108,7 +4100,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:4112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4104: \"$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 @@ -4133,12 +4125,12 @@ fi for ac_func in fcntl getpagesize setitimer sysconf fdopen getuid getgid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4137: checking for $ac_func" >&5 +echo "configure:4129: 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 <<EOF -#line 4142 "configure" +#line 4134 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4161,7 +4153,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4157: \"$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 @@ -4196,12 +4188,12 @@ EOF esac echo $ac_n "checking whether strstr must be declared""... $ac_c" 1>&6 -echo "configure:4200: checking whether strstr must be declared" >&5 +echo "configure:4192: checking whether strstr must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_strstr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4205 "configure" +#line 4197 "configure" #include "confdefs.h" #include <stdio.h> @@ -4222,7 +4214,7 @@ int main() { char *(*pfn) = (char *(*)) strstr ; return 0; } EOF -if { (eval echo configure:4226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_strstr=no else @@ -4243,12 +4235,12 @@ EOF fi echo $ac_n "checking whether malloc must be declared""... $ac_c" 1>&6 -echo "configure:4247: checking whether malloc must be declared" >&5 +echo "configure:4239: checking whether malloc must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4252 "configure" +#line 4244 "configure" #include "confdefs.h" #include <stdio.h> @@ -4269,7 +4261,7 @@ int main() { char *(*pfn) = (char *(*)) malloc ; return 0; } EOF -if { (eval echo configure:4273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_malloc=no else @@ -4290,12 +4282,12 @@ EOF fi echo $ac_n "checking whether realloc must be declared""... $ac_c" 1>&6 -echo "configure:4294: checking whether realloc must be declared" >&5 +echo "configure:4286: checking whether realloc must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_realloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4299 "configure" +#line 4291 "configure" #include "confdefs.h" #include <stdio.h> @@ -4316,7 +4308,7 @@ int main() { char *(*pfn) = (char *(*)) realloc ; return 0; } EOF -if { (eval echo configure:4320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_realloc=no else @@ -4337,12 +4329,12 @@ EOF fi echo $ac_n "checking whether free must be declared""... $ac_c" 1>&6 -echo "configure:4341: checking whether free must be declared" >&5 +echo "configure:4333: checking whether free must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4346 "configure" +#line 4338 "configure" #include "confdefs.h" #include <stdio.h> @@ -4363,7 +4355,7 @@ int main() { char *(*pfn) = (char *(*)) free ; return 0; } EOF -if { (eval echo configure:4367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_free=no else @@ -4384,12 +4376,12 @@ EOF fi echo $ac_n "checking whether getenv must be declared""... $ac_c" 1>&6 -echo "configure:4388: checking whether getenv must be declared" >&5 +echo "configure:4380: checking whether getenv must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_getenv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4393 "configure" +#line 4385 "configure" #include "confdefs.h" #include <stdio.h> @@ -4410,7 +4402,7 @@ int main() { char *(*pfn) = (char *(*)) getenv ; return 0; } EOF -if { (eval echo configure:4414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_getenv=no else @@ -4442,6 +4434,7 @@ if test "${target}" = "${host}"; then TRAD_HEADER='"hosts/alphalinux.h"' ;; alpha*-*-netbsd*) COREFILE=netbsd-core.lo ;; + alpha*-*-freebsd*) ;; alpha*-*-*) COREFILE=osf-core.lo ;; arm-*-riscix) COREFILE=trad-core.lo ;; hppa*-*-hpux*) COREFILE=hpux-core.lo ;; @@ -4616,17 +4609,17 @@ if test "${target}" = "${host}"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4620: checking for $ac_hdr" >&5 +echo "configure:4613: 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 -#line 4625 "configure" +#line 4618 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4623: \"$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* @@ -4654,19 +4647,19 @@ done if test "$ac_cv_header_sys_procfs_h" = yes; then echo $ac_n "checking for prstatus_t in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:4658: checking for prstatus_t in sys/procfs.h" >&5 +echo "configure:4651: checking for prstatus_t in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prstatus_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4663 "configure" +#line 4656 "configure" #include "confdefs.h" #include <sys/procfs.h> int main() { prstatus_t avar ; return 0; } EOF -if { (eval echo configure:4670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_prstatus_t=yes else @@ -4688,19 +4681,19 @@ EOF echo "$ac_t""$bfd_cv_have_sys_procfs_type_prstatus_t" 1>&6 echo $ac_n "checking for prstatus_t.pr_who in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:4692: checking for prstatus_t.pr_who in sys/procfs.h" >&5 +echo "configure:4685: checking for prstatus_t.pr_who in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4697 "configure" +#line 4690 "configure" #include "confdefs.h" #include <sys/procfs.h> int main() { prstatus_t avar; void* aref = (void*) &avar.pr_who ; return 0; } EOF -if { (eval echo configure:4704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who=yes else @@ -4722,19 +4715,19 @@ EOF echo "$ac_t""$bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who" 1>&6 echo $ac_n "checking for pstatus_t in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:4726: checking for pstatus_t in sys/procfs.h" >&5 +echo "configure:4719: checking for pstatus_t in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pstatus_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4731 "configure" +#line 4724 "configure" #include "confdefs.h" #include <sys/procfs.h> int main() { pstatus_t avar ; return 0; } EOF -if { (eval echo configure:4738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_pstatus_t=yes else @@ -4756,19 +4749,19 @@ EOF echo "$ac_t""$bfd_cv_have_sys_procfs_type_pstatus_t" 1>&6 echo $ac_n "checking for prpsinfo_t in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:4760: checking for prpsinfo_t in sys/procfs.h" >&5 +echo "configure:4753: checking for prpsinfo_t in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prpsinfo_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4765 "configure" +#line 4758 "configure" #include "confdefs.h" #include <sys/procfs.h> int main() { prpsinfo_t avar ; return 0; } EOF -if { (eval echo configure:4772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_prpsinfo_t=yes else @@ -4790,19 +4783,19 @@ EOF echo "$ac_t""$bfd_cv_have_sys_procfs_type_prpsinfo_t" 1>&6 echo $ac_n "checking for psinfo_t in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:4794: checking for psinfo_t in sys/procfs.h" >&5 +echo "configure:4787: checking for psinfo_t in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_psinfo_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4799 "configure" +#line 4792 "configure" #include "confdefs.h" #include <sys/procfs.h> int main() { psinfo_t avar ; return 0; } EOF -if { (eval echo configure:4806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_psinfo_t=yes else @@ -4824,19 +4817,19 @@ EOF echo "$ac_t""$bfd_cv_have_sys_procfs_type_psinfo_t" 1>&6 echo $ac_n "checking for lwpstatus_t in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:4828: checking for lwpstatus_t in sys/procfs.h" >&5 +echo "configure:4821: checking for lwpstatus_t in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_lwpstatus_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4833 "configure" +#line 4826 "configure" #include "confdefs.h" #include <sys/procfs.h> int main() { lwpstatus_t avar ; return 0; } EOF -if { (eval echo configure:4840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_lwpstatus_t=yes else @@ -4858,19 +4851,19 @@ EOF echo "$ac_t""$bfd_cv_have_sys_procfs_type_lwpstatus_t" 1>&6 echo $ac_n "checking for lwpstatus_t.pr_context in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:4862: checking for lwpstatus_t.pr_context in sys/procfs.h" >&5 +echo "configure:4855: checking for lwpstatus_t.pr_context in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4867 "configure" +#line 4860 "configure" #include "confdefs.h" #include <sys/procfs.h> int main() { lwpstatus_t avar; void* aref = (void*) &avar.pr_context ; return 0; } EOF -if { (eval echo configure:4874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context=yes else @@ -4892,19 +4885,19 @@ EOF echo "$ac_t""$bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context" 1>&6 echo $ac_n "checking for lwpstatus_t.pr_reg in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:4896: checking for lwpstatus_t.pr_reg in sys/procfs.h" >&5 +echo "configure:4889: checking for lwpstatus_t.pr_reg in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4901 "configure" +#line 4894 "configure" #include "confdefs.h" #include <sys/procfs.h> int main() { lwpstatus_t avar; void* aref = (void*) &avar.pr_reg ; return 0; } EOF -if { (eval echo configure:4908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg=yes else @@ -4926,19 +4919,19 @@ EOF echo "$ac_t""$bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg" 1>&6 echo $ac_n "checking for win32_pstatus_t in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:4930: checking for win32_pstatus_t in sys/procfs.h" >&5 +echo "configure:4923: checking for win32_pstatus_t in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_win32_pstatus_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4935 "configure" +#line 4928 "configure" #include "confdefs.h" #include <sys/procfs.h> int main() { win32_pstatus_t avar ; return 0; } EOF -if { (eval echo configure:4942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_win32_pstatus_t=yes else @@ -5298,17 +5291,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:5302: checking for $ac_hdr" >&5 +echo "configure:5295: 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 -#line 5307 "configure" +#line 5300 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5305: \"$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* @@ -5337,12 +5330,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5341: checking for $ac_func" >&5 +echo "configure:5334: 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 <<EOF -#line 5346 "configure" +#line 5339 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5365,7 +5358,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5362: \"$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 @@ -5390,7 +5383,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:5394: checking for working mmap" >&5 +echo "configure:5387: 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 @@ -5398,7 +5391,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 5402 "configure" +#line 5395 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -5425,12 +5418,15 @@ else #include <sys/types.h> #include <fcntl.h> #include <sys/mman.h> +#include <stdlib.h> +#include <sys/stat.h> + +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif /* This mess was copied from the GNU getpagesize.h. */ #ifndef HAVE_GETPAGESIZE -# ifdef HAVE_UNISTD_H -# include <unistd.h> -# endif /* Assume that all systems that can run configure have sys/param.h. */ # ifndef HAVE_SYS_PARAM_H @@ -5485,7 +5481,7 @@ main() /* * First, make a file with some known garbage in it. */ - data = malloc(pagesize); + data = (char*)malloc(pagesize); if (!data) exit(1); for (i = 0; i < pagesize; ++i) @@ -5506,7 +5502,7 @@ main() fd = open("conftestmmap", O_RDWR); if (fd < 0) exit(1); - data2 = malloc(2 * pagesize); + data2 = (char*)malloc(2 * pagesize); if (!data2) exit(1); data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); @@ -5524,7 +5520,7 @@ main() */ for (i = 0; i < pagesize; ++i) *(data2 + i) = *(data2 + i) + 1; - data3 = malloc(pagesize); + data3 = (char*)malloc(pagesize); if (!data3) exit(1); if (read(fd, data3, pagesize) != pagesize) @@ -5538,7 +5534,7 @@ main() } EOF -if { (eval echo configure:5542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5538: \"$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 @@ -5563,12 +5559,12 @@ fi for ac_func in madvise mprotect do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5567: checking for $ac_func" >&5 +echo "configure:5563: 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 <<EOF -#line 5572 "configure" +#line 5568 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5591,7 +5587,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5591: \"$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 --git a/contrib/binutils/bfd/configure.in b/contrib/binutils/bfd/configure.in index df2b613..1b48c25 100644 --- a/contrib/binutils/bfd/configure.in +++ b/contrib/binutils/bfd/configure.in @@ -7,7 +7,7 @@ AC_INIT(libbfd.c) AC_CANONICAL_SYSTEM AC_ISC_POSIX -AM_INIT_AUTOMAKE(bfd, 2.9.5) +AM_INIT_AUTOMAKE(bfd, 2.10) dnl These must be called before AM_PROG_LIBTOOL, because it may want dnl to call AC_CHECK_PROG. @@ -119,6 +119,7 @@ if test "${target}" = "${host}"; then TRAD_HEADER='"hosts/alphalinux.h"' ;; alpha*-*-netbsd*) COREFILE=netbsd-core.lo ;; + alpha*-*-freebsd*) ;; alpha*-*-*) COREFILE=osf-core.lo ;; arm-*-riscix) COREFILE=trad-core.lo ;; hppa*-*-hpux*) COREFILE=hpux-core.lo ;; diff --git a/contrib/binutils/bfd/doc/archures.texi b/contrib/binutils/bfd/doc/archures.texi index c555ea7..6ee20e9 100644 --- a/contrib/binutils/bfd/doc/archures.texi +++ b/contrib/binutils/bfd/doc/archures.texi @@ -45,6 +45,7 @@ enum bfd_architecture #define bfd_mach_m68030 5 #define bfd_mach_m68040 6 #define bfd_mach_m68060 7 +#define bfd_mach_cpu32 8 bfd_arch_vax, /* DEC Vax */ bfd_arch_i960, /* Intel 960 */ /* The order of the following is important. @@ -72,8 +73,9 @@ enum bfd_architecture #define bfd_mach_sparc_sparclite 3 #define bfd_mach_sparc_v8plus 4 #define bfd_mach_sparc_v8plusa 5 /* with ultrasparc add'ns */ -#define bfd_mach_sparc_v9 6 -#define bfd_mach_sparc_v9a 7 /* with ultrasparc add'ns */ +#define bfd_mach_sparc_sparclite_le 6 +#define bfd_mach_sparc_v9 7 +#define bfd_mach_sparc_v9a 8 /* with ultrasparc add'ns */ /* Nonzero if MACH has the v9 instruction set. */ #define bfd_mach_sparc_v9_p(mach) \ ((mach) >= bfd_mach_sparc_v8plus && (mach) <= bfd_mach_sparc_v9a) @@ -83,6 +85,7 @@ enum bfd_architecture #define bfd_mach_mips4000 4000 #define bfd_mach_mips4010 4010 #define bfd_mach_mips4100 4100 +#define bfd_mach_mips4111 4111 #define bfd_mach_mips4300 4300 #define bfd_mach_mips4400 4400 #define bfd_mach_mips4600 4600 @@ -95,9 +98,11 @@ enum bfd_architecture bfd_arch_i386, /* Intel 386 */ #define bfd_mach_i386_i386 0 #define bfd_mach_i386_i8086 1 +#define bfd_mach_i386_i386_intel_syntax 2 bfd_arch_we32k, /* AT&T WE32xxx */ bfd_arch_tahoe, /* CCI/Harris Tahoe */ bfd_arch_i860, /* Intel 860 */ + bfd_arch_i370, /* IBM 360/370 Mainframes */ bfd_arch_romp, /* IBM ROMP PC/RT */ bfd_arch_alliant, /* Alliant */ bfd_arch_convex, /* Convex */ @@ -111,34 +116,61 @@ enum bfd_architecture bfd_arch_rs6000, /* IBM RS/6000 */ bfd_arch_hppa, /* HP PA RISC */ bfd_arch_d10v, /* Mitsubishi D10V */ +#define bfd_mach_d10v 0 +#define bfd_mach_d10v_ts2 2 +#define bfd_mach_d10v_ts3 3 + bfd_arch_d30v, /* Mitsubishi D30V */ bfd_arch_z8k, /* Zilog Z8000 */ #define bfd_mach_z8001 1 #define bfd_mach_z8002 2 bfd_arch_h8500, /* Hitachi H8/500 */ bfd_arch_sh, /* Hitachi SH */ #define bfd_mach_sh 0 +#define bfd_mach_sh2 0x20 +#define bfd_mach_sh_dsp 0x2d #define bfd_mach_sh3 0x30 +#define bfd_mach_sh3_dsp 0x3d #define bfd_mach_sh3e 0x3e #define bfd_mach_sh4 0x40 bfd_arch_alpha, /* Dec Alpha */ +#define bfd_mach_alpha_ev4 0x10 +#define bfd_mach_alpha_ev5 0x20 +#define bfd_mach_alpha_ev6 0x30 bfd_arch_arm, /* Advanced Risc Machines ARM */ #define bfd_mach_arm_2 1 -#define bfd_mach_arm_2a 2 +#define bfd_mach_arm_2a 2 #define bfd_mach_arm_3 3 #define bfd_mach_arm_3M 4 -#define bfd_mach_arm_4 5 +#define bfd_mach_arm_4 5 #define bfd_mach_arm_4T 6 +#define bfd_mach_arm_5 7 +#define bfd_mach_arm_5T 8 bfd_arch_ns32k, /* National Semiconductors ns32000 */ bfd_arch_w65, /* WDC 65816 */ bfd_arch_tic30, /* Texas Instruments TMS320C30 */ + bfd_arch_tic80, /* TI TMS320c80 (MVP) */ bfd_arch_v850, /* NEC V850 */ #define bfd_mach_v850 0 +#define bfd_mach_v850e 'E' +#define bfd_mach_v850ea 'A' bfd_arch_arc, /* Argonaut RISC Core */ #define bfd_mach_arc_base 0 bfd_arch_m32r, /* Mitsubishi M32R/D */ #define bfd_mach_m32r 0 /* backwards compatibility */ +#define bfd_mach_m32rx 'x' bfd_arch_mn10200, /* Matsushita MN10200 */ bfd_arch_mn10300, /* Matsushita MN10300 */ +#define bfd_mach_mn10300 300 +#define bfd_mach_am33 330 + bfd_arch_fr30, +#define bfd_mach_fr30 0x46523330 + bfd_arch_mcore, + bfd_arch_pj, + bfd_arch_avr, /* Atmel AVR microcontrollers */ +#define bfd_mach_avr1 1 +#define bfd_mach_avr2 2 +#define bfd_mach_avr3 3 +#define bfd_mach_avr4 4 bfd_arch_last @}; @end example @@ -352,3 +384,26 @@ machine type. This routine is depreciated. +@findex bfd_octets_per_byte +@subsubsection @code{bfd_octets_per_byte} +@strong{Synopsis} +@example +unsigned int bfd_octets_per_byte(bfd *abfd); +@end example +@strong{Description}@* +Return the number of octets (8-bit quantities) per target byte +(minimum addressable unit). In most cases, this will be one, but some +DSP targets have 16, 32, or even 48 bits per byte. + +@findex bfd_arch_mach_octets_per_byte +@subsubsection @code{bfd_arch_mach_octets_per_byte} +@strong{Synopsis} +@example +unsigned int bfd_arch_mach_octets_per_byte(enum bfd_architecture arch, + unsigned long machine); +@end example +@strong{Description}@* +See bfd_octets_per_byte. +This routine is provided for those cases where a bfd * is not +available + diff --git a/contrib/binutils/bfd/doc/bfdt.texi b/contrib/binutils/bfd/doc/bfdt.texi index 6013d6a..98269fb 100644 --- a/contrib/binutils/bfd/doc/bfdt.texi +++ b/contrib/binutils/bfd/doc/bfdt.texi @@ -144,6 +144,7 @@ struct _bfd struct nlm_obj_tdata *nlm_obj_data; struct bout_data_struct *bout_data; struct sun_core_struct *sun_core_data; + struct sco5_core_struct *sco5_core_data; struct trad_core_struct *trad_core_data; struct som_data_struct *som_data; struct hpux_core_struct *hpux_core_data; @@ -561,6 +562,9 @@ Stuff which should be documented: #define bfd_relax_section(abfd, section, link_info, again) \ BFD_SEND (abfd, _bfd_relax_section, (abfd, section, link_info, again)) +#define bfd_gc_sections(abfd, link_info) \ + BFD_SEND (abfd, _bfd_gc_sections, (abfd, link_info)) + #define bfd_link_hash_table_create(abfd) \ BFD_SEND (abfd, _bfd_link_hash_table_create, (abfd)) diff --git a/contrib/binutils/bfd/doc/coffcode.texi b/contrib/binutils/bfd/doc/coffcode.texi index d3bcfa0..fcb7e75 100644 --- a/contrib/binutils/bfd/doc/coffcode.texi +++ b/contrib/binutils/bfd/doc/coffcode.texi @@ -96,7 +96,7 @@ coff which has a varying field size not catered to at the moment. To port BFD, that person will have to add more @code{#defines}. Three of the bit twiddling routines are exported to @code{gdb}; @code{coff_swap_aux_in}, @code{coff_swap_sym_in} -and @code{coff_swap_linno_in}. @code{GDB} reads the symbol +and @code{coff_swap_lineno_in}. @code{GDB} reads the symbol table on its own, but uses BFD to fix things up. More of the bit twiddlers are exported for @code{gas}; @code{coff_swap_aux_out}, @code{coff_swap_sym_out}, @@ -266,6 +266,25 @@ boolean done_lineno; @end example @findex bfd_coff_backend_data @subsubsection @code{bfd_coff_backend_data} + +@example +/* COFF symbol classifications. */ + +enum coff_symbol_classification +@{ + /* Global symbol. */ + COFF_SYMBOL_GLOBAL, + /* Common symbol. */ + COFF_SYMBOL_COMMON, + /* Undefined symbol. */ + COFF_SYMBOL_UNDEFINED, + /* Local symbol. */ + COFF_SYMBOL_LOCAL, + /* PE section symbol. */ + COFF_SYMBOL_PE_SECTION +@}; + +@end example Special entry points for gdb to swap in coff symbol table parts: @example typedef struct @@ -342,6 +361,7 @@ dependent COFF routines: unsigned int _bfd_auxesz; unsigned int _bfd_relsz; unsigned int _bfd_linesz; + unsigned int _bfd_filnmlen; boolean _bfd_coff_long_filenames; boolean _bfd_coff_long_section_names; unsigned int _bfd_coff_default_section_alignment_power; @@ -374,7 +394,8 @@ dependent COFF routines: flagword (*_bfd_styp_to_sec_flags_hook) PARAMS (( bfd *abfd, PTR internal_scnhdr, - const char *name)); + const char *name, + asection *section)); void (*_bfd_set_alignment_hook) PARAMS (( bfd *abfd, asection *sec, @@ -411,7 +432,7 @@ dependent COFF routines: arelent *r, unsigned int shrink, struct bfd_link_info *link_info)); - boolean (*_bfd_coff_sym_is_global) PARAMS (( + enum coff_symbol_classification (*_bfd_coff_classify_symbol) PARAMS (( bfd *abfd, struct internal_syment *)); boolean (*_bfd_coff_compute_section_file_positions) PARAMS (( @@ -455,7 +476,8 @@ dependent COFF routines: struct bfd_link_hash_entry **hashp)); boolean (*_bfd_coff_link_output_has_begun) PARAMS (( - bfd * abfd )); + bfd * abfd, + struct coff_final_link_info * pfinfo)); boolean (*_bfd_coff_final_link_postscript) PARAMS (( bfd * abfd, struct coff_final_link_info * pfinfo)); @@ -501,6 +523,7 @@ dependent COFF routines: #define bfd_coff_auxesz(abfd) (coff_backend_info (abfd)->_bfd_auxesz) #define bfd_coff_relsz(abfd) (coff_backend_info (abfd)->_bfd_relsz) #define bfd_coff_linesz(abfd) (coff_backend_info (abfd)->_bfd_linesz) +#define bfd_coff_filnmlen(abfd) (coff_backend_info (abfd)->_bfd_filnmlen) #define bfd_coff_long_filenames(abfd) (coff_backend_info (abfd)->_bfd_coff_long_filenames) #define bfd_coff_long_section_names(abfd) \ (coff_backend_info (abfd)->_bfd_coff_long_section_names) @@ -526,8 +549,9 @@ dependent COFF routines: #define bfd_coff_mkobject_hook(abfd, filehdr, aouthdr)\ ((coff_backend_info (abfd)->_bfd_coff_mkobject_hook) (abfd, filehdr, aouthdr)) -#define bfd_coff_styp_to_sec_flags_hook(abfd, scnhdr, name)\ - ((coff_backend_info (abfd)->_bfd_styp_to_sec_flags_hook) (abfd, scnhdr, name)) +#define bfd_coff_styp_to_sec_flags_hook(abfd, scnhdr, name, section)\ + ((coff_backend_info (abfd)->_bfd_styp_to_sec_flags_hook)\ + (abfd, scnhdr, name, section)) #define bfd_coff_set_alignment_hook(abfd, sec, scnhdr)\ ((coff_backend_info (abfd)->_bfd_set_alignment_hook) (abfd, sec, scnhdr)) @@ -550,8 +574,8 @@ dependent COFF routines: ((coff_backend_info (abfd)->_bfd_coff_reloc16_estimate)\ (abfd, section, reloc, shrink, link_info)) -#define bfd_coff_sym_is_global(abfd, sym)\ - ((coff_backend_info (abfd)->_bfd_coff_sym_is_global)\ +#define bfd_coff_classify_symbol(abfd, sym)\ + ((coff_backend_info (abfd)->_bfd_coff_classify_symbol)\ (abfd, sym)) #define bfd_coff_compute_section_file_positions(abfd)\ @@ -574,8 +598,8 @@ dependent COFF routines: ((coff_backend_info (abfd)->_bfd_coff_link_add_one_symbol)\ (info, abfd, name, flags, section, value, string, cp, coll, hashp)) -#define bfd_coff_link_output_has_begun(a) \ - ((coff_backend_info (a)->_bfd_coff_link_output_has_begun) (a)) +#define bfd_coff_link_output_has_begun(a,p) \ + ((coff_backend_info (a)->_bfd_coff_link_output_has_begun) (a,p)) #define bfd_coff_final_link_postscript(a,p) \ ((coff_backend_info (a)->_bfd_coff_final_link_postscript) (a,p)) @@ -601,6 +625,9 @@ function is an offset from the first line in the function. The base of the line number information for the table is stored in the symbol associated with the function. +Note: The PE format uses line number 0 for a flag indicating a +new source file. + The information is copied from the external to the internal table, and each symbol which marks a function is marked by pointing its... diff --git a/contrib/binutils/bfd/doc/hash.texi b/contrib/binutils/bfd/doc/hash.texi index 45d63e0..7ddc900 100644 --- a/contrib/binutils/bfd/doc/hash.texi +++ b/contrib/binutils/bfd/doc/hash.texi @@ -42,7 +42,7 @@ error occurs. The function @code{bfd_hash_table_init} take as an argument a function to use to create new entries. For a basic hash table, use the function @code{bfd_hash_newfunc}. @xref{Deriving -a New Hash Table Type} for why you would want to use a +a New Hash Table Type}, for why you would want to use a different value for this argument. @findex bfd_hash_allocate diff --git a/contrib/binutils/bfd/doc/libbfd.texi b/contrib/binutils/bfd/doc/libbfd.texi index 6bee5b5..d202dc2 100644 --- a/contrib/binutils/bfd/doc/libbfd.texi +++ b/contrib/binutils/bfd/doc/libbfd.texi @@ -43,7 +43,7 @@ To detect calling these with less than a @code{bfd_vma}, use /* Byte swapping macros for user section data. */ #define bfd_put_8(abfd, val, ptr) \ - (*((unsigned char *)(ptr)) = (unsigned char)(val)) + ((void) (*((unsigned char *)(ptr)) = (unsigned char)(val))) #define bfd_put_signed_8 \ bfd_put_8 #define bfd_get_8(abfd, ptr) \ @@ -78,6 +78,20 @@ To detect calling these with less than a @code{bfd_vma}, use #define bfd_get_signed_64(abfd, ptr) \ BFD_SEND(abfd, bfd_getx_signed_64, (ptr)) +#define bfd_get(bits, abfd, ptr) \ + ((bits) == 8 ? bfd_get_8 (abfd, ptr) \ + : (bits) == 16 ? bfd_get_16 (abfd, ptr) \ + : (bits) == 32 ? bfd_get_32 (abfd, ptr) \ + : (bits) == 64 ? bfd_get_64 (abfd, ptr) \ + : (abort (), (bfd_vma) - 1)) + +#define bfd_put(bits, abfd, val, ptr) \ + ((bits) == 8 ? bfd_put_8 (abfd, val, ptr) \ + : (bits) == 16 ? bfd_put_16 (abfd, val, ptr) \ + : (bits) == 32 ? bfd_put_32 (abfd, val, ptr) \ + : (bits) == 64 ? bfd_put_64 (abfd, val, ptr) \ + : (abort (), (void) 0)) + @end example @findex bfd_h_put_size diff --git a/contrib/binutils/bfd/doc/linker.texi b/contrib/binutils/bfd/doc/linker.texi index 0de907d..b618156 100644 --- a/contrib/binutils/bfd/doc/linker.texi +++ b/contrib/binutils/bfd/doc/linker.texi @@ -42,7 +42,7 @@ routines are used as examples throughout this section. @cindex target vector (_bfd_link_hash_table_create) The linker routines must create a hash table, which must be derived from @code{struct bfd_link_hash_table} described in -@code{bfdlink.c}. @xref{Hash Tables} for information on how to +@code{bfdlink.c}. @xref{Hash Tables}, for information on how to create a derived hash table. This entry point is called using the target vector of the linker output file. diff --git a/contrib/binutils/bfd/doc/opncls.texi b/contrib/binutils/bfd/doc/opncls.texi index 4fbb0a7..fcea49b 100644 --- a/contrib/binutils/bfd/doc/opncls.texi +++ b/contrib/binutils/bfd/doc/opncls.texi @@ -116,6 +116,37 @@ Create a new BFD in the manner of takes the target from the target used by @var{template}. The format is always set to @code{bfd_object}. +@findex bfd_make_writable +@subsubsection @code{bfd_make_writable} +@strong{Synopsis} +@example +boolean bfd_make_writable(bfd *abfd); +@end example +@strong{Description}@* +Takes a BFD as created by @code{bfd_create} and converts it +into one like as returned by @code{bfd_openw}. It does this +by converting the BFD to BFD_IN_MEMORY. It's assumed that +you will call @code{bfd_make_readable} on this bfd later. + +@strong{Returns}@* +@code{true} is returned if all is ok, otherwise @code{false}. + +@findex bfd_make_readable +@subsubsection @code{bfd_make_readable} +@strong{Synopsis} +@example +boolean bfd_make_readable(bfd *abfd); +@end example +@strong{Description}@* +Takes a BFD as created by @code{bfd_create} and +@code{bfd_make_writable} and converts it into one like as +returned by @code{bfd_openr}. It does this by writing the +contents out to the memory buffer, then reversing the +direction. + +@strong{Returns}@* +@code{true} is returned if all is ok, otherwise @code{false}. + @findex bfd_alloc @subsubsection @code{bfd_alloc} @strong{Synopsis} diff --git a/contrib/binutils/bfd/doc/reloc.texi b/contrib/binutils/bfd/doc/reloc.texi index fc4970d..89811d8 100644 --- a/contrib/binutils/bfd/doc/reloc.texi +++ b/contrib/binutils/bfd/doc/reloc.texi @@ -1,7 +1,7 @@ @section Relocations BFD maintains relocations in much the same way it maintains symbols: they are left alone until required, then read in -en-mass and translated into an internal form. A common +en-masse and translated into an internal form. A common routine @code{bfd_perform_relocation} acts upon the canonical form to do the fixup. @@ -307,13 +307,26 @@ struct reloc_howto_struct /* The textual name of the relocation type. */ char *name; - /* When performing a partial link, some formats must modify the - relocations rather than the data - this flag signals this.*/ + /* Some formats record a relocation addend in the section contents + rather than with the relocation. For ELF formats this is the + distinction between USE_REL and USE_RELA (though the code checks + for USE_REL == 1/0). The value of this field is TRUE if the + addend is recorded with the section contents; when performing a + partial link (ld -r) the section contents (the data) will be + modified. The value of this field is FALSE if addends are + recorded with the relocation (in arelent.addend); when performing + a partial link the relocation will be modified. + All relocations for all ELF USE_RELA targets should set this field + to FALSE (values of TRUE should be looked on with suspicion). + However, the converse is not true: not all relocations of all ELF + USE_REL targets set this field to TRUE. Why this is so is peculiar + to each particular target. For relocs that aren't used in partial + links (e.g. GOT stuff) it doesn't matter what this is set to. */ boolean partial_inplace; /* The src_mask selects which parts of the read in data are to be used in the relocation sum. E.g., if this was an 8 bit - bit of data which we read and relocated, this would be + byte of data which we read and relocated, this would be 0x000000ff. When we have relocs which have an addend, such as sun4 extended relocs, the value in the offset part of a relocating field is garbage so we never use it. In this case @@ -354,6 +367,14 @@ moment, we are compatible, so do it this way. @end example @strong{Description}@* +This is used to fill in an empty howto entry in an array. +@example +#define EMPTY_HOWTO(C) \ + HOWTO((C),0,0,0,false,0,complain_overflow_dont,NULL,NULL,false,0,0,false) + +@end example + +@strong{Description}@* Helper routine to turn a symbol into a relocation value. @example #define HOWTO_PREPARE(relocation, symbol) \ @@ -399,13 +420,15 @@ bfd_check_overflow (enum complain_overflow how, unsigned int bitsize, unsigned int rightshift, + unsigned int addrsize, bfd_vma relocation); @end example @strong{Description}@* -Perform overflow checking on @var{relocation} which has @var{bitsize} -significant bits and will be shifted right by @var{rightshift} bits. -The result is either of @code{bfd_reloc_ok} or -@code{bfd_reloc_overflow}. +Perform overflow checking on @var{relocation} which has +@var{bitsize} significant bits and will be shifted right by +@var{rightshift} bits, on a machine with addresses containing +@var{addrsize} significant bits. The result is either of +@code{bfd_reloc_ok} or @code{bfd_reloc_overflow}. @findex bfd_perform_relocation @subsubsection @code{bfd_perform_relocation} @@ -609,6 +632,9 @@ I think these are specific to SPARC a.out (e.g., Sun 4). @deffnx {} BFD_RELOC_SPARC_REGISTER SPARC64 relocations @end deffn +@deffn {} BFD_RELOC_SPARC_REV32 +SPARC little endian relocation +@end deffn @deffn {} BFD_RELOC_ALPHA_GPDISP_HI16 Alpha ECOFF and ELF relocations. Some of these treat the symbol or "addend" in some special way. @@ -657,6 +683,17 @@ of instruction using the register: The GNU linker currently doesn't do any of this optimizing. @end deffn +@deffn {} BFD_RELOC_ALPHA_USER_LITERAL +@deffnx {} BFD_RELOC_ALPHA_USER_LITUSE_BASE +@deffnx {} BFD_RELOC_ALPHA_USER_LITUSE_BYTOFF +@deffnx {} BFD_RELOC_ALPHA_USER_LITUSE_JSR +@deffnx {} BFD_RELOC_ALPHA_USER_GPDISP +@deffnx {} BFD_RELOC_ALPHA_USER_GPRELHIGH +@deffnx {} BFD_RELOC_ALPHA_USER_GPRELLOW +The BFD_RELOC_ALPHA_USER_* relocations are used by the assembler to +process the explicit !<reloc>!sequence relocations, and are mapped +into the normal relocations at the end of processing. +@end deffn @deffn {} BFD_RELOC_ALPHA_HINT The HINT relocation indicates a value that should be filled into the "hint" field of a jmp/jsr/ret instruction, for possible branch- @@ -711,6 +748,10 @@ Relocation against a MIPS literal section. @deffnx {} BFD_RELOC_MIPS_GOT_LO16 @deffnx {} BFD_RELOC_MIPS_CALL_HI16 @deffnx {} BFD_RELOC_MIPS_CALL_LO16 +@deffnx {} BFD_RELOC_MIPS_SUB +@deffnx {} BFD_RELOC_MIPS_GOT_PAGE +@deffnx {} BFD_RELOC_MIPS_GOT_OFST +@deffnx {} BFD_RELOC_MIPS_GOT_DISP MIPS ELF relocations. @end deffn @deffn {} BFD_RELOC_386_GOT32 @@ -737,6 +778,14 @@ i386/elf relocations @deffnx {} BFD_RELOC_NS32K_DISP_32_PCREL ns32k relocations @end deffn +@deffn {} BFD_RELOC_PJ_CODE_HI16 +@deffnx {} BFD_RELOC_PJ_CODE_LO16 +@deffnx {} BFD_RELOC_PJ_CODE_DIR16 +@deffnx {} BFD_RELOC_PJ_CODE_DIR32 +@deffnx {} BFD_RELOC_PJ_CODE_REL16 +@deffnx {} BFD_RELOC_PJ_CODE_REL32 +Picojava relocs. Not all of these appear in object files. +@end deffn @deffn {} BFD_RELOC_PPC_B26 @deffnx {} BFD_RELOC_PPC_BA26 @deffnx {} BFD_RELOC_PPC_TOC16 @@ -769,6 +818,9 @@ ns32k relocations @deffnx {} BFD_RELOC_PPC_EMB_RELSDA Power(rs6000) and PowerPC relocations. @end deffn +@deffn {} BFD_RELOC_I370_D12 +IBM 370/390 relocations +@end deffn @deffn {} BFD_RELOC_CTOR The type of reloc used to build a contructor table - at the moment probably a 32 bit wide absolute relocation, but the target can choose. @@ -779,6 +831,7 @@ ARM 26 bit pc-relative branch. The lowest two bits must be zero and are not stored in the instruction. @end deffn @deffn {} BFD_RELOC_ARM_IMMEDIATE +@deffnx {} BFD_RELOC_ARM_ADRL_IMMEDIATE @deffnx {} BFD_RELOC_ARM_OFFSET_IMM @deffnx {} BFD_RELOC_ARM_SHIFT_IMM @deffnx {} BFD_RELOC_ARM_SWI @@ -794,6 +847,15 @@ not stored in the instruction. @deffnx {} BFD_RELOC_ARM_THUMB_IMM @deffnx {} BFD_RELOC_ARM_THUMB_SHIFT @deffnx {} BFD_RELOC_ARM_THUMB_OFFSET +@deffnx {} BFD_RELOC_ARM_GOT12 +@deffnx {} BFD_RELOC_ARM_GOT32 +@deffnx {} BFD_RELOC_ARM_JUMP_SLOT +@deffnx {} BFD_RELOC_ARM_COPY +@deffnx {} BFD_RELOC_ARM_GLOB_DAT +@deffnx {} BFD_RELOC_ARM_PLT32 +@deffnx {} BFD_RELOC_ARM_RELATIVE +@deffnx {} BFD_RELOC_ARM_GOTOFF +@deffnx {} BFD_RELOC_ARM_GOTPC These relocs are only used within the ARM assembler. They are not (at present) written to any object files. @end deffn @@ -854,6 +916,54 @@ assumed to be 0. This is an 18-bit reloc with the right 2 bits assumed to be 0. @end deffn +@deffn {} BFD_RELOC_D30V_6 +Mitsubishi D30V relocs. +This is a 6-bit absolute reloc. +@end deffn +@deffn {} BFD_RELOC_D30V_9_PCREL +This is a 6-bit pc-relative reloc with +the right 3 bits assumed to be 0. +@end deffn +@deffn {} BFD_RELOC_D30V_9_PCREL_R +This is a 6-bit pc-relative reloc with +the right 3 bits assumed to be 0. Same +as the previous reloc but on the right side +of the container. +@end deffn +@deffn {} BFD_RELOC_D30V_15 +This is a 12-bit absolute reloc with the +right 3 bitsassumed to be 0. +@end deffn +@deffn {} BFD_RELOC_D30V_15_PCREL +This is a 12-bit pc-relative reloc with +the right 3 bits assumed to be 0. +@end deffn +@deffn {} BFD_RELOC_D30V_15_PCREL_R +This is a 12-bit pc-relative reloc with +the right 3 bits assumed to be 0. Same +as the previous reloc but on the right side +of the container. +@end deffn +@deffn {} BFD_RELOC_D30V_21 +This is an 18-bit absolute reloc with +the right 3 bits assumed to be 0. +@end deffn +@deffn {} BFD_RELOC_D30V_21_PCREL +This is an 18-bit pc-relative reloc with +the right 3 bits assumed to be 0. +@end deffn +@deffn {} BFD_RELOC_D30V_21_PCREL_R +This is an 18-bit pc-relative reloc with +the right 3 bits assumed to be 0. Same +as the previous reloc but on the right side +of the container. +@end deffn +@deffn {} BFD_RELOC_D30V_32 +This is a 32-bit absolute reloc. +@end deffn +@deffn {} BFD_RELOC_D30V_32_PCREL +This is a 32-bit pc-relative reloc. +@end deffn @deffn {} BFD_RELOC_M32R_24 Mitsubishi M32R relocs. This is a 24 bit absolute address. @@ -916,6 +1026,27 @@ This is a 7 bit offset from the tiny data area pointer. @deffn {} BFD_RELOC_V850_TDA_16_16_OFFSET This is a 16 bit offset from the tiny data area pointer. @end deffn +@deffn {} BFD_RELOC_V850_TDA_4_5_OFFSET +This is a 5 bit offset (of which only 4 bits are used) from the tiny +data area pointer. +@end deffn +@deffn {} BFD_RELOC_V850_TDA_4_4_OFFSET +This is a 4 bit offset from the tiny data area pointer. +@end deffn +@deffn {} BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET +This is a 16 bit offset from the short data area pointer, with the +bits placed non-contigously in the instruction. +@end deffn +@deffn {} BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET +This is a 16 bit offset from the zero data area pointer, with the +bits placed non-contigously in the instruction. +@end deffn +@deffn {} BFD_RELOC_V850_CALLT_6_7_OFFSET +This is a 6 bit offset from the call table base pointer. +@end deffn +@deffn {} BFD_RELOC_V850_CALLT_16_16_OFFSET +This is a 16 bit offset from the call table base pointer. +@end deffn @deffn {} BFD_RELOC_MN10300_32_PCREL This is a 32bit pcrel reloc for the mn10300, offset by two bytes in the instruction. @@ -929,6 +1060,133 @@ This is a 8bit DP reloc for the tms320c30, where the most significant 8 bits of a 24 bit word are placed into the least significant 8 bits of the opcode. @end deffn +@deffn {} BFD_RELOC_FR30_48 +This is a 48 bit reloc for the FR30 that stores 32 bits. +@end deffn +@deffn {} BFD_RELOC_FR30_20 +This is a 32 bit reloc for the FR30 that stores 20 bits split up into +two sections. +@end deffn +@deffn {} BFD_RELOC_FR30_6_IN_4 +This is a 16 bit reloc for the FR30 that stores a 6 bit word offset in +4 bits. +@end deffn +@deffn {} BFD_RELOC_FR30_8_IN_8 +This is a 16 bit reloc for the FR30 that stores an 8 bit byte offset +into 8 bits. +@end deffn +@deffn {} BFD_RELOC_FR30_9_IN_8 +This is a 16 bit reloc for the FR30 that stores a 9 bit short offset +into 8 bits. +@end deffn +@deffn {} BFD_RELOC_FR30_10_IN_8 +This is a 16 bit reloc for the FR30 that stores a 10 bit word offset +into 8 bits. +@end deffn +@deffn {} BFD_RELOC_FR30_9_PCREL +This is a 16 bit reloc for the FR30 that stores a 9 bit pc relative +short offset into 8 bits. +@end deffn +@deffn {} BFD_RELOC_FR30_12_PCREL +This is a 16 bit reloc for the FR30 that stores a 12 bit pc relative +short offset into 11 bits. +@end deffn +@deffn {} BFD_RELOC_MCORE_PCREL_IMM8BY4 +@deffnx {} BFD_RELOC_MCORE_PCREL_IMM11BY2 +@deffnx {} BFD_RELOC_MCORE_PCREL_IMM4BY2 +@deffnx {} BFD_RELOC_MCORE_PCREL_32 +@deffnx {} BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2 +@deffnx {} BFD_RELOC_MCORE_RVA +Motorola Mcore relocations. +@end deffn +@deffn {} BFD_RELOC_AVR_7_PCREL +This is a 16 bit reloc for the AVR that stores 8 bit pc relative +short offset into 7 bits. +@end deffn +@deffn {} BFD_RELOC_AVR_13_PCREL +This is a 16 bit reloc for the AVR that stores 13 bit pc relative +short offset into 12 bits. +@end deffn +@deffn {} BFD_RELOC_AVR_16_PM +This is a 16 bit reloc for the AVR that stores 17 bit value (usually +program memory address) into 16 bits. +@end deffn +@deffn {} BFD_RELOC_AVR_LO8_LDI +This is a 16 bit reloc for the AVR that stores 8 bit value (usually +data memory address) into 8 bit immediate value of LDI insn. +@end deffn +@deffn {} BFD_RELOC_AVR_HI8_LDI +This is a 16 bit reloc for the AVR that stores 8 bit value (high 8 bit +of data memory address) into 8 bit immediate value of LDI insn. +@end deffn +@deffn {} BFD_RELOC_AVR_HH8_LDI +This is a 16 bit reloc for the AVR that stores 8 bit value (most high 8 bit +of program memory address) into 8 bit immediate value of LDI insn. +@end deffn +@deffn {} BFD_RELOC_AVR_LO8_LDI_NEG +This is a 16 bit reloc for the AVR that stores negated 8 bit value +(usually data memory address) into 8 bit immediate value of SUBI insn. +@end deffn +@deffn {} BFD_RELOC_AVR_HI8_LDI_NEG +This is a 16 bit reloc for the AVR that stores negated 8 bit value +(high 8 bit of data memory address) into 8 bit immediate value of +SUBI insn. +@end deffn +@deffn {} BFD_RELOC_AVR_HH8_LDI_NEG +This is a 16 bit reloc for the AVR that stores negated 8 bit value +(most high 8 bit of program memory address) into 8 bit immediate value +of LDI or SUBI insn. +@end deffn +@deffn {} BFD_RELOC_AVR_LO8_LDI_PM +This is a 16 bit reloc for the AVR that stores 8 bit value (usually +command address) into 8 bit immediate value of LDI insn. +@end deffn +@deffn {} BFD_RELOC_AVR_HI8_LDI_PM +This is a 16 bit reloc for the AVR that stores 8 bit value (high 8 bit +of command address) into 8 bit immediate value of LDI insn. +@end deffn +@deffn {} BFD_RELOC_AVR_HH8_LDI_PM +This is a 16 bit reloc for the AVR that stores 8 bit value (most high 8 bit +of command address) into 8 bit immediate value of LDI insn. +@end deffn +@deffn {} BFD_RELOC_AVR_LO8_LDI_PM_NEG +This is a 16 bit reloc for the AVR that stores negated 8 bit value +(usually command address) into 8 bit immediate value of SUBI insn. +@end deffn +@deffn {} BFD_RELOC_AVR_HI8_LDI_PM_NEG +This is a 16 bit reloc for the AVR that stores negated 8 bit value +(high 8 bit of 16 bit command address) into 8 bit immediate value +of SUBI insn. +@end deffn +@deffn {} BFD_RELOC_AVR_HH8_LDI_PM_NEG +This is a 16 bit reloc for the AVR that stores negated 8 bit value +(high 6 bit of 22 bit command address) into 8 bit immediate +value of SUBI insn. +@end deffn +@deffn {} BFD_RELOC_AVR_CALL +This is a 32 bit reloc for the AVR that stores 23 bit value +into 22 bits. +@end deffn +@deffn {} BFD_RELOC_VTABLE_INHERIT +@deffnx {} BFD_RELOC_VTABLE_ENTRY +These two relocations are used by the linker to determine which of +the entries in a C++ virtual function table are actually used. When +the --gc-sections option is given, the linker will zero out the entries +that are not used, so that the code for those functions need not be +included in the output. + +VTABLE_INHERIT is a zero-space relocation used to describe to the +linker the inheritence tree of a C++ virtual function table. The +relocation's symbol should be the parent class' vtable, and the +relocation should be located at the child vtable. + +VTABLE_ENTRY is a zero-space relocation that describes the use of a +virtual function table entry. The reloc's symbol should refer to the +table of the class mentioned in the code. Off of that base, an offset +describes the entry that is being used. For Rela hosts, this offset +is stored in the reloc's addend. For Rel hosts, we are forced to put +this offset in the reloc's section offset. +@end deffn @example @@ -980,6 +1238,17 @@ boolean bfd_generic_relax_section Provides default handling for relaxing for back ends which don't do relaxing -- i.e., does nothing. +@findex bfd_generic_gc_sections +@subsubsection @code{bfd_generic_gc_sections} +@strong{Synopsis} +@example +boolean bfd_generic_gc_sections + (bfd *, struct bfd_link_info *); +@end example +@strong{Description}@* +Provides default handling for relaxing for back ends which +don't do section gc -- i.e., does nothing. + @findex bfd_generic_get_relocated_section_contents @subsubsection @code{bfd_generic_get_relocated_section_contents} @strong{Synopsis} diff --git a/contrib/binutils/bfd/doc/section.texi b/contrib/binutils/bfd/doc/section.texi index 24625c2..2569590 100644 --- a/contrib/binutils/bfd/doc/section.texi +++ b/contrib/binutils/bfd/doc/section.texi @@ -107,6 +107,27 @@ Here is the section structure: @example + /* This structure is used for a comdat section, as in PE. A comdat + section is associated with a particular symbol. When the linker + sees a comdat section, it keeps only one of the sections with a + given name and associated with a given symbol. */ + +struct bfd_comdat_info +@{ + /* The name of the symbol associated with a comdat section. */ + const char *name; + + /* The local symbol table index of the symbol associated with a + comdat section. This is only meaningful to the object file format + specific code; it is not an index into the list returned by + bfd_canonicalize_symtab. */ + long symbol; + + /* If this section is being discarded, the linker uses this field + to point to the input section which is being kept. */ + struct sec *sec; +@}; + typedef struct sec @{ /* The name of the section; the name isn't a copy, the pointer is @@ -172,7 +193,7 @@ typedef struct sec standard data. */ #define SEC_CONSTRUCTOR 0x100 - /* The section is a constuctor, and should be placed at the + /* The section is a constructor, and should be placed at the end of the text, data, or bss section(?). */ #define SEC_CONSTRUCTOR_TEXT 0x1100 #define SEC_CONSTRUCTOR_DATA 0x2100 @@ -261,6 +282,17 @@ typedef struct sec else up the line will take care of it later. */ #define SEC_LINKER_CREATED 0x800000 + /* This section should not be subject to garbage collection. */ +#define SEC_KEEP 0x1000000 + + /* This section contains "short" data, and should be placed + "near" the GP. */ +#define SEC_SMALL_DATA 0x2000000 + + /* This section contains data which may be shared with other + executables or shared objects. */ +#define SEC_SHARED 0x4000000 + /* End of section flags. */ /* Some internal packed boolean fields. */ @@ -274,6 +306,9 @@ typedef struct sec /* A mark flag used by some of the linker backends. */ unsigned int linker_mark : 1; + /* A mark flag used by some linker backends for garbage collection. */ + unsigned int gc_mark : 1; + /* End of internal packed boolean fields. */ /* The virtual memory address of the section - where it will be @@ -291,22 +326,25 @@ typedef struct sec bfd_vma lma; - /* The size of the section in bytes, as it will be output. - contains a value even if the section has no contents (e.g., the - size of @code{.bss}). This will be filled in after relocation */ + /* The size of the section in octets, as it will be output. + Contains a value even if the section has no contents (e.g., the + size of @code{.bss}). This will be filled in after relocation. */ bfd_size_type _cooked_size; - /* The original size on disk of the section, in bytes. Normally this + /* The original size on disk of the section, in octets. Normally this value is the same as the size, but if some relaxing has been done, then this value will be bigger. */ bfd_size_type _raw_size; /* If this section is going to be output, then this value is the - offset into the output section of the first byte in the input - section. E.g., if this was going to start at the 100th byte in - the output section, this value would be 100. */ + offset in *bytes* into the output section of the first byte in the + input section (byte ==> smallest addressable unit on the + target). In most cases, if this was going to start at the + 100th octet (8-bit quantity) in the output section, this value + would be 100. However, if the target byte size is 16 bits + (bfd_octets_per_byte is "2"), this value would be 50. */ bfd_vma output_offset; @@ -364,6 +402,10 @@ typedef struct sec unsigned int lineno_count; + /* Optional information about a COMDAT entry; NULL if not COMDAT */ + + struct bfd_comdat_info *comdat; + /* When a section is being output, this value changes as more linenumbers are written out */ @@ -423,9 +465,11 @@ extern const struct symbol_cache_entry * const bfd_com_symbol; extern const struct symbol_cache_entry * const bfd_und_symbol; extern const struct symbol_cache_entry * const bfd_ind_symbol; #define bfd_get_section_size_before_reloc(section) \ - (section->reloc_done ? (abort(),1): (section)->_raw_size) + ((section)->reloc_done ? (abort (), (bfd_size_type) 1) \ + : (section)->_raw_size) #define bfd_get_section_size_after_reloc(section) \ - ((section->reloc_done) ? (section)->_cooked_size: (abort(),1)) + ((section)->reloc_done ? (section)->_cooked_size \ + : (abort (), (bfd_size_type) 1)) @end example @node section prototypes, , typedef asection, Sections @@ -588,7 +632,7 @@ boolean bfd_set_section_contents Sets the contents of the section @var{section} in BFD @var{abfd} to the data starting in memory at @var{data}. The data is written to the output section starting at offset -@var{offset} for @var{count} bytes. +@var{offset} for @var{count} octets. Normally @code{true} is returned, else @code{false}. Possible error returns are: @@ -648,3 +692,16 @@ Not enough memory exists to create private data for @var{osec}. (ibfd, isection, obfd, osection)) @end example +@findex _bfd_strip_section_from_output +@subsubsection @code{_bfd_strip_section_from_output} +@strong{Synopsis} +@example +void _bfd_strip_section_from_output + (struct bfd_link_info *info, asection *section); +@end example +@strong{Description}@* +Remove @var{section} from the output. If the output section +becomes empty, remove it from the output bfd. @var{info} may +be NULL; if it is not, it is used to decide whether the output +section is empty. + diff --git a/contrib/binutils/bfd/doc/syms.texi b/contrib/binutils/bfd/doc/syms.texi index 48593f4..74c151b 100644 --- a/contrib/binutils/bfd/doc/syms.texi +++ b/contrib/binutils/bfd/doc/syms.texi @@ -183,7 +183,7 @@ typedef struct symbol_cache_entry @code{BSF_GLOBAL} */ /* The symbol is a debugging record. The value has an arbitary - meaning. */ + meaning, unless BSF_DEBUGGING_RELOC is also set. */ #define BSF_DEBUGGING 0x08 /* The symbol denotes a function entry point. Used in ELF, @@ -241,6 +241,11 @@ typedef struct symbol_cache_entry others someday. */ #define BSF_OBJECT 0x10000 + /* This symbol is a debugging symbol. The value is the offset + into the section of the data. BSF_DEBUGGING should be set + as well. */ +#define BSF_DEBUGGING_RELOC 0x20000 + flagword flags; /* A pointer to the section to which this symbol is @@ -371,6 +376,17 @@ class of @var{symbol}, or '?' for an unknown class. @example int bfd_decode_symclass(asymbol *symbol); @end example +@findex bfd_is_undefined_symclass +@subsubsection @code{bfd_is_undefined_symclass } +@strong{Description}@* +Returns non-zero if the class symbol returned by +bfd_decode_symclass represents an undefined symbol. +Returns zero otherwise. + +@strong{Synopsis} +@example +boolean bfd_is_undefined_symclass (int symclass); +@end example @findex bfd_symbol_info @subsubsection @code{bfd_symbol_info} @strong{Description}@* diff --git a/contrib/binutils/bfd/doc/targets.texi b/contrib/binutils/bfd/doc/targets.texi index ccaaf40..50086c4 100644 --- a/contrib/binutils/bfd/doc/targets.texi +++ b/contrib/binutils/bfd/doc/targets.texi @@ -127,6 +127,7 @@ enum bfd_flavour @{ bfd_target_os9k_flavour, bfd_target_versados_flavour, bfd_target_msdos_flavour, + bfd_target_ovax_flavour, bfd_target_evax_flavour @}; @@ -219,7 +220,8 @@ Write cached information into a file being written, at @code{bfd_close}. @example boolean (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *)); @end example -The general target vector. +The general target vector. These vectors are initialized using the +BFD_JUMP_TABLE macros. @example /* Generic entry points. */ @@ -388,7 +390,8 @@ CAT(NAME,_bfd_relax_section),\ CAT(NAME,_bfd_link_hash_table_create),\ CAT(NAME,_bfd_link_add_symbols),\ CAT(NAME,_bfd_final_link),\ -CAT(NAME,_bfd_link_split_section) +CAT(NAME,_bfd_link_split_section),\ +CAT(NAME,_bfd_gc_sections) int (*_bfd_sizeof_headers) PARAMS ((bfd *, boolean)); bfd_byte * (*_bfd_get_relocated_section_contents) PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, @@ -412,7 +415,10 @@ CAT(NAME,_bfd_link_split_section) /* Should this section be split up into smaller pieces during linking. */ boolean (*_bfd_link_split_section) PARAMS ((bfd *, struct sec *)); - /* Routines to handle dynamic symbols and relocs. */ + /* Remove sections that are not referenced from the output. */ + boolean (*_bfd_gc_sections) PARAMS ((bfd *, struct bfd_link_info *)); + + /* Routines to handle dynamic symbols and relocs. */ #define BFD_JUMP_TABLE_DYNAMIC(NAME)\ CAT(NAME,_get_dynamic_symtab_upper_bound),\ CAT(NAME,_canonicalize_dynamic_symtab),\ @@ -430,10 +436,21 @@ CAT(NAME,_canonicalize_dynamic_reloc) PARAMS ((bfd *, arelent **, struct symbol_cache_entry **)); @end example +A pointer to an alternative bfd_target in case the current one is not +satisfactory. This can happen when the target cpu supports both big +and little endian code, and target chosen by the linker has the wrong +endianness. The function open_output() in ld/ldlang.c uses this field +to find an alternative output format that is suitable. +@example + /* Opposite endian version of this target. */ + const struct bfd_target * alternative_target; + +@end example Data for use by back-end routines, which isn't generic enough to belong in this structure. @example PTR backend_data; + @} bfd_target; @end example @@ -476,3 +493,16 @@ Return a freshly malloced NULL-terminated vector of the names of all the valid BFD targets. Do not modify the names. +@findex bfd_seach_for_target +@subsubsection @code{bfd_seach_for_target} +@strong{Synopsis} +@example +const bfd_target * bfd_search_for_target (int (* search_func)(const bfd_target *, void *), void *); +@end example +@strong{Description}@* +Return a pointer to the first transfer vector in the list of +transfer vectors maintained by BFD that produces a non-zero +result when passed to the function @var{search_func}. The +parameter @var{data} is passed, unexamined, to the search +function. + diff --git a/contrib/binutils/bfd/elf.c b/contrib/binutils/bfd/elf.c index c210638..39b823b 100644 --- a/contrib/binutils/bfd/elf.c +++ b/contrib/binutils/bfd/elf.c @@ -977,6 +977,7 @@ _bfd_elf_link_hash_table_init (table, abfd, newfunc) table->needed = NULL; table->hgot = NULL; table->stab_info = NULL; + table->dynlocal = NULL; return _bfd_link_hash_table_init (&table->root, abfd, newfunc); } @@ -3206,7 +3207,7 @@ prep_headers (abfd) bfd_big_endian (abfd) ? ELFDATA2MSB : ELFDATA2LSB; i_ehdrp->e_ident[EI_VERSION] = bed->s->ev_current; - i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_SYSV; + i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_NONE; i_ehdrp->e_ident[EI_ABIVERSION] = 0; for (count = EI_PAD; count < EI_NIDENT; count++) diff --git a/contrib/binutils/bfd/opncls.c b/contrib/binutils/bfd/opncls.c index 8f10135..57ca0d0a2 100644 --- a/contrib/binutils/bfd/opncls.c +++ b/contrib/binutils/bfd/opncls.c @@ -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 --git a/contrib/binutils/bfd/ppcboot.c b/contrib/binutils/bfd/ppcboot.c index d9db826..9441848 100644 --- a/contrib/binutils/bfd/ppcboot.c +++ b/contrib/binutils/bfd/ppcboot.c @@ -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 --git a/contrib/binutils/bfd/sysdep.h b/contrib/binutils/bfd/sysdep.h index 0a58983..77b5e50a 100644 --- a/contrib/binutils/bfd/sysdep.h +++ b/contrib/binutils/bfd/sysdep.h @@ -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 @@ -131,14 +133,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 --git a/contrib/binutils/binutils/ChangeLog b/contrib/binutils/binutils/ChangeLog index f2e5ee4..074d4b4 100644 --- a/contrib/binutils/binutils/ChangeLog +++ b/contrib/binutils/binutils/ChangeLog @@ -1,3 +1,72 @@ +2000-05-30 Alan Modra <alan@linuxcare.com.au> + + * objdump.c (display_target_list): Use bfd_close_all_done, not + bfd_close to fix crash caused by 2000-05-24 change. + +2000-05-26 Eli Zaretskii <eliz@is.elta.co.il> + + * 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 <alan@linuxcare.com.au> + + * objdump.c (display_target_list): Close the bfd. + (display_info_table): Likewise. + +2000-05-23 Philip Blundell <pb@futuretv.com> + + * configure.in: Set version to 2.10. + * configure: Regenerate. + +2000-05-02 H.J. Lu <hjl@gnu.org> + + * readelf.c (get_osabi_name): Handle ELFOSABI_NONE instead of + ELFOSABI_SYSV. Also handle ELFOSABI_NETBSD, ELFOSABI_HURD, + ELFOSABI_SOLARIS, ELFOSABI_MONTEREY, ELFOSABI_IRIX, + ELFOSABI_FREEBSD, ELFOSABI_TRU64, ELFOSABI_MODESTO + and ELFOSABI_OPENBSD. + +2000-04-14 Michael Sokolov <msokolov@ivan.Harhan.ORG> + + * arlex.l: Add directives to increase lex buffer size. + + * objdump.c, readelf.c: Don't include strarg.h or varargs.h. They are + already included by bucomm.h. + 2000-04-10 Philippe De Muyter <phdm@macqel.be> * readelf (dynamic_segment_mips_val): Call `sprintf', not diff --git a/contrib/binutils/binutils/ar.c b/contrib/binutils/binutils/ar.c index 17388a4..d67f4b3 100644 --- a/contrib/binutils/binutils/ar.c +++ b/contrib/binutils/binutils/ar.c @@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "aout/ar.h" #include "libbfd.h" #include "arsup.h" +#include "filenames.h" #include <sys/stat.h> #ifdef __GO32___ @@ -215,7 +216,7 @@ map_over_members (arch, function, files, count) 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_to_append) 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, default_posname) 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, quick) /* 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 --git a/contrib/binutils/binutils/arlex.l b/contrib/binutils/binutils/arlex.l index 74e13d1..2fd94da 100644 --- a/contrib/binutils/binutils/arlex.l +++ b/contrib/binutils/binutils/arlex.l @@ -31,6 +31,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ int linenumber; %} + +%a 10000 +%o 25000 + %% "ADDLIB" { return ADDLIB; } diff --git a/contrib/binutils/binutils/arsup.c b/contrib/binutils/binutils/arsup.c index d6809fc..eebee99 100644 --- a/contrib/binutils/binutils/arsup.c +++ b/contrib/binutils/binutils/arsup.c @@ -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 LIST #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 --git a/contrib/binutils/binutils/bucomm.c b/contrib/binutils/binutils/bucomm.c index 3406e1d..76ffa60 100644 --- a/contrib/binutils/binutils/bucomm.c +++ b/contrib/binutils/binutils/bucomm.c @@ -25,6 +25,7 @@ #include "bfd.h" #include "libiberty.h" #include "bucomm.h" +#include "filenames.h" #include <sys/stat.h> #include <time.h> /* 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 --git a/contrib/binutils/binutils/config.in b/contrib/binutils/binutils/config.in index 3c26c5c..7b70d16 100644 --- a/contrib/binutils/binutils/config.in +++ b/contrib/binutils/binutils/config.in @@ -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 --git a/contrib/binutils/binutils/config.texi b/contrib/binutils/binutils/config.texi index d40699c..b696ac7 100644 --- a/contrib/binutils/binutils/config.texi +++ b/contrib/binutils/binutils/config.texi @@ -1 +1 @@ -@set VERSION 2.9.1 +@set VERSION 2.10 diff --git a/contrib/binutils/binutils/configure b/contrib/binutils/binutils/configure index 65f6612..e733ae7 100755 --- a/contrib/binutils/binutils/configure +++ b/contrib/binutils/binutils/configure @@ -814,7 +814,7 @@ fi PACKAGE=binutils -VERSION=2.9.5 +VERSION=2.10 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; } @@ -4300,7 +4300,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:4307: checking for $ac_func" >&5 diff --git a/contrib/binutils/binutils/configure.in b/contrib/binutils/binutils/configure.in index aa10ce9..9f724ec 100644 --- a/contrib/binutils/binutils/configure.in +++ b/contrib/binutils/binutils/configure.in @@ -5,7 +5,7 @@ AC_INIT(ar.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(binutils, 2.9.5) +AM_INIT_AUTOMAKE(binutils, 2.10) AM_PROG_LIBTOOL @@ -75,7 +75,7 @@ AC_SUBST(DEMANGLER_NAME) AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h fcntl.h sys/file.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 --git a/contrib/binutils/binutils/defparse.c b/contrib/binutils/binutils/defparse.c index 1212c6b..f36480f 100644 --- a/contrib/binutils/binutils/defparse.c +++ b/contrib/binutils/binutils/defparse.c @@ -1,35 +1,41 @@ -/* A Bison parser, made from /5g/ian/binutils/release/copy/binutils/defparse.y - by GNU Bison version 1.25 - */ +/* A Bison parser, made from defparse.y + by GNU Bison version 1.28 */ #define YYBISON 1 /* Identify Bison output. */ -#define NAME 258 -#define LIBRARY 259 -#define DESCRIPTION 260 -#define STACKSIZE 261 -#define HEAPSIZE 262 -#define CODE 263 -#define DATA 264 -#define SECTIONS 265 -#define EXPORTS 266 -#define IMPORTS 267 -#define VERSIONK 268 -#define BASE 269 -#define CONSTANT 270 -#define READ 271 -#define WRITE 272 -#define EXECUTE 273 -#define SHARED 274 +#define NAME 257 +#define LIBRARY 258 +#define DESCRIPTION 259 +#define STACKSIZE 260 +#define HEAPSIZE 261 +#define CODE 262 +#define DATA 263 +#define SECTIONS 264 +#define EXPORTS 265 +#define IMPORTS 266 +#define VERSIONK 267 +#define BASE 268 +#define CONSTANT 269 +#define READ 270 +#define WRITE 271 +#define EXECUTE 272 +#define SHARED 273 +#define NONSHARED 274 #define NONAME 275 -#define ID 276 -#define NUMBER 277 - -#line 1 "/5g/ian/binutils/release/copy/binutils/defparse.y" +#define SINGLE 276 +#define MULTIPLE 277 +#define INITINSTANCE 278 +#define INITGLOBAL 279 +#define TERMINSTANCE 280 +#define TERMGLOBAL 281 +#define ID 282 +#define NUMBER 283 + +#line 1 "defparse.y" /* defparse.y - parser for .def files */ -/* Copyright (C) 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -51,7 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "bucomm.h" #include "dlltool.h" -#line 26 "/5g/ian/binutils/release/copy/binutils/defparse.y" +#line 26 "defparse.y" typedef union { char *id; int number; @@ -66,20 +72,20 @@ typedef union { -#define YYFINAL 75 +#define YYFINAL 94 #define YYFLAG -32768 -#define YYNTBASE 27 +#define YYNTBASE 34 -#define YYTRANSLATE(x) ((unsigned)(x) <= 277 ? yytranslate[x] : 46) +#define YYTRANSLATE(x) ((unsigned)(x) <= 283 ? yytranslate[x] : 55) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 25, 2, 23, 2, 2, 2, 2, + 2, 2, 2, 32, 2, 30, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 24, 2, 2, 26, 2, 2, 2, 2, 2, 2, + 31, 2, 2, 33, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -98,45 +104,56 @@ static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22 + 2, 2, 2, 2, 2, 1, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, + 27, 28, 29 }; #if YYDEBUG != 0 static const short yyprhs[] = { 0, - 0, 3, 5, 9, 13, 16, 19, 23, 27, 30, - 33, 36, 39, 42, 47, 48, 50, 53, 60, 63, - 65, 71, 75, 78, 80, 83, 87, 89, 91, 92, - 95, 96, 98, 100, 102, 104, 106, 107, 109, 110, - 112, 113, 115, 116, 119, 120, 123, 124, 128 + 0, 3, 5, 9, 14, 17, 20, 24, 28, 31, + 34, 37, 40, 43, 48, 49, 52, 59, 62, 64, + 72, 80, 86, 92, 98, 104, 108, 112, 115, 117, + 120, 124, 126, 128, 129, 132, 133, 135, 137, 139, + 141, 143, 145, 147, 149, 150, 152, 153, 155, 156, + 158, 162, 163, 166, 167, 170, 171, 175, 176, 177, + 181, 183, 185, 187 }; -static const short yyrhs[] = { 27, - 28, 0, 28, 0, 3, 42, 45, 0, 4, 42, - 45, 0, 11, 29, 0, 5, 21, 0, 6, 22, - 37, 0, 7, 22, 37, 0, 8, 35, 0, 9, - 35, 0, 10, 33, 0, 12, 31, 0, 13, 22, - 0, 13, 22, 23, 22, 0, 0, 30, 0, 29, - 30, 0, 21, 44, 43, 40, 39, 41, 0, 31, - 32, 0, 32, 0, 21, 24, 21, 23, 21, 0, - 21, 23, 21, 0, 33, 34, 0, 34, 0, 21, - 35, 0, 35, 36, 38, 0, 38, 0, 25, 0, - 0, 25, 22, 0, 0, 16, 0, 17, 0, 18, - 0, 19, 0, 15, 0, 0, 20, 0, 0, 9, - 0, 0, 21, 0, 0, 26, 22, 0, 0, 24, - 21, 0, 0, 14, 24, 22, 0, 0 +static const short yyrhs[] = { 34, + 35, 0, 35, 0, 3, 49, 52, 0, 4, 49, + 52, 53, 0, 11, 36, 0, 5, 28, 0, 6, + 29, 44, 0, 7, 29, 44, 0, 8, 42, 0, + 9, 42, 0, 10, 40, 0, 12, 38, 0, 13, + 29, 0, 13, 29, 30, 29, 0, 0, 36, 37, + 0, 28, 51, 50, 47, 46, 48, 0, 38, 39, + 0, 39, 0, 28, 31, 28, 30, 28, 30, 28, + 0, 28, 31, 28, 30, 28, 30, 29, 0, 28, + 31, 28, 30, 28, 0, 28, 31, 28, 30, 29, + 0, 28, 30, 28, 30, 28, 0, 28, 30, 28, + 30, 29, 0, 28, 30, 28, 0, 28, 30, 29, + 0, 40, 41, 0, 41, 0, 28, 42, 0, 42, + 43, 45, 0, 45, 0, 32, 0, 0, 32, 29, + 0, 0, 16, 0, 17, 0, 18, 0, 19, 0, + 20, 0, 22, 0, 23, 0, 15, 0, 0, 21, + 0, 0, 9, 0, 0, 28, 0, 28, 30, 28, + 0, 0, 33, 29, 0, 0, 31, 28, 0, 0, + 14, 31, 29, 0, 0, 0, 53, 43, 54, 0, + 24, 0, 25, 0, 26, 0, 27, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 42, 43, 46, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 62, 64, 65, 68, 72, 74, - 77, 79, 81, 83, 86, 90, 92, 95, 97, 99, - 100, 103, 105, 106, 107, 110, 112, 115, 117, 120, - 122, 125, 126, 129, 131, 134, 136, 139, 140 + 43, 44, 47, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 63, 65, 68, 72, 74, 77, + 79, 80, 81, 82, 83, 84, 85, 88, 90, 93, + 97, 99, 102, 104, 106, 107, 110, 112, 113, 114, + 115, 116, 117, 120, 122, 125, 127, 130, 132, 135, + 136, 142, 145, 147, 150, 152, 155, 156, 159, 161, + 164, 166, 167, 168 }; #endif @@ -145,88 +162,105 @@ static const short yyrline[] = { 0, static const char * const yytname[] = { "$","error","$undefined.","NAME","LIBRARY", "DESCRIPTION","STACKSIZE","HEAPSIZE","CODE","DATA","SECTIONS","EXPORTS","IMPORTS", -"VERSIONK","BASE","CONSTANT","READ","WRITE","EXECUTE","SHARED","NONAME","ID", -"NUMBER","'.'","'='","','","'@'","start","command","explist","expline","implist", -"impline","seclist","secline","attr_list","opt_comma","opt_number","attr","opt_CONSTANT", -"opt_NONAME","opt_DATA","opt_name","opt_ordinal","opt_equal_name","opt_base", NULL +"VERSIONK","BASE","CONSTANT","READ","WRITE","EXECUTE","SHARED","NONSHARED","NONAME", +"SINGLE","MULTIPLE","INITINSTANCE","INITGLOBAL","TERMINSTANCE","TERMGLOBAL", +"ID","NUMBER","'.'","'='","','","'@'","start","command","explist","expline", +"implist","impline","seclist","secline","attr_list","opt_comma","opt_number", +"attr","opt_CONSTANT","opt_NONAME","opt_DATA","opt_name","opt_ordinal","opt_equal_name", +"opt_base","option_list","option", NULL }; #endif static const short yyr1[] = { 0, - 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, - 28, 28, 28, 28, 29, 29, 29, 30, 31, 31, - 32, 32, 33, 33, 34, 35, 35, 36, 36, 37, - 37, 38, 38, 38, 38, 39, 39, 40, 40, 41, - 41, 42, 42, 43, 43, 44, 44, 45, 45 + 34, 34, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 36, 36, 37, 38, 38, 39, + 39, 39, 39, 39, 39, 39, 39, 40, 40, 41, + 42, 42, 43, 43, 44, 44, 45, 45, 45, 45, + 45, 45, 45, 46, 46, 47, 47, 48, 48, 49, + 49, 49, 50, 50, 51, 51, 52, 52, 53, 53, + 54, 54, 54, 54 }; static const short yyr2[] = { 0, - 2, 1, 3, 3, 2, 2, 3, 3, 2, 2, - 2, 2, 2, 4, 0, 1, 2, 6, 2, 1, - 5, 3, 2, 1, 2, 3, 1, 1, 0, 2, - 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, - 0, 1, 0, 2, 0, 2, 0, 3, 0 + 2, 1, 3, 4, 2, 2, 3, 3, 2, 2, + 2, 2, 2, 4, 0, 2, 6, 2, 1, 7, + 7, 5, 5, 5, 5, 3, 3, 2, 1, 2, + 3, 1, 1, 0, 2, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, + 3, 0, 2, 0, 2, 0, 3, 0, 0, 3, + 1, 1, 1, 1 }; static const short yydefact[] = { 0, - 43, 43, 0, 0, 0, 0, 0, 0, 15, 0, - 0, 0, 2, 42, 49, 49, 6, 31, 31, 32, - 33, 34, 35, 9, 27, 10, 0, 11, 24, 47, - 5, 16, 0, 12, 20, 13, 1, 0, 3, 4, - 0, 7, 8, 28, 0, 25, 23, 0, 45, 17, - 0, 0, 19, 0, 0, 30, 26, 46, 0, 39, - 22, 0, 14, 48, 44, 38, 37, 0, 36, 41, - 21, 40, 18, 0, 0 + 52, 52, 0, 0, 0, 0, 0, 0, 15, 0, + 0, 0, 2, 50, 58, 58, 6, 36, 36, 37, + 38, 39, 40, 41, 42, 43, 9, 32, 10, 0, + 11, 29, 5, 0, 12, 19, 13, 1, 0, 0, + 3, 59, 0, 7, 8, 33, 0, 30, 28, 56, + 16, 0, 0, 18, 0, 51, 0, 4, 35, 31, + 0, 54, 26, 27, 0, 14, 57, 0, 55, 0, + 47, 0, 0, 61, 62, 63, 64, 60, 53, 46, + 45, 24, 25, 22, 23, 44, 49, 0, 48, 17, + 20, 21, 0, 0 }; static const short yydefgoto[] = { 12, - 13, 31, 32, 34, 35, 28, 29, 24, 45, 42, - 25, 70, 67, 73, 15, 60, 49, 39 + 13, 33, 51, 35, 36, 31, 32, 27, 47, 44, + 28, 87, 81, 90, 15, 71, 62, 41, 58, 78 }; -static const short yypact[] = { 18, - -2, -2, 15, 17, 20, -1, -1, 19, 22, 23, - 24, 1,-32768,-32768, 31, 31,-32768, 12, 12,-32768, --32768,-32768,-32768, 16,-32768, 16, -1, 19,-32768, 14, - 22,-32768, -21, 23,-32768, 25,-32768, 26,-32768,-32768, - 27,-32768,-32768,-32768, -1, 16,-32768, 30, 21,-32768, - 32, 33,-32768, 34, 35,-32768,-32768,-32768, 36, 39, --32768, 29,-32768,-32768,-32768,-32768, 40, 41,-32768, 51, --32768,-32768,-32768, 61,-32768 +static const short yypact[] = { 32, + -22, -22, -19, -13, 22, 30, 30, -6,-32768, 26, + 38, 21,-32768, 29, 46, 46,-32768, 36, 36,-32768, +-32768,-32768,-32768,-32768,-32768,-32768, -15,-32768, -15, 30, + -6,-32768, 41, -16, 26,-32768, 40,-32768, 43, 42, +-32768,-32768, 45,-32768,-32768,-32768, 30, -15,-32768, 44, +-32768, -9, 48,-32768, 49,-32768, 50, -14,-32768,-32768, + 52, 39, 47,-32768, 51,-32768,-32768, 31,-32768, 53, + 62, 33, 35,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 69,-32768,-32768, 55,-32768,-32768, 77, 37,-32768,-32768, +-32768,-32768, 87,-32768 }; static const short yypgoto[] = {-32768, - 52,-32768, 37,-32768, 38,-32768, 42, -7,-32768, 44, - 28,-32768,-32768,-32768, 63,-32768,-32768, 50 + 76,-32768,-32768,-32768, 54,-32768, 59, -7, 34, 72, + 56,-32768,-32768,-32768, 91,-32768,-32768, 78,-32768,-32768 }; -#define YYLAST 73 +#define YYLAST 103 -static const short yytable[] = { 26, - 74, 51, 52, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 20, 21, 22, 23, 14, 46, - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, - 11, -29, -29, -29, -29, 17, 41, 48, 18, 27, - 44, 19, 30, 33, 38, 36, 59, 54, 56, 55, - 58, 68, 61, 62, 69, 63, 64, 65, 66, 72, - 75, 71, 43, 37, 16, 40, 0, 50, 0, 47, - 0, 53, 57 +static const short yytable[] = { 29, + -34, -34, -34, -34, -34, 14, -34, -34, 17, -34, + -34, -34, -34, 52, 53, 18, 46, 46, 63, 64, + 93, 30, 48, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 1, 2, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 20, 21, 22, 23, 24, + 19, 25, 26, 34, 74, 75, 76, 77, 39, 40, + 82, 83, 84, 85, 91, 92, 37, 43, 50, 55, + 56, 70, 57, 59, 61, 65, 72, 66, 67, 69, + 73, 79, 80, 86, 88, 89, 94, 38, 54, 49, + 45, 68, 16, 42, 0, 0, 0, 0, 0, 0, + 0, 0, 60 }; static const short yycheck[] = { 7, - 0, 23, 24, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 16, 17, 18, 19, 21, 27, - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 16, 17, 18, 19, 21, 25, 24, 22, 21, - 25, 22, 21, 21, 14, 22, 26, 23, 22, 24, - 21, 23, 21, 21, 15, 22, 22, 22, 20, 9, - 0, 21, 19, 12, 2, 16, -1, 31, -1, 28, - -1, 34, 45 + 16, 17, 18, 19, 20, 28, 22, 23, 28, 24, + 25, 26, 27, 30, 31, 29, 32, 32, 28, 29, + 0, 28, 30, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 16, 17, 18, 19, 20, + 29, 22, 23, 28, 24, 25, 26, 27, 30, 14, + 28, 29, 28, 29, 28, 29, 29, 32, 28, 30, + 28, 33, 31, 29, 31, 28, 30, 29, 29, 28, + 30, 29, 21, 15, 30, 9, 0, 12, 35, 31, + 19, 58, 2, 16, -1, -1, -1, -1, -1, -1, + -1, -1, 47 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/cygnus/progressive-97r2/share/bison.simple" +#line 3 "/usr/share/misc/bison.simple" +/* This file comes from bison-1.28. */ /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -243,46 +277,66 @@ static const short yycheck[] = { 7, 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. This special exception was added by the Free Software Foundation in version 1.24 of Bison. */ -#ifndef alloca +/* This is the parser code that is written into each bison parser + when the %semantic_parser declaration is not specified in the grammar. + It was written by Richard Stallman by simplifying the hairy parser + used when %semantic_parser is specified. */ + +#ifndef YYSTACK_USE_ALLOCA +#ifdef alloca +#define YYSTACK_USE_ALLOCA +#else /* alloca not defined */ #ifdef __GNUC__ +#define YYSTACK_USE_ALLOCA #define alloca __builtin_alloca #else /* not GNU C. */ -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) +#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386)) +#define YYSTACK_USE_ALLOCA #include <alloca.h> #else /* not sparc */ -#if defined (MSDOS) && !defined (__TURBOC__) +/* We think this test detects Watcom and Microsoft C. */ +/* This used to test MSDOS, but that is a bad idea + since that symbol is in the user namespace. */ +#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__) +#if 0 /* No need for malloc.h, which pollutes the namespace; + instead, just don't use alloca. */ #include <malloc.h> +#endif #else /* not MSDOS, or __TURBOC__ */ #if defined(_AIX) -#include <malloc.h> +/* I don't know what this was needed for, but it pollutes the namespace. + So I turned it off. rms, 2 May 1997. */ +/* #include <malloc.h> */ #pragma alloca -#else /* not MSDOS, __TURBOC__, or _AIX */ -#ifdef __hpux -#ifdef __cplusplus -extern "C" { -void *alloca (unsigned int); -}; -#else /* not __cplusplus */ -void *alloca (); -#endif /* not __cplusplus */ +#define YYSTACK_USE_ALLOCA +#else /* not MSDOS, or __TURBOC__, or _AIX */ +#if 0 +#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, + and on HPUX 10. Eventually we can turn this on. */ +#define YYSTACK_USE_ALLOCA +#define alloca __builtin_alloca #endif /* __hpux */ +#endif #endif /* not _AIX */ #endif /* not MSDOS, or __TURBOC__ */ -#endif /* not sparc. */ -#endif /* not GNU C. */ -#endif /* alloca not defined. */ +#endif /* not sparc */ +#endif /* not GNU C */ +#endif /* alloca not defined */ +#endif /* YYSTACK_USE_ALLOCA not defined */ -/* This is the parser code that is written into each bison parser - when the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ +#ifdef YYSTACK_USE_ALLOCA +#define YYSTACK_ALLOC alloca +#else +#define YYSTACK_ALLOC malloc +#endif /* Note: there must be only one dollar sign in this file. It is replaced by the list of actions, each action @@ -292,8 +346,8 @@ void *alloca (); #define yyclearin (yychar = YYEMPTY) #define YYEMPTY -2 #define YYEOF 0 -#define YYACCEPT return(0) -#define YYABORT return(1) +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab #define YYERROR goto yyerrlab1 /* Like YYERROR except do call yyerror. This remains here temporarily to ease the @@ -374,12 +428,12 @@ int yydebug; /* nonzero means print parse trace */ #ifndef YYMAXDEPTH #define YYMAXDEPTH 10000 #endif - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -int yyparse (void); -#endif +/* Define __yy_memcpy. Note that the size argument + should be passed with type unsigned int, because that is what the non-GCC + definitions require. With GCC, __builtin_memcpy takes an arg + of type size_t, but it can handle unsigned int. */ + #if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ #define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) #else /* not GNU C or C++ */ @@ -391,7 +445,7 @@ static void __yy_memcpy (to, from, count) char *to; char *from; - int count; + unsigned int count; { register char *f = from; register char *t = to; @@ -406,10 +460,10 @@ __yy_memcpy (to, from, count) /* This is the most reliable way to avoid incompatibilities in available built-in functions on various systems. */ static void -__yy_memcpy (char *to, char *from, int count) +__yy_memcpy (char *to, char *from, unsigned int count) { - register char *f = from; register char *t = to; + register char *f = from; register int i = count; while (i-- > 0) @@ -419,7 +473,7 @@ __yy_memcpy (char *to, char *from, int count) #endif #endif -#line 196 "/usr/cygnus/progressive-97r2/share/bison.simple" +#line 217 "/usr/share/misc/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -440,6 +494,15 @@ __yy_memcpy (char *to, char *from, int count) #define YYPARSE_PARAM_DECL #endif /* not YYPARSE_PARAM */ +/* Prevent warning if -Wstrict-prototypes. */ +#ifdef __GNUC__ +#ifdef YYPARSE_PARAM +int yyparse (void *); +#else +int yyparse (void); +#endif +#endif + int yyparse(YYPARSE_PARAM_ARG) YYPARSE_PARAM_DECL @@ -468,6 +531,7 @@ yyparse(YYPARSE_PARAM_ARG) #endif int yystacksize = YYINITDEPTH; + int yyfree_stacks = 0; #ifdef YYPURE int yychar; @@ -552,18 +616,32 @@ yynewstate: if (yystacksize >= YYMAXDEPTH) { yyerror("parser stack overflow"); + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } return 2; } yystacksize *= 2; if (yystacksize > YYMAXDEPTH) yystacksize = YYMAXDEPTH; - yyss = (short *) alloca (yystacksize * sizeof (*yyssp)); - __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp)); - yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp)); - __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp)); +#ifndef YYSTACK_USE_ALLOCA + yyfree_stacks = 1; +#endif + yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp)); + __yy_memcpy ((char *)yyss, (char *)yyss1, + size * (unsigned int) sizeof (*yyssp)); + yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp)); + __yy_memcpy ((char *)yyvs, (char *)yyvs1, + size * (unsigned int) sizeof (*yyvsp)); #ifdef YYLSP_NEEDED - yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp)); - __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp)); + yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp)); + __yy_memcpy ((char *)yyls, (char *)yyls1, + size * (unsigned int) sizeof (*yylsp)); #endif #endif /* no yyoverflow */ @@ -724,140 +802,184 @@ yyreduce: switch (yyn) { case 3: -#line 47 "/5g/ian/binutils/release/copy/binutils/defparse.y" +#line 48 "defparse.y" { def_name (yyvsp[-1].id, yyvsp[0].number); ; break;} case 4: -#line 48 "/5g/ian/binutils/release/copy/binutils/defparse.y" -{ def_library (yyvsp[-1].id, yyvsp[0].number); ; +#line 49 "defparse.y" +{ def_library (yyvsp[-2].id, yyvsp[-1].number); ; break;} case 6: -#line 50 "/5g/ian/binutils/release/copy/binutils/defparse.y" +#line 51 "defparse.y" { def_description (yyvsp[0].id);; break;} case 7: -#line 51 "/5g/ian/binutils/release/copy/binutils/defparse.y" +#line 52 "defparse.y" { def_stacksize (yyvsp[-1].number, yyvsp[0].number);; break;} case 8: -#line 52 "/5g/ian/binutils/release/copy/binutils/defparse.y" +#line 53 "defparse.y" { def_heapsize (yyvsp[-1].number, yyvsp[0].number);; break;} case 9: -#line 53 "/5g/ian/binutils/release/copy/binutils/defparse.y" +#line 54 "defparse.y" { def_code (yyvsp[0].number);; break;} case 10: -#line 54 "/5g/ian/binutils/release/copy/binutils/defparse.y" +#line 55 "defparse.y" { def_data (yyvsp[0].number);; break;} case 13: -#line 57 "/5g/ian/binutils/release/copy/binutils/defparse.y" +#line 58 "defparse.y" { def_version (yyvsp[0].number,0);; break;} case 14: -#line 58 "/5g/ian/binutils/release/copy/binutils/defparse.y" +#line 59 "defparse.y" { def_version (yyvsp[-2].number,yyvsp[0].number);; break;} -case 18: -#line 70 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 17: +#line 70 "defparse.y" { def_exports (yyvsp[-5].id, yyvsp[-4].id, yyvsp[-3].number, yyvsp[-2].number, yyvsp[-1].number, yyvsp[0].number);; break;} +case 20: +#line 78 "defparse.y" +{ def_import (yyvsp[-6].id,yyvsp[-4].id,yyvsp[-2].id,yyvsp[0].id, 0); ; + break;} case 21: -#line 78 "/5g/ian/binutils/release/copy/binutils/defparse.y" -{ def_import (yyvsp[-4].id,yyvsp[-2].id,yyvsp[0].id);; +#line 79 "defparse.y" +{ def_import (yyvsp[-6].id,yyvsp[-4].id,yyvsp[-2].id, 0,yyvsp[0].number); ; break;} case 22: -#line 79 "/5g/ian/binutils/release/copy/binutils/defparse.y" -{ def_import (0, yyvsp[-2].id,yyvsp[0].id);; +#line 80 "defparse.y" +{ def_import (yyvsp[-4].id,yyvsp[-2].id, 0,yyvsp[0].id, 0); ; + break;} +case 23: +#line 81 "defparse.y" +{ def_import (yyvsp[-4].id,yyvsp[-2].id, 0, 0,yyvsp[0].number); ; + break;} +case 24: +#line 82 "defparse.y" +{ def_import ( 0,yyvsp[-4].id,yyvsp[-2].id,yyvsp[0].id, 0); ; break;} case 25: -#line 87 "/5g/ian/binutils/release/copy/binutils/defparse.y" -{ def_section (yyvsp[-1].id,yyvsp[0].number);; +#line 83 "defparse.y" +{ def_import ( 0,yyvsp[-4].id,yyvsp[-2].id, 0,yyvsp[0].number); ; + break;} +case 26: +#line 84 "defparse.y" +{ def_import ( 0,yyvsp[-2].id, 0,yyvsp[0].id, 0); ; + break;} +case 27: +#line 85 "defparse.y" +{ def_import ( 0,yyvsp[-2].id, 0, 0,yyvsp[0].number); ; break;} case 30: -#line 99 "/5g/ian/binutils/release/copy/binutils/defparse.y" +#line 94 "defparse.y" +{ def_section (yyvsp[-1].id,yyvsp[0].number);; + break;} +case 35: +#line 106 "defparse.y" { yyval.number=yyvsp[0].number;; break;} -case 31: -#line 100 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 36: +#line 107 "defparse.y" { yyval.number=-1;; break;} -case 32: -#line 104 "/5g/ian/binutils/release/copy/binutils/defparse.y" -{ yyval.number = 1;; +case 37: +#line 111 "defparse.y" +{ yyval.number = 1; ; break;} -case 33: -#line 105 "/5g/ian/binutils/release/copy/binutils/defparse.y" -{ yyval.number = 2;; +case 38: +#line 112 "defparse.y" +{ yyval.number = 2; ; break;} -case 34: -#line 106 "/5g/ian/binutils/release/copy/binutils/defparse.y" -{ yyval.number=4;; +case 39: +#line 113 "defparse.y" +{ yyval.number = 4; ; break;} -case 35: -#line 107 "/5g/ian/binutils/release/copy/binutils/defparse.y" -{ yyval.number=8;; +case 40: +#line 114 "defparse.y" +{ yyval.number = 8; ; break;} -case 36: -#line 111 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 41: +#line 115 "defparse.y" +{ yyval.number = 0; ; + break;} +case 42: +#line 116 "defparse.y" +{ yyval.number = 0; ; + break;} +case 43: +#line 117 "defparse.y" +{ yyval.number = 0; ; + break;} +case 44: +#line 121 "defparse.y" {yyval.number=1;; break;} -case 37: -#line 112 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 45: +#line 122 "defparse.y" {yyval.number=0;; break;} -case 38: -#line 116 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 46: +#line 126 "defparse.y" {yyval.number=1;; break;} -case 39: -#line 117 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 47: +#line 127 "defparse.y" {yyval.number=0;; break;} -case 40: -#line 121 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 48: +#line 131 "defparse.y" { yyval.number = 1; ; break;} -case 41: -#line 122 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 49: +#line 132 "defparse.y" { yyval.number = 0; ; break;} -case 42: -#line 125 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 50: +#line 135 "defparse.y" { yyval.id =yyvsp[0].id; ; break;} -case 43: -#line 126 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 51: +#line 137 "defparse.y" +{ + char *name = xmalloc (strlen (yyvsp[-2].id) + 1 + strlen (yyvsp[0].id) + 1); + sprintf (name, "%s.%s", yyvsp[-2].id, yyvsp[0].id); + yyval.id = name; + ; + break;} +case 52: +#line 142 "defparse.y" { yyval.id=""; ; break;} -case 44: -#line 130 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 53: +#line 146 "defparse.y" { yyval.number=yyvsp[0].number;; break;} -case 45: -#line 131 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 54: +#line 147 "defparse.y" { yyval.number=-1;; break;} -case 46: -#line 135 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 55: +#line 151 "defparse.y" { yyval.id = yyvsp[0].id; ; break;} -case 47: -#line 136 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 56: +#line 152 "defparse.y" { yyval.id = 0; ; break;} -case 48: -#line 139 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 57: +#line 155 "defparse.y" { yyval.number= yyvsp[0].number;; break;} -case 49: -#line 140 "/5g/ian/binutils/release/copy/binutils/defparse.y" +case 58: +#line 156 "defparse.y" { yyval.number=-1;; break;} } /* the action file gets copied in in place of this dollarsign */ -#line 498 "/usr/cygnus/progressive-97r2/share/bison.simple" +#line 543 "/usr/share/misc/bison.simple" yyvsp -= yylen; yyssp -= yylen; @@ -1052,5 +1174,29 @@ yyerrhandle: yystate = yyn; goto yynewstate; + + yyacceptlab: + /* YYACCEPT comes here. */ + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } + return 0; + + yyabortlab: + /* YYABORT comes here. */ + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } + return 1; } -#line 145 "/5g/ian/binutils/release/copy/binutils/defparse.y" +#line 170 "defparse.y" diff --git a/contrib/binutils/binutils/defparse.h b/contrib/binutils/binutils/defparse.h index fa35fb0..d1167c6 100644 --- a/contrib/binutils/binutils/defparse.h +++ b/contrib/binutils/binutils/defparse.h @@ -2,26 +2,33 @@ typedef union { char *id; int number; } YYSTYPE; -#define NAME 258 -#define LIBRARY 259 -#define DESCRIPTION 260 -#define STACKSIZE 261 -#define HEAPSIZE 262 -#define CODE 263 -#define DATA 264 -#define SECTIONS 265 -#define EXPORTS 266 -#define IMPORTS 267 -#define VERSIONK 268 -#define BASE 269 -#define CONSTANT 270 -#define READ 271 -#define WRITE 272 -#define EXECUTE 273 -#define SHARED 274 +#define NAME 257 +#define LIBRARY 258 +#define DESCRIPTION 259 +#define STACKSIZE 260 +#define HEAPSIZE 261 +#define CODE 262 +#define DATA 263 +#define SECTIONS 264 +#define EXPORTS 265 +#define IMPORTS 266 +#define VERSIONK 267 +#define BASE 268 +#define CONSTANT 269 +#define READ 270 +#define WRITE 271 +#define EXECUTE 272 +#define SHARED 273 +#define NONSHARED 274 #define NONAME 275 -#define ID 276 -#define NUMBER 277 +#define SINGLE 276 +#define MULTIPLE 277 +#define INITINSTANCE 278 +#define INITGLOBAL 279 +#define TERMINSTANCE 280 +#define TERMGLOBAL 281 +#define ID 282 +#define NUMBER 283 extern YYSTYPE yylval; diff --git a/contrib/binutils/binutils/ieee.c b/contrib/binutils/binutils/ieee.c index a3bb93b..27409cc 100644 --- a/contrib/binutils/binutils/ieee.c +++ b/contrib/binutils/binutils/ieee.c @@ -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 <ian@cygnus.com>. 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 --git a/contrib/binutils/binutils/objcopy.c b/contrib/binutils/binutils/objcopy.c index e8b710f..10b20e4 100644 --- a/contrib/binutils/binutils/objcopy.c +++ b/contrib/binutils/binutils/objcopy.c @@ -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 <sys/stat.h> /* A list of symbols to explicitly strip out, or to keep. A linked @@ -2248,7 +2249,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 --git a/contrib/binutils/binutils/objdump.c b/contrib/binutils/binutils/objdump.c index 6f0a63e..d3c1ed2 100644 --- a/contrib/binutils/binutils/objdump.c +++ b/contrib/binutils/binutils/objdump.c @@ -29,12 +29,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "debug.h" #include "budbg.h" -#ifdef ANSI_PROTOTYPES -#include <stdarg.h> -#else -#include <varargs.h> -#endif - /* Internal headers for the ELF .stab-dump code - sorry. */ #define BYTES_IN_WORD 32 #include "aout/aout64.h" @@ -2657,6 +2651,7 @@ display_target_list () { if (bfd_get_error () != bfd_error_invalid_operation) nonfatal (p->name); + bfd_close_all_done (abfd); continue; } @@ -2664,6 +2659,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); @@ -2731,6 +2727,8 @@ display_info_table (first, last) putchar ('-'); putchar (' '); } + if (abfd != NULL) + bfd_close_all_done (abfd); } putchar ('\n'); } diff --git a/contrib/binutils/binutils/rclex.c b/contrib/binutils/binutils/rclex.c index 3c9682e..b2967bb 100644 --- a/contrib/binutils/binutils/rclex.c +++ b/contrib/binutils/binutils/rclex.c @@ -1,7 +1,7 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.85 95/04/24 10:48:47 vern Exp $ + * $Header: /cvs/src/src/binutils/Attic/rclex.c,v 1.1.2.1 2000/05/29 14:08:52 pb Exp $ */ #define FLEX_SCANNER @@ -126,6 +126,7 @@ extern FILE *yyin, *yyout; { \ /* Undo effects of setting up yytext. */ \ *yy_cp = yy_hold_char; \ + YY_RESTORE_YY_MORE_OFFSET \ yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ @@ -235,7 +236,7 @@ void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); #define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); -YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *str )); +YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); static void *yy_flex_alloc YY_PROTO(( yy_size_t )); @@ -629,10 +630,11 @@ static char *yy_last_accepting_cpos; #define REJECT reject_used_but_not_detected #define yymore() yymore_used_but_not_detected #define YY_MORE_ADJ 0 +#define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "/5g/ian/binutils/release/copy/binutils/rclex.l" +#line 1 "rclex.l" #define INITIAL 0 -#line 2 "/5g/ian/binutils/release/copy/binutils/rclex.l" +#line 2 "rclex.l" /* Copyright 1997, 1998 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support. @@ -671,6 +673,23 @@ char *yytext; static int rcdata_mode; +/* Whether we are supressing lines from cpp (including windows.h or + headers from your C sources may bring in externs and typedefs). + When active, we return IGNORED_TOKEN, which lets us ignore these + outside of resource constructs. Thus, it isn't required to protect + all the non-preprocessor lines in your header files with #ifdef + RC_INVOKED. It also means your RC file can't include other RC + files if they're named "*.h". Sorry. Name them *.rch or whatever. */ + +static int suppress_cpp_data; + +#define MAYBE_RETURN(x) return suppress_cpp_data ? IGNORED_TOKEN : (x) + +/* The first filename we detect in the cpp output. We use this to + tell included files from the original file. */ + +static char *initial_fn; + /* List of allocated strings. */ struct alloc_string @@ -687,7 +706,7 @@ static void cpp_line PARAMS ((const char *)); static char *handle_quotes PARAMS ((const char *, unsigned long *)); static char *get_string PARAMS ((int)); -#line 691 "lex.yy.c" +#line 710 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -709,6 +728,10 @@ static void yyunput YY_PROTO(( int c, char *buf_ptr )); static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); #endif +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen YY_PROTO(( yyconst char * )); +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput YY_PROTO(( void )); @@ -834,10 +857,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 58 "/5g/ian/binutils/release/copy/binutils/rclex.l" +#line 75 "rclex.l" -#line 841 "lex.yy.c" +#line 864 "lex.yy.c" if ( yy_init ) { @@ -922,387 +945,387 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 60 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return BEG; } +#line 77 "rclex.l" +{ MAYBE_RETURN (BEG); } YY_BREAK case 2: YY_RULE_SETUP -#line 61 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return BEG; } +#line 78 "rclex.l" +{ MAYBE_RETURN (BEG); } YY_BREAK case 3: YY_RULE_SETUP -#line 62 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return END; } +#line 79 "rclex.l" +{ MAYBE_RETURN (END); } YY_BREAK case 4: YY_RULE_SETUP -#line 63 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return END; } +#line 80 "rclex.l" +{ MAYBE_RETURN (END); } YY_BREAK case 5: YY_RULE_SETUP -#line 64 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return ACCELERATORS; } +#line 81 "rclex.l" +{ MAYBE_RETURN (ACCELERATORS); } YY_BREAK case 6: YY_RULE_SETUP -#line 65 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return VIRTKEY; } +#line 82 "rclex.l" +{ MAYBE_RETURN (VIRTKEY); } YY_BREAK case 7: YY_RULE_SETUP -#line 66 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return ASCII; } +#line 83 "rclex.l" +{ MAYBE_RETURN (ASCII); } YY_BREAK case 8: YY_RULE_SETUP -#line 67 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return NOINVERT; } +#line 84 "rclex.l" +{ MAYBE_RETURN (NOINVERT); } YY_BREAK case 9: YY_RULE_SETUP -#line 68 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return SHIFT; } +#line 85 "rclex.l" +{ MAYBE_RETURN (SHIFT); } YY_BREAK case 10: YY_RULE_SETUP -#line 69 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return CONTROL; } +#line 86 "rclex.l" +{ MAYBE_RETURN (CONTROL); } YY_BREAK case 11: YY_RULE_SETUP -#line 70 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return ALT; } +#line 87 "rclex.l" +{ MAYBE_RETURN (ALT); } YY_BREAK case 12: YY_RULE_SETUP -#line 71 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return BITMAP; } +#line 88 "rclex.l" +{ MAYBE_RETURN (BITMAP); } YY_BREAK case 13: YY_RULE_SETUP -#line 72 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return CURSOR; } +#line 89 "rclex.l" +{ MAYBE_RETURN (CURSOR); } YY_BREAK case 14: YY_RULE_SETUP -#line 73 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return DIALOG; } +#line 90 "rclex.l" +{ MAYBE_RETURN (DIALOG); } YY_BREAK case 15: YY_RULE_SETUP -#line 74 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return DIALOGEX; } +#line 91 "rclex.l" +{ MAYBE_RETURN (DIALOGEX); } YY_BREAK case 16: YY_RULE_SETUP -#line 75 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return EXSTYLE; } +#line 92 "rclex.l" +{ MAYBE_RETURN (EXSTYLE); } YY_BREAK case 17: YY_RULE_SETUP -#line 76 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return CAPTION; } +#line 93 "rclex.l" +{ MAYBE_RETURN (CAPTION); } YY_BREAK case 18: YY_RULE_SETUP -#line 77 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return CLASS; } +#line 94 "rclex.l" +{ MAYBE_RETURN (CLASS); } YY_BREAK case 19: YY_RULE_SETUP -#line 78 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return STYLE; } +#line 95 "rclex.l" +{ MAYBE_RETURN (STYLE); } YY_BREAK case 20: YY_RULE_SETUP -#line 79 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return AUTO3STATE; } +#line 96 "rclex.l" +{ MAYBE_RETURN (AUTO3STATE); } YY_BREAK case 21: YY_RULE_SETUP -#line 80 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return AUTOCHECKBOX; } +#line 97 "rclex.l" +{ MAYBE_RETURN (AUTOCHECKBOX); } YY_BREAK case 22: YY_RULE_SETUP -#line 81 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return AUTORADIOBUTTON; } +#line 98 "rclex.l" +{ MAYBE_RETURN (AUTORADIOBUTTON); } YY_BREAK case 23: YY_RULE_SETUP -#line 82 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return CHECKBOX; } +#line 99 "rclex.l" +{ MAYBE_RETURN (CHECKBOX); } YY_BREAK case 24: YY_RULE_SETUP -#line 83 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return COMBOBOX; } +#line 100 "rclex.l" +{ MAYBE_RETURN (COMBOBOX); } YY_BREAK case 25: YY_RULE_SETUP -#line 84 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return CTEXT; } +#line 101 "rclex.l" +{ MAYBE_RETURN (CTEXT); } YY_BREAK case 26: YY_RULE_SETUP -#line 85 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return DEFPUSHBUTTON; } +#line 102 "rclex.l" +{ MAYBE_RETURN (DEFPUSHBUTTON); } YY_BREAK case 27: YY_RULE_SETUP -#line 86 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return EDITTEXT; } +#line 103 "rclex.l" +{ MAYBE_RETURN (EDITTEXT); } YY_BREAK case 28: YY_RULE_SETUP -#line 87 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return GROUPBOX; } +#line 104 "rclex.l" +{ MAYBE_RETURN (GROUPBOX); } YY_BREAK case 29: YY_RULE_SETUP -#line 88 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return LISTBOX; } +#line 105 "rclex.l" +{ MAYBE_RETURN (LISTBOX); } YY_BREAK case 30: YY_RULE_SETUP -#line 89 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return LTEXT; } +#line 106 "rclex.l" +{ MAYBE_RETURN (LTEXT); } YY_BREAK case 31: YY_RULE_SETUP -#line 90 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return PUSHBOX; } +#line 107 "rclex.l" +{ MAYBE_RETURN (PUSHBOX); } YY_BREAK case 32: YY_RULE_SETUP -#line 91 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return PUSHBUTTON; } +#line 108 "rclex.l" +{ MAYBE_RETURN (PUSHBUTTON); } YY_BREAK case 33: YY_RULE_SETUP -#line 92 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return RADIOBUTTON; } +#line 109 "rclex.l" +{ MAYBE_RETURN (RADIOBUTTON); } YY_BREAK case 34: YY_RULE_SETUP -#line 93 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return RTEXT; } +#line 110 "rclex.l" +{ MAYBE_RETURN (RTEXT); } YY_BREAK case 35: YY_RULE_SETUP -#line 94 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return SCROLLBAR; } +#line 111 "rclex.l" +{ MAYBE_RETURN (SCROLLBAR); } YY_BREAK case 36: YY_RULE_SETUP -#line 95 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return STATE3; } +#line 112 "rclex.l" +{ MAYBE_RETURN (STATE3); } YY_BREAK case 37: YY_RULE_SETUP -#line 96 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return USERBUTTON; } +#line 113 "rclex.l" +{ MAYBE_RETURN (USERBUTTON); } YY_BREAK case 38: YY_RULE_SETUP -#line 97 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return BEDIT; } +#line 114 "rclex.l" +{ MAYBE_RETURN (BEDIT); } YY_BREAK case 39: YY_RULE_SETUP -#line 98 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return HEDIT; } +#line 115 "rclex.l" +{ MAYBE_RETURN (HEDIT); } YY_BREAK case 40: YY_RULE_SETUP -#line 99 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return IEDIT; } +#line 116 "rclex.l" +{ MAYBE_RETURN (IEDIT); } YY_BREAK case 41: YY_RULE_SETUP -#line 100 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return FONT; } +#line 117 "rclex.l" +{ MAYBE_RETURN (FONT); } YY_BREAK case 42: YY_RULE_SETUP -#line 101 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return ICON; } +#line 118 "rclex.l" +{ MAYBE_RETURN (ICON); } YY_BREAK case 43: YY_RULE_SETUP -#line 102 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return LANGUAGE; } +#line 119 "rclex.l" +{ MAYBE_RETURN (LANGUAGE); } YY_BREAK case 44: YY_RULE_SETUP -#line 103 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return CHARACTERISTICS; } +#line 120 "rclex.l" +{ MAYBE_RETURN (CHARACTERISTICS); } YY_BREAK case 45: YY_RULE_SETUP -#line 104 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return VERSIONK; } +#line 121 "rclex.l" +{ MAYBE_RETURN (VERSIONK); } YY_BREAK case 46: YY_RULE_SETUP -#line 105 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return MENU; } +#line 122 "rclex.l" +{ MAYBE_RETURN (MENU); } YY_BREAK case 47: YY_RULE_SETUP -#line 106 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return MENUEX; } +#line 123 "rclex.l" +{ MAYBE_RETURN (MENUEX); } YY_BREAK case 48: YY_RULE_SETUP -#line 107 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return MENUITEM; } +#line 124 "rclex.l" +{ MAYBE_RETURN (MENUITEM); } YY_BREAK case 49: YY_RULE_SETUP -#line 108 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return SEPARATOR; } +#line 125 "rclex.l" +{ MAYBE_RETURN (SEPARATOR); } YY_BREAK case 50: YY_RULE_SETUP -#line 109 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return POPUP; } +#line 126 "rclex.l" +{ MAYBE_RETURN (POPUP); } YY_BREAK case 51: YY_RULE_SETUP -#line 110 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return CHECKED; } +#line 127 "rclex.l" +{ MAYBE_RETURN (CHECKED); } YY_BREAK case 52: YY_RULE_SETUP -#line 111 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return GRAYED; } +#line 128 "rclex.l" +{ MAYBE_RETURN (GRAYED); } YY_BREAK case 53: YY_RULE_SETUP -#line 112 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return HELP; } +#line 129 "rclex.l" +{ MAYBE_RETURN (HELP); } YY_BREAK case 54: YY_RULE_SETUP -#line 113 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return INACTIVE; } +#line 130 "rclex.l" +{ MAYBE_RETURN (INACTIVE); } YY_BREAK case 55: YY_RULE_SETUP -#line 114 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return MENUBARBREAK; } +#line 131 "rclex.l" +{ MAYBE_RETURN (MENUBARBREAK); } YY_BREAK case 56: YY_RULE_SETUP -#line 115 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return MENUBREAK; } +#line 132 "rclex.l" +{ MAYBE_RETURN (MENUBREAK); } YY_BREAK case 57: YY_RULE_SETUP -#line 116 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return MESSAGETABLE; } +#line 133 "rclex.l" +{ MAYBE_RETURN (MESSAGETABLE); } YY_BREAK case 58: YY_RULE_SETUP -#line 117 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return RCDATA; } +#line 134 "rclex.l" +{ MAYBE_RETURN (RCDATA); } YY_BREAK case 59: YY_RULE_SETUP -#line 118 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return STRINGTABLE; } +#line 135 "rclex.l" +{ MAYBE_RETURN (STRINGTABLE); } YY_BREAK case 60: YY_RULE_SETUP -#line 119 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return VERSIONINFO; } +#line 136 "rclex.l" +{ MAYBE_RETURN (VERSIONINFO); } YY_BREAK case 61: YY_RULE_SETUP -#line 120 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return FILEVERSION; } +#line 137 "rclex.l" +{ MAYBE_RETURN (FILEVERSION); } YY_BREAK case 62: YY_RULE_SETUP -#line 121 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return PRODUCTVERSION; } +#line 138 "rclex.l" +{ MAYBE_RETURN (PRODUCTVERSION); } YY_BREAK case 63: YY_RULE_SETUP -#line 122 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return FILEFLAGSMASK; } +#line 139 "rclex.l" +{ MAYBE_RETURN (FILEFLAGSMASK); } YY_BREAK case 64: YY_RULE_SETUP -#line 123 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return FILEFLAGS; } +#line 140 "rclex.l" +{ MAYBE_RETURN (FILEFLAGS); } YY_BREAK case 65: YY_RULE_SETUP -#line 124 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return FILEOS; } +#line 141 "rclex.l" +{ MAYBE_RETURN (FILEOS); } YY_BREAK case 66: YY_RULE_SETUP -#line 125 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return FILETYPE; } +#line 142 "rclex.l" +{ MAYBE_RETURN (FILETYPE); } YY_BREAK case 67: YY_RULE_SETUP -#line 126 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return FILESUBTYPE; } +#line 143 "rclex.l" +{ MAYBE_RETURN (FILESUBTYPE); } YY_BREAK case 68: YY_RULE_SETUP -#line 127 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return VALUE; } +#line 144 "rclex.l" +{ MAYBE_RETURN (VALUE); } YY_BREAK case 69: YY_RULE_SETUP -#line 128 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return MOVEABLE; } +#line 145 "rclex.l" +{ MAYBE_RETURN (MOVEABLE); } YY_BREAK case 70: YY_RULE_SETUP -#line 129 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return FIXED; } +#line 146 "rclex.l" +{ MAYBE_RETURN (FIXED); } YY_BREAK case 71: YY_RULE_SETUP -#line 130 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return PURE; } +#line 147 "rclex.l" +{ MAYBE_RETURN (PURE); } YY_BREAK case 72: YY_RULE_SETUP -#line 131 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return IMPURE; } +#line 148 "rclex.l" +{ MAYBE_RETURN (IMPURE); } YY_BREAK case 73: YY_RULE_SETUP -#line 132 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return PRELOAD; } +#line 149 "rclex.l" +{ MAYBE_RETURN (PRELOAD); } YY_BREAK case 74: YY_RULE_SETUP -#line 133 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return LOADONCALL; } +#line 150 "rclex.l" +{ MAYBE_RETURN (LOADONCALL); } YY_BREAK case 75: YY_RULE_SETUP -#line 134 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return DISCARDABLE; } +#line 151 "rclex.l" +{ MAYBE_RETURN (DISCARDABLE); } YY_BREAK case 76: YY_RULE_SETUP -#line 135 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return NOT; } +#line 152 "rclex.l" +{ MAYBE_RETURN (NOT); } YY_BREAK case 77: YY_RULE_SETUP -#line 137 "/5g/ian/binutils/release/copy/binutils/rclex.l" +#line 154 "rclex.l" { char *s, *send; @@ -1315,11 +1338,11 @@ YY_RULE_SETUP if (strncmp (s, "StringFileInfo", sizeof "StringFileInfo" - 1) == 0 && s + sizeof "StringFileInfo" - 1 == send) - return BLOCKSTRINGFILEINFO; + MAYBE_RETURN (BLOCKSTRINGFILEINFO); else if (strncmp (s, "VarFileInfo", sizeof "VarFileInfo" - 1) == 0 && s + sizeof "VarFileInfo" - 1 == send) - return BLOCKVARFILEINFO; + MAYBE_RETURN (BLOCKVARFILEINFO); else { char *r; @@ -1328,38 +1351,38 @@ YY_RULE_SETUP strncpy (r, s, send - s); r[send - s] = '\0'; yylval.s = r; - return BLOCK; + MAYBE_RETURN (BLOCK); } } YY_BREAK case 78: YY_RULE_SETUP -#line 166 "/5g/ian/binutils/release/copy/binutils/rclex.l" +#line 183 "rclex.l" { cpp_line (yytext); } YY_BREAK case 79: YY_RULE_SETUP -#line 170 "/5g/ian/binutils/release/copy/binutils/rclex.l" +#line 187 "rclex.l" { yylval.i.val = strtoul (yytext, 0, 0); yylval.i.dword = 1; - return NUMBER; + MAYBE_RETURN (NUMBER); } YY_BREAK case 80: YY_RULE_SETUP -#line 176 "/5g/ian/binutils/release/copy/binutils/rclex.l" +#line 193 "rclex.l" { yylval.i.val = strtoul (yytext, 0, 0); yylval.i.dword = 0; - return NUMBER; + MAYBE_RETURN (NUMBER); } YY_BREAK case 81: YY_RULE_SETUP -#line 182 "/5g/ian/binutils/release/copy/binutils/rclex.l" +#line 199 "rclex.l" { char *s; unsigned long length; @@ -1368,19 +1391,19 @@ YY_RULE_SETUP if (! rcdata_mode) { yylval.s = s; - return QUOTEDSTRING; + MAYBE_RETURN (QUOTEDSTRING); } else { yylval.ss.length = length; yylval.ss.s = s; - return SIZEDSTRING; + MAYBE_RETURN (SIZEDSTRING); } } YY_BREAK case 82: YY_RULE_SETUP -#line 200 "/5g/ian/binutils/release/copy/binutils/rclex.l" +#line 217 "rclex.l" { char *s; @@ -1393,30 +1416,30 @@ YY_RULE_SETUP s = get_string (strlen (yytext) + 1); strcpy (s, yytext); yylval.s = s; - return STRING; + MAYBE_RETURN (STRING); } YY_BREAK case 83: YY_RULE_SETUP -#line 215 "/5g/ian/binutils/release/copy/binutils/rclex.l" +#line 232 "rclex.l" { ++rc_lineno; } YY_BREAK case 84: YY_RULE_SETUP -#line 216 "/5g/ian/binutils/release/copy/binutils/rclex.l" +#line 233 "rclex.l" { /* ignore whitespace */ } YY_BREAK case 85: YY_RULE_SETUP -#line 217 "/5g/ian/binutils/release/copy/binutils/rclex.l" -{ return *yytext; } +#line 234 "rclex.l" +{ MAYBE_RETURN (*yytext); } YY_BREAK case 86: YY_RULE_SETUP -#line 219 "/5g/ian/binutils/release/copy/binutils/rclex.l" +#line 236 "rclex.l" ECHO; YY_BREAK -#line 1420 "lex.yy.c" +#line 1443 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1427,6 +1450,7 @@ case YY_STATE_EOF(INITIAL): /* Undo the effects of YY_DO_BEFORE_ACTION. */ *yy_cp = yy_hold_char; + YY_RESTORE_YY_MORE_OFFSET if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) { @@ -1572,7 +1596,7 @@ static int yy_get_next_buffer() { /* Don't try to fill the buffer, so this is an EOF. */ if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) { - /* We matched a singled characater, the EOB, so + /* We matched a single character, the EOB, so * treat this as a final EOF. */ return EOB_ACT_END_OF_FILE; @@ -1599,7 +1623,7 @@ static int yy_get_next_buffer() /* don't do the read, it's not guaranteed to return an EOF, * just force an EOF */ - yy_n_chars = 0; + yy_current_buffer->yy_n_chars = yy_n_chars = 0; else { @@ -1654,6 +1678,8 @@ static int yy_get_next_buffer() /* Read in more data. */ YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), yy_n_chars, num_to_read ); + + yy_current_buffer->yy_n_chars = yy_n_chars; } if ( yy_n_chars == 0 ) @@ -1778,7 +1804,8 @@ register char *yy_bp; yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); - yy_n_chars = yy_current_buffer->yy_buf_size; + yy_current_buffer->yy_n_chars = + yy_n_chars = yy_current_buffer->yy_buf_size; if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); @@ -1816,19 +1843,31 @@ static int input() else { /* need more input */ - yytext_ptr = yy_c_buf_p; + int offset = yy_c_buf_p - yytext_ptr; ++yy_c_buf_p; switch ( yy_get_next_buffer() ) { + case EOB_ACT_LAST_MATCH: + /* This happens because yy_g_n_b() + * sees that we've accumulated a + * token and flags that we need to + * try matching the token before + * proceeding. But for input(), + * there's no matching to consider. + * So convert the EOB_ACT_LAST_MATCH + * to EOB_ACT_END_OF_FILE. + */ + + /* Reset buffer status. */ + yyrestart( yyin ); + + /* fall through */ + case EOB_ACT_END_OF_FILE: { if ( yywrap() ) - { - yy_c_buf_p = - yytext_ptr + YY_MORE_ADJ; return EOF; - } if ( ! yy_did_buffer_switch_on_eof ) YY_NEW_FILE; @@ -1840,17 +1879,8 @@ static int input() } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; + yy_c_buf_p = yytext_ptr + offset; break; - - case EOB_ACT_LAST_MATCH: -#ifdef __cplusplus - YY_FATAL_ERROR( - "unexpected last match in yyinput()" ); -#else - YY_FATAL_ERROR( - "unexpected last match in input()" ); -#endif } } } @@ -2014,6 +2044,9 @@ YY_BUFFER_STATE b; #endif { + if ( ! b ) + return; + b->yy_n_chars = 0; /* We always need two end-of-buffer characters. The first causes @@ -2073,17 +2106,17 @@ yy_size_t size; #ifndef YY_NO_SCAN_STRING #ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_string( yyconst char *str ) +YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) #else -YY_BUFFER_STATE yy_scan_string( str ) -yyconst char *str; +YY_BUFFER_STATE yy_scan_string( yy_str ) +yyconst char *yy_str; #endif { int len; - for ( len = 0; str[len]; ++len ) + for ( len = 0; yy_str[len]; ++len ) ; - return yy_scan_bytes( str, len ); + return yy_scan_bytes( yy_str, len ); } #endif @@ -2204,7 +2237,7 @@ char msg[]; { \ /* Undo effects of setting up yytext. */ \ yytext[yyleng] = yy_hold_char; \ - yy_c_buf_p = yytext + n - YY_MORE_ADJ; \ + yy_c_buf_p = yytext + n; \ yy_hold_char = *yy_c_buf_p; \ *yy_c_buf_p = '\0'; \ yyleng = n; \ @@ -2230,6 +2263,22 @@ int n; } #endif +#ifdef YY_NEED_STRLEN +#ifdef YY_USE_PROTOS +static int yy_flex_strlen( yyconst char *s ) +#else +static int yy_flex_strlen( s ) +yyconst char *s; +#endif + { + register int n; + for ( n = 0; s[n]; ++n ) + ; + + return n; + } +#endif + #ifdef YY_USE_PROTOS static void *yy_flex_alloc( yy_size_t size ) @@ -2276,7 +2325,7 @@ int main() return 0; } #endif -#line 219 "/5g/ian/binutils/release/copy/binutils/rclex.l" +#line 236 "rclex.l" #ifndef yywrap /* This is needed for some versions of lex. */ @@ -2296,18 +2345,18 @@ cpp_line (s) char *send, *fn; ++s; - while (isspace (*s)) + while (isspace ((unsigned char) *s)) ++s; line = strtol (s, &send, 0); - if (*send != '\0' && ! isspace (*send)) + if (*send != '\0' && ! isspace ((unsigned char) *send)) return; /* Subtract 1 because we are about to count the newline. */ rc_lineno = line - 1; s = send; - while (isspace (*s)) + while (isspace ((unsigned char) *s)) ++s; if (*s != '"') @@ -2324,6 +2373,20 @@ cpp_line (s) free (rc_filename); rc_filename = fn; + + if (!initial_fn) + { + initial_fn = xmalloc (strlen (fn) + 1); + strcpy(initial_fn, fn); + } + + /* Allow the initial file, regardless of name. Suppress all other + files if they end in ".h" (this allows included "*.rc") */ + if (strcmp (initial_fn, fn) == 0 + || strcmp (fn + strlen (fn) - 2, ".h") != 0) + suppress_cpp_data = 0; + else + suppress_cpp_data = 1; } /* Handle a quoted string. The quotes are stripped. A pair of quotes @@ -2453,8 +2516,8 @@ handle_quotes (input, len) else { ++t; - assert (isspace (*t)); - while (isspace (*t)) + assert (isspace ((unsigned char) *t)); + while (isspace ((unsigned char) *t)) ++t; if (*t == '\0') break; diff --git a/contrib/binutils/binutils/rcparse.c b/contrib/binutils/binutils/rcparse.c index 767dbcf..dff3302 100644 --- a/contrib/binutils/binutils/rcparse.c +++ b/contrib/binutils/binutils/rcparse.c @@ -1,96 +1,96 @@ -/* A Bison parser, made from /5g/ian/binutils/release/copy/binutils/rcparse.y - by GNU Bison version 1.25 - */ +/* A Bison parser, made from rcparse.y + by GNU Bison version 1.28 */ #define YYBISON 1 /* Identify Bison output. */ -#define BEG 258 -#define END 259 -#define ACCELERATORS 260 -#define VIRTKEY 261 -#define ASCII 262 -#define NOINVERT 263 -#define SHIFT 264 -#define CONTROL 265 -#define ALT 266 -#define BITMAP 267 -#define CURSOR 268 -#define DIALOG 269 -#define DIALOGEX 270 -#define EXSTYLE 271 -#define CAPTION 272 -#define CLASS 273 -#define STYLE 274 -#define AUTO3STATE 275 -#define AUTOCHECKBOX 276 -#define AUTORADIOBUTTON 277 -#define CHECKBOX 278 -#define COMBOBOX 279 -#define CTEXT 280 -#define DEFPUSHBUTTON 281 -#define EDITTEXT 282 -#define GROUPBOX 283 -#define LISTBOX 284 -#define LTEXT 285 -#define PUSHBOX 286 -#define PUSHBUTTON 287 -#define RADIOBUTTON 288 -#define RTEXT 289 -#define SCROLLBAR 290 -#define STATE3 291 -#define USERBUTTON 292 -#define BEDIT 293 -#define HEDIT 294 -#define IEDIT 295 -#define FONT 296 -#define ICON 297 -#define LANGUAGE 298 -#define CHARACTERISTICS 299 -#define VERSIONK 300 -#define MENU 301 -#define MENUEX 302 -#define MENUITEM 303 -#define SEPARATOR 304 -#define POPUP 305 -#define CHECKED 306 -#define GRAYED 307 -#define HELP 308 -#define INACTIVE 309 -#define MENUBARBREAK 310 -#define MENUBREAK 311 -#define MESSAGETABLE 312 -#define RCDATA 313 -#define STRINGTABLE 314 -#define VERSIONINFO 315 -#define FILEVERSION 316 -#define PRODUCTVERSION 317 -#define FILEFLAGSMASK 318 -#define FILEFLAGS 319 -#define FILEOS 320 -#define FILETYPE 321 -#define FILESUBTYPE 322 -#define BLOCKSTRINGFILEINFO 323 -#define BLOCKVARFILEINFO 324 -#define VALUE 325 -#define BLOCK 326 -#define MOVEABLE 327 -#define FIXED 328 -#define PURE 329 -#define IMPURE 330 -#define PRELOAD 331 -#define LOADONCALL 332 -#define DISCARDABLE 333 -#define NOT 334 -#define QUOTEDSTRING 335 -#define STRING 336 -#define NUMBER 337 -#define SIZEDSTRING 338 +#define BEG 257 +#define END 258 +#define ACCELERATORS 259 +#define VIRTKEY 260 +#define ASCII 261 +#define NOINVERT 262 +#define SHIFT 263 +#define CONTROL 264 +#define ALT 265 +#define BITMAP 266 +#define CURSOR 267 +#define DIALOG 268 +#define DIALOGEX 269 +#define EXSTYLE 270 +#define CAPTION 271 +#define CLASS 272 +#define STYLE 273 +#define AUTO3STATE 274 +#define AUTOCHECKBOX 275 +#define AUTORADIOBUTTON 276 +#define CHECKBOX 277 +#define COMBOBOX 278 +#define CTEXT 279 +#define DEFPUSHBUTTON 280 +#define EDITTEXT 281 +#define GROUPBOX 282 +#define LISTBOX 283 +#define LTEXT 284 +#define PUSHBOX 285 +#define PUSHBUTTON 286 +#define RADIOBUTTON 287 +#define RTEXT 288 +#define SCROLLBAR 289 +#define STATE3 290 +#define USERBUTTON 291 +#define BEDIT 292 +#define HEDIT 293 +#define IEDIT 294 +#define FONT 295 +#define ICON 296 +#define LANGUAGE 297 +#define CHARACTERISTICS 298 +#define VERSIONK 299 +#define MENU 300 +#define MENUEX 301 +#define MENUITEM 302 +#define SEPARATOR 303 +#define POPUP 304 +#define CHECKED 305 +#define GRAYED 306 +#define HELP 307 +#define INACTIVE 308 +#define MENUBARBREAK 309 +#define MENUBREAK 310 +#define MESSAGETABLE 311 +#define RCDATA 312 +#define STRINGTABLE 313 +#define VERSIONINFO 314 +#define FILEVERSION 315 +#define PRODUCTVERSION 316 +#define FILEFLAGSMASK 317 +#define FILEFLAGS 318 +#define FILEOS 319 +#define FILETYPE 320 +#define FILESUBTYPE 321 +#define BLOCKSTRINGFILEINFO 322 +#define BLOCKVARFILEINFO 323 +#define VALUE 324 +#define BLOCK 325 +#define MOVEABLE 326 +#define FIXED 327 +#define PURE 328 +#define IMPURE 329 +#define PRELOAD 330 +#define LOADONCALL 331 +#define DISCARDABLE 332 +#define NOT 333 +#define QUOTEDSTRING 334 +#define STRING 335 +#define NUMBER 336 +#define SIZEDSTRING 337 +#define IGNORED_TOKEN 338 #define NEG 339 -#line 1 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +#line 1 "rcparse.y" /* rcparse.y -- parser for Windows rc files - Copyright 1997 Free Software Foundation, Inc. + Copyright 1997, 1998 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support. This file is part of GNU Binutils. @@ -146,7 +146,7 @@ static unsigned long default_style; static unsigned long class; -#line 59 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +#line 59 "rcparse.y" typedef union { struct accelerator acc; @@ -196,26 +196,26 @@ typedef union -#define YYFINAL 462 +#define YYFINAL 475 #define YYFLAG -32768 -#define YYNTBASE 98 +#define YYNTBASE 99 -#define YYTRANSLATE(x) ((unsigned)(x) <= 339 ? yytranslate[x] : 188) +#define YYTRANSLATE(x) ((unsigned)(x) <= 339 ? yytranslate[x] : 189) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 91, 86, 2, 96, - 97, 89, 87, 94, 88, 2, 90, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 92, 87, 2, 97, + 98, 90, 88, 95, 89, 2, 91, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 95, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 96, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 85, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 86, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 84, 2, 92, 2, 2, 2, 2, + 2, 2, 2, 85, 2, 93, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -228,162 +228,165 @@ static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 93 + 2, 2, 2, 2, 2, 1, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 94 }; #if YYDEBUG != 0 static const short yyprhs[] = { 0, 0, 1, 5, 9, 13, 17, 21, 25, 29, 33, - 37, 41, 45, 49, 53, 57, 58, 65, 66, 69, - 72, 77, 79, 81, 83, 87, 90, 92, 94, 96, - 98, 100, 102, 107, 112, 113, 127, 128, 142, 143, - 158, 159, 163, 164, 168, 172, 173, 178, 182, 188, - 196, 200, 204, 209, 213, 214, 217, 218, 222, 223, - 227, 228, 232, 233, 237, 238, 242, 243, 247, 259, - 272, 273, 277, 278, 282, 283, 287, 288, 292, 293, - 297, 304, 315, 327, 328, 332, 333, 337, 338, 342, - 343, 347, 348, 352, 353, 357, 358, 362, 363, 367, - 368, 372, 373, 390, 398, 408, 419, 420, 423, 424, - 428, 429, 433, 434, 438, 439, 443, 448, 453, 457, - 464, 465, 468, 473, 476, 483, 484, 488, 491, 493, - 495, 497, 499, 501, 503, 510, 511, 514, 517, 521, - 527, 533, 540, 548, 558, 563, 570, 571, 574, 575, - 577, 579, 581, 585, 589, 590, 597, 598, 602, 607, - 614, 619, 626, 627, 634, 641, 645, 649, 653, 657, - 661, 662, 671, 679, 680, 686, 687, 691, 693, 695, - 696, 699, 703, 708, 712, 713, 716, 717, 720, 722, - 724, 726, 728, 730, 732, 734, 736, 738, 740, 743, - 747, 752, 754, 758, 759, 761, 764, 766, 768, 772, - 775, 778, 782, 786, 790, 794, 798, 802, 806, 810, - 813, 815, 817, 821, 824, 828, 832, 836, 840, 844, - 848, 852 + 37, 41, 45, 49, 53, 57, 61, 62, 69, 70, + 73, 76, 81, 83, 85, 87, 91, 94, 96, 98, + 100, 102, 104, 106, 111, 116, 117, 131, 132, 146, + 147, 162, 163, 167, 168, 172, 176, 177, 182, 186, + 192, 200, 204, 208, 213, 217, 218, 221, 222, 226, + 227, 231, 232, 236, 237, 241, 242, 246, 247, 251, + 263, 276, 289, 303, 304, 308, 309, 313, 314, 318, + 319, 323, 324, 328, 335, 346, 358, 359, 363, 364, + 368, 369, 373, 374, 378, 379, 383, 384, 388, 389, + 393, 394, 398, 399, 403, 404, 421, 429, 439, 450, + 451, 454, 455, 459, 460, 464, 465, 469, 470, 474, + 479, 484, 488, 495, 496, 499, 504, 507, 514, 515, + 519, 522, 524, 526, 528, 530, 532, 534, 541, 542, + 545, 548, 552, 558, 561, 567, 574, 582, 592, 597, + 604, 605, 608, 609, 611, 613, 615, 619, 623, 624, + 631, 632, 636, 641, 648, 653, 660, 661, 668, 675, + 679, 683, 687, 691, 695, 696, 705, 713, 714, 720, + 721, 725, 727, 729, 730, 733, 737, 742, 746, 747, + 750, 751, 754, 756, 758, 760, 762, 764, 766, 768, + 770, 772, 774, 777, 781, 786, 788, 792, 793, 795, + 798, 800, 802, 806, 809, 812, 816, 820, 824, 828, + 832, 836, 840, 844, 847, 849, 851, 855, 858, 862, + 866, 870, 874, 878, 882, 886 }; static const short yyrhs[] = { -1, - 98, 99, 100, 0, 98, 99, 106, 0, 98, 99, - 107, 0, 98, 99, 108, 0, 98, 99, 147, 0, - 98, 99, 148, 0, 98, 99, 149, 0, 98, 99, - 150, 0, 98, 99, 155, 0, 98, 99, 158, 0, - 98, 99, 159, 0, 98, 99, 164, 0, 98, 99, - 167, 0, 98, 99, 168, 0, 0, 173, 5, 174, - 3, 101, 4, 0, 0, 101, 102, 0, 103, 185, - 0, 103, 185, 94, 104, 0, 80, 0, 186, 0, - 105, 0, 104, 94, 105, 0, 104, 105, 0, 6, - 0, 7, 0, 8, 0, 9, 0, 10, 0, 11, - 0, 173, 12, 176, 178, 0, 173, 13, 175, 178, - 0, 0, 173, 14, 176, 112, 186, 182, 182, 182, - 109, 113, 3, 115, 4, 0, 0, 173, 15, 176, - 112, 186, 182, 182, 182, 110, 113, 3, 115, 4, - 0, 0, 173, 15, 176, 112, 186, 182, 182, 182, - 182, 111, 113, 3, 115, 4, 0, 0, 16, 95, - 183, 0, 0, 113, 17, 80, 0, 113, 18, 173, - 0, 0, 113, 19, 114, 179, 0, 113, 16, 183, - 0, 113, 41, 183, 94, 80, 0, 113, 41, 183, - 94, 80, 182, 182, 0, 113, 46, 173, 0, 113, - 44, 183, 0, 113, 43, 183, 182, 0, 113, 45, - 183, 0, 0, 115, 116, 0, 0, 20, 117, 138, - 0, 0, 21, 118, 138, 0, 0, 22, 119, 138, - 0, 0, 38, 120, 138, 0, 0, 23, 121, 138, - 0, 0, 24, 122, 138, 0, 10, 139, 183, 182, - 141, 182, 182, 182, 182, 181, 140, 0, 10, 139, - 183, 182, 141, 182, 182, 182, 182, 182, 182, 140, - 0, 0, 25, 123, 138, 0, 0, 26, 124, 138, - 0, 0, 27, 125, 138, 0, 0, 28, 126, 138, - 0, 0, 39, 127, 138, 0, 42, 139, 183, 182, - 182, 140, 0, 42, 139, 183, 182, 182, 182, 182, - 143, 181, 140, 0, 42, 139, 183, 182, 182, 182, - 182, 143, 182, 182, 140, 0, 0, 40, 128, 138, - 0, 0, 29, 129, 138, 0, 0, 30, 130, 138, - 0, 0, 31, 131, 138, 0, 0, 32, 132, 138, - 0, 0, 33, 133, 138, 0, 0, 34, 134, 138, - 0, 0, 35, 135, 138, 0, 0, 36, 136, 138, - 0, 0, 37, 80, 94, 183, 94, 183, 94, 183, - 94, 183, 94, 183, 94, 137, 179, 181, 0, 139, - 183, 182, 182, 182, 182, 140, 0, 139, 183, 182, - 182, 182, 182, 145, 181, 140, 0, 139, 183, 182, - 182, 182, 182, 145, 182, 182, 140, 0, 0, 80, - 94, 0, 0, 3, 160, 4, 0, 0, 94, 142, - 179, 0, 0, 94, 144, 179, 0, 0, 94, 146, - 179, 0, 173, 41, 175, 178, 0, 173, 42, 175, - 178, 0, 43, 183, 182, 0, 173, 46, 174, 3, - 151, 4, 0, 0, 151, 152, 0, 48, 80, 182, - 153, 0, 48, 49, 0, 50, 80, 153, 3, 151, - 4, 0, 0, 153, 94, 154, 0, 153, 154, 0, - 51, 0, 52, 0, 53, 0, 54, 0, 55, 0, - 56, 0, 173, 47, 174, 3, 156, 4, 0, 0, - 156, 157, 0, 48, 80, 0, 48, 80, 182, 0, - 48, 80, 182, 182, 181, 0, 50, 80, 3, 156, - 4, 0, 50, 80, 182, 3, 156, 4, 0, 50, - 80, 182, 182, 3, 156, 4, 0, 50, 80, 182, - 182, 182, 181, 3, 156, 4, 0, 173, 57, 176, - 178, 0, 173, 58, 174, 3, 160, 4, 0, 0, - 161, 162, 0, 0, 163, 0, 83, 0, 184, 0, - 163, 94, 83, 0, 163, 94, 184, 0, 0, 59, - 174, 3, 165, 166, 4, 0, 0, 166, 183, 80, - 0, 166, 183, 94, 80, 0, 173, 173, 174, 3, - 160, 4, 0, 173, 173, 174, 178, 0, 173, 60, - 169, 3, 170, 4, 0, 0, 169, 61, 183, 182, - 182, 182, 0, 169, 62, 183, 182, 182, 182, 0, - 169, 63, 183, 0, 169, 64, 183, 0, 169, 65, - 183, 0, 169, 66, 183, 0, 169, 67, 183, 0, - 0, 170, 68, 3, 71, 3, 171, 4, 4, 0, - 170, 69, 3, 70, 80, 172, 4, 0, 0, 171, - 70, 80, 94, 80, 0, 0, 172, 182, 182, 0, - 186, 0, 81, 0, 0, 174, 177, 0, 174, 44, - 183, 0, 174, 43, 183, 182, 0, 174, 45, 183, - 0, 0, 175, 177, 0, 0, 175, 177, 0, 72, - 0, 73, 0, 74, 0, 75, 0, 76, 0, 77, - 0, 78, 0, 80, 0, 81, 0, 180, 0, 79, - 180, 0, 179, 84, 180, 0, 179, 84, 79, 180, - 0, 82, 0, 96, 183, 97, 0, 0, 182, 0, - 94, 183, 0, 184, 0, 82, 0, 96, 184, 97, - 0, 92, 184, 0, 88, 184, 0, 184, 89, 184, - 0, 184, 90, 184, 0, 184, 91, 184, 0, 184, - 87, 184, 0, 184, 88, 184, 0, 184, 86, 184, - 0, 184, 85, 184, 0, 184, 84, 184, 0, 94, - 186, 0, 187, 0, 82, 0, 96, 184, 97, 0, - 92, 184, 0, 187, 89, 184, 0, 187, 90, 184, - 0, 187, 91, 184, 0, 187, 87, 184, 0, 187, - 88, 184, 0, 187, 86, 184, 0, 187, 85, 184, - 0, 187, 84, 184, 0 + 99, 100, 101, 0, 99, 100, 107, 0, 99, 100, + 108, 0, 99, 100, 109, 0, 99, 100, 148, 0, + 99, 100, 149, 0, 99, 100, 150, 0, 99, 100, + 151, 0, 99, 100, 156, 0, 99, 100, 159, 0, + 99, 100, 160, 0, 99, 100, 165, 0, 99, 100, + 168, 0, 99, 100, 169, 0, 99, 100, 84, 0, + 0, 174, 5, 175, 3, 102, 4, 0, 0, 102, + 103, 0, 104, 186, 0, 104, 186, 95, 105, 0, + 80, 0, 187, 0, 106, 0, 105, 95, 106, 0, + 105, 106, 0, 6, 0, 7, 0, 8, 0, 9, + 0, 10, 0, 11, 0, 174, 12, 177, 179, 0, + 174, 13, 176, 179, 0, 0, 174, 14, 177, 113, + 187, 183, 183, 183, 110, 114, 3, 116, 4, 0, + 0, 174, 15, 177, 113, 187, 183, 183, 183, 111, + 114, 3, 116, 4, 0, 0, 174, 15, 177, 113, + 187, 183, 183, 183, 183, 112, 114, 3, 116, 4, + 0, 0, 16, 96, 184, 0, 0, 114, 17, 80, + 0, 114, 18, 174, 0, 0, 114, 19, 115, 180, + 0, 114, 16, 184, 0, 114, 41, 184, 95, 80, + 0, 114, 41, 184, 95, 80, 183, 183, 0, 114, + 46, 174, 0, 114, 44, 184, 0, 114, 43, 184, + 183, 0, 114, 45, 184, 0, 0, 116, 117, 0, + 0, 20, 118, 139, 0, 0, 21, 119, 139, 0, + 0, 22, 120, 139, 0, 0, 38, 121, 139, 0, + 0, 23, 122, 139, 0, 0, 24, 123, 139, 0, + 10, 140, 184, 183, 142, 183, 183, 183, 183, 182, + 141, 0, 10, 140, 184, 183, 142, 183, 183, 183, + 183, 183, 183, 141, 0, 10, 140, 184, 95, 80, + 142, 183, 183, 183, 183, 182, 141, 0, 10, 140, + 184, 95, 80, 142, 183, 183, 183, 183, 183, 183, + 141, 0, 0, 25, 124, 139, 0, 0, 26, 125, + 139, 0, 0, 27, 126, 139, 0, 0, 28, 127, + 139, 0, 0, 39, 128, 139, 0, 42, 140, 184, + 183, 183, 141, 0, 42, 140, 184, 183, 183, 183, + 183, 144, 182, 141, 0, 42, 140, 184, 183, 183, + 183, 183, 144, 183, 183, 141, 0, 0, 40, 129, + 139, 0, 0, 29, 130, 139, 0, 0, 30, 131, + 139, 0, 0, 31, 132, 139, 0, 0, 32, 133, + 139, 0, 0, 33, 134, 139, 0, 0, 34, 135, + 139, 0, 0, 35, 136, 139, 0, 0, 36, 137, + 139, 0, 0, 37, 80, 95, 184, 95, 184, 95, + 184, 95, 184, 95, 184, 95, 138, 180, 182, 0, + 140, 184, 183, 183, 183, 183, 141, 0, 140, 184, + 183, 183, 183, 183, 146, 182, 141, 0, 140, 184, + 183, 183, 183, 183, 146, 183, 183, 141, 0, 0, + 80, 95, 0, 0, 3, 161, 4, 0, 0, 95, + 143, 180, 0, 0, 95, 145, 180, 0, 0, 95, + 147, 180, 0, 174, 41, 176, 179, 0, 174, 42, + 176, 179, 0, 43, 184, 183, 0, 174, 46, 175, + 3, 152, 4, 0, 0, 152, 153, 0, 48, 80, + 183, 154, 0, 48, 49, 0, 50, 80, 154, 3, + 152, 4, 0, 0, 154, 95, 155, 0, 154, 155, + 0, 51, 0, 52, 0, 53, 0, 54, 0, 55, + 0, 56, 0, 174, 47, 175, 3, 157, 4, 0, + 0, 157, 158, 0, 48, 80, 0, 48, 80, 183, + 0, 48, 80, 183, 183, 182, 0, 48, 49, 0, + 50, 80, 3, 157, 4, 0, 50, 80, 183, 3, + 157, 4, 0, 50, 80, 183, 183, 3, 157, 4, + 0, 50, 80, 183, 183, 183, 182, 3, 157, 4, + 0, 174, 57, 177, 179, 0, 174, 58, 175, 3, + 161, 4, 0, 0, 162, 163, 0, 0, 164, 0, + 83, 0, 185, 0, 164, 95, 83, 0, 164, 95, + 185, 0, 0, 59, 175, 3, 166, 167, 4, 0, + 0, 167, 184, 80, 0, 167, 184, 95, 80, 0, + 174, 174, 175, 3, 161, 4, 0, 174, 174, 175, + 179, 0, 174, 60, 170, 3, 171, 4, 0, 0, + 170, 61, 184, 183, 183, 183, 0, 170, 62, 184, + 183, 183, 183, 0, 170, 63, 184, 0, 170, 64, + 184, 0, 170, 65, 184, 0, 170, 66, 184, 0, + 170, 67, 184, 0, 0, 171, 68, 3, 71, 3, + 172, 4, 4, 0, 171, 69, 3, 70, 80, 173, + 4, 0, 0, 172, 70, 80, 95, 80, 0, 0, + 173, 183, 183, 0, 187, 0, 81, 0, 0, 175, + 178, 0, 175, 44, 184, 0, 175, 43, 184, 183, + 0, 175, 45, 184, 0, 0, 176, 178, 0, 0, + 177, 178, 0, 72, 0, 73, 0, 74, 0, 75, + 0, 76, 0, 77, 0, 78, 0, 80, 0, 81, + 0, 181, 0, 79, 181, 0, 180, 85, 181, 0, + 180, 85, 79, 181, 0, 82, 0, 97, 184, 98, + 0, 0, 183, 0, 95, 184, 0, 185, 0, 82, + 0, 97, 185, 98, 0, 93, 185, 0, 89, 185, + 0, 185, 90, 185, 0, 185, 91, 185, 0, 185, + 92, 185, 0, 185, 88, 185, 0, 185, 89, 185, + 0, 185, 87, 185, 0, 185, 86, 185, 0, 185, + 85, 185, 0, 95, 187, 0, 188, 0, 82, 0, + 97, 185, 98, 0, 93, 185, 0, 188, 90, 185, + 0, 188, 91, 185, 0, 188, 92, 185, 0, 188, + 88, 185, 0, 188, 89, 185, 0, 188, 87, 185, + 0, 188, 86, 185, 0, 188, 85, 185, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 154, 156, 157, 158, 159, 160, 161, 162, 163, 164, - 165, 166, 167, 168, 169, 172, 181, 188, 193, 213, - 219, 230, 252, 261, 266, 271, 277, 282, 287, 291, - 295, 299, 307, 316, 325, 343, 347, 366, 370, 390, - 396, 401, 407, 409, 413, 417, 420, 423, 427, 433, - 446, 450, 454, 458, 464, 466, 476, 484, 487, 494, - 497, 504, 507, 514, 520, 527, 530, 537, 540, 551, - 560, 567, 570, 577, 580, 587, 590, 597, 600, 607, - 613, 624, 636, 646, 653, 659, 666, 669, 676, 679, - 686, 689, 696, 699, 706, 709, 716, 719, 726, 729, - 736, 739, 742, 756, 769, 780, 791, 796, 802, 807, - 815, 819, 821, 825, 827, 831, 835, 844, 854, 863, - 870, 875, 891, 896, 900, 906, 911, 915, 921, 926, - 930, 934, 938, 942, 950, 957, 962, 978, 983, 987, - 991, 995, 999, 1003, 1012, 1021, 1031, 1036, 1042, 1048, - 1054, 1063, 1071, 1080, 1093, 1096, 1099, 1101, 1105, 1114, - 1119, 1127, 1134, 1141, 1147, 1153, 1158, 1163, 1168, 1173, - 1186, 1191, 1195, 1201, 1206, 1212, 1217, 1225, 1231, 1248, - 1256, 1262, 1267, 1272, 1281, 1288, 1298, 1305, 1316, 1322, - 1327, 1332, 1337, 1342, 1347, 1356, 1361, 1377, 1382, 1386, - 1390, 1396, 1401, 1409, 1414, 1422, 1431, 1440, 1445, 1449, - 1454, 1459, 1464, 1469, 1474, 1479, 1484, 1489, 1494, 1504, - 1513, 1524, 1529, 1533, 1538, 1543, 1548, 1553, 1558, 1563, - 1568, 1573 + 155, 157, 158, 159, 160, 161, 162, 163, 164, 165, + 166, 167, 168, 169, 170, 171, 174, 183, 190, 195, + 215, 221, 232, 254, 263, 268, 273, 279, 284, 289, + 293, 297, 301, 309, 318, 327, 345, 349, 368, 372, + 392, 398, 403, 409, 411, 415, 419, 422, 425, 429, + 435, 448, 452, 456, 460, 466, 468, 478, 486, 489, + 496, 499, 506, 509, 516, 522, 529, 532, 539, 542, + 553, 562, 575, 586, 593, 596, 603, 606, 613, 616, + 623, 626, 633, 639, 650, 662, 672, 679, 685, 692, + 695, 702, 705, 712, 715, 722, 725, 732, 735, 742, + 745, 752, 755, 762, 765, 768, 782, 795, 806, 817, + 822, 828, 833, 841, 845, 847, 851, 853, 857, 861, + 870, 880, 889, 896, 901, 917, 922, 926, 932, 937, + 941, 947, 952, 956, 960, 964, 968, 976, 983, 988, + 1004, 1009, 1013, 1017, 1021, 1025, 1029, 1033, 1042, 1051, + 1061, 1066, 1072, 1078, 1084, 1093, 1101, 1110, 1123, 1126, + 1129, 1131, 1135, 1144, 1149, 1157, 1164, 1171, 1177, 1183, + 1188, 1193, 1198, 1203, 1216, 1221, 1225, 1231, 1236, 1242, + 1247, 1255, 1261, 1278, 1286, 1292, 1297, 1302, 1311, 1318, + 1328, 1335, 1346, 1352, 1357, 1362, 1367, 1372, 1377, 1386, + 1391, 1407, 1412, 1416, 1420, 1426, 1431, 1439, 1444, 1452, + 1461, 1470, 1475, 1479, 1484, 1489, 1494, 1499, 1504, 1509, + 1514, 1519, 1524, 1534, 1543, 1554, 1559, 1563, 1568, 1573, + 1578, 1583, 1588, 1593, 1598, 1603 }; #endif @@ -401,9 +404,9 @@ static const char * const yytname[] = { "$","error","$undefined.","BEG","END", "RCDATA","STRINGTABLE","VERSIONINFO","FILEVERSION","PRODUCTVERSION","FILEFLAGSMASK", "FILEFLAGS","FILEOS","FILETYPE","FILESUBTYPE","BLOCKSTRINGFILEINFO","BLOCKVARFILEINFO", "VALUE","BLOCK","MOVEABLE","FIXED","PURE","IMPURE","PRELOAD","LOADONCALL","DISCARDABLE", -"NOT","QUOTEDSTRING","STRING","NUMBER","SIZEDSTRING","'|'","'^'","'&'","'+'", -"'-'","'*'","'/'","'%'","'~'","NEG","','","'='","'('","')'","input","newcmd", -"accelerator","acc_entries","acc_entry","acc_event","acc_options","acc_option", +"NOT","QUOTEDSTRING","STRING","NUMBER","SIZEDSTRING","IGNORED_TOKEN","'|'","'^'", +"'&'","'+'","'-'","'*'","'/'","'%'","'~'","NEG","','","'='","'('","')'","input", +"newcmd","accelerator","acc_entries","acc_entry","acc_event","acc_options","acc_option", "bitmap","cursor","dialog","@1","@2","@3","exstyle","styles","@4","controls", "control","@5","@6","@7","@8","@9","@10","@11","@12","@13","@14","@15","@16", "@17","@18","@19","@20","@21","@22","@23","@24","@25","control_params","optstringc", @@ -419,330 +422,341 @@ static const char * const yytname[] = { "$","error","$undefined.","BEG","END", #endif static const short yyr1[] = { 0, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 99, 100, 101, 101, 102, - 102, 103, 103, 104, 104, 104, 105, 105, 105, 105, - 105, 105, 106, 107, 109, 108, 110, 108, 111, 108, - 112, 112, 113, 113, 113, 114, 113, 113, 113, 113, - 113, 113, 113, 113, 115, 115, 117, 116, 118, 116, - 119, 116, 120, 116, 121, 116, 122, 116, 116, 116, - 123, 116, 124, 116, 125, 116, 126, 116, 127, 116, - 116, 116, 116, 128, 116, 129, 116, 130, 116, 131, - 116, 132, 116, 133, 116, 134, 116, 135, 116, 136, - 116, 137, 116, 138, 138, 138, 139, 139, 140, 140, - 142, 141, 144, 143, 146, 145, 147, 148, 149, 150, - 151, 151, 152, 152, 152, 153, 153, 153, 154, 154, - 154, 154, 154, 154, 155, 156, 156, 157, 157, 157, - 157, 157, 157, 157, 158, 159, 161, 160, 162, 162, - 163, 163, 163, 163, 165, 164, 166, 166, 166, 167, - 167, 168, 169, 169, 169, 169, 169, 169, 169, 169, - 170, 170, 170, 171, 171, 172, 172, 173, 173, 174, - 174, 174, 174, 174, 175, 175, 176, 176, 177, 177, - 177, 177, 177, 177, 177, 178, 178, 179, 179, 179, - 179, 180, 180, 181, 181, 182, 183, 184, 184, 184, - 184, 184, 184, 184, 184, 184, 184, 184, 184, 185, - 186, 187, 187, 187, 187, 187, 187, 187, 187, 187, - 187, 187 + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, + 99, 99, 99, 99, 99, 99, 100, 101, 102, 102, + 103, 103, 104, 104, 105, 105, 105, 106, 106, 106, + 106, 106, 106, 107, 108, 110, 109, 111, 109, 112, + 109, 113, 113, 114, 114, 114, 115, 114, 114, 114, + 114, 114, 114, 114, 114, 116, 116, 118, 117, 119, + 117, 120, 117, 121, 117, 122, 117, 123, 117, 117, + 117, 117, 117, 124, 117, 125, 117, 126, 117, 127, + 117, 128, 117, 117, 117, 117, 129, 117, 130, 117, + 131, 117, 132, 117, 133, 117, 134, 117, 135, 117, + 136, 117, 137, 117, 138, 117, 139, 139, 139, 140, + 140, 141, 141, 143, 142, 145, 144, 147, 146, 148, + 149, 150, 151, 152, 152, 153, 153, 153, 154, 154, + 154, 155, 155, 155, 155, 155, 155, 156, 157, 157, + 158, 158, 158, 158, 158, 158, 158, 158, 159, 160, + 162, 161, 163, 163, 164, 164, 164, 164, 166, 165, + 167, 167, 167, 168, 168, 169, 170, 170, 170, 170, + 170, 170, 170, 170, 171, 171, 171, 172, 172, 173, + 173, 174, 174, 175, 175, 175, 175, 175, 176, 176, + 177, 177, 178, 178, 178, 178, 178, 178, 178, 179, + 179, 180, 180, 180, 180, 181, 181, 182, 182, 183, + 184, 185, 185, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 186, 187, 188, 188, 188, 188, 188, + 188, 188, 188, 188, 188, 188 }; static const short yyr2[] = { 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 0, 6, 0, 2, 2, - 4, 1, 1, 1, 3, 2, 1, 1, 1, 1, - 1, 1, 4, 4, 0, 13, 0, 13, 0, 14, - 0, 3, 0, 3, 3, 0, 4, 3, 5, 7, - 3, 3, 4, 3, 0, 2, 0, 3, 0, 3, - 0, 3, 0, 3, 0, 3, 0, 3, 11, 12, + 3, 3, 3, 3, 3, 3, 0, 6, 0, 2, + 2, 4, 1, 1, 1, 3, 2, 1, 1, 1, + 1, 1, 1, 4, 4, 0, 13, 0, 13, 0, + 14, 0, 3, 0, 3, 3, 0, 4, 3, 5, + 7, 3, 3, 4, 3, 0, 2, 0, 3, 0, + 3, 0, 3, 0, 3, 0, 3, 0, 3, 11, + 12, 12, 13, 0, 3, 0, 3, 0, 3, 0, + 3, 0, 3, 6, 10, 11, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, - 6, 10, 11, 0, 3, 0, 3, 0, 3, 0, - 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, - 3, 0, 16, 7, 9, 10, 0, 2, 0, 3, - 0, 3, 0, 3, 0, 3, 4, 4, 3, 6, - 0, 2, 4, 2, 6, 0, 3, 2, 1, 1, - 1, 1, 1, 1, 6, 0, 2, 2, 3, 5, - 5, 6, 7, 9, 4, 6, 0, 2, 0, 1, - 1, 1, 3, 3, 0, 6, 0, 3, 4, 6, - 4, 6, 0, 6, 6, 3, 3, 3, 3, 3, - 0, 8, 7, 0, 5, 0, 3, 1, 1, 0, - 2, 3, 4, 3, 0, 2, 0, 2, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, - 4, 1, 3, 0, 1, 2, 1, 1, 3, 2, - 2, 3, 3, 3, 3, 3, 3, 3, 3, 2, - 1, 1, 3, 2, 3, 3, 3, 3, 3, 3, - 3, 3 + 0, 3, 0, 3, 0, 16, 7, 9, 10, 0, + 2, 0, 3, 0, 3, 0, 3, 0, 3, 4, + 4, 3, 6, 0, 2, 4, 2, 6, 0, 3, + 2, 1, 1, 1, 1, 1, 1, 6, 0, 2, + 2, 3, 5, 2, 5, 6, 7, 9, 4, 6, + 0, 2, 0, 1, 1, 1, 3, 3, 0, 6, + 0, 3, 4, 6, 4, 6, 0, 6, 6, 3, + 3, 3, 3, 3, 0, 8, 7, 0, 5, 0, + 3, 1, 1, 0, 2, 3, 4, 3, 0, 2, + 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 3, 4, 1, 3, 0, 1, 2, + 1, 1, 3, 2, 2, 3, 3, 3, 3, 3, + 3, 3, 3, 2, 1, 1, 3, 2, 3, 3, + 3, 3, 3, 3, 3, 3 }; static const short yydefact[] = { 1, - 16, 0, 0, 180, 179, 222, 0, 0, 2, 3, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 0, 178, 221, 208, 0, 0, 0, 0, - 207, 0, 224, 0, 180, 185, 185, 185, 185, 185, - 185, 180, 180, 185, 180, 163, 180, 0, 0, 0, - 0, 0, 0, 0, 0, 211, 210, 0, 0, 119, - 0, 0, 0, 0, 0, 0, 0, 0, 155, 0, - 0, 0, 189, 190, 191, 192, 193, 194, 195, 181, - 223, 0, 0, 0, 0, 41, 41, 0, 0, 0, - 0, 0, 0, 0, 0, 232, 231, 230, 228, 229, - 225, 226, 227, 209, 206, 219, 218, 217, 215, 216, - 212, 213, 214, 157, 0, 182, 184, 18, 186, 196, - 197, 33, 186, 34, 0, 0, 0, 117, 118, 121, - 136, 145, 147, 171, 0, 0, 0, 0, 0, 0, - 0, 147, 161, 0, 183, 0, 0, 0, 0, 0, - 0, 0, 149, 0, 0, 0, 166, 167, 168, 169, - 170, 0, 156, 0, 17, 22, 19, 0, 23, 42, - 0, 0, 120, 0, 0, 122, 135, 0, 0, 137, - 146, 151, 148, 150, 152, 162, 0, 0, 0, 0, - 160, 158, 0, 0, 20, 0, 0, 124, 0, 126, - 138, 0, 0, 0, 0, 0, 0, 159, 220, 0, - 35, 37, 126, 0, 139, 136, 0, 153, 154, 0, - 0, 164, 165, 27, 28, 29, 30, 31, 32, 21, - 24, 43, 43, 39, 123, 121, 129, 130, 131, 132, - 133, 134, 0, 128, 204, 0, 136, 0, 174, 176, - 0, 26, 0, 0, 43, 0, 127, 140, 205, 141, - 0, 136, 204, 0, 0, 25, 55, 0, 0, 0, - 46, 0, 0, 0, 0, 0, 55, 0, 125, 142, - 0, 0, 0, 0, 173, 0, 0, 48, 44, 45, - 0, 0, 0, 52, 54, 51, 0, 55, 143, 136, - 172, 0, 177, 36, 107, 57, 59, 61, 65, 67, - 71, 73, 75, 77, 86, 88, 90, 92, 94, 96, - 98, 100, 0, 63, 79, 84, 107, 56, 0, 202, - 0, 47, 198, 0, 53, 38, 0, 0, 0, 0, - 0, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 0, 107, - 107, 107, 0, 199, 0, 0, 49, 40, 144, 175, - 108, 0, 58, 0, 60, 62, 66, 68, 72, 74, - 76, 78, 87, 89, 91, 93, 95, 97, 99, 101, - 0, 64, 80, 85, 0, 203, 0, 200, 0, 0, - 0, 0, 0, 201, 50, 111, 0, 0, 0, 109, - 0, 0, 0, 0, 147, 81, 0, 112, 0, 0, - 0, 0, 0, 0, 109, 0, 110, 113, 204, 204, - 115, 104, 204, 0, 0, 109, 205, 109, 205, 0, - 109, 205, 0, 114, 82, 109, 69, 109, 116, 105, - 109, 0, 83, 70, 106, 0, 102, 0, 204, 103, - 0, 0 + 17, 0, 0, 184, 183, 226, 16, 0, 0, 2, + 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 0, 182, 225, 212, 0, 0, 0, + 0, 211, 0, 228, 0, 184, 191, 189, 191, 191, + 189, 189, 184, 184, 191, 184, 167, 184, 0, 0, + 0, 0, 0, 0, 0, 0, 215, 214, 0, 0, + 122, 0, 0, 0, 0, 0, 0, 0, 0, 159, + 0, 0, 0, 193, 194, 195, 196, 197, 198, 199, + 185, 227, 0, 0, 0, 42, 42, 0, 0, 0, + 0, 0, 0, 0, 0, 236, 235, 234, 232, 233, + 229, 230, 231, 213, 210, 223, 222, 221, 219, 220, + 216, 217, 218, 161, 0, 186, 188, 19, 200, 201, + 192, 34, 190, 35, 0, 0, 0, 120, 121, 124, + 139, 149, 151, 175, 0, 0, 0, 0, 0, 0, + 0, 151, 165, 0, 187, 0, 0, 0, 0, 0, + 0, 0, 153, 0, 0, 0, 170, 171, 172, 173, + 174, 0, 160, 0, 18, 23, 20, 0, 24, 43, + 0, 0, 123, 0, 0, 125, 138, 0, 0, 140, + 150, 155, 152, 154, 156, 166, 0, 0, 0, 0, + 164, 162, 0, 0, 21, 0, 0, 127, 0, 129, + 144, 141, 0, 0, 0, 0, 0, 0, 163, 224, + 0, 36, 38, 129, 0, 142, 139, 0, 157, 158, + 0, 0, 168, 169, 28, 29, 30, 31, 32, 33, + 22, 25, 44, 44, 40, 126, 124, 132, 133, 134, + 135, 136, 137, 0, 131, 208, 0, 139, 0, 178, + 180, 0, 27, 0, 0, 44, 0, 130, 143, 209, + 145, 0, 139, 208, 0, 0, 26, 56, 0, 0, + 0, 47, 0, 0, 0, 0, 0, 56, 0, 128, + 146, 0, 0, 0, 0, 177, 0, 0, 49, 45, + 46, 0, 0, 0, 53, 55, 52, 0, 56, 147, + 139, 176, 0, 181, 37, 110, 58, 60, 62, 66, + 68, 74, 76, 78, 80, 89, 91, 93, 95, 97, + 99, 101, 103, 0, 64, 82, 87, 110, 57, 0, + 206, 0, 48, 202, 0, 54, 39, 0, 0, 0, + 0, 0, 110, 110, 110, 110, 110, 110, 110, 110, + 110, 110, 110, 110, 110, 110, 110, 110, 110, 0, + 110, 110, 110, 0, 203, 0, 0, 50, 41, 148, + 179, 111, 0, 59, 0, 61, 63, 67, 69, 75, + 77, 79, 81, 90, 92, 94, 96, 98, 100, 102, + 104, 0, 65, 83, 88, 0, 207, 0, 204, 0, + 0, 0, 0, 0, 0, 205, 51, 0, 114, 0, + 0, 0, 112, 0, 0, 0, 0, 0, 151, 84, + 0, 0, 115, 0, 0, 0, 0, 0, 0, 0, + 112, 0, 113, 116, 208, 0, 208, 118, 107, 208, + 0, 0, 112, 209, 208, 112, 209, 0, 112, 209, + 0, 117, 85, 112, 112, 209, 70, 112, 119, 108, + 112, 0, 86, 72, 112, 71, 109, 0, 73, 105, + 0, 208, 106, 0, 0 }; static const short yydefgoto[] = { 1, - 2, 9, 146, 167, 168, 230, 231, 10, 11, 12, - 232, 233, 255, 126, 253, 291, 287, 328, 342, 343, - 344, 360, 345, 346, 347, 348, 349, 350, 361, 362, - 351, 352, 353, 354, 355, 356, 357, 358, 458, 373, - 374, 416, 407, 411, 429, 435, 433, 440, 13, 14, - 15, 16, 150, 176, 214, 244, 17, 151, 180, 18, - 19, 152, 153, 183, 184, 20, 114, 144, 21, 22, - 94, 154, 264, 265, 23, 32, 83, 84, 80, 122, - 332, 333, 258, 259, 30, 31, 195, 24, 25 + 2, 10, 146, 167, 168, 231, 232, 11, 12, 13, + 233, 234, 256, 126, 254, 292, 288, 329, 343, 344, + 345, 361, 346, 347, 348, 349, 350, 351, 362, 363, + 352, 353, 354, 355, 356, 357, 358, 359, 471, 374, + 375, 420, 410, 415, 435, 442, 440, 448, 14, 15, + 16, 17, 150, 176, 215, 245, 18, 151, 180, 19, + 20, 152, 153, 183, 184, 21, 114, 144, 22, 23, + 94, 154, 265, 266, 24, 33, 85, 84, 81, 122, + 333, 334, 259, 260, 105, 32, 195, 25, 26 }; static const short yypact[] = {-32768, - 41, 97, 496,-32768,-32768,-32768, 496, 496,-32768,-32768, + 39, 284, 231,-32768,-32768,-32768,-32768, 231, 231,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768, 149,-32768, 419,-32768, 496, 496, 496, -49, - 456, 214,-32768, 533,-32768, -75,-32768, -12, -12,-32768, --32768,-32768,-32768, -75,-32768,-32768,-32768, 496, 496, 496, - 496, 496, 496, 496, 496,-32768,-32768, 547, 496,-32768, - 496, 496, 496, 496, 496, 496, 496, 496,-32768, 496, - 496, 496,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768, 234, 583, 2, 573, 95, 95, 573, 573, 257, - 277, 2, 341, 295, 195, 577, 366, 538, 163, 163, --32768,-32768,-32768,-32768,-32768, 577, 366, 538, 163, 163, --32768,-32768,-32768,-32768, -49,-32768,-32768,-32768, 53,-32768, --32768,-32768,-32768,-32768, 33, 123, 123,-32768,-32768,-32768, --32768,-32768,-32768,-32768, 496, 496, 496, 496, 496, 496, - 496,-32768,-32768, 14,-32768, 17, 496, -49, -49, 38, - 100, 127, 231, 55, -49, -49,-32768,-32768,-32768,-32768, --32768, 132,-32768, -77,-32768,-32768,-32768, 45,-32768,-32768, - -49, -49,-32768, 66, 63,-32768,-32768, 64, 67,-32768, --32768,-32768,-32768, 76, 456,-32768, 171, 180, -49, -49, --32768,-32768, 106, 123, 98, -49, -49,-32768, -49,-32768, - -49, 6, 309, 128, 131, -49, -49,-32768,-32768, 663, --32768, -49,-32768, 20, -49,-32768, 9,-32768, 456, 205, - 136,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 26, --32768,-32768,-32768,-32768, 376,-32768,-32768,-32768,-32768,-32768, --32768,-32768, 624,-32768, -49, 125,-32768, 13,-32768,-32768, - 663,-32768, 405, 417,-32768, 154,-32768,-32768,-32768,-32768, - 164,-32768, -49, 7, 11,-32768,-32768, 496, 144, 169, --32768, 496, 496, 496, 496, 169,-32768, 423,-32768,-32768, - 184, 230, 232, 162,-32768, -49, 455,-32768,-32768,-32768, - -39, 153, -49,-32768,-32768,-32768, 492,-32768,-32768,-32768, --32768, 168,-32768,-32768, 186,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768, 233,-32768, 601,-32768, 231, 231, 231, + -60, 609, 35,-32768, 314,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 231, 231, + 231, 231, 231, 231, 231, 231,-32768,-32768, 577, 231, +-32768, 231, 231, 231, 231, 231, 231, 231, 231,-32768, + 231, 231, 231,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768, 209, 604, 604, 234, 234, 604, 604, 259, + 273, 604, 319, 169, 113, 616, 152, 386, -33, -33, +-32768,-32768,-32768,-32768,-32768, 616, 152, 386, -33, -33, +-32768,-32768,-32768,-32768, -60,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768, -1, 99, 99,-32768,-32768,-32768, +-32768,-32768,-32768,-32768, 231, 231, 231, 231, 231, 231, + 231,-32768,-32768, 0,-32768, 1, 231, -60, -60, 92, + 95, 110, 337, 52, -60, -60,-32768,-32768,-32768,-32768, +-32768, 124,-32768, 59,-32768,-32768,-32768, 32,-32768,-32768, + -60, -60,-32768, -36, 51,-32768,-32768, 42, 68,-32768, +-32768,-32768,-32768, 54, 609,-32768, 150, 161, -60, -60, +-32768,-32768, 75, 99, 66, -60, -60,-32768, -60,-32768, +-32768, -60, 5, 527, 107, 136, -60, -60,-32768,-32768, + 703,-32768, -60,-32768, 20, -60,-32768, 6,-32768, 609, + 212, 137,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 23,-32768,-32768,-32768,-32768, 303,-32768,-32768,-32768,-32768, +-32768,-32768,-32768, 664,-32768, -60, 102,-32768, 7,-32768, +-32768, 703,-32768, 446, 454,-32768, 115,-32768,-32768,-32768, +-32768, 120,-32768, -60, 15, 10,-32768,-32768, 231, 141, + 123,-32768, 231, 231, 231, 231, 123,-32768, 463,-32768, +-32768, 121, 219, 221, 143,-32768, -60, 492,-32768,-32768, +-32768, -57, 131, -60,-32768,-32768,-32768, 529,-32768,-32768, +-32768,-32768, 133,-32768,-32768, 157,-32768,-32768,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768, 201,-32768,-32768,-32768, 186,-32768, 34,-32768, - 496, 159,-32768, 202,-32768,-32768, 529, 196, 203, 170, - 496, 186, 186, 186, 186, 186, 186, 186, 186, 186, - 186, 186, 186, 186, 186, 186, 186, 186, 190, 186, - 186, 186, 496,-32768, 151, 115, -49,-32768,-32768,-32768, --32768, -49,-32768, 496,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768, 177,-32768,-32768,-32768, 157,-32768, 65, +-32768, 231, 171,-32768, 184,-32768,-32768, 566, 125, 185, + 172, 231, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 173, + 157, 157, 157, 231,-32768, 190, 98, -60,-32768,-32768, +-32768,-32768, 174,-32768, 231,-32768,-32768,-32768,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 496,-32768,-32768,-32768, -49,-32768, 34,-32768, -49, 200, - -49, 209, -49,-32768,-32768,-32768, -49, -49, 496, 27, - -39, -49, -49, 210,-32768,-32768, -49, 159, -49, -49, - 496, 301, 221, -49, 28, 222,-32768,-32768, -49, -49, --32768,-32768, -49, 496, -39, 296, -49, 296, -49, -39, - 296, -49, 224, 159,-32768, 296,-32768, 296, 159,-32768, - 296, 496,-32768,-32768,-32768, 244,-32768, -39, -38,-32768, - 324,-32768 +-32768, 231,-32768,-32768,-32768, -60,-32768, 65,-32768, -60, + 289, 194, -60, 197, -60,-32768,-32768, 194,-32768, -60, + -60, 231, 8, -60, -57, -60, -60, 199,-32768,-32768, + -60, -60, 171, -60, -60, 231, 291, 201, -60, -60, + 9, 202,-32768,-32768, -60, -60, -60,-32768,-32768, -60, + 231, -57, 296, -60, -60, 296, -60, -57, 296, -60, + 205, 171,-32768, 296, 296, -60,-32768, 296, 171,-32768, + 296, 231,-32768,-32768, 296,-32768,-32768, 206,-32768,-32768, + -57, 114,-32768, 321,-32768 }; static const short yypgoto[] = {-32768, --32768,-32768,-32768,-32768,-32768,-32768, -172,-32768,-32768,-32768, --32768,-32768,-32768, 238, -211,-32768, -160,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768, -211,-32768,-32768,-32768, +-32768,-32768,-32768, 232, -219,-32768, -254,-32768,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 254, - -267, 145,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768, 90,-32768, 134, 105,-32768, -135,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 298, + -285, 176, -85,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768, 88,-32768, 126, 94,-32768, -171,-32768,-32768, -32768, -141,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768, -21, 178, 256, 113, 491, 251, - -303, -319, -249, -30, -46, 0,-32768, -107,-32768 +-32768,-32768,-32768,-32768, -22, 215, 46, 158, 493, 452, + -325, -312, -261, 11, -3, -2,-32768, -110,-32768 }; -#define YYLAST 680 - - -static const short yytable[] = { 60, - 162, 47, 192, -187, -187, -187, 33, 34, 216, 364, - 283, 247, 105, 282, 285, 262, 193, 163, 148, 149, - 165, 254, 236, 115, 116, 117, 56, 57, 58, 415, - 415, 224, 225, 226, 227, 228, 229, 341, 169, 329, - 461, 173, 330, 278, 59, 366, 398, 96, 97, 98, - 99, 100, 101, 102, 103, 59, 331, 252, 186, 363, - 106, 107, 108, 109, 110, 111, 112, 113, -188, -187, - 237, 238, 239, 240, 241, 242, 284, 404, 266, -187, - 246, 120, 121, -187, 145, 174, 209, 175, 155, 156, - 157, 158, 159, 160, 161, 26, 166, 164, 6, 59, - 170, 27, 59, 177, 59, 28, 59, 418, 7, 29, - 125, 261, 8, 243, 198, 330, 297, 171, 172, 251, - 59, 431, 187, 188, 189, 190, 281, 147, 260, 331, - 181, 444, -188, -188, -188, 191, 449, 337, 194, 3, - 196, 197, 200, 201, -188, 199, 202, 178, -188, 179, - 86, 87, 185, 35, 459, 4, 92, 279, 206, 207, - 36, 37, 38, 39, 338, 211, 212, 280, 213, 203, - 215, 217, 178, 204, 179, 222, 223, 5, 6, 436, - 438, 234, 205, 441, 245, 208, 248, 299, 7, 40, - 41, 210, 8, 397, 42, 43, 330, 142, 220, 369, - 221, 174, 219, 175, 6, 44, 45, 249, 46, 460, - 331, 178, 82, 179, 7, 250, 69, 263, 8, 90, - 91, 288, 93, 289, 95, 292, 293, 294, 295, 5, - 6, 178, 300, 179, 286, 301, 118, 70, 71, 72, - 7, 302, 366, 178, 8, 179, 334, 396, 290, 5, - 6, 66, 67, 68, 296, 303, 70, 71, 72, 130, - 7, 339, 335, 371, 8, 340, 73, 74, 75, 76, - 77, 78, 79, 422, 120, 121, 70, 71, 72, 131, - 359, 367, 370, 391, 365, 73, 74, 75, 76, 77, - 78, 79, 85, 406, 372, 88, 89, 134, 415, 70, - 71, 72, 409, 421, 427, 73, 74, 75, 76, 77, - 78, 79, 26, 182, 428, 434, 395, 452, 27, 70, - 71, 72, 28, 462, 127, 256, 29, 401, 73, 74, - 75, 76, 77, 78, 79, 124, 399, 457, 128, 129, - 0, 400, 132, 133, 402, 143, 235, 257, 73, 74, - 75, 76, 77, 78, 79, 135, 136, 137, 138, 139, - 140, 141, 414, 0, 403, 0, 0, 0, 405, 0, - 408, 0, 410, 0, 426, 0, 412, 413, 0, 417, - 0, 419, 420, 70, 71, 72, 423, 443, 424, 425, - 26, 218, 0, 430, 0, 0, 27, 0, 437, 439, - 28, 0, 442, 0, 29, 456, 446, 267, 448, 0, - 0, 451, 73, 74, 75, 76, 77, 78, 79, 277, - 268, 269, 270, 271, 0, 298, 237, 238, 239, 240, - 241, 242, 268, 269, 270, 271, 0, 0, 268, 269, - 270, 271, 0, 0, 0, 272, 0, 273, 274, 275, - 276, 63, 64, 65, 66, 67, 68, 272, 304, 273, - 274, 275, 276, 272, 305, 273, 274, 275, 276, 243, - 0, 0, 0, 0, 306, 307, 308, 309, 310, 311, +#define YYLAST 720 + + +static const short yytable[] = { 31, + 162, 48, 283, 163, 165, 34, 35, 217, 248, 263, + 419, 419, 198, 286, 255, 148, 149, 365, 284, 253, + 342, 330, 237, 298, 331, 57, 58, 59, 225, 226, + 227, 228, 229, 230, 60, 169, 279, 70, 474, 332, + 267, 61, 364, 199, 338, 247, 96, 97, 98, 99, + 100, 101, 102, 103, 399, 186, 67, 68, 69, 106, + 107, 108, 109, 110, 111, 112, 113, 115, 116, 117, + 238, 239, 240, 241, 242, 243, 262, 71, 72, 73, + 166, 27, 6, 210, 285, 406, 88, 89, 28, 423, + 201, 282, 29, 8, 147, 173, 30, 9, 177, 60, + 60, 60, 60, 438, 60, 261, 74, 75, 76, 77, + 78, 79, 80, 181, 244, 142, 452, 252, 280, 187, + 188, 202, 459, 281, 300, 145, 194, 191, 370, 339, + 200, 155, 156, 157, 158, 159, 160, 161, 192, 174, + 164, 175, 178, 170, 179, 472, 331, 203, 204, 178, + 185, 179, 205, 193, 209, 71, 72, 73, 171, 172, + 211, 332, 174, 206, 175, 189, 190, 178, 178, 179, + 179, 134, 178, 443, 179, 446, 398, 221, 449, 331, + 6, 196, 197, 455, 74, 75, 76, 77, 78, 79, + 80, 8, 119, 120, 332, 9, 86, 87, 367, 207, + 208, 220, 92, 5, 6, 222, 212, 213, 60, 214, + 473, 118, 216, 218, 250, 8, 251, 223, 224, 9, + 290, 301, 303, 235, 302, 335, 246, 340, 249, 135, + 136, 137, 138, 139, 140, 141, 341, 36, 64, 65, + 66, 67, 68, 69, 37, 38, 39, 40, 291, 125, + 83, 71, 72, 73, 297, 367, 360, 90, 91, 264, + 93, 130, 95, 368, 371, 289, 372, 392, 401, 293, + 294, 295, 296, 41, 42, 131, 287, 427, 43, 44, + 74, 75, 76, 77, 78, 79, 80, 397, 409, 45, + 46, 412, 47, 426, 433, 434, 441, 304, 419, 462, + 470, 71, 72, 73, 336, 74, 75, 76, 77, 78, + 79, 80, 27, 5, 6, 71, 72, 73, 127, 28, + 475, 133, 414, 29, 257, 8, 3, 30, 366, 9, + 74, 75, 76, 77, 78, 79, 80, 258, 373, 236, + 0, 0, 4, 0, 74, 75, 76, 77, 78, 79, + 80, 0, 0, 238, 239, 240, 241, 242, 243, 0, + 396, 71, 72, 73, 5, 6, 0, 7, 408, 0, + 27, 403, 0, 0, 0, 0, 8, 28, 400, 0, + 9, 29, 0, 402, 0, 30, 0, 0, 404, 0, + 74, 75, 76, 77, 78, 79, 80, 244, 62, 63, + 64, 65, 66, 67, 68, 69, 405, 0, 418, 0, + 407, 82, 0, 411, 0, 413, 0, 0, 27, 182, + 416, 417, 432, 421, 422, 28, 424, 425, 0, 29, + 0, 428, 429, 30, 430, 431, 0, 451, 0, 436, + 437, 0, 0, 0, 0, 444, 445, 447, 268, 0, + 450, 0, 0, 0, 454, 456, 278, 458, 468, 0, + 461, 269, 270, 271, 272, 299, 465, 0, 0, 269, + 270, 271, 272, 65, 66, 67, 68, 69, 269, 270, + 271, 272, 0, 0, 0, 0, 273, 0, 274, 275, + 276, 277, 0, 0, 273, 305, 274, 275, 276, 277, + 0, 306, 0, 273, 0, 274, 275, 276, 277, 0, + 0, 307, 308, 309, 310, 311, 312, 313, 314, 315, + 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, + 326, 327, 337, 328, 0, 0, 124, 0, 306, 128, + 129, 0, 0, 132, 0, 0, 143, 0, 307, 308, + 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, + 319, 320, 321, 322, 323, 324, 325, 326, 327, 369, + 328, 0, 0, 0, 0, 306, 121, 123, 121, 121, + 123, 123, 0, 0, 121, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, - 322, 323, 324, 325, 326, 336, 327, 0, 0, 0, - 0, 305, 48, 49, 50, 51, 52, 53, 54, 55, - 0, 306, 307, 308, 309, 310, 311, 312, 313, 314, - 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, - 325, 326, 368, 327, 0, 0, 0, 0, 305, 61, - 62, 63, 64, 65, 66, 67, 68, 0, 306, 307, - 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, - 318, 319, 320, 321, 322, 323, 324, 325, 326, 432, - 327, 0, 0, 119, 0, 123, 0, 26, 123, 123, - 445, 0, 447, 27, 0, 450, 0, 28, 0, 0, - 453, 29, 454, 0, 0, 455, 375, 376, 377, 378, - 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, - 389, 390, 0, 392, 393, 394, 61, 62, 63, 64, - 65, 66, 67, 68, 64, 65, 66, 67, 68, 81, - 61, 62, 63, 64, 65, 66, 67, 68, 0, 0, - 0, 0, 0, 104, 73, 74, 75, 76, 77, 78, - 79, 0, 120, 121, 73, 74, 75, 76, 77, 78, - 79, 62, 63, 64, 65, 66, 67, 68, 224, 225, - 226, 227, 228, 229, 237, 238, 239, 240, 241, 242 + 322, 323, 324, 325, 326, 327, 439, 328, 27, 219, + 0, 0, 0, 0, 0, 28, 0, 0, 453, 29, + 0, 457, 0, 30, 460, 0, 0, 0, 0, 463, + 464, 0, 0, 466, 0, 0, 467, 0, 0, 0, + 469, 376, 377, 378, 379, 380, 381, 382, 383, 384, + 385, 386, 387, 388, 389, 390, 391, 0, 393, 394, + 395, 62, 63, 64, 65, 66, 67, 68, 69, 0, + 0, 0, 0, 0, 104, 74, 75, 76, 77, 78, + 79, 80, 0, 119, 120, 49, 50, 51, 52, 53, + 54, 55, 56, 62, 63, 64, 65, 66, 67, 68, + 69, 63, 64, 65, 66, 67, 68, 69, 225, 226, + 227, 228, 229, 230, 238, 239, 240, 241, 242, 243 }; -static const short yycheck[] = { 30, - 142, 23, 80, 16, 80, 81, 7, 8, 3, 329, - 4, 3, 59, 263, 4, 3, 94, 4, 126, 127, - 4, 233, 3, 70, 71, 72, 27, 28, 29, 3, - 3, 6, 7, 8, 9, 10, 11, 305, 146, 79, - 0, 4, 82, 255, 94, 84, 366, 48, 49, 50, - 51, 52, 53, 54, 55, 94, 96, 230, 4, 327, - 61, 62, 63, 64, 65, 66, 67, 68, 16, 82, - 51, 52, 53, 54, 55, 56, 70, 397, 251, 92, - 216, 80, 81, 96, 115, 48, 194, 50, 135, 136, - 137, 138, 139, 140, 141, 82, 80, 144, 82, 94, - 147, 88, 94, 4, 94, 92, 94, 411, 92, 96, - 16, 247, 96, 94, 49, 82, 277, 148, 149, 94, - 94, 94, 68, 69, 155, 156, 262, 95, 4, 96, - 4, 435, 80, 81, 82, 4, 440, 298, 94, 43, - 171, 172, 80, 80, 92, 80, 80, 48, 96, 50, - 38, 39, 153, 5, 458, 59, 44, 4, 189, 190, - 12, 13, 14, 15, 300, 196, 197, 4, 199, 94, - 201, 202, 48, 3, 50, 206, 207, 81, 82, 429, - 430, 212, 3, 433, 215, 80, 217, 4, 92, 41, - 42, 94, 96, 79, 46, 47, 82, 3, 71, 4, - 70, 48, 203, 50, 82, 57, 58, 3, 60, 459, - 96, 48, 35, 50, 92, 80, 3, 248, 96, 42, - 43, 268, 45, 80, 47, 272, 273, 274, 275, 81, - 82, 48, 3, 50, 265, 4, 3, 43, 44, 45, - 92, 80, 84, 48, 96, 50, 94, 97, 270, 81, - 82, 89, 90, 91, 276, 286, 43, 44, 45, 3, - 92, 94, 293, 94, 96, 80, 72, 73, 74, 75, - 76, 77, 78, 415, 80, 81, 43, 44, 45, 3, - 80, 80, 80, 94, 331, 72, 73, 74, 75, 76, - 77, 78, 37, 94, 341, 40, 41, 3, 3, 43, - 44, 45, 94, 94, 4, 72, 73, 74, 75, 76, - 77, 78, 82, 83, 94, 94, 363, 94, 88, 43, - 44, 45, 92, 0, 87, 236, 96, 374, 72, 73, - 74, 75, 76, 77, 78, 85, 367, 94, 88, 89, - -1, 372, 92, 3, 391, 95, 213, 243, 72, 73, - 74, 75, 76, 77, 78, 61, 62, 63, 64, 65, - 66, 67, 409, -1, 395, -1, -1, -1, 399, -1, - 401, -1, 403, -1, 421, -1, 407, 408, -1, 410, - -1, 412, 413, 43, 44, 45, 417, 434, 419, 420, - 82, 83, -1, 424, -1, -1, 88, -1, 429, 430, - 92, -1, 433, -1, 96, 452, 437, 3, 439, -1, - -1, 442, 72, 73, 74, 75, 76, 77, 78, 3, - 16, 17, 18, 19, -1, 3, 51, 52, 53, 54, - 55, 56, 16, 17, 18, 19, -1, -1, 16, 17, - 18, 19, -1, -1, -1, 41, -1, 43, 44, 45, - 46, 86, 87, 88, 89, 90, 91, 41, 4, 43, - 44, 45, 46, 41, 10, 43, 44, 45, 46, 94, - -1, -1, -1, -1, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 4, 42, -1, -1, -1, - -1, 10, 84, 85, 86, 87, 88, 89, 90, 91, +static const short yycheck[] = { 3, + 142, 24, 264, 4, 4, 8, 9, 3, 3, 3, + 3, 3, 49, 4, 234, 126, 127, 330, 4, 231, + 306, 79, 3, 278, 82, 28, 29, 30, 6, 7, + 8, 9, 10, 11, 95, 146, 256, 3, 0, 97, + 252, 31, 328, 80, 299, 217, 49, 50, 51, 52, + 53, 54, 55, 56, 367, 4, 90, 91, 92, 62, + 63, 64, 65, 66, 67, 68, 69, 71, 72, 73, + 51, 52, 53, 54, 55, 56, 248, 43, 44, 45, + 80, 82, 82, 194, 70, 398, 41, 42, 89, 415, + 49, 263, 93, 93, 96, 4, 97, 97, 4, 95, + 95, 95, 95, 95, 95, 4, 72, 73, 74, 75, + 76, 77, 78, 4, 95, 3, 442, 95, 4, 68, + 69, 80, 448, 4, 4, 115, 95, 4, 4, 301, + 80, 135, 136, 137, 138, 139, 140, 141, 80, 48, + 144, 50, 48, 147, 50, 471, 82, 80, 95, 48, + 153, 50, 3, 95, 80, 43, 44, 45, 148, 149, + 95, 97, 48, 3, 50, 155, 156, 48, 48, 50, + 50, 3, 48, 435, 50, 437, 79, 71, 440, 82, + 82, 171, 172, 445, 72, 73, 74, 75, 76, 77, + 78, 93, 80, 81, 97, 97, 39, 40, 85, 189, + 190, 204, 45, 81, 82, 70, 196, 197, 95, 199, + 472, 3, 202, 203, 3, 93, 80, 207, 208, 97, + 80, 3, 80, 213, 4, 95, 216, 95, 218, 61, + 62, 63, 64, 65, 66, 67, 80, 5, 87, 88, + 89, 90, 91, 92, 12, 13, 14, 15, 271, 16, + 36, 43, 44, 45, 277, 85, 80, 43, 44, 249, + 46, 3, 48, 80, 80, 269, 95, 95, 95, 273, + 274, 275, 276, 41, 42, 3, 266, 419, 46, 47, + 72, 73, 74, 75, 76, 77, 78, 98, 95, 57, + 58, 95, 60, 95, 4, 95, 95, 287, 3, 95, + 95, 43, 44, 45, 294, 72, 73, 74, 75, 76, + 77, 78, 82, 81, 82, 43, 44, 45, 87, 89, + 0, 3, 408, 93, 237, 93, 43, 97, 332, 97, + 72, 73, 74, 75, 76, 77, 78, 244, 342, 214, + -1, -1, 59, -1, 72, 73, 74, 75, 76, 77, + 78, -1, -1, 51, 52, 53, 54, 55, 56, -1, + 364, 43, 44, 45, 81, 82, -1, 84, 80, -1, + 82, 375, -1, -1, -1, -1, 93, 89, 368, -1, + 97, 93, -1, 373, -1, 97, -1, -1, 392, -1, + 72, 73, 74, 75, 76, 77, 78, 95, 85, 86, + 87, 88, 89, 90, 91, 92, 396, -1, 412, -1, + 400, 98, -1, 403, -1, 405, -1, -1, 82, 83, + 410, 411, 426, 413, 414, 89, 416, 417, -1, 93, + -1, 421, 422, 97, 424, 425, -1, 441, -1, 429, + 430, -1, -1, -1, -1, 435, 436, 437, 3, -1, + 440, -1, -1, -1, 444, 445, 3, 447, 462, -1, + 450, 16, 17, 18, 19, 3, 456, -1, -1, 16, + 17, 18, 19, 88, 89, 90, 91, 92, 16, 17, + 18, 19, -1, -1, -1, -1, 41, -1, 43, 44, + 45, 46, -1, -1, 41, 4, 43, 44, 45, 46, + -1, 10, -1, 41, -1, 43, 44, 45, 46, -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, 40, 4, 42, -1, -1, -1, -1, 10, 84, - 85, 86, 87, 88, 89, 90, 91, -1, 20, 21, + 39, 40, 4, 42, -1, -1, 85, -1, 10, 88, + 89, -1, -1, 92, -1, -1, 95, -1, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 425, - 42, -1, -1, 83, -1, 85, -1, 82, 88, 89, - 436, -1, 438, 88, -1, 441, -1, 92, -1, -1, - 446, 96, 448, -1, -1, 451, 343, 344, 345, 346, - 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, - 357, 358, -1, 360, 361, 362, 84, 85, 86, 87, - 88, 89, 90, 91, 87, 88, 89, 90, 91, 97, - 84, 85, 86, 87, 88, 89, 90, 91, -1, -1, - -1, -1, -1, 97, 72, 73, 74, 75, 76, 77, - 78, -1, 80, 81, 72, 73, 74, 75, 76, 77, - 78, 85, 86, 87, 88, 89, 90, 91, 6, 7, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 4, + 42, -1, -1, -1, -1, 10, 84, 85, 86, 87, + 88, 89, -1, -1, 92, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 431, 42, 82, 83, + -1, -1, -1, -1, -1, 89, -1, -1, 443, 93, + -1, 446, -1, 97, 449, -1, -1, -1, -1, 454, + 455, -1, -1, 458, -1, -1, 461, -1, -1, -1, + 465, 344, 345, 346, 347, 348, 349, 350, 351, 352, + 353, 354, 355, 356, 357, 358, 359, -1, 361, 362, + 363, 85, 86, 87, 88, 89, 90, 91, 92, -1, + -1, -1, -1, -1, 98, 72, 73, 74, 75, 76, + 77, 78, -1, 80, 81, 85, 86, 87, 88, 89, + 90, 91, 92, 85, 86, 87, 88, 89, 90, 91, + 92, 86, 87, 88, 89, 90, 91, 92, 6, 7, 8, 9, 10, 11, 51, 52, 53, 54, 55, 56 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/cygnus/progressive-97r2/share/bison.simple" +#line 3 "/usr/share/misc/bison.simple" +/* This file comes from bison-1.28. */ /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -759,46 +773,66 @@ static const short yycheck[] = { 30, 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. This special exception was added by the Free Software Foundation in version 1.24 of Bison. */ -#ifndef alloca +/* This is the parser code that is written into each bison parser + when the %semantic_parser declaration is not specified in the grammar. + It was written by Richard Stallman by simplifying the hairy parser + used when %semantic_parser is specified. */ + +#ifndef YYSTACK_USE_ALLOCA +#ifdef alloca +#define YYSTACK_USE_ALLOCA +#else /* alloca not defined */ #ifdef __GNUC__ +#define YYSTACK_USE_ALLOCA #define alloca __builtin_alloca #else /* not GNU C. */ -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) +#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386)) +#define YYSTACK_USE_ALLOCA #include <alloca.h> #else /* not sparc */ -#if defined (MSDOS) && !defined (__TURBOC__) +/* We think this test detects Watcom and Microsoft C. */ +/* This used to test MSDOS, but that is a bad idea + since that symbol is in the user namespace. */ +#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__) +#if 0 /* No need for malloc.h, which pollutes the namespace; + instead, just don't use alloca. */ #include <malloc.h> +#endif #else /* not MSDOS, or __TURBOC__ */ #if defined(_AIX) -#include <malloc.h> +/* I don't know what this was needed for, but it pollutes the namespace. + So I turned it off. rms, 2 May 1997. */ +/* #include <malloc.h> */ #pragma alloca -#else /* not MSDOS, __TURBOC__, or _AIX */ -#ifdef __hpux -#ifdef __cplusplus -extern "C" { -void *alloca (unsigned int); -}; -#else /* not __cplusplus */ -void *alloca (); -#endif /* not __cplusplus */ +#define YYSTACK_USE_ALLOCA +#else /* not MSDOS, or __TURBOC__, or _AIX */ +#if 0 +#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, + and on HPUX 10. Eventually we can turn this on. */ +#define YYSTACK_USE_ALLOCA +#define alloca __builtin_alloca #endif /* __hpux */ +#endif #endif /* not _AIX */ #endif /* not MSDOS, or __TURBOC__ */ -#endif /* not sparc. */ -#endif /* not GNU C. */ -#endif /* alloca not defined. */ +#endif /* not sparc */ +#endif /* not GNU C */ +#endif /* alloca not defined */ +#endif /* YYSTACK_USE_ALLOCA not defined */ -/* This is the parser code that is written into each bison parser - when the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ +#ifdef YYSTACK_USE_ALLOCA +#define YYSTACK_ALLOC alloca +#else +#define YYSTACK_ALLOC malloc +#endif /* Note: there must be only one dollar sign in this file. It is replaced by the list of actions, each action @@ -808,8 +842,8 @@ void *alloca (); #define yyclearin (yychar = YYEMPTY) #define YYEMPTY -2 #define YYEOF 0 -#define YYACCEPT return(0) -#define YYABORT return(1) +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab #define YYERROR goto yyerrlab1 /* Like YYERROR except do call yyerror. This remains here temporarily to ease the @@ -890,12 +924,12 @@ int yydebug; /* nonzero means print parse trace */ #ifndef YYMAXDEPTH #define YYMAXDEPTH 10000 #endif - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -int yyparse (void); -#endif +/* Define __yy_memcpy. Note that the size argument + should be passed with type unsigned int, because that is what the non-GCC + definitions require. With GCC, __builtin_memcpy takes an arg + of type size_t, but it can handle unsigned int. */ + #if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ #define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) #else /* not GNU C or C++ */ @@ -907,7 +941,7 @@ static void __yy_memcpy (to, from, count) char *to; char *from; - int count; + unsigned int count; { register char *f = from; register char *t = to; @@ -922,10 +956,10 @@ __yy_memcpy (to, from, count) /* This is the most reliable way to avoid incompatibilities in available built-in functions on various systems. */ static void -__yy_memcpy (char *to, char *from, int count) +__yy_memcpy (char *to, char *from, unsigned int count) { - register char *f = from; register char *t = to; + register char *f = from; register int i = count; while (i-- > 0) @@ -935,7 +969,7 @@ __yy_memcpy (char *to, char *from, int count) #endif #endif -#line 196 "/usr/cygnus/progressive-97r2/share/bison.simple" +#line 217 "/usr/share/misc/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -956,6 +990,15 @@ __yy_memcpy (char *to, char *from, int count) #define YYPARSE_PARAM_DECL #endif /* not YYPARSE_PARAM */ +/* Prevent warning if -Wstrict-prototypes. */ +#ifdef __GNUC__ +#ifdef YYPARSE_PARAM +int yyparse (void *); +#else +int yyparse (void); +#endif +#endif + int yyparse(YYPARSE_PARAM_ARG) YYPARSE_PARAM_DECL @@ -984,6 +1027,7 @@ yyparse(YYPARSE_PARAM_ARG) #endif int yystacksize = YYINITDEPTH; + int yyfree_stacks = 0; #ifdef YYPURE int yychar; @@ -1068,18 +1112,32 @@ yynewstate: if (yystacksize >= YYMAXDEPTH) { yyerror("parser stack overflow"); + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } return 2; } yystacksize *= 2; if (yystacksize > YYMAXDEPTH) yystacksize = YYMAXDEPTH; - yyss = (short *) alloca (yystacksize * sizeof (*yyssp)); - __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp)); - yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp)); - __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp)); +#ifndef YYSTACK_USE_ALLOCA + yyfree_stacks = 1; +#endif + yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp)); + __yy_memcpy ((char *)yyss, (char *)yyss1, + size * (unsigned int) sizeof (*yyssp)); + yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp)); + __yy_memcpy ((char *)yyvs, (char *)yyvs1, + size * (unsigned int) sizeof (*yyvsp)); #ifdef YYLSP_NEEDED - yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp)); - __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp)); + yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp)); + __yy_memcpy ((char *)yyls, (char *)yyls1, + size * (unsigned int) sizeof (*yylsp)); #endif #endif /* no yyoverflow */ @@ -1239,26 +1297,26 @@ yyreduce: switch (yyn) { -case 16: -#line 174 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 17: +#line 176 "rcparse.y" { rcparse_discard_strings (); ; break;} -case 17: -#line 183 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 18: +#line 185 "rcparse.y" { define_accelerator (yyvsp[-5].id, &yyvsp[-3].res_info, yyvsp[-1].pacc); ; break;} -case 18: -#line 190 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 19: +#line 192 "rcparse.y" { yyval.pacc = NULL; ; break;} -case 19: -#line 194 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 20: +#line 196 "rcparse.y" { struct accelerator *a; @@ -1277,26 +1335,26 @@ case 19: } ; break;} -case 20: -#line 215 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 21: +#line 217 "rcparse.y" { yyval.acc = yyvsp[-1].acc; yyval.acc.id = yyvsp[0].il; ; break;} -case 21: -#line 220 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 22: +#line 222 "rcparse.y" { yyval.acc = yyvsp[-3].acc; yyval.acc.id = yyvsp[-2].il; yyval.acc.flags |= yyvsp[0].is; if ((yyval.acc.flags & ACC_VIRTKEY) == 0 && (yyval.acc.flags & (ACC_SHIFT | ACC_CONTROL | ACC_ALT)) != 0) - rcparse_warning ("inappropriate modifiers for non-VIRTKEY"); + rcparse_warning (_("inappropriate modifiers for non-VIRTKEY")); ; break;} -case 22: -#line 232 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 23: +#line 234 "rcparse.y" { const char *s = yyvsp[0].s; char ch; @@ -1315,11 +1373,11 @@ case 22: } yyval.acc.key = ch; if (s[1] != '\0') - rcparse_warning ("accelerator should only be one character"); + rcparse_warning (_("accelerator should only be one character")); ; break;} -case 23: -#line 253 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 24: +#line 255 "rcparse.y" { yyval.acc.next = NULL; yyval.acc.flags = 0; @@ -1327,75 +1385,75 @@ case 23: yyval.acc.key = yyvsp[0].il; ; break;} -case 24: -#line 263 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 25: +#line 265 "rcparse.y" { yyval.is = yyvsp[0].is; ; break;} -case 25: -#line 267 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 26: +#line 269 "rcparse.y" { yyval.is = yyvsp[-2].is | yyvsp[0].is; ; break;} -case 26: -#line 272 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 27: +#line 274 "rcparse.y" { yyval.is = yyvsp[-1].is | yyvsp[0].is; ; break;} -case 27: -#line 279 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 28: +#line 281 "rcparse.y" { yyval.is = ACC_VIRTKEY; ; break;} -case 28: -#line 283 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 29: +#line 285 "rcparse.y" { /* This is just the absence of VIRTKEY. */ yyval.is = 0; ; break;} -case 29: -#line 288 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 30: +#line 290 "rcparse.y" { yyval.is = ACC_NOINVERT; ; break;} -case 30: -#line 292 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 31: +#line 294 "rcparse.y" { yyval.is = ACC_SHIFT; ; break;} -case 31: -#line 296 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 32: +#line 298 "rcparse.y" { yyval.is = ACC_CONTROL; ; break;} -case 32: -#line 300 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 33: +#line 302 "rcparse.y" { yyval.is = ACC_ALT; ; break;} -case 33: -#line 309 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 34: +#line 311 "rcparse.y" { define_bitmap (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s); ; break;} -case 34: -#line 318 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 35: +#line 320 "rcparse.y" { define_cursor (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s); ; break;} -case 35: -#line 328 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 36: +#line 330 "rcparse.y" { memset (&dialog, 0, sizeof dialog); dialog.x = yyvsp[-3].il; @@ -1412,14 +1470,14 @@ case 35: sub_res_info = yyvsp[-5].res_info; ; break;} -case 36: -#line 344 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 37: +#line 346 "rcparse.y" { define_dialog (yyvsp[-12].id, &sub_res_info, &dialog); ; break;} -case 37: -#line 349 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 38: +#line 351 "rcparse.y" { memset (&dialog, 0, sizeof dialog); dialog.x = yyvsp[-3].il; @@ -1438,14 +1496,14 @@ case 37: sub_res_info = yyvsp[-5].res_info; ; break;} -case 38: -#line 367 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 39: +#line 369 "rcparse.y" { define_dialog (yyvsp[-12].id, &sub_res_info, &dialog); ; break;} -case 39: -#line 372 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 40: +#line 374 "rcparse.y" { memset (&dialog, 0, sizeof dialog); dialog.x = yyvsp[-4].il; @@ -1465,68 +1523,68 @@ case 39: sub_res_info = yyvsp[-6].res_info; ; break;} -case 40: -#line 391 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 41: +#line 393 "rcparse.y" { define_dialog (yyvsp[-13].id, &sub_res_info, &dialog); ; break;} -case 41: -#line 398 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 42: +#line 400 "rcparse.y" { yyval.il = 0; ; break;} -case 42: -#line 402 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 43: +#line 404 "rcparse.y" { yyval.il = yyvsp[0].il; ; break;} -case 44: -#line 410 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 45: +#line 412 "rcparse.y" { unicode_from_ascii ((int *) NULL, &dialog.caption, yyvsp[0].s); ; break;} -case 45: -#line 414 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 46: +#line 416 "rcparse.y" { dialog.class = yyvsp[0].id; ; break;} -case 46: -#line 418 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 47: +#line 420 "rcparse.y" { style = dialog.style; ; break;} -case 47: -#line 420 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 48: +#line 422 "rcparse.y" { dialog.style = style; ; break;} -case 48: -#line 424 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 49: +#line 426 "rcparse.y" { dialog.exstyle = yyvsp[0].il; ; break;} -case 49: -#line 428 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 50: +#line 430 "rcparse.y" { dialog.style |= DS_SETFONT; dialog.pointsize = yyvsp[-2].il; unicode_from_ascii ((int *) NULL, &dialog.font, yyvsp[0].s); ; break;} -case 50: -#line 434 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 51: +#line 436 "rcparse.y" { dialog.style |= DS_SETFONT; dialog.pointsize = yyvsp[-4].il; unicode_from_ascii ((int *) NULL, &dialog.font, yyvsp[-2].s); if (dialog.ex == NULL) - rcparse_warning ("extended FONT requires DIALOGEX"); + rcparse_warning (_("extended FONT requires DIALOGEX")); else { dialog.ex->weight = yyvsp[-1].il; @@ -1534,32 +1592,32 @@ case 50: } ; break;} -case 51: -#line 447 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 52: +#line 449 "rcparse.y" { dialog.menu = yyvsp[0].id; ; break;} -case 52: -#line 451 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 53: +#line 453 "rcparse.y" { sub_res_info.characteristics = yyvsp[0].il; ; break;} -case 53: -#line 455 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 54: +#line 457 "rcparse.y" { sub_res_info.language = yyvsp[-1].il | (yyvsp[0].il << 8); ; break;} -case 54: -#line 459 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 55: +#line 461 "rcparse.y" { sub_res_info.version = yyvsp[0].il; ; break;} -case 56: -#line 467 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 57: +#line 469 "rcparse.y" { struct dialog_control **pp; @@ -1568,468 +1626,494 @@ case 56: *pp = yyvsp[0].dialog_control; ; break;} -case 57: -#line 478 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 58: +#line 480 "rcparse.y" { default_style = BS_AUTO3STATE | WS_TABSTOP; base_style = BS_AUTO3STATE; class = CTL_BUTTON; ; break;} -case 58: -#line 484 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 59: +#line 486 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 59: -#line 488 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 60: +#line 490 "rcparse.y" { default_style = BS_AUTOCHECKBOX | WS_TABSTOP; base_style = BS_AUTOCHECKBOX; class = CTL_BUTTON; ; break;} -case 60: -#line 494 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 61: +#line 496 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 61: -#line 498 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 62: +#line 500 "rcparse.y" { default_style = BS_AUTORADIOBUTTON | WS_TABSTOP; base_style = BS_AUTORADIOBUTTON; class = CTL_BUTTON; ; break;} -case 62: -#line 504 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 63: +#line 506 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 63: -#line 508 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 64: +#line 510 "rcparse.y" { default_style = ES_LEFT | WS_BORDER | WS_TABSTOP; base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class = CTL_EDIT; ; break;} -case 64: -#line 514 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 65: +#line 516 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; if (dialog.ex == NULL) - rcparse_warning ("IEDIT requires DIALOGEX"); + rcparse_warning (_("IEDIT requires DIALOGEX")); res_string_to_id (&yyval.dialog_control->class, "BEDIT"); ; break;} -case 65: -#line 521 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 66: +#line 523 "rcparse.y" { default_style = BS_CHECKBOX | WS_TABSTOP; base_style = BS_CHECKBOX | WS_TABSTOP; class = CTL_BUTTON; ; break;} -case 66: -#line 527 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 67: +#line 529 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 67: -#line 531 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 68: +#line 533 "rcparse.y" { default_style = CBS_SIMPLE | WS_TABSTOP; base_style = 0; class = CTL_COMBOBOX; ; break;} -case 68: -#line 537 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 69: +#line 539 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 69: -#line 542 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 70: +#line 544 "rcparse.y" { yyval.dialog_control = define_control (yyvsp[-9].s, yyvsp[-8].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-2].il, yyvsp[-7].il, style, yyvsp[-1].il); if (yyvsp[0].rcdata_item != NULL) { if (dialog.ex == NULL) - rcparse_warning ("control data requires DIALOGEX"); + rcparse_warning (_("control data requires DIALOGEX")); yyval.dialog_control->data = yyvsp[0].rcdata_item; } ; break;} -case 70: -#line 553 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 71: +#line 555 "rcparse.y" { yyval.dialog_control = define_control (yyvsp[-10].s, yyvsp[-9].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-8].il, style, yyvsp[-2].il); if (dialog.ex == NULL) + rcparse_warning (_("help ID requires DIALOGEX")); + yyval.dialog_control->help = yyvsp[-1].il; + yyval.dialog_control->data = yyvsp[0].rcdata_item; + ; + break;} +case 72: +#line 564 "rcparse.y" +{ + yyval.dialog_control = define_control (yyvsp[-10].s, yyvsp[-9].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-2].il, 0, style, yyvsp[-1].il); + if (yyvsp[0].rcdata_item != NULL) + { + if (dialog.ex == NULL) + rcparse_warning ("control data requires DIALOGEX"); + yyval.dialog_control->data = yyvsp[0].rcdata_item; + } + yyval.dialog_control->class.named = 1; + unicode_from_ascii(&yyval.dialog_control->class.u.n.length, &yyval.dialog_control->class.u.n.name, yyvsp[-7].s); + ; + break;} +case 73: +#line 577 "rcparse.y" +{ + yyval.dialog_control = define_control (yyvsp[-11].s, yyvsp[-10].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, 0, style, yyvsp[-2].il); + if (dialog.ex == NULL) rcparse_warning ("help ID requires DIALOGEX"); yyval.dialog_control->help = yyvsp[-1].il; yyval.dialog_control->data = yyvsp[0].rcdata_item; + yyval.dialog_control->class.named = 1; + unicode_from_ascii(&yyval.dialog_control->class.u.n.length, &yyval.dialog_control->class.u.n.name, yyvsp[-8].s); ; break;} -case 71: -#line 561 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 74: +#line 587 "rcparse.y" { default_style = SS_CENTER | WS_GROUP; base_style = SS_CENTER; class = CTL_STATIC; ; break;} -case 72: -#line 567 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 75: +#line 593 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 73: -#line 571 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 76: +#line 597 "rcparse.y" { default_style = BS_DEFPUSHBUTTON | WS_TABSTOP; base_style = BS_DEFPUSHBUTTON | WS_TABSTOP; class = CTL_BUTTON; ; break;} -case 74: -#line 577 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 77: +#line 603 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 75: -#line 581 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 78: +#line 607 "rcparse.y" { default_style = ES_LEFT | WS_BORDER | WS_TABSTOP; base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class = CTL_EDIT; ; break;} -case 76: -#line 587 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 79: +#line 613 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 77: -#line 591 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 80: +#line 617 "rcparse.y" { default_style = BS_GROUPBOX; base_style = BS_GROUPBOX; class = CTL_BUTTON; ; break;} -case 78: -#line 597 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 81: +#line 623 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 79: -#line 601 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 82: +#line 627 "rcparse.y" { default_style = ES_LEFT | WS_BORDER | WS_TABSTOP; base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class = CTL_EDIT; ; break;} -case 80: -#line 607 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 83: +#line 633 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; if (dialog.ex == NULL) - rcparse_warning ("IEDIT requires DIALOGEX"); + rcparse_warning (_("IEDIT requires DIALOGEX")); res_string_to_id (&yyval.dialog_control->class, "HEDIT"); ; break;} -case 81: -#line 614 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 84: +#line 640 "rcparse.y" { yyval.dialog_control = define_control (yyvsp[-4].s, yyvsp[-3].il, yyvsp[-2].il, yyvsp[-1].il, 0, 0, CTL_STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0); if (yyvsp[0].rcdata_item != NULL) { if (dialog.ex == NULL) - rcparse_warning ("control data requires DIALOGEX"); + rcparse_warning (_("control data requires DIALOGEX")); yyval.dialog_control->data = yyvsp[0].rcdata_item; } ; break;} -case 82: -#line 626 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 85: +#line 652 "rcparse.y" { yyval.dialog_control = define_control (yyvsp[-8].s, yyvsp[-7].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, CTL_STATIC, style, yyvsp[-1].il); if (yyvsp[0].rcdata_item != NULL) { if (dialog.ex == NULL) - rcparse_warning ("control data requires DIALOGEX"); + rcparse_warning (_("control data requires DIALOGEX")); yyval.dialog_control->data = yyvsp[0].rcdata_item; } ; break;} -case 83: -#line 638 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 86: +#line 664 "rcparse.y" { yyval.dialog_control = define_control (yyvsp[-9].s, yyvsp[-8].il, yyvsp[-7].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, CTL_STATIC, style, yyvsp[-2].il); if (dialog.ex == NULL) - rcparse_warning ("help ID requires DIALOGEX"); + rcparse_warning (_("help ID requires DIALOGEX")); yyval.dialog_control->help = yyvsp[-1].il; yyval.dialog_control->data = yyvsp[0].rcdata_item; ; break;} -case 84: -#line 647 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 87: +#line 673 "rcparse.y" { default_style = ES_LEFT | WS_BORDER | WS_TABSTOP; base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class = CTL_EDIT; ; break;} -case 85: -#line 653 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 88: +#line 679 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; if (dialog.ex == NULL) - rcparse_warning ("IEDIT requires DIALOGEX"); + rcparse_warning (_("IEDIT requires DIALOGEX")); res_string_to_id (&yyval.dialog_control->class, "IEDIT"); ; break;} -case 86: -#line 660 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 89: +#line 686 "rcparse.y" { default_style = LBS_NOTIFY | WS_BORDER; base_style = LBS_NOTIFY | WS_BORDER; class = CTL_LISTBOX; ; break;} -case 87: -#line 666 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 90: +#line 692 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 88: -#line 670 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 91: +#line 696 "rcparse.y" { default_style = SS_LEFT | WS_GROUP; base_style = SS_LEFT; class = CTL_STATIC; ; break;} -case 89: -#line 676 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 92: +#line 702 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 90: -#line 680 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 93: +#line 706 "rcparse.y" { default_style = BS_PUSHBOX | WS_TABSTOP; base_style = BS_PUSHBOX; class = CTL_BUTTON; ; break;} -case 91: -#line 686 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 94: +#line 712 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 92: -#line 690 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 95: +#line 716 "rcparse.y" { default_style = BS_PUSHBUTTON | WS_TABSTOP; base_style = BS_PUSHBUTTON | WS_TABSTOP; class = CTL_BUTTON; ; break;} -case 93: -#line 696 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 96: +#line 722 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 94: -#line 700 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 97: +#line 726 "rcparse.y" { default_style = BS_RADIOBUTTON | WS_TABSTOP; base_style = BS_RADIOBUTTON; class = CTL_BUTTON; ; break;} -case 95: -#line 706 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 98: +#line 732 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 96: -#line 710 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 99: +#line 736 "rcparse.y" { default_style = SS_RIGHT | WS_GROUP; base_style = SS_RIGHT; class = CTL_STATIC; ; break;} -case 97: -#line 716 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 100: +#line 742 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 98: -#line 720 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 101: +#line 746 "rcparse.y" { default_style = SBS_HORZ; base_style = 0; class = CTL_SCROLLBAR; ; break;} -case 99: -#line 726 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 102: +#line 752 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 100: -#line 730 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 103: +#line 756 "rcparse.y" { default_style = BS_3STATE | WS_TABSTOP; base_style = BS_3STATE; class = CTL_BUTTON; ; break;} -case 101: -#line 736 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 104: +#line 762 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; ; break;} -case 102: -#line 741 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 105: +#line 767 "rcparse.y" { style = WS_CHILD | WS_VISIBLE; ; break;} -case 103: -#line 743 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 106: +#line 769 "rcparse.y" { yyval.dialog_control = define_control (yyvsp[-14].s, yyvsp[-12].il, yyvsp[-10].il, yyvsp[-8].il, yyvsp[-6].il, yyvsp[-4].il, CTL_BUTTON, style, yyvsp[0].il); ; break;} -case 104: -#line 759 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 107: +#line 785 "rcparse.y" { yyval.dialog_control = define_control (yyvsp[-6].s, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-2].il, yyvsp[-1].il, class, default_style | WS_CHILD | WS_VISIBLE, 0); if (yyvsp[0].rcdata_item != NULL) { if (dialog.ex == NULL) - rcparse_warning ("control data requires DIALOGEX"); + rcparse_warning (_("control data requires DIALOGEX")); yyval.dialog_control->data = yyvsp[0].rcdata_item; } ; break;} -case 105: -#line 771 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 108: +#line 797 "rcparse.y" { yyval.dialog_control = define_control (yyvsp[-8].s, yyvsp[-7].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, class, style, yyvsp[-1].il); if (yyvsp[0].rcdata_item != NULL) { if (dialog.ex == NULL) - rcparse_warning ("control data requires DIALOGEX"); + rcparse_warning (_("control data requires DIALOGEX")); yyval.dialog_control->data = yyvsp[0].rcdata_item; } ; break;} -case 106: -#line 782 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 109: +#line 808 "rcparse.y" { yyval.dialog_control = define_control (yyvsp[-9].s, yyvsp[-8].il, yyvsp[-7].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, class, style, yyvsp[-2].il); if (dialog.ex == NULL) - rcparse_warning ("help ID requires DIALOGEX"); + rcparse_warning (_("help ID requires DIALOGEX")); yyval.dialog_control->help = yyvsp[-1].il; yyval.dialog_control->data = yyvsp[0].rcdata_item; ; break;} -case 107: -#line 793 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 110: +#line 819 "rcparse.y" { yyval.s = NULL; ; break;} -case 108: -#line 797 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 111: +#line 823 "rcparse.y" { yyval.s = yyvsp[-1].s; ; break;} -case 109: -#line 804 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 112: +#line 830 "rcparse.y" { yyval.rcdata_item = NULL; ; break;} -case 110: -#line 808 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 113: +#line 834 "rcparse.y" { yyval.rcdata_item = yyvsp[-1].rcdata.first; ; break;} -case 111: -#line 817 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 114: +#line 843 "rcparse.y" { style = WS_CHILD | WS_VISIBLE; ; break;} -case 113: -#line 823 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 116: +#line 849 "rcparse.y" { style = SS_ICON | WS_CHILD | WS_VISIBLE; ; break;} -case 115: -#line 829 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 118: +#line 855 "rcparse.y" { style = base_style | WS_CHILD | WS_VISIBLE; ; break;} -case 117: -#line 837 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 120: +#line 863 "rcparse.y" { define_font (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s); ; break;} -case 118: -#line 846 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 121: +#line 872 "rcparse.y" { define_icon (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s); ; break;} -case 119: -#line 856 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 122: +#line 882 "rcparse.y" { language = yyvsp[-1].il | (yyvsp[0].il << 8); ; break;} -case 120: -#line 865 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 123: +#line 891 "rcparse.y" { define_menu (yyvsp[-5].id, &yyvsp[-3].res_info, yyvsp[-1].menuitem); ; break;} -case 121: -#line 872 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 124: +#line 898 "rcparse.y" { yyval.menuitem = NULL; ; break;} -case 122: -#line 876 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 125: +#line 902 "rcparse.y" { if (yyvsp[-1].menuitem == NULL) yyval.menuitem = yyvsp[0].menuitem; @@ -2044,92 +2128,92 @@ case 122: } ; break;} -case 123: -#line 893 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 126: +#line 919 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-2].s, yyvsp[-1].il, yyvsp[0].is, 0, 0, NULL); ; break;} -case 124: -#line 897 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 127: +#line 923 "rcparse.y" { yyval.menuitem = define_menuitem (NULL, 0, 0, 0, 0, NULL); ; break;} -case 125: -#line 901 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 128: +#line 927 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-4].s, 0, yyvsp[-3].is, 0, 0, yyvsp[-1].menuitem); ; break;} -case 126: -#line 908 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 129: +#line 934 "rcparse.y" { yyval.is = 0; ; break;} -case 127: -#line 912 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 130: +#line 938 "rcparse.y" { yyval.is = yyvsp[-2].is | yyvsp[0].is; ; break;} -case 128: -#line 916 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 131: +#line 942 "rcparse.y" { yyval.is = yyvsp[-1].is | yyvsp[0].is; ; break;} -case 129: -#line 923 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 132: +#line 949 "rcparse.y" { yyval.is = MENUITEM_CHECKED; ; break;} -case 130: -#line 927 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 133: +#line 953 "rcparse.y" { yyval.is = MENUITEM_GRAYED; ; break;} -case 131: -#line 931 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 134: +#line 957 "rcparse.y" { yyval.is = MENUITEM_HELP; ; break;} -case 132: -#line 935 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 135: +#line 961 "rcparse.y" { yyval.is = MENUITEM_INACTIVE; ; break;} -case 133: -#line 939 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 136: +#line 965 "rcparse.y" { yyval.is = MENUITEM_MENUBARBREAK; ; break;} -case 134: -#line 943 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 137: +#line 969 "rcparse.y" { yyval.is = MENUITEM_MENUBREAK; ; break;} -case 135: -#line 952 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 138: +#line 978 "rcparse.y" { define_menu (yyvsp[-5].id, &yyvsp[-3].res_info, yyvsp[-1].menuitem); ; break;} -case 136: -#line 959 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 139: +#line 985 "rcparse.y" { yyval.menuitem = NULL; ; break;} -case 137: -#line 963 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 140: +#line 989 "rcparse.y" { if (yyvsp[-1].menuitem == NULL) yyval.menuitem = yyvsp[0].menuitem; @@ -2144,88 +2228,94 @@ case 137: } ; break;} -case 138: -#line 980 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 141: +#line 1006 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[0].s, 0, 0, 0, 0, NULL); ; break;} -case 139: -#line 984 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 142: +#line 1010 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-1].s, yyvsp[0].il, 0, 0, 0, NULL); ; break;} -case 140: -#line 988 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 143: +#line 1014 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-3].s, yyvsp[-2].il, yyvsp[-1].il, yyvsp[0].il, 0, NULL); ; break;} -case 141: -#line 992 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 144: +#line 1018 "rcparse.y" +{ + yyval.menuitem = define_menuitem (NULL, 0, 0, 0, 0, NULL); + ; + break;} +case 145: +#line 1022 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-3].s, 0, 0, 0, 0, yyvsp[-1].menuitem); ; break;} -case 142: -#line 996 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 146: +#line 1026 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-4].s, yyvsp[-3].il, 0, 0, 0, yyvsp[-1].menuitem); ; break;} -case 143: -#line 1000 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 147: +#line 1030 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-5].s, yyvsp[-4].il, yyvsp[-3].il, 0, 0, yyvsp[-1].menuitem); ; break;} -case 144: -#line 1005 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 148: +#line 1035 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-7].s, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-1].menuitem); ; break;} -case 145: -#line 1014 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 149: +#line 1044 "rcparse.y" { define_messagetable (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s); ; break;} -case 146: -#line 1023 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 150: +#line 1053 "rcparse.y" { define_rcdata (yyvsp[-5].id, &yyvsp[-3].res_info, yyvsp[-1].rcdata.first); ; break;} -case 147: -#line 1032 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 151: +#line 1062 "rcparse.y" { rcparse_rcdata (); ; break;} -case 148: -#line 1036 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 152: +#line 1066 "rcparse.y" { rcparse_normal (); yyval.rcdata = yyvsp[0].rcdata; ; break;} -case 149: -#line 1044 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 153: +#line 1074 "rcparse.y" { yyval.rcdata.first = NULL; yyval.rcdata.last = NULL; ; break;} -case 150: -#line 1049 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 154: +#line 1079 "rcparse.y" { yyval.rcdata = yyvsp[0].rcdata; ; break;} -case 151: -#line 1056 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 155: +#line 1086 "rcparse.y" { struct rcdata_item *ri; @@ -2234,8 +2324,8 @@ case 151: yyval.rcdata.last = ri; ; break;} -case 152: -#line 1064 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 156: +#line 1094 "rcparse.y" { struct rcdata_item *ri; @@ -2244,8 +2334,8 @@ case 152: yyval.rcdata.last = ri; ; break;} -case 153: -#line 1072 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 157: +#line 1102 "rcparse.y" { struct rcdata_item *ri; @@ -2255,8 +2345,8 @@ case 153: yyval.rcdata.last = ri; ; break;} -case 154: -#line 1081 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 158: +#line 1111 "rcparse.y" { struct rcdata_item *ri; @@ -2266,164 +2356,164 @@ case 154: yyval.rcdata.last = ri; ; break;} -case 155: -#line 1095 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 159: +#line 1125 "rcparse.y" { sub_res_info = yyvsp[-1].res_info; ; break;} -case 158: -#line 1102 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 162: +#line 1132 "rcparse.y" { define_stringtable (&sub_res_info, yyvsp[-1].il, yyvsp[0].s); ; break;} -case 159: -#line 1106 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 163: +#line 1136 "rcparse.y" { define_stringtable (&sub_res_info, yyvsp[-2].il, yyvsp[0].s); ; break;} -case 160: -#line 1116 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 164: +#line 1146 "rcparse.y" { define_user_data (yyvsp[-5].id, yyvsp[-4].id, &yyvsp[-3].res_info, yyvsp[-1].rcdata.first); ; break;} -case 161: -#line 1120 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 165: +#line 1150 "rcparse.y" { define_user_file (yyvsp[-3].id, yyvsp[-2].id, &yyvsp[-1].res_info, yyvsp[0].s); ; break;} -case 162: -#line 1129 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 166: +#line 1159 "rcparse.y" { define_versioninfo (yyvsp[-5].id, language, yyvsp[-3].fixver, yyvsp[-1].verinfo); ; break;} -case 163: -#line 1136 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 167: +#line 1166 "rcparse.y" { yyval.fixver = ((struct fixed_versioninfo *) res_alloc (sizeof (struct fixed_versioninfo))); memset (yyval.fixver, 0, sizeof (struct fixed_versioninfo)); ; break;} -case 164: -#line 1142 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 168: +#line 1172 "rcparse.y" { yyvsp[-5].fixver->file_version_ms = (yyvsp[-3].il << 16) | yyvsp[-2].il; yyvsp[-5].fixver->file_version_ls = (yyvsp[-1].il << 16) | yyvsp[0].il; yyval.fixver = yyvsp[-5].fixver; ; break;} -case 165: -#line 1148 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 169: +#line 1178 "rcparse.y" { yyvsp[-5].fixver->product_version_ms = (yyvsp[-3].il << 16) | yyvsp[-2].il; yyvsp[-5].fixver->product_version_ls = (yyvsp[-1].il << 16) | yyvsp[0].il; yyval.fixver = yyvsp[-5].fixver; ; break;} -case 166: -#line 1154 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 170: +#line 1184 "rcparse.y" { yyvsp[-2].fixver->file_flags_mask = yyvsp[0].il; yyval.fixver = yyvsp[-2].fixver; ; break;} -case 167: -#line 1159 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 171: +#line 1189 "rcparse.y" { yyvsp[-2].fixver->file_flags = yyvsp[0].il; yyval.fixver = yyvsp[-2].fixver; ; break;} -case 168: -#line 1164 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 172: +#line 1194 "rcparse.y" { yyvsp[-2].fixver->file_os = yyvsp[0].il; yyval.fixver = yyvsp[-2].fixver; ; break;} -case 169: -#line 1169 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 173: +#line 1199 "rcparse.y" { yyvsp[-2].fixver->file_type = yyvsp[0].il; yyval.fixver = yyvsp[-2].fixver; ; break;} -case 170: -#line 1174 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 174: +#line 1204 "rcparse.y" { yyvsp[-2].fixver->file_subtype = yyvsp[0].il; yyval.fixver = yyvsp[-2].fixver; ; break;} -case 171: -#line 1188 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 175: +#line 1218 "rcparse.y" { yyval.verinfo = NULL; ; break;} -case 172: -#line 1192 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 176: +#line 1222 "rcparse.y" { yyval.verinfo = append_ver_stringfileinfo (yyvsp[-7].verinfo, yyvsp[-4].s, yyvsp[-2].verstring); ; break;} -case 173: -#line 1196 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 177: +#line 1226 "rcparse.y" { yyval.verinfo = append_ver_varfileinfo (yyvsp[-6].verinfo, yyvsp[-2].s, yyvsp[-1].vervar); ; break;} -case 174: -#line 1203 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 178: +#line 1233 "rcparse.y" { yyval.verstring = NULL; ; break;} -case 175: -#line 1207 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 179: +#line 1237 "rcparse.y" { yyval.verstring = append_verval (yyvsp[-4].verstring, yyvsp[-2].s, yyvsp[0].s); ; break;} -case 176: -#line 1214 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 180: +#line 1244 "rcparse.y" { yyval.vervar = NULL; ; break;} -case 177: -#line 1218 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 181: +#line 1248 "rcparse.y" { yyval.vervar = append_vertrans (yyvsp[-2].vervar, yyvsp[-1].il, yyvsp[0].il); ; break;} -case 178: -#line 1227 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 182: +#line 1257 "rcparse.y" { yyval.id.named = 0; yyval.id.u.id = yyvsp[0].il; ; break;} -case 179: -#line 1232 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 183: +#line 1262 "rcparse.y" { char *copy, *s; /* It seems that resource ID's are forced to upper case. */ copy = xstrdup (yyvsp[0].s); for (s = copy; *s != '\0'; s++) - if (islower (*s)) - *s = toupper (*s); + if (islower ((unsigned char) *s)) + *s = toupper ((unsigned char) *s); res_string_to_id (&yyval.id, copy); free (copy); ; break;} -case 180: -#line 1250 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 184: +#line 1280 "rcparse.y" { memset (&yyval.res_info, 0, sizeof (struct res_res_info)); yyval.res_info.language = language; @@ -2431,352 +2521,352 @@ case 180: yyval.res_info.memflags = MEMFLAG_MOVEABLE; ; break;} -case 181: -#line 1257 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 185: +#line 1287 "rcparse.y" { yyval.res_info = yyvsp[-1].res_info; yyval.res_info.memflags |= yyvsp[0].memflags.on; yyval.res_info.memflags &=~ yyvsp[0].memflags.off; ; break;} -case 182: -#line 1263 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 186: +#line 1293 "rcparse.y" { yyval.res_info = yyvsp[-2].res_info; yyval.res_info.characteristics = yyvsp[0].il; ; break;} -case 183: -#line 1268 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 187: +#line 1298 "rcparse.y" { yyval.res_info = yyvsp[-3].res_info; yyval.res_info.language = yyvsp[-1].il | (yyvsp[0].il << 8); ; break;} -case 184: -#line 1273 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 188: +#line 1303 "rcparse.y" { yyval.res_info = yyvsp[-2].res_info; yyval.res_info.version = yyvsp[0].il; ; break;} -case 185: -#line 1283 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 189: +#line 1313 "rcparse.y" { memset (&yyval.res_info, 0, sizeof (struct res_res_info)); yyval.res_info.language = language; yyval.res_info.memflags = MEMFLAG_MOVEABLE | MEMFLAG_DISCARDABLE; ; break;} -case 186: -#line 1289 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 190: +#line 1319 "rcparse.y" { yyval.res_info = yyvsp[-1].res_info; yyval.res_info.memflags |= yyvsp[0].memflags.on; yyval.res_info.memflags &=~ yyvsp[0].memflags.off; ; break;} -case 187: -#line 1300 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 191: +#line 1330 "rcparse.y" { memset (&yyval.res_info, 0, sizeof (struct res_res_info)); yyval.res_info.language = language; yyval.res_info.memflags = MEMFLAG_MOVEABLE; ; break;} -case 188: -#line 1306 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 192: +#line 1336 "rcparse.y" { yyval.res_info = yyvsp[-1].res_info; yyval.res_info.memflags |= yyvsp[0].memflags.on; yyval.res_info.memflags &=~ yyvsp[0].memflags.off; ; break;} -case 189: -#line 1318 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 193: +#line 1348 "rcparse.y" { yyval.memflags.on = MEMFLAG_MOVEABLE; yyval.memflags.off = 0; ; break;} -case 190: -#line 1323 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 194: +#line 1353 "rcparse.y" { yyval.memflags.on = 0; yyval.memflags.off = MEMFLAG_MOVEABLE; ; break;} -case 191: -#line 1328 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 195: +#line 1358 "rcparse.y" { yyval.memflags.on = MEMFLAG_PURE; yyval.memflags.off = 0; ; break;} -case 192: -#line 1333 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 196: +#line 1363 "rcparse.y" { yyval.memflags.on = 0; yyval.memflags.off = MEMFLAG_PURE; ; break;} -case 193: -#line 1338 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 197: +#line 1368 "rcparse.y" { yyval.memflags.on = MEMFLAG_PRELOAD; yyval.memflags.off = 0; ; break;} -case 194: -#line 1343 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 198: +#line 1373 "rcparse.y" { yyval.memflags.on = 0; yyval.memflags.off = MEMFLAG_PRELOAD; ; break;} -case 195: -#line 1348 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 199: +#line 1378 "rcparse.y" { yyval.memflags.on = MEMFLAG_DISCARDABLE; yyval.memflags.off = 0; ; break;} -case 196: -#line 1358 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 200: +#line 1388 "rcparse.y" { yyval.s = yyvsp[0].s; ; break;} -case 197: -#line 1362 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 201: +#line 1392 "rcparse.y" { yyval.s = yyvsp[0].s; ; break;} -case 198: -#line 1379 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 202: +#line 1409 "rcparse.y" { style |= yyvsp[0].il; ; break;} -case 199: -#line 1383 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 203: +#line 1413 "rcparse.y" { style &=~ yyvsp[0].il; ; break;} -case 200: -#line 1387 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 204: +#line 1417 "rcparse.y" { style |= yyvsp[0].il; ; break;} -case 201: -#line 1391 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 205: +#line 1421 "rcparse.y" { style &=~ yyvsp[0].il; ; break;} -case 202: -#line 1398 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 206: +#line 1428 "rcparse.y" { yyval.il = yyvsp[0].i.val; ; break;} -case 203: -#line 1402 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 207: +#line 1432 "rcparse.y" { yyval.il = yyvsp[-1].il; ; break;} -case 204: -#line 1411 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 208: +#line 1441 "rcparse.y" { yyval.il = 0; ; break;} -case 205: -#line 1415 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 209: +#line 1445 "rcparse.y" { yyval.il = yyvsp[0].il; ; break;} -case 206: -#line 1424 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 210: +#line 1454 "rcparse.y" { yyval.il = yyvsp[0].il; ; break;} -case 207: -#line 1433 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 211: +#line 1463 "rcparse.y" { yyval.il = yyvsp[0].i.val; ; break;} -case 208: -#line 1442 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 212: +#line 1472 "rcparse.y" { yyval.i = yyvsp[0].i; ; break;} -case 209: -#line 1446 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 213: +#line 1476 "rcparse.y" { yyval.i = yyvsp[-1].i; ; break;} -case 210: -#line 1450 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 214: +#line 1480 "rcparse.y" { yyval.i.val = ~ yyvsp[0].i.val; yyval.i.dword = yyvsp[0].i.dword; ; break;} -case 211: -#line 1455 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 215: +#line 1485 "rcparse.y" { yyval.i.val = - yyvsp[0].i.val; yyval.i.dword = yyvsp[0].i.dword; ; break;} -case 212: -#line 1460 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 216: +#line 1490 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val * yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 213: -#line 1465 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 217: +#line 1495 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val / yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 214: -#line 1470 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 218: +#line 1500 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val % yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 215: -#line 1475 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 219: +#line 1505 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val + yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 216: -#line 1480 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 220: +#line 1510 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val - yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 217: -#line 1485 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 221: +#line 1515 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val & yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 218: -#line 1490 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 222: +#line 1520 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val ^ yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 219: -#line 1495 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 223: +#line 1525 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val | yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 220: -#line 1506 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 224: +#line 1536 "rcparse.y" { yyval.il = yyvsp[0].il; ; break;} -case 221: -#line 1515 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 225: +#line 1545 "rcparse.y" { yyval.il = yyvsp[0].i.val; ; break;} -case 222: -#line 1526 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 226: +#line 1556 "rcparse.y" { yyval.i = yyvsp[0].i; ; break;} -case 223: -#line 1530 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 227: +#line 1560 "rcparse.y" { yyval.i = yyvsp[-1].i; ; break;} -case 224: -#line 1534 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 228: +#line 1564 "rcparse.y" { yyval.i.val = ~ yyvsp[0].i.val; yyval.i.dword = yyvsp[0].i.dword; ; break;} -case 225: -#line 1539 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 229: +#line 1569 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val * yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 226: -#line 1544 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 230: +#line 1574 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val / yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 227: -#line 1549 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 231: +#line 1579 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val % yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 228: -#line 1554 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 232: +#line 1584 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val + yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 229: -#line 1559 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 233: +#line 1589 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val - yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 230: -#line 1564 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 234: +#line 1594 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val & yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 231: -#line 1569 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 235: +#line 1599 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val ^ yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; ; break;} -case 232: -#line 1574 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +case 236: +#line 1604 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val | yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; @@ -2784,7 +2874,7 @@ case 232: break;} } /* the action file gets copied in in place of this dollarsign */ -#line 498 "/usr/cygnus/progressive-97r2/share/bison.simple" +#line 543 "/usr/share/misc/bison.simple" yyvsp -= yylen; yyssp -= yylen; @@ -2979,8 +3069,32 @@ yyerrhandle: yystate = yyn; goto yynewstate; + + yyacceptlab: + /* YYACCEPT comes here. */ + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } + return 0; + + yyabortlab: + /* YYABORT comes here. */ + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } + return 1; } -#line 1580 "/5g/ian/binutils/release/copy/binutils/rcparse.y" +#line 1610 "rcparse.y" /* Set the language from the command line. */ diff --git a/contrib/binutils/binutils/rcparse.h b/contrib/binutils/binutils/rcparse.h index dbf9c59..9661d54 100644 --- a/contrib/binutils/binutils/rcparse.h +++ b/contrib/binutils/binutils/rcparse.h @@ -37,87 +37,88 @@ typedef union const char *s; } ss; } YYSTYPE; -#define BEG 258 -#define END 259 -#define ACCELERATORS 260 -#define VIRTKEY 261 -#define ASCII 262 -#define NOINVERT 263 -#define SHIFT 264 -#define CONTROL 265 -#define ALT 266 -#define BITMAP 267 -#define CURSOR 268 -#define DIALOG 269 -#define DIALOGEX 270 -#define EXSTYLE 271 -#define CAPTION 272 -#define CLASS 273 -#define STYLE 274 -#define AUTO3STATE 275 -#define AUTOCHECKBOX 276 -#define AUTORADIOBUTTON 277 -#define CHECKBOX 278 -#define COMBOBOX 279 -#define CTEXT 280 -#define DEFPUSHBUTTON 281 -#define EDITTEXT 282 -#define GROUPBOX 283 -#define LISTBOX 284 -#define LTEXT 285 -#define PUSHBOX 286 -#define PUSHBUTTON 287 -#define RADIOBUTTON 288 -#define RTEXT 289 -#define SCROLLBAR 290 -#define STATE3 291 -#define USERBUTTON 292 -#define BEDIT 293 -#define HEDIT 294 -#define IEDIT 295 -#define FONT 296 -#define ICON 297 -#define LANGUAGE 298 -#define CHARACTERISTICS 299 -#define VERSIONK 300 -#define MENU 301 -#define MENUEX 302 -#define MENUITEM 303 -#define SEPARATOR 304 -#define POPUP 305 -#define CHECKED 306 -#define GRAYED 307 -#define HELP 308 -#define INACTIVE 309 -#define MENUBARBREAK 310 -#define MENUBREAK 311 -#define MESSAGETABLE 312 -#define RCDATA 313 -#define STRINGTABLE 314 -#define VERSIONINFO 315 -#define FILEVERSION 316 -#define PRODUCTVERSION 317 -#define FILEFLAGSMASK 318 -#define FILEFLAGS 319 -#define FILEOS 320 -#define FILETYPE 321 -#define FILESUBTYPE 322 -#define BLOCKSTRINGFILEINFO 323 -#define BLOCKVARFILEINFO 324 -#define VALUE 325 -#define BLOCK 326 -#define MOVEABLE 327 -#define FIXED 328 -#define PURE 329 -#define IMPURE 330 -#define PRELOAD 331 -#define LOADONCALL 332 -#define DISCARDABLE 333 -#define NOT 334 -#define QUOTEDSTRING 335 -#define STRING 336 -#define NUMBER 337 -#define SIZEDSTRING 338 +#define BEG 257 +#define END 258 +#define ACCELERATORS 259 +#define VIRTKEY 260 +#define ASCII 261 +#define NOINVERT 262 +#define SHIFT 263 +#define CONTROL 264 +#define ALT 265 +#define BITMAP 266 +#define CURSOR 267 +#define DIALOG 268 +#define DIALOGEX 269 +#define EXSTYLE 270 +#define CAPTION 271 +#define CLASS 272 +#define STYLE 273 +#define AUTO3STATE 274 +#define AUTOCHECKBOX 275 +#define AUTORADIOBUTTON 276 +#define CHECKBOX 277 +#define COMBOBOX 278 +#define CTEXT 279 +#define DEFPUSHBUTTON 280 +#define EDITTEXT 281 +#define GROUPBOX 282 +#define LISTBOX 283 +#define LTEXT 284 +#define PUSHBOX 285 +#define PUSHBUTTON 286 +#define RADIOBUTTON 287 +#define RTEXT 288 +#define SCROLLBAR 289 +#define STATE3 290 +#define USERBUTTON 291 +#define BEDIT 292 +#define HEDIT 293 +#define IEDIT 294 +#define FONT 295 +#define ICON 296 +#define LANGUAGE 297 +#define CHARACTERISTICS 298 +#define VERSIONK 299 +#define MENU 300 +#define MENUEX 301 +#define MENUITEM 302 +#define SEPARATOR 303 +#define POPUP 304 +#define CHECKED 305 +#define GRAYED 306 +#define HELP 307 +#define INACTIVE 308 +#define MENUBARBREAK 309 +#define MENUBREAK 310 +#define MESSAGETABLE 311 +#define RCDATA 312 +#define STRINGTABLE 313 +#define VERSIONINFO 314 +#define FILEVERSION 315 +#define PRODUCTVERSION 316 +#define FILEFLAGSMASK 317 +#define FILEFLAGS 318 +#define FILEOS 319 +#define FILETYPE 320 +#define FILESUBTYPE 321 +#define BLOCKSTRINGFILEINFO 322 +#define BLOCKVARFILEINFO 323 +#define VALUE 324 +#define BLOCK 325 +#define MOVEABLE 326 +#define FIXED 327 +#define PURE 328 +#define IMPURE 329 +#define PRELOAD 330 +#define LOADONCALL 331 +#define DISCARDABLE 332 +#define NOT 333 +#define QUOTEDSTRING 334 +#define STRING 335 +#define NUMBER 336 +#define SIZEDSTRING 337 +#define IGNORED_TOKEN 338 #define NEG 339 diff --git a/contrib/binutils/binutils/readelf.c b/contrib/binutils/binutils/readelf.c index 81d768e..fc011e4 100644 --- a/contrib/binutils/binutils/readelf.c +++ b/contrib/binutils/binutils/readelf.c @@ -74,12 +74,6 @@ #include "bucomm.h" #include "getopt.h" -#ifdef ANSI_PROTOTYPES -#include <stdarg.h> -#else -#include <varargs.h> -#endif - char * program_name = "readelf"; unsigned int dynamic_addr; bfd_size_type dynamic_size; @@ -1937,9 +1931,18 @@ get_osabi_name (osabi) switch (osabi) { - case ELFOSABI_SYSV: return _("UNIX - System V"); + case ELFOSABI_NONE: return _("UNIX - System V"); case ELFOSABI_HPUX: return _("UNIX - HP-UX"); + case ELFOSABI_NETBSD: return _("UNIX - NetBSD"); case ELFOSABI_LINUX: return _("UNIX - Linux"); + case ELFOSABI_HURD: return _("GNU/Hurd"); + case ELFOSABI_SOLARIS: return _("UNIX - Solaris"); + case ELFOSABI_MONTEREY: return _("UNIX - Monterey"); + case ELFOSABI_IRIX: return _("UNIX - IRIX"); + case ELFOSABI_FREEBSD: return _("UNIX - FreeBSD"); + case ELFOSABI_TRU64: return _("UNIX - TRU64"); + case ELFOSABI_MODESTO: return _("Novell - Modesto"); + case ELFOSABI_OPENBSD: return _("UNIX - OpenBSD"); case ELFOSABI_STANDALONE: return _("Standalone App"); case ELFOSABI_ARM: return _("ARM"); default: diff --git a/contrib/binutils/binutils/strings.c b/contrib/binutils/binutils/strings.c index ab845b0..54f29e4 100644 --- a/contrib/binutils/binutils/strings.c +++ b/contrib/binutils/binutils/strings.c @@ -59,6 +59,23 @@ #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 <io.h> +#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)) #else @@ -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 --git a/contrib/binutils/gas/ChangeLog b/contrib/binutils/gas/ChangeLog index cef6d17..00424ba 100644 --- a/contrib/binutils/gas/ChangeLog +++ b/contrib/binutils/gas/ChangeLog @@ -1,3 +1,92 @@ +2000-06-09 Nick Clifton <nickc@cygnus.com> + + * config/tc-arm.c (cons_fix_new_arm): Assign correct reloc value + for size 1 fixes. + +2000-06-01 Scott Bambrough <scottb@netwinder.org> + + * config/tc-arm.c (do_mrs): Allow SPSR_BIT to be set correctly. + +2000-05-22 David O'Brien <obrien@FreeBSD.org> + + * configure.in: Recognize alpha-*-freebsd*. + * configure: Regenerate. + +2000-05-26 Scott Bambrough <scottb@netwinder.org> + + Port of patch to mainline by Nick Clifton <nickc@cygnus.com>: + * 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. + + Port of patch to mainline by Nick Clifton <nickc@cygnus.com>: + * testsuite/gas/arm/arch4t.s: Add tests of new fields + to msr instruction. + + * NEWS: Mention change in behaviour when assembling msr + instruction. + +2000-04-24 Nick Clifton <nickc@cygnus.com> + + * doc/c-arm.texi (ARM Directives): Document behaviour of .align 0. + * doc/as.texinfo (Align): Include arm and strongarm in list of + targets that have the second form of the behaviour of the .align + directive. + +2000-05-29 Philip Blundell <philb@gnu.org> + + * doc/as.texinfo: Update copyright dates. + (Local Labels): Delete misplaced mention of ARM. + * NEWS: Mention ARM ELF support. + +Tue May 23 00:57:05 2000 Hans-Peter Nilsson <hp@axis.com> + + * configure.in (i386-*-freebsd a.out entry): Quote properly. + * configure: Regenerate. + +2000-05-23 Philip Blundell <pb@futuretv.com> + + * configure.in: Set version to 2.10. + * configure: Regenerate. + +2000-05-23 Alan Modra <alan@linuxcare.com.au> + + * 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. + + * 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. + +2000-05-14 David O'Brien <obrien@FreeBSD.org> + + * config/te-freebsd.h: New file. + + * doc/as.1: Fix unbalanced brackets. + + * config/tc-i386.c (comment_chars): Don't use '/' as comment start if + TE_FreeBSD. + (line_comment_chars): Set to '/' if TE_FreeBSD. + +1999-07-03 Joel Sherrill <joel@OARcorp.com> + + * configure.in (*rtems except sh): Move RTEMS targets to elf. + * configure: Regenerate. + 2000-05-08 Alan Modra <alan@linuxcare.com.au> * as.h: #include "file", not <file> on files from ../include. diff --git a/contrib/binutils/gas/NEWS b/contrib/binutils/gas/NEWS index 03f554c..4143540 100644 --- a/contrib/binutils/gas/NEWS +++ b/contrib/binutils/gas/NEWS @@ -2,6 +2,9 @@ Changes in 2.10: +Support for the ARM msr instruction was changed to only allow an immediate +operand when altering the flags field. + Support for ATMEL AVR. Support for IBM 370 ELF. Somewhat experimental. @@ -42,6 +45,8 @@ Texas Instruments c80 (tms320c80) support added. i960 ELF support added. +ARM ELF support added. + Changes in 2.9: Texas Instruments c30 (tms320c30) support added. diff --git a/contrib/binutils/gas/config/tc-arm.c b/contrib/binutils/gas/config/tc-arm.c index 4779b3d..c6a1979 100644 --- a/contrib/binutils/gas/config/tc-arm.c +++ b/contrib/binutils/gas/config/tc-arm.c @@ -382,39 +382,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 <psr>'s */ - {"cpsr", CPSR_ALL}, - {"cpsr_all", CPSR_ALL}, - {"spsr", SPSR_ALL}, - {"spsr_all", SPSR_ALL}, - - /* Valid <psrf>'s */ - {"cpsr_flg", CPSR_FLG}, - {"spsr_flg", SPSR_FLG}, - - /* Valid <psrc>'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. */ @@ -459,7 +470,7 @@ static void do_fp_to_reg PARAMS ((char *, unsigned long)); 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)); @@ -468,7 +479,7 @@ static int validate_offset_imm PARAMS ((unsigned int, int)); 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)); @@ -570,8 +581,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}, @@ -1563,27 +1574,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 = _("<psr(f)> 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; @@ -1866,6 +1915,8 @@ do_mrs (str, flags) char *str; unsigned long flags; { + int skip = 0; + /* Only one syntax. */ skip_whitespace (str); @@ -1875,104 +1926,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 = _("<psr> expected"); + 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 = _("{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: "<psr>, Rm", "<psrf>, Rm", "<psrf>, #expression". */ +/* Two possible forms: + "{C|S}PSR_<field>, 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 "<psr>, 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 "<psrf>, rm", "<psrf>, #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 @@ -5242,7 +5300,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' @@ -5307,33 +5365,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; @@ -6390,7 +6421,7 @@ _("Warning: Use of the 'nv' conditional is deprecated\n")); * -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 @@ -6847,12 +6878,13 @@ cons_fix_new_arm (frag, where, size, exp) bfd_reloc_code_real_type type; int pcrel = 0; - /* Pick a reloc ... - * - * @@ Should look at CPU word size. - */ + /* Pick a reloc. + FIXME: @@ Should look at CPU word size. */ switch (size) { + case 1: + type = BFD_RELOC_8; + break; case 2: type = BFD_RELOC_16; break; diff --git a/contrib/binutils/gas/config/tc-i386.c b/contrib/binutils/gas/config/tc-i386.c index 7efd6dd..17b1f79 100644 --- a/contrib/binutils/gas/config/tc-i386.c +++ b/contrib/binutils/gas/config/tc-i386.c @@ -143,7 +143,7 @@ const char extra_symbol_chars[] = "*%-("; /* This array holds the chars that always start a comment. If the pre-processor is disabled, these aren't very useful */ -#if defined (TE_I386AIX) || ((defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)) && ! defined (TE_LINUX)) +#if defined (TE_I386AIX) || ((defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)) && !defined (TE_LINUX) && !defined(TE_FreeBSD)) /* Putting '/' here makes it impossible to use the divide operator. However, we need it for compatibility with SVR4 systems. */ const char comment_chars[] = "#/"; @@ -161,7 +161,7 @@ const char comment_chars[] = "#"; #NO_APP at the beginning of its output. */ /* Also note that comments started like this one will always work if '/' isn't otherwise defined. */ -#if defined (TE_I386AIX) || ((defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)) && ! defined (TE_LINUX)) +#if defined (TE_I386AIX) || ((defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)) && !defined (TE_LINUX) && !defined(TE_FreeBSD)) const char line_comment_chars[] = ""; #else const char line_comment_chars[] = "/"; @@ -937,12 +937,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 */ @@ -2157,10 +2156,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), @@ -3647,54 +3647,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) + 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 */ - int code16 = fragP->fr_subtype & CODE16; - int size = code16 ? 2 : 4; + /* 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 */ @@ -3719,10 +3721,11 @@ md_estimate_size_before_relax (fragP, segment) 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(); * diff --git a/contrib/binutils/gas/config/te-freebsd.h b/contrib/binutils/gas/config/te-freebsd.h index 1314235..44f4610 100644 --- a/contrib/binutils/gas/config/te-freebsd.h +++ b/contrib/binutils/gas/config/te-freebsd.h @@ -1,8 +1,30 @@ -/* - * Target environment for FreeBSD. It is the same as the generic - * target, except it arranges to suppress the use of "/" as a comment - * character. Some code in the FreeBSD kernel uses "/" to mean - * division. (What a concept.) - */ +/* 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 -#include "te-generic.h" + +#define LOCAL_LABELS_DOLLAR 1 +#define LOCAL_LABELS_FB 1 + +#include "obj-format.h" diff --git a/contrib/binutils/gas/configure b/contrib/binutils/gas/configure index 61c9e8c..bb0ce7a 100755 --- a/contrib/binutils/gas/configure +++ b/contrib/binutils/gas/configure @@ -51,7 +51,6 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -166,7 +165,6 @@ 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 @@ -337,11 +335,6 @@ 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=*) @@ -507,16 +500,12 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -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 +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 -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -603,7 +592,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:607: checking host system type" >&5 +echo "configure:596: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -624,7 +613,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:628: checking target system type" >&5 +echo "configure:617: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -642,7 +631,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:646: checking build system type" >&5 +echo "configure:635: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -677,7 +666,7 @@ test "$host_alias" != "$target_alias" && # 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:681: checking for a BSD compatible install" >&5 +echo "configure:670: 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 @@ -730,7 +719,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:734: checking whether build environment is sane" >&5 +echo "configure:723: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -787,7 +776,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:791: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:780: 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 @@ -816,7 +805,7 @@ fi PACKAGE=gas -VERSION=2.9.5 +VERSION=2.10 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; } @@ -833,7 +822,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:837: checking for working aclocal" >&5 +echo "configure:826: 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. @@ -846,7 +835,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:850: checking for working autoconf" >&5 +echo "configure:839: 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. @@ -859,7 +848,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:863: checking for working automake" >&5 +echo "configure:852: 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. @@ -872,7 +861,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:876: checking for working autoheader" >&5 +echo "configure:865: 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. @@ -885,7 +874,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:889: checking for working makeinfo" >&5 +echo "configure:878: 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. @@ -971,7 +960,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:975: checking for $ac_word" >&5 +echo "configure:964: 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 @@ -1001,7 +990,7 @@ fi # 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:1005: checking for $ac_word" >&5 +echo "configure:994: 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 @@ -1031,7 +1020,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:1035: checking for $ac_word" >&5 +echo "configure:1024: 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 @@ -1082,7 +1071,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:1086: checking for $ac_word" >&5 +echo "configure:1075: 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 @@ -1114,7 +1103,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1118: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1107: 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. @@ -1125,12 +1114,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1129 "configure" +#line 1118 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1123: \"$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 @@ -1156,12 +1145,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:1160: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1149: 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:1165: checking whether we are using GNU C" >&5 +echo "configure:1154: 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 @@ -1170,7 +1159,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1174: \"$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:1163: \"$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 @@ -1189,7 +1178,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:1193: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1182: 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 @@ -1232,7 +1221,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:1236: checking for ld used by GCC" >&5 +echo "configure:1225: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1256,10 +1245,10 @@ echo "configure:1236: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1260: checking for GNU ld" >&5 +echo "configure:1249: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1263: checking for non-GNU ld" >&5 +echo "configure:1252: 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 @@ -1294,7 +1283,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:1298: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1287: 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 @@ -1310,7 +1299,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:1314: checking for BSD-compatible nm" >&5 +echo "configure:1303: 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 @@ -1346,7 +1335,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:1350: checking whether ln -s works" >&5 +echo "configure:1339: 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 @@ -1395,8 +1384,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1399 "configure"' > conftest.$ac_ext - if { (eval echo configure:1400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1388 "configure"' > conftest.$ac_ext + if { (eval echo configure:1389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1417,19 +1406,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:1421: checking whether the C compiler needs -belf" >&5 +echo "configure:1410: 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 <<EOF -#line 1426 "configure" +#line 1415 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:1433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1422: \"$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 @@ -1680,6 +1669,7 @@ for this_target in $target $canon_targets ; do alpha*-*-osf*) fmt=ecoff ;; alpha*-*-linuxecoff*) fmt=ecoff ;; alpha*-*-linux-gnu*) fmt=elf em=linux ;; + alpha*-*-freebsd*) fmt=elf em=freebsd ;; alpha*-*-netbsd*) fmt=elf em=nbsd ;; arc-*-elf*) fmt=elf bfd_gas=yes ;; @@ -1732,7 +1722,7 @@ for this_target in $target $canon_targets ; do 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*) @@ -1749,8 +1739,9 @@ EOF i386-*-vsta) fmt=aout ;; i386-*-msdosdjgpp* | i386-*-go32* | i386-go32-rtems*) fmt=coff em=go32;; + i386-*-rtemscoff*) fmt=coff ;; i386-*-rtemself*) fmt=elf ;; - i386-*-rtems*) fmt=coff ;; + i386-*-rtems*) fmt=elf ;; i386-*-gnu*) fmt=elf ;; i386-*-mach*) fmt=aout em=mach bfd_gas=yes ;; @@ -1764,6 +1755,8 @@ EOF i386-*-vxworks*) fmt=aout ;; i960-*-bout) fmt=bout ;; i960-*-coff) fmt=coff em=ic960 ;; + i960-*-rtemscoff*) fmt=coff em=ic960 ;; + i960-*-rtemself*) fmt=elf ;; i960-*-rtems*) fmt=coff em=ic960 ;; i960-*-nindy*) fmt=bout ;; i960-*-vxworks4*) fmt=bout ;; @@ -1782,7 +1775,10 @@ EOF m68k-*-sysv4*) # must be before -sysv* fmt=elf em=svr4 ;; m68k-*-elf*) fmt=elf ;; - m68k-*-coff | m68k-*-sysv* | m68k-*-rtems*) + m68k-*-rtemscoff*) fmt=coff ;; + m68k-*-rtemself*) fmt=elf ;; + m68k-*-rtems*) fmt=elf ;; + m68k-*-coff | m68k-*-sysv*) fmt=coff ;; m68k-*-hpux*) fmt=hp300 em=hp300 ;; m68k-*-linux*aout*) fmt=aout em=linux ;; @@ -1861,13 +1857,16 @@ EOF sh-*-coff*) fmt=coff ;; sh-*-pe*) fmt=coff em=pe bfd_gas=yes;; sh-*-rtemself*) fmt=elf ;; - sh-*-rtems*) fmt=coff ;; + sh-*-rtemscoff*) fmt=coff ;; + sh-*-rtems*) fmt=coff ;; ns32k-pc532-mach* | ns32k-pc532-ux*) fmt=aout em=pc532mach ;; ns32k-pc532-netbsd* | ns32k-pc532-lites*) fmt=aout em=nbsd532 ;; ns32k-pc532-openbsd*) fmt=aout em=nbsd532 ;; - sparc-*-rtems*) fmt=aout ;; + sparc-*-rtemsaout*) fmt=aout ;; + sparc-*-rtemself*) fmt=elf ;; + sparc-*-rtems*) fmt=elf ;; sparc-*-sunos4*) fmt=aout em=sun3 ;; sparc-*-aout | sparc*-*-vxworks*) fmt=aout em=sparcaout ;; @@ -2382,7 +2381,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:2386: checking for $ac_word" >&5 +echo "configure:2385: 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 @@ -2412,7 +2411,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:2416: checking for $ac_word" >&5 +echo "configure:2415: 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 @@ -2463,7 +2462,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:2467: checking for $ac_word" >&5 +echo "configure:2466: 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 @@ -2495,7 +2494,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2499: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2498: 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. @@ -2506,12 +2505,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2510 "configure" +#line 2509 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2514: \"$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 @@ -2537,12 +2536,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:2541: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2540: 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:2546: checking whether we are using GNU C" >&5 +echo "configure:2545: 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 @@ -2551,7 +2550,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2555: \"$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:2554: \"$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 @@ -2570,7 +2569,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:2574: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2573: 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 @@ -2607,7 +2606,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:2611: checking for $ac_word" >&5 +echo "configure:2610: 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 @@ -2638,7 +2637,7 @@ done test -n "$YACC" || YACC="yacc" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2642: checking how to run the C preprocessor" >&5 +echo "configure:2641: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2653,13 +2652,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2657 "configure" +#line 2656 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2662: \"$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 : @@ -2670,13 +2669,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2674 "configure" +#line 2673 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2679: \"$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 : @@ -2687,13 +2686,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2691 "configure" +#line 2690 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2697: \"$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 : @@ -2723,7 +2722,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:2727: checking for $ac_word" >&5 +echo "configure:2726: 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 @@ -2756,7 +2755,7 @@ test -n "$LEX" || LEX=""$missing_dir/missing flex"" # 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:2760: checking for $ac_word" >&5 +echo "configure:2759: 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 @@ -2790,7 +2789,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:2794: checking for yywrap in -l$ac_lib" >&5 +echo "configure:2793: 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 @@ -2798,7 +2797,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 2802 "configure" +#line 2801 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2809,7 +2808,7 @@ int main() { yywrap() ; return 0; } EOF -if { (eval echo configure:2813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2812: \"$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 @@ -2832,7 +2831,7 @@ fi fi echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:2836: checking lex output file root" >&5 +echo "configure:2835: 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 @@ -2853,7 +2852,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:2857: checking whether yytext is a pointer" >&5 +echo "configure:2856: 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 @@ -2865,14 +2864,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <<EOF -#line 2869 "configure" +#line 2868 "configure" #include "confdefs.h" `cat $LEX_OUTPUT_ROOT.c` int main() { ; return 0; } EOF -if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2875: \"$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 @@ -2896,7 +2895,7 @@ fi ALL_LINGUAS= echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:2900: checking for POSIXized ISC" >&5 +echo "configure:2899: 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 @@ -2917,12 +2916,12 @@ else fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2921: checking for ANSI C header files" >&5 +echo "configure:2920: 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 <<EOF -#line 2926 "configure" +#line 2925 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2930,7 +2929,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2933: \"$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* @@ -2947,7 +2946,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 -#line 2951 "configure" +#line 2950 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2965,7 +2964,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 -#line 2969 "configure" +#line 2968 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2986,7 +2985,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2990 "configure" +#line 2989 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2997,7 +2996,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3021,18 +3020,18 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3025: checking for working const" >&5 +echo "configure:3024: 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 <<EOF -#line 3030 "configure" +#line 3029 "configure" #include "confdefs.h" int main() { /* Ultrix mips cc rejects this. */ -typedef int charset[2]; const charset x; +typedef int charset[2]; const charset x = {0,0}; /* SunOS 4.1.1 cc rejects this. */ char const *const *ccp; char **p; @@ -3075,7 +3074,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:3079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3096,21 +3095,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3100: checking for inline" >&5 +echo "configure:3099: 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 <<EOF -#line 3107 "configure" +#line 3106 "configure" #include "confdefs.h" int main() { -} $ac_kw foo() { +} int $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:3114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3136,12 +3135,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3140: checking for off_t" >&5 +echo "configure:3139: 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 <<EOF -#line 3145 "configure" +#line 3144 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3169,12 +3168,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3173: checking for size_t" >&5 +echo "configure:3172: 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 <<EOF -#line 3178 "configure" +#line 3177 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3204,19 +3203,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:3208: checking for working alloca.h" >&5 +echo "configure:3207: 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 <<EOF -#line 3213 "configure" +#line 3212 "configure" #include "confdefs.h" #include <alloca.h> int main() { -char *p = alloca(2 * sizeof(int)); +void *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:3220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3219: \"$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 @@ -3237,12 +3236,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:3241: checking for alloca" >&5 +echo "configure:3240: 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 <<EOF -#line 3246 "configure" +#line 3245 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -3270,7 +3269,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:3274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3273: \"$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 @@ -3302,12 +3301,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:3306: checking whether alloca needs Cray hooks" >&5 +echo "configure:3305: 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 <<EOF -#line 3311 "configure" +#line 3310 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -3332,12 +3331,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&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:3336: checking for $ac_func" >&5 +echo "configure:3335: 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 <<EOF -#line 3341 "configure" +#line 3340 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3360,7 +3359,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3363: \"$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 @@ -3387,7 +3386,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:3391: checking stack direction for C alloca" >&5 +echo "configure:3390: 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 @@ -3395,7 +3394,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 3399 "configure" +#line 3398 "configure" #include "confdefs.h" find_stack_direction () { @@ -3414,7 +3413,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:3418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3417: \"$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 @@ -3439,17 +3438,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:3443: checking for $ac_hdr" >&5 +echo "configure:3442: 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 -#line 3448 "configure" +#line 3447 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3452: \"$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* @@ -3478,12 +3477,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3482: checking for $ac_func" >&5 +echo "configure:3481: 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 <<EOF -#line 3487 "configure" +#line 3486 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3506,7 +3505,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3509: \"$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 @@ -3531,7 +3530,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3535: checking for working mmap" >&5 +echo "configure:3534: 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 @@ -3539,7 +3538,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 3543 "configure" +#line 3542 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -3566,12 +3565,15 @@ else #include <sys/types.h> #include <fcntl.h> #include <sys/mman.h> +#include <stdlib.h> +#include <sys/stat.h> + +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif /* This mess was copied from the GNU getpagesize.h. */ #ifndef HAVE_GETPAGESIZE -# ifdef HAVE_UNISTD_H -# include <unistd.h> -# endif /* Assume that all systems that can run configure have sys/param.h. */ # ifndef HAVE_SYS_PARAM_H @@ -3626,7 +3628,7 @@ main() /* * First, make a file with some known garbage in it. */ - data = malloc(pagesize); + data = (char*)malloc(pagesize); if (!data) exit(1); for (i = 0; i < pagesize; ++i) @@ -3647,7 +3649,7 @@ main() fd = open("conftestmmap", O_RDWR); if (fd < 0) exit(1); - data2 = malloc(2 * pagesize); + data2 = (char*)malloc(2 * pagesize); if (!data2) exit(1); data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); @@ -3665,7 +3667,7 @@ main() */ for (i = 0; i < pagesize; ++i) *(data2 + i) = *(data2 + i) + 1; - data3 = malloc(pagesize); + data3 = (char*)malloc(pagesize); if (!data3) exit(1); if (read(fd, data3, pagesize) != pagesize) @@ -3679,7 +3681,7 @@ main() } EOF -if { (eval echo configure:3683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3685: \"$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 @@ -3707,17 +3709,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:3711: checking for $ac_hdr" >&5 +echo "configure:3713: 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 -#line 3716 "configure" +#line 3718 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3723: \"$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* @@ -3747,12 +3749,12 @@ done __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3751: checking for $ac_func" >&5 +echo "configure:3753: 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 <<EOF -#line 3756 "configure" +#line 3758 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3775,7 +3777,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3781: \"$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 @@ -3804,12 +3806,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3808: checking for $ac_func" >&5 +echo "configure:3810: 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 <<EOF -#line 3813 "configure" +#line 3815 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3832,7 +3834,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3838: \"$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 @@ -3866,19 +3868,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3870: checking for LC_MESSAGES" >&5 +echo "configure:3872: 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 <<EOF -#line 3875 "configure" +#line 3877 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:3882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3884: \"$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 @@ -3899,7 +3901,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3903: checking whether NLS is requested" >&5 +echo "configure:3905: 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" @@ -3919,7 +3921,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3923: checking whether included gettext is requested" >&5 +echo "configure:3925: 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" @@ -3938,17 +3940,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3942: checking for libintl.h" >&5 +echo "configure:3944: 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 -#line 3947 "configure" +#line 3949 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3954: \"$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* @@ -3965,19 +3967,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:3969: checking for gettext in libc" >&5 +echo "configure:3971: 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 <<EOF -#line 3974 "configure" +#line 3976 "configure" #include "confdefs.h" #include <libintl.h> int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:3981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3983: \"$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 @@ -3993,7 +3995,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3997: checking for bindtextdomain in -lintl" >&5 +echo "configure:3999: 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 @@ -4001,7 +4003,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4005 "configure" +#line 4007 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4012,7 +4014,7 @@ int main() { bindtextdomain() ; return 0; } EOF -if { (eval echo configure:4016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4018: \"$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 @@ -4028,19 +4030,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:4032: checking for gettext in libintl" >&5 +echo "configure:4034: 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 <<EOF -#line 4037 "configure" +#line 4039 "configure" #include "confdefs.h" int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:4044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4046: \"$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 @@ -4068,7 +4070,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:4072: checking for $ac_word" >&5 +echo "configure:4074: 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 @@ -4102,12 +4104,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4106: checking for $ac_func" >&5 +echo "configure:4108: 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 <<EOF -#line 4111 "configure" +#line 4113 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4130,7 +4132,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4136: \"$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 @@ -4157,7 +4159,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:4161: checking for $ac_word" >&5 +echo "configure:4163: 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 @@ -4193,7 +4195,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:4197: checking for $ac_word" >&5 +echo "configure:4199: 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 @@ -4225,7 +4227,7 @@ else fi cat > conftest.$ac_ext <<EOF -#line 4229 "configure" +#line 4231 "configure" #include "confdefs.h" int main() { @@ -4233,7 +4235,7 @@ extern int _nl_msg_cat_cntr; return _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:4237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -4265,7 +4267,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:4269: checking for $ac_word" >&5 +echo "configure:4271: 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 @@ -4299,7 +4301,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:4303: checking for $ac_word" >&5 +echo "configure:4305: 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 @@ -4335,7 +4337,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:4339: checking for $ac_word" >&5 +echo "configure:4341: 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 @@ -4425,7 +4427,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:4429: checking for catalogs to be installed" >&5 +echo "configure:4431: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -4453,17 +4455,17 @@ echo "configure:4429: checking for catalogs to be installed" >&5 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:4457: checking for linux/version.h" >&5 +echo "configure:4459: 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 -#line 4462 "configure" +#line 4464 "configure" #include "confdefs.h" #include <linux/version.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4469: \"$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* @@ -4526,7 +4528,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:4530: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:4532: 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" @@ -4549,12 +4551,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:4553: checking for Cygwin environment" >&5 +echo "configure:4555: 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 <<EOF -#line 4558 "configure" +#line 4560 "configure" #include "confdefs.h" int main() { @@ -4565,7 +4567,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:4569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -4582,19 +4584,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:4586: checking for mingw32 environment" >&5 +echo "configure:4588: 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 <<EOF -#line 4591 "configure" +#line 4593 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:4598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -4613,7 +4615,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:4617: checking for executable suffix" >&5 +echo "configure:4619: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4623,10 +4625,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:4627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:4629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -4648,17 +4650,17 @@ for ac_hdr in string.h stdlib.h memory.h strings.h unistd.h stdarg.h varargs.h e do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4652: checking for $ac_hdr" >&5 +echo "configure:4654: 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 -#line 4657 "configure" +#line 4659 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4664: \"$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* @@ -4688,7 +4690,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:4692: checking whether compiling a cross-assembler" >&5 +echo "configure:4694: checking whether compiling a cross-assembler" >&5 if test "${host}" = "${target}"; then cross_gas=no else @@ -4703,19 +4705,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:4707: checking for working alloca.h" >&5 +echo "configure:4709: 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 <<EOF -#line 4712 "configure" +#line 4714 "configure" #include "confdefs.h" #include <alloca.h> int main() { -char *p = alloca(2 * sizeof(int)); +void *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:4719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4721: \"$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 @@ -4736,12 +4738,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:4740: checking for alloca" >&5 +echo "configure:4742: 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 <<EOF -#line 4745 "configure" +#line 4747 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -4769,7 +4771,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:4773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4775: \"$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 @@ -4801,12 +4803,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:4805: checking whether alloca needs Cray hooks" >&5 +echo "configure:4807: 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 <<EOF -#line 4810 "configure" +#line 4812 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -4831,12 +4833,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&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:4835: checking for $ac_func" >&5 +echo "configure:4837: 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 <<EOF -#line 4840 "configure" +#line 4842 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4859,7 +4861,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4865: \"$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 @@ -4886,7 +4888,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:4890: checking stack direction for C alloca" >&5 +echo "configure:4892: 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 @@ -4894,7 +4896,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 4898 "configure" +#line 4900 "configure" #include "confdefs.h" find_stack_direction () { @@ -4913,7 +4915,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:4917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4919: \"$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 @@ -4935,21 +4937,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:4939: checking for inline" >&5 +echo "configure:4941: 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 <<EOF -#line 4946 "configure" +#line 4948 "configure" #include "confdefs.h" int main() { -} $ac_kw foo() { +} int $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:4953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -4979,12 +4981,12 @@ esac for ac_func in unlink remove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4983: checking for $ac_func" >&5 +echo "configure:4985: 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 <<EOF -#line 4988 "configure" +#line 4990 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5007,7 +5009,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5013: \"$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 @@ -5036,12 +5038,12 @@ done for ac_func in sbrk do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5040: checking for $ac_func" >&5 +echo "configure:5042: 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 <<EOF -#line 5045 "configure" +#line 5047 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5064,7 +5066,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5070: \"$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 @@ -5093,12 +5095,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:5097: checking for working assert macro" >&5 +echo "configure:5099: 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 <<EOF -#line 5102 "configure" +#line 5104 "configure" #include "confdefs.h" #include <assert.h> #include <stdio.h> @@ -5114,7 +5116,7 @@ assert (a == b ; return 0; } EOF -if { (eval echo configure:5118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_assert_ok=yes else @@ -5155,12 +5157,12 @@ gas_test_headers=" " echo $ac_n "checking whether declaration is required for strstr""... $ac_c" 1>&6 -echo "configure:5159: checking whether declaration is required for strstr" >&5 +echo "configure:5161: 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 <<EOF -#line 5164 "configure" +#line 5166 "configure" #include "confdefs.h" $gas_test_headers int main() { @@ -5171,7 +5173,7 @@ x = (f) strstr; ; return 0; } EOF -if { (eval echo configure:5175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5177: \"$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 @@ -5192,12 +5194,12 @@ fi echo $ac_n "checking whether declaration is required for malloc""... $ac_c" 1>&6 -echo "configure:5196: checking whether declaration is required for malloc" >&5 +echo "configure:5198: 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 <<EOF -#line 5201 "configure" +#line 5203 "configure" #include "confdefs.h" $gas_test_headers int main() { @@ -5208,7 +5210,7 @@ x = (f) malloc; ; return 0; } EOF -if { (eval echo configure:5212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5214: \"$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 @@ -5229,12 +5231,12 @@ fi echo $ac_n "checking whether declaration is required for free""... $ac_c" 1>&6 -echo "configure:5233: checking whether declaration is required for free" >&5 +echo "configure:5235: 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 <<EOF -#line 5238 "configure" +#line 5240 "configure" #include "confdefs.h" $gas_test_headers int main() { @@ -5245,7 +5247,7 @@ x = (f) free; ; return 0; } EOF -if { (eval echo configure:5249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5251: \"$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 @@ -5266,12 +5268,12 @@ fi echo $ac_n "checking whether declaration is required for sbrk""... $ac_c" 1>&6 -echo "configure:5270: checking whether declaration is required for sbrk" >&5 +echo "configure:5272: 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 <<EOF -#line 5275 "configure" +#line 5277 "configure" #include "confdefs.h" $gas_test_headers int main() { @@ -5282,7 +5284,7 @@ x = (f) sbrk; ; return 0; } EOF -if { (eval echo configure:5286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5288: \"$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 @@ -5303,12 +5305,12 @@ fi echo $ac_n "checking whether declaration is required for environ""... $ac_c" 1>&6 -echo "configure:5307: checking whether declaration is required for environ" >&5 +echo "configure:5309: 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 <<EOF -#line 5312 "configure" +#line 5314 "configure" #include "confdefs.h" $gas_test_headers int main() { @@ -5319,7 +5321,7 @@ x = (f) environ; ; return 0; } EOF -if { (eval echo configure:5323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5325: \"$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 @@ -5343,12 +5345,12 @@ fi # for it? echo $ac_n "checking whether declaration is required for errno""... $ac_c" 1>&6 -echo "configure:5347: checking whether declaration is required for errno" >&5 +echo "configure:5349: 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 <<EOF -#line 5352 "configure" +#line 5354 "configure" #include "confdefs.h" #ifdef HAVE_ERRNO_H @@ -5363,7 +5365,7 @@ x = (f) errno; ; return 0; } EOF -if { (eval echo configure:5367: \"$ac_link\") 1>&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_errno=no else diff --git a/contrib/binutils/gas/configure.in b/contrib/binutils/gas/configure.in index 8ee42a6..283d49c 100644 --- a/contrib/binutils/gas/configure.in +++ b/contrib/binutils/gas/configure.in @@ -10,7 +10,7 @@ AC_INIT(as.h) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(gas, 2.9.5) +AM_INIT_AUTOMAKE(gas, 2.10) AM_PROG_LIBTOOL @@ -147,6 +147,7 @@ changequote([,])dnl alpha*-*-osf*) fmt=ecoff ;; alpha*-*-linuxecoff*) fmt=ecoff ;; alpha*-*-linux-gnu*) fmt=elf em=linux ;; + alpha*-*-freebsd*) fmt=elf em=freebsd ;; alpha*-*-netbsd*) fmt=elf em=nbsd ;; arc-*-elf*) fmt=elf bfd_gas=yes ;; @@ -199,8 +200,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 ;; @@ -214,8 +217,9 @@ changequote([,])dnl i386-*-vsta) fmt=aout ;; i386-*-msdosdjgpp* | i386-*-go32* | i386-go32-rtems*) fmt=coff em=go32;; + i386-*-rtemscoff*) fmt=coff ;; i386-*-rtemself*) fmt=elf ;; - i386-*-rtems*) fmt=coff ;; + i386-*-rtems*) fmt=elf ;; i386-*-gnu*) fmt=elf ;; i386-*-mach*) fmt=aout em=mach bfd_gas=yes ;; @@ -229,6 +233,8 @@ changequote([,])dnl i386-*-vxworks*) fmt=aout ;; i960-*-bout) fmt=bout ;; i960-*-coff) fmt=coff em=ic960 ;; + i960-*-rtemscoff*) fmt=coff em=ic960 ;; + i960-*-rtemself*) fmt=elf ;; i960-*-rtems*) fmt=coff em=ic960 ;; i960-*-nindy*) fmt=bout ;; i960-*-vxworks4*) fmt=bout ;; @@ -247,7 +253,10 @@ changequote([,])dnl m68k-*-sysv4*) # must be before -sysv* fmt=elf em=svr4 ;; m68k-*-elf*) fmt=elf ;; - m68k-*-coff | m68k-*-sysv* | m68k-*-rtems*) + m68k-*-rtemscoff*) fmt=coff ;; + m68k-*-rtemself*) fmt=elf ;; + m68k-*-rtems*) fmt=elf ;; + m68k-*-coff | m68k-*-sysv*) fmt=coff ;; m68k-*-hpux*) fmt=hp300 em=hp300 ;; m68k-*-linux*aout*) fmt=aout em=linux ;; @@ -322,13 +331,16 @@ changequote([,])dnl sh-*-coff*) fmt=coff ;; sh-*-pe*) fmt=coff em=pe bfd_gas=yes;; sh-*-rtemself*) fmt=elf ;; - sh-*-rtems*) fmt=coff ;; + sh-*-rtemscoff*) fmt=coff ;; + sh-*-rtems*) fmt=coff ;; ns32k-pc532-mach* | ns32k-pc532-ux*) fmt=aout em=pc532mach ;; ns32k-pc532-netbsd* | ns32k-pc532-lites*) fmt=aout em=nbsd532 ;; ns32k-pc532-openbsd*) fmt=aout em=nbsd532 ;; - sparc-*-rtems*) fmt=aout ;; + sparc-*-rtemsaout*) fmt=aout ;; + sparc-*-rtemself*) fmt=elf ;; + sparc-*-rtems*) fmt=elf ;; sparc-*-sunos4*) fmt=aout em=sun3 ;; sparc-*-aout | sparc*-*-vxworks*) fmt=aout em=sparcaout ;; diff --git a/contrib/binutils/gas/doc/as.1 b/contrib/binutils/gas/doc/as.1 index 08d5805..5fc517c 100644 --- a/contrib/binutils/gas/doc/as.1 +++ b/contrib/binutils/gas/doc/as.1 @@ -9,7 +9,7 @@ GNU as \- the portable GNU assembler. .na .B as .RB "[\|" \-a "[\|" dhlns "\|]" \c -\&\[\|\=\c +\&[\|\=\c .I file\c \&\|]\|] .RB "[\|" \-D "\|]" diff --git a/contrib/binutils/gas/doc/as.texinfo b/contrib/binutils/gas/doc/as.texinfo index 5917a00..4ceb104 100644 --- a/contrib/binutils/gas/doc/as.texinfo +++ b/contrib/binutils/gas/doc/as.texinfo @@ -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 @@ -1162,9 +1162,6 @@ 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 @section Assemble in MRI Compatibility Mode: @code{-M} @@ -3264,7 +3261,8 @@ alignment request in bytes. For example @samp{.align 8} advances the location counter until it is a multiple of 8. If the location counter is already a multiple of 8, no change is needed. -For other systems, including the i386 using a.out format, it is the +For other systems, including the i386 using a.out format, and the arm and +strongarm, it is the number of low-order zero bits the location counter must have after advancement. For example @samp{.align 3} advances the location counter until it a multiple of 8. If the location counter is already a diff --git a/contrib/binutils/gas/doc/c-arm.texi b/contrib/binutils/gas/doc/c-arm.texi index ff98d7f..e354982 100644 --- a/contrib/binutils/gas/doc/c-arm.texi +++ b/contrib/binutils/gas/doc/c-arm.texi @@ -1,4 +1,4 @@ -@c Copyright (C) 1996, 1998, 1999 Free Software Foundation, Inc. +@c Copyright (C) 1996, 1998, 1999, 2000 Free Software Foundation, Inc. @c This is part of the GAS manual. @c For copying conditions, see the file as.texinfo. @@ -27,66 +27,86 @@ @section Options @cindex ARM options (none) @cindex options for ARM (none) + @table @code + @cindex @code{-marm} command line option, ARM -@item -marm [@var{2}|@var{250}|@var{3}|@var{6}|@var{60}|@var{600}|@var{610}|@var{620}|@var{7}|@var{7m}|@var{7d}|@var{7dm}|@var{7di}|@var{7dmi}|@var{70}|@var{700}|@var{700i}|@var{710}|@var{710c}|@var{7100}|@var{7500}|@var{7500fe}|@var{7tdmi}|@var{8}|@var{810}|@var{9}|@var{9tdmi}|@var{920}|@var{strongarm}|@var{strongarm110}|@var{strongarm1100}] +@item -marm@code{[2|250|3|6|60|600|610|620|7|7m|7d|7dm|7di|7dmi|70|700|700i|710|710c|7100|7500|7500fe|7tdmi|8|810|9|9tdmi|920|strongarm|strongarm110|strongarm1100]} This option specifies the target processor. The assembler will issue an error message if an attempt is made to assemble an instruction which will not execute on the target processor. + @cindex @code{-marmv} command line option, ARM -@item -marmv [@var{2}|@var{2a}|@var{3}|@var{3m}|@var{4}|@var{4t}|@var{5}|@var{5t}] +@item -marmv@code{[2|2a|3|3m|4|4t|5|5t]} This option specifies the target architecture. The assembler will issue an error message if an attempt is made to assemble an instruction which will not execute on the target architecture. + @cindex @code{-mthumb} command line option, ARM @item -mthumb This option specifies that only Thumb instructions should be assembled. + @cindex @code{-mall} command line option, ARM @item -mall This option specifies that any Arm or Thumb instruction should be assembled. + @cindex @code{-mfpa} command line option, ARM -@item -mfpa [@var{10}|@var{11}] +@item -mfpa @var{[10|11]} This option specifies the floating point architecture in use on the target processor. + @cindex @code{-mfpe-old} command line option, ARM @item -mfpe-old Do not allow the assemble of floating point multiple instructions. + @cindex @code{-mno-fpu} command line option, ARM @item -mno-fpu Do not allow the assembly of any floating point instructions. + @cindex @code{-mthumb-interwork} command line option, ARM @item -mthumb-interwork This option specifies that the output generated by the assembler should be marked as supporting interworking. + @cindex @code{-mapcs} command line option, ARM -@item -mapcs [@var{26}|@var{32}] +@item -mapcs @var{[26|32]} This option specifies that the output generated by the assembler should be marked as supporting the indicated version of the Arm Procedure. Calling Standard. + +@cindex @code{-mapcs-float} command line option, ARM @item -mapcs-float This indicates the the floating point variant of the APCS should be used. In this variant floating point arguments are passed in FP registers rather than integer registers. + +@cindex @code{-mapcs-reentrant} command line option, ARM @item -mapcs-reentrant This indicates that the reentrant variant of the APCS should be used. This variant supports position independent code. + @cindex @code{-EB} command line option, ARM @item -EB This option specifies that the output generated by the assembler should be marked as being encoded for a big-endian processor. + @cindex @code{-EL} command line option, ARM @item -EL This option specifies that the output generated by the assembler should be marked as being encoded for a little-endian processor. + @cindex @code{-k} command line option, ARM @cindex PIC code generation for ARM @item -k This option enables the generation of PIC (position independent code). + +@cindex @code{-moabi} command line option, ARM @item -moabi This indicates that the code should be assembled using the old ARM ELF conventions, based on a beta release release of the ARM-ELF specifications, rather than the default conventions which are based on the final release of the ARM-ELF specifications. + @end table @@ -143,6 +163,13 @@ The ARM family uses @sc{ieee} floating-point numbers. @cindex ARM machine directives @table @code +@cindex @code{align} directive, ARM +@item .align @var{expression} [, @var{expression}] +This is the generic @var{.align} directive. For the ARM however if the +first argument is zero (ie no alignment is needed) the assembler will +behave as if the argument had been 2 (ie pad to the next four byte +boundary). This is for compatability with ARM's own assembler. + @cindex @code{req} directive, ARM @item @var{name} .req @var{register name} This creates an alias for @var{register name} called @var{name}. For @@ -153,7 +180,7 @@ example: @end smallexample @cindex @code{code} directive, ARM -@item .code [@var{16}|@var{32}] +@item .code @var{[16|32]} This directive selects the instruction set being generated. The value 16 selects Thumb, with the value 32 selecting ARM. diff --git a/contrib/binutils/gas/frags.c b/contrib/binutils/gas/frags.c index 882cb12..d184664 100644 --- a/contrib/binutils/gas/frags.c +++ b/contrib/binutils/gas/frags.c @@ -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. @@ -93,11 +93,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 --git a/contrib/binutils/gas/frags.h b/contrib/binutils/gas/frags.h index b4c6e38..dcd9a2f 100644 --- a/contrib/binutils/gas/frags.h +++ b/contrib/binutils/gas/frags.h @@ -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 --git a/contrib/binutils/include/ChangeLog b/contrib/binutils/include/ChangeLog index 0dda323..4408899 100644 --- a/contrib/binutils/include/ChangeLog +++ b/contrib/binutils/include/ChangeLog @@ -1,3 +1,9 @@ +2000-05-26 Eli Zaretskii <eliz@is.elta.co.il> + + * filenames.h: New file. + (HAVE_DOS_BASED_FILE_SYSTEM, IS_DIR_SEPARATOR) + (IS_ABSOLUTE_PATH, FILENAME_CMP): New macros. + 2000-04-04 Alan Modra <alan@linuxcare.com.au> * bin-bugs.h (REPORT_BUGS_TO): Remove translated part. diff --git a/contrib/binutils/include/elf/ChangeLog b/contrib/binutils/include/elf/ChangeLog index e1f68c3..4b5a50b 100644 --- a/contrib/binutils/include/elf/ChangeLog +++ b/contrib/binutils/include/elf/ChangeLog @@ -1,3 +1,23 @@ +2000-05-02 H.J. Lu <hjl@gnu.org> + + * common.h (ELFOSABI_NONE): Renamed from ELFOSABI_SYSV. + (ELFOSABI_MODESTO): Defined. + (ELFOSABI_OPENBSD): Likewise. + +2000-04-14 H.J. Lu <hjl@gnu.org> + + * common.h (ELFOSABI_TRUE64): Renamed to ELFOSABI_TRU64. + +2000-04-14 H.J. Lu <hjl@gnu.org> + + * common.h (ELFOSABI_NETBSD): Defined. + (ELFOSABI_HURD): Likewise. + (ELFOSABI_SOLARIS): Likewise. + (ELFOSABI_MONTEREY): Likewise. + (ELFOSABI_IRIX): Likewise. + (ELFOSABI_FREEBSD): Likewise. + (ELFOSABI_TRUE64): Likewise. + 2000-03-27 Denis Chertykov <denisc@overta.ru> * avr.h: New file. AVR ELF support for BFD. diff --git a/contrib/binutils/include/elf/common.h b/contrib/binutils/include/elf/common.h index 659f986..09b9669 100644 --- a/contrib/binutils/include/elf/common.h +++ b/contrib/binutils/include/elf/common.h @@ -58,7 +58,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define EI_VERSION 6 /* File version */ #define EI_OSABI 7 /* Operating System/ABI indication */ -#define ELFOSABI_SYSV 0 /* UNIX System V ABI */ +#define ELFOSABI_NONE 0 /* UNIX System V ABI */ #define ELFOSABI_HPUX 1 /* HP-UX operating system */ #define ELFOSABI_NETBSD 2 /* NetBSD */ #define ELFOSABI_LINUX 3 /* GNU/Linux */ diff --git a/contrib/binutils/include/filenames.h b/contrib/binutils/include/filenames.h new file mode 100644 index 0000000..ba933c85 --- /dev/null +++ b/contrib/binutils/include/filenames.h @@ -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 --git a/contrib/binutils/include/opcode/ChangeLog b/contrib/binutils/include/opcode/ChangeLog index 7452c2b..4e8dbf1 100644 --- a/contrib/binutils/include/opcode/ChangeLog +++ b/contrib/binutils/include/opcode/ChangeLog @@ -1,3 +1,18 @@ +2000-05-23 Maciej W. Rozycki <macro@ds2.pg.gda.pl> + + * i386.h: Allow d suffix on iret, and add DefaultSize modifier. + +2000-05-23 Alan Modra <alan@linuxcare.com.au> + + * i386.h: Delete redundant fp instruction comments. + + From Gavin Romig-Koch <gavin@cygnus.com> + * i386.h (wld_Suf): Define. Use on pushf, popf, pusha, popa. + +2000-05-17 Maciej W. Rozycki <macro@ds2.pg.gda.pl> + + * i386.h: Use sl_FP, not sl_Suf for fild. + 2000-03-27 Nick Clifton <nickc@cygnus.com> * d30v.h (SHORT_A1): Fix value. diff --git a/contrib/binutils/include/opcode/i386.h b/contrib/binutils/include/opcode/i386.h index d399f4eb..d00d331 100644 --- a/contrib/binutils/include/opcode/i386.h +++ b/contrib/binutils/include/opcode/i386.h @@ -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) @@ -103,14 +105,14 @@ static const template i386_optab[] = { {"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 */ +/* Intel Syntax next 2 insns */ {"movsx", 2, 0x0fbf, X, w_Suf|Modrm|IgnoreSize, { Reg16|ShortMem, Reg32, 0} }, {"movsx", 2, 0x0fbe, X, 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 */ +/* Intel Syntax next 2 insns */ {"movzx", 2, 0x0fb7, X, w_Suf|Modrm|IgnoreSize, { Reg16|ShortMem, Reg32, 0} }, {"movzx", 2, 0x0fb6, X, b_Suf|Modrm, { Reg8|ByteMem, WordReg, 0} }, @@ -121,7 +123,7 @@ static const template i386_optab[] = { {"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 } }, +{"pusha", 0, 0x60, X, wld_Suf|DefaultSize, { 0, 0, 0 } }, /* Pop instructions. */ {"pop", 1, 0x58, X, wl_Suf|ShortForm|DefaultSize, { WordReg, 0, 0 } }, @@ -129,7 +131,7 @@ static const template i386_optab[] = { #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 } }, +{"popa", 0, 0x61, X, wld_Suf|DefaultSize, { 0, 0, 0 } }, /* Exchange instructions. xchg commutes: we allow both operand orders. */ @@ -166,8 +168,8 @@ static const template i386_optab[] = { {"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} }, +{"pushf", 0, 0x9c, X, wld_Suf|DefaultSize, { 0, 0, 0} }, +{"popf", 0, 0x9d, X, wld_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} }, @@ -219,7 +221,7 @@ static const template i386_optab[] = { {"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 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} }, @@ -300,24 +302,24 @@ static const template i386_optab[] = { {"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} }, +{"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} }, + +{"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} }, + /* 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} }, @@ -477,7 +479,7 @@ static const template i386_optab[] = { {"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} }, +{"iret", 0, 0xcf, X, wld_Suf|DefaultSize, { 0, 0, 0} }, /* i386sl, i486sl, later 486, and Pentium. */ {"rsm", 0, 0x0faa, X, NoSuf, { 0, 0, 0} }, @@ -509,98 +511,107 @@ static const template i386_optab[] = { /* 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, FP|ShortForm, { FloatReg, 0, 0} }, +{"fld", 1, 0xd9, 0, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, {"fld", 1, 0xd9c0, X, 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, x_FP|Modrm, { LLongMem, 0, 0} }, +{"fild", 1, 0xdf, 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, FP|Modrm, { LLongMem, 0, 0} }, +{"fildq", 1, 0xdf, 5, FP|Modrm, { LLongMem, 0, 0} }, +{"fildll", 1, 0xdf, 5, FP|Modrm, { LLongMem, 0, 0} }, +{"fldt", 1, 0xdb, 5, FP|Modrm, { LLongMem, 0, 0} }, +{"fbld", 1, 0xdf, 4, 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, FP|ShortForm, { FloatReg, 0, 0} }, +{"fst", 1, 0xd9, 2, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, {"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) */ +{"fist", 1, 0xdf, 2, 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, FP|ShortForm, { FloatReg, 0, 0} }, +{"fstp", 1, 0xd9, 3, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, {"fstp", 1, 0xddd8, X, 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, x_FP|Modrm, { LLongMem, 0, 0} }, +{"fistp", 1, 0xdf, 3, 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, FP|Modrm, { LLongMem, 0, 0} }, +{"fistpq", 1, 0xdf, 7, FP|Modrm, { LLongMem, 0, 0} }, +{"fistpll",1, 0xdf, 7, FP|Modrm, { LLongMem, 0, 0} }, +{"fstpt", 1, 0xdb, 7, FP|Modrm, { LLongMem, 0, 0} }, +{"fbstp", 1, 0xdf, 6, FP|Modrm, { LLongMem, 0, 0} }, /* exchange %st<n> with %st0 */ {"fxch", 1, 0xd9c8, X, FP|ShortForm, { FloatReg, 0, 0} }, -{"fxch", 0, 0xd9c9, X, FP, { 0, 0, 0} }, /* alias for fxch %st(1) */ +/* alias for fxch %st(1) */ +{"fxch", 0, 0xd9c9, X, 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 */ +/* alias for fcom %st(1) */ +{"fcom", 0, 0xd8d1, X, FP, { 0, 0, 0} }, +{"fcom", 1, 0xd8, 2, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, {"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 */ +{"ficom", 1, 0xde, 2, 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 */ +/* alias for fcomp %st(1) */ +{"fcomp", 0, 0xd8d9, X, FP, { 0, 0, 0} }, +{"fcomp", 1, 0xd8, 3, sld_FP|FloatMF|Modrm, { LongMem|LLongMem, 0, 0} }, {"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 */ +{"ficomp", 1, 0xde, 3, sl_FP|FloatMF|Modrm, { ShortMem|LongMem, 0, 0} }, +{"fcompp", 0, 0xded9, X, 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) */ +/* alias for fucom %st(1) */ +{"fucom", 0, 0xdde1, X, FP, { 0, 0, 0} }, {"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 */ +/* alias for fucomp %st(1) */ +{"fucomp", 0, 0xdde9, X, FP, { 0, 0, 0} }, +{"fucompp",0, 0xdae9, X, 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, FP, { 0, 0, 0} }, +{"fxam", 0, 0xd9e5, X, 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, FP, { 0, 0, 0} }, +{"fldl2t", 0, 0xd9e9, X, FP, { 0, 0, 0} }, +{"fldl2e", 0, 0xd9ea, X, FP, { 0, 0, 0} }, +{"fldpi", 0, 0xd9eb, X, FP, { 0, 0, 0} }, +{"fldlg2", 0, 0xd9ec, X, FP, { 0, 0, 0} }, +{"fldln2", 0, 0xd9ed, X, FP, { 0, 0, 0} }, +{"fldz", 0, 0xd9ee, X, 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 */ +/* alias for fadd %st(i), %st */ +{"fadd", 1, 0xd8c0, X, 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, 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} }, {"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) */ +/* alias for faddp %st, %st(1) */ +{"faddp", 0, 0xdec1, X, FP, { 0, 0, 0} }, {"faddp", 2, 0xdec0, X, 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} }, #if SYSV386_COMPAT -{"fsub", 0, 0xdee1, X, FP|Ugh, { 0, 0, 0} }, /* alias for fsubp */ +/* alias for fsubp */ +{"fsub", 0, 0xdee1, X, 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} }, @@ -622,7 +633,8 @@ static const template i386_optab[] = { {"fsubr", 2, 0xd8e8, X, FP|ShortForm|FloatDR, { FloatReg, FloatAcc, 0} }, {"fsubr", 1, 0xd8e8, X, 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, 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} }, @@ -644,7 +656,8 @@ static const template i386_optab[] = { {"fmul", 2, 0xd8c8, X, FP|ShortForm|FloatD, { FloatReg, FloatAcc, 0} }, {"fmul", 1, 0xd8c8, X, 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, 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} }, @@ -658,7 +671,8 @@ static const template i386_optab[] = { {"fdiv", 2, 0xd8f0, X, FP|ShortForm|FloatDR, { FloatReg, FloatAcc, 0} }, {"fdiv", 1, 0xd8f0, X, 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, 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} }, @@ -680,7 +694,8 @@ static const template i386_optab[] = { {"fdivr", 2, 0xd8f8, X, FP|ShortForm|FloatDR, { FloatReg, FloatAcc, 0} }, {"fdivr", 1, 0xd8f8, X, 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, 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} }, @@ -798,17 +813,19 @@ static const template i386_optab[] = { {"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} }, + +/* Pentium II/Pentium Pro extensions. */ {"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. */ +/* official undefined instr. */ +{"ud2", 0, 0x0f0b, X, NoSuf, { 0, 0, 0} }, +/* alias for ud2 */ +{"ud2a", 0, 0x0f0b, X, NoSuf, { 0, 0, 0} }, +/* 2nd. official undefined instr. */ +{"ud2b", 0, 0x0fb9, X, NoSuf, { 0, 0, 0} }, {"cmovo", 2, 0x0f40, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, {"cmovno", 2, 0x0f41, X, wl_Suf|Modrm, { WordReg|WordMem, WordReg, 0} }, @@ -1047,7 +1064,8 @@ static const template i386_optab[] = { {"pmulhrw", 2, 0x0f0f, 0xb7, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, {"pswapd", 2, 0x0f0f, 0xbb, FP|Modrm|ImmExt, { RegMMX|LongMem, RegMMX, 0 } }, /* Athlon */ -{NULL, 0, 0, 0, 0, { 0, 0, 0} } /* sentinel */ +/* sentinel */ +{NULL, 0, 0, 0, 0, { 0, 0, 0} } }; #undef X #undef NoSuf @@ -1059,6 +1077,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 --git a/contrib/binutils/ld/ChangeLog b/contrib/binutils/ld/ChangeLog index 62357d9..612d098 100644 --- a/contrib/binutils/ld/ChangeLog +++ b/contrib/binutils/ld/ChangeLog @@ -1,3 +1,33 @@ +2000-05-22 David O'Brien <obrien@FreeBSD.org> + + * configure.tgt: Recognize alpha-*-freebsd*. + +2000-05-26 Eli Zaretskii <eliz@is.elta.co.il> + + * ldmain.c: Include filenames.h. + (set_scripts_dir): Support backslashes in program name. + +2000-05-23 Philip Blundell <pb@futuretv.com> + + * configure.in: Set version to 2.10. + * configure: Regenerate. + +2000-05-15 David O'Brien <obrien@FreeBSD.org> + + * lexsup.c (parse_args): Update the year in the copyright notice. + +2000-05-13 Philip Blundell <pb@futuretv.com> + + From Joel Sherrill <joel@OARcorp.com>: + * configure.tgt (sparc-*-rtemsaout*, sparc-*-rtemself*): New. + (sparc-*-rtems*): Use ELF. + (i960-*-rtemself*, i960-*-rtemscoff*): New. + (i[3456]86-*-rtemscoff*): New. + (i[3456]86-*-rtems*): Use ELF. + (sh-*-rtemscoff*): New. + (m68*-*-rtemscoff*, m68*-*-rtemself): New. + (m68*-*-rtems*): Use ELF. + 2000-05-03 Alan Modra <alan@linuxcare.com.au> From Ulf Carlsson <ulfc@engr.sgi.com> and Andreas Jaeger <aj@suse.de> diff --git a/contrib/binutils/ld/configure b/contrib/binutils/ld/configure index 707add1..a60a189 100755 --- a/contrib/binutils/ld/configure +++ b/contrib/binutils/ld/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13.1 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -354,7 +354,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13.1" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -514,7 +514,7 @@ done if test -r "$cache_file"; then echo "loading cache $cache_file" - test -f "$cache_file" && . $cache_file + . $cache_file else echo "creating cache $cache_file" > $cache_file @@ -558,130 +558,9 @@ done if test -z "$ac_aux_dir"; then { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - - -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:568: checking host system type" >&5 -if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then - -# Make sure we can run config.sub. - if $ac_config_sub sun4 >/dev/null 2>&1; then : - else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } - fi - - ac_cv_host_alias=$host - case "$ac_cv_host_alias" in - NONE) - case $nonopt in - NONE) - if ac_cv_host_alias=`$ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) ac_cv_host_alias=$nonopt ;; - esac ;; - esac - - ac_cv_host=`$ac_config_sub $ac_cv_host_alias` - ac_cv_host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - ac_cv_host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - ac_cv_host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -else - echo $ac_n "(cached) $ac_c" 1>&6 -fi - -echo "$ac_t""$ac_cv_host" 1>&6 - -host=$ac_cv_host -host_alias=$ac_cv_host_alias -host_cpu=$ac_cv_host_cpu -host_vendor=$ac_cv_host_vendor -host_os=$ac_cv_host_os - - - - - -echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:609: checking target system type" >&5 -if test "x$ac_cv_target" = "x" || (test "x$target" != "xNONE" && test "x$target" != "x$ac_cv_target_alias"); then - -# Make sure we can run config.sub. - if $ac_config_sub sun4 >/dev/null 2>&1; then : - else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } - fi - - ac_cv_target_alias=$target - case "$ac_cv_target_alias" in - NONE) - case $nonopt in - NONE) - ac_cv_target_alias=$host_alias ;; - - *) ac_cv_target_alias=$nonopt ;; - esac ;; - esac - - ac_cv_target=`$ac_config_sub $ac_cv_target_alias` - ac_cv_target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - ac_cv_target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - ac_cv_target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -else - echo $ac_n "(cached) $ac_c" 1>&6 -fi - -echo "$ac_t""$ac_cv_target" 1>&6 - -target=$ac_cv_target -target_alias=$ac_cv_target_alias -target_cpu=$ac_cv_target_cpu -target_vendor=$ac_cv_target_vendor -target_os=$ac_cv_target_os - - - - - -echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:649: checking build system type" >&5 -if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then - -# Make sure we can run config.sub. - if $ac_config_sub sun4 >/dev/null 2>&1; then : - else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } - fi - - ac_cv_build_alias=$build - case "$ac_cv_build_alias" in - NONE) - case $nonopt in - NONE) - ac_cv_build_alias=$host_alias ;; - - *) ac_cv_build_alias=$nonopt ;; - esac ;; - esac - - ac_cv_build=`$ac_config_sub $ac_cv_build_alias` - ac_cv_build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -else - echo $ac_n "(cached) $ac_c" 1>&6 -fi - -echo "$ac_t""$ac_cv_build" 1>&6 - -build=$ac_cv_build -build_alias=$ac_cv_build_alias -build_cpu=$ac_cv_build_cpu -build_vendor=$ac_cv_build_vendor -build_os=$ac_cv_build_os - - - +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # Do some error checking and defaulting for the host and target type. @@ -704,6 +583,69 @@ NONE---*---* | *---NONE---* | *---*---NONE) ;; *) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; esac + +# Make sure we can run config.sub. +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +fi + +echo $ac_n "checking host system type""... $ac_c" 1>&6 +echo "configure:594: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 + +echo $ac_n "checking target system type""... $ac_c" 1>&6 +echo "configure:615: checking target system type" >&5 + +target_alias=$target +case "$target_alias" in +NONE) + case $nonopt in + NONE) target_alias=$host_alias ;; + *) target_alias=$nonopt ;; + esac ;; +esac + +target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` +target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$target" 1>&6 + +echo $ac_n "checking build system type""... $ac_c" 1>&6 +echo "configure:633: checking build system type" >&5 + +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac + +build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` +build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$build" 1>&6 + test "$host_alias" != "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && @@ -722,9 +664,9 @@ test "$host_alias" != "$target_alias" && # 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:726: checking for a BSD compatible install" >&5 +echo "configure:668: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then -if eval "test \"\${ac_cv_path_install+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" @@ -742,10 +684,6 @@ else grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : - elif test $ac_prog = install && - grep pwplus $ac_dir/$ac_prog >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : else ac_cv_path_install="$ac_dir/$ac_prog -c" break 2 @@ -774,12 +712,12 @@ echo "$ac_t""$INSTALL" 1>&6 # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:783: checking whether build environment is sane" >&5 +echo "configure:721: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -827,18 +765,18 @@ EOF_SED rm -f conftestsed fi test "$program_prefix" != NONE && - program_transform_name="s,^,${program_prefix},;$program_transform_name" + program_transform_name="s,^,${program_prefix},; $program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$\$,${program_suffix},;$program_transform_name" + program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" # sed with no file args requires a program. 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:840: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:778: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftestmake <<\EOF @@ -865,7 +803,7 @@ fi PACKAGE=ld -VERSION=2.9.5 +VERSION=2.10 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; } @@ -882,7 +820,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:886: checking for working aclocal" >&5 +echo "configure:824: 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. @@ -895,7 +833,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:899: checking for working autoconf" >&5 +echo "configure:837: 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. @@ -908,7 +846,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:912: checking for working automake" >&5 +echo "configure:850: 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. @@ -921,7 +859,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:925: checking for working autoheader" >&5 +echo "configure:863: 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. @@ -934,7 +872,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:938: checking for working makeinfo" >&5 +echo "configure:876: 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. @@ -1020,8 +958,8 @@ 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:1024: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_RANLIB+set}\" = set"; then +echo "configure:962: 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 if test -n "$RANLIB"; then @@ -1050,8 +988,8 @@ fi # 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:1054: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:992: 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 if test -n "$CC"; then @@ -1080,8 +1018,8 @@ 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:1084: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:1022: 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 if test -n "$CC"; then @@ -1127,12 +1065,12 @@ fi if test -z "$CC"; then case "`uname -s`" in - *win32* | *WIN32* | *CYGWIN*) + *win32* | *WIN32*) # 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:1135: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:1073: 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 if test -n "$CC"; then @@ -1162,8 +1100,8 @@ fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1167: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:1105: 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. @@ -1174,12 +1112,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1178 "configure" +#line 1116 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1121: \"$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 @@ -1204,14 +1142,14 @@ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 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 $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1209: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:1147: 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:1214: checking whether we are using GNU C" >&5 -if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then +echo "configure:1152: 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 cat > conftest.c <<EOF @@ -1219,7 +1157,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1223: \"$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:1161: \"$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 @@ -1238,8 +1176,8 @@ 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:1242: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then +echo "configure:1180: 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 echo 'void f(){}' > conftest.c @@ -1281,7 +1219,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:1285: checking for ld used by GCC" >&5 +echo "configure:1223: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1305,12 +1243,12 @@ echo "configure:1285: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1309: checking for GNU ld" >&5 +echo "configure:1247: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1312: checking for non-GNU ld" >&5 +echo "configure:1250: checking for non-GNU ld" >&5 fi -if eval "test \"\${ac_cv_path_LD+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -z "$LD"; then @@ -1343,8 +1281,8 @@ 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:1347: checking if the linker ($LD) is GNU ld" >&5 -if eval "test \"\${ac_cv_prog_gnu_ld+set}\" = set"; then +echo "configure:1285: 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 # I'd rather use --version here, but apparently some GNU ld's only accept -v. @@ -1359,8 +1297,8 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1363: checking for BSD-compatible nm" >&5 -if eval "test \"\${ac_cv_path_NM+set}\" = set"; then +echo "configure:1301: 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 if test -n "$NM"; then @@ -1395,8 +1333,8 @@ 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:1399: checking whether ln -s works" >&5 -if eval "test \"\${ac_cv_prog_LN_S+set}\" = set"; then +echo "configure:1337: 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 rm -f conftestdata @@ -1444,8 +1382,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1448 "configure"' > conftest.$ac_ext - if { (eval echo configure:1449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1386 "configure"' > conftest.$ac_ext + if { (eval echo configure:1387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1466,19 +1404,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:1470: checking whether the C compiler needs -belf" >&5 -if eval "test \"\${lt_cv_cc_needs_belf+set}\" = set"; then +echo "configure:1408: 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 <<EOF -#line 1475 "configure" +#line 1413 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:1482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1420: \"$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 @@ -1562,7 +1500,7 @@ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ # Reload cache, that may have been modified by ltconfig if test -r "$cache_file"; then echo "loading cache $cache_file" - test -f "$cache_file" && . $cache_file + . $cache_file else echo "creating cache $cache_file" > $cache_file @@ -1618,8 +1556,8 @@ fi # 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:1622: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:1560: 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 if test -n "$CC"; then @@ -1648,8 +1586,8 @@ 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:1652: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:1590: 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 if test -n "$CC"; then @@ -1695,12 +1633,12 @@ fi if test -z "$CC"; then case "`uname -s`" in - *win32* | *WIN32* | *CYGWIN*) + *win32* | *WIN32*) # 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:1703: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:1641: 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 if test -n "$CC"; then @@ -1730,8 +1668,8 @@ fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1735: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:1673: 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. @@ -1742,12 +1680,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1746 "configure" +#line 1684 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1689: \"$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 @@ -1772,14 +1710,14 @@ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 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 $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1777: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:1715: 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:1782: checking whether we are using GNU C" >&5 -if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then +echo "configure:1720: 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 cat > conftest.c <<EOF @@ -1787,7 +1725,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1791: \"$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:1729: \"$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 @@ -1806,8 +1744,8 @@ 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:1810: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then +echo "configure:1748: 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 echo 'void f(){}' > conftest.c @@ -1849,9 +1787,9 @@ 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:1853: checking for a BSD compatible install" >&5 +echo "configure:1791: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then -if eval "test \"\${ac_cv_path_install+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" @@ -1869,10 +1807,6 @@ else grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : - elif test $ac_prog = install && - grep pwplus $ac_dir/$ac_prog >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : else ac_cv_path_install="$ac_dir/$ac_prog -c" break 2 @@ -1901,20 +1835,20 @@ echo "$ac_t""$INSTALL" 1>&6 # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ALL_LINGUAS= echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1912: checking how to run the C preprocessor" >&5 +echo "configure:1846: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then -if eval "test \"\${ac_cv_prog_CPP+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else # This must be in double quotes, not single quotes, because CPP may get @@ -1923,13 +1857,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1927 "configure" +#line 1861 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1867: \"$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 : @@ -1940,13 +1874,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1944 "configure" +#line 1878 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1884: \"$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 : @@ -1957,13 +1891,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1961 "configure" +#line 1895 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1901: \"$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 : @@ -1988,7 +1922,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1992: checking for POSIXized ISC" >&5 +echo "configure:1926: 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 @@ -2009,12 +1943,12 @@ else fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2013: checking for ANSI C header files" >&5 -if eval "test \"\${ac_cv_header_stdc+set}\" = set"; then +echo "configure:1947: 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 <<EOF -#line 2018 "configure" +#line 1952 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2022,7 +1956,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1960: \"$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* @@ -2039,7 +1973,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 -#line 2043 "configure" +#line 1977 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2057,7 +1991,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 -#line 2061 "configure" +#line 1995 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2078,7 +2012,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2082 "configure" +#line 2016 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2089,7 +2023,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2113,18 +2047,18 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2117: checking for working const" >&5 -if eval "test \"\${ac_cv_c_const+set}\" = set"; then +echo "configure:2051: 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 <<EOF -#line 2122 "configure" +#line 2056 "configure" #include "confdefs.h" int main() { /* Ultrix mips cc rejects this. */ -typedef int charset[2]; const charset x; +typedef int charset[2]; const charset x = {0,0}; /* SunOS 4.1.1 cc rejects this. */ char const *const *ccp; char **p; @@ -2167,7 +2101,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:2171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2188,21 +2122,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2192: checking for inline" >&5 -if eval "test \"\${ac_cv_c_inline+set}\" = set"; then +echo "configure:2126: 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 <<EOF -#line 2199 "configure" +#line 2133 "configure" #include "confdefs.h" int main() { -} $ac_kw int foo() { +} $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:2206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2228,12 +2162,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2232: checking for off_t" >&5 -if eval "test \"\${ac_cv_type_off_t+set}\" = set"; then +echo "configure:2166: 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 <<EOF -#line 2237 "configure" +#line 2171 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2244,31 +2178,29 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_type_off_t=yes" + ac_cv_type_off_t=yes else rm -rf conftest* - eval "ac_cv_type_off_t=no" + ac_cv_type_off_t=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_type_'off_t`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <<EOF +echo "$ac_t""$ac_cv_type_off_t" 1>&6 +if test $ac_cv_type_off_t = no; then + cat >> confdefs.h <<\EOF #define off_t long EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2267: checking for size_t" >&5 -if eval "test \"\${ac_cv_type_size_t+set}\" = set"; then +echo "configure:2199: 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 <<EOF -#line 2272 "configure" +#line 2204 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2279,19 +2211,17 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_type_size_t=yes" + ac_cv_type_size_t=yes else rm -rf conftest* - eval "ac_cv_type_size_t=no" + ac_cv_type_size_t=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_type_'size_t`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <<EOF +echo "$ac_t""$ac_cv_type_size_t" 1>&6 +if test $ac_cv_type_size_t = no; then + cat >> confdefs.h <<\EOF #define size_t unsigned EOF @@ -2300,19 +2230,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:2304: checking for working alloca.h" >&5 -if eval "test \"\${ac_cv_header_alloca_h+set}\" = set"; then +echo "configure:2234: 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 <<EOF -#line 2309 "configure" +#line 2239 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2246: \"$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 @@ -2333,12 +2263,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2337: checking for alloca" >&5 -if eval "test \"\${ac_cv_func_alloca_works+set}\" = set"; then +echo "configure:2267: 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 <<EOF -#line 2342 "configure" +#line 2272 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -2366,7 +2296,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:2370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2300: \"$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 @@ -2398,12 +2328,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2402: checking whether alloca needs Cray hooks" >&5 -if eval "test \"\${ac_cv_os_cray+set}\" = set"; then +echo "configure:2332: 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 <<EOF -#line 2407 "configure" +#line 2337 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -2428,12 +2358,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&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:2432: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:2362: 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 <<EOF -#line 2437 "configure" +#line 2367 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2442,7 +2372,6 @@ else /* 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(); -char (*f)(); int main() { @@ -2452,12 +2381,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:2461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2390: \"$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 @@ -2484,15 +2413,15 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2488: checking stack direction for C alloca" >&5 -if eval "test \"\${ac_cv_c_stack_direction+set}\" = set"; then +echo "configure:2417: 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 if test "$cross_compiling" = yes; then ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 2496 "configure" +#line 2425 "configure" #include "confdefs.h" find_stack_direction () { @@ -2511,7 +2440,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:2515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2444: \"$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 @@ -2536,17 +2465,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:2540: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:2469: 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 -#line 2545 "configure" +#line 2474 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2479: \"$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* @@ -2575,12 +2504,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2579: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:2508: 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 <<EOF -#line 2584 "configure" +#line 2513 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2589,7 +2518,6 @@ else /* 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(); -char (*f)(); int main() { @@ -2599,12 +2527,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:2608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2536: \"$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 @@ -2629,15 +2557,15 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2633: checking for working mmap" >&5 -if eval "test \"\${ac_cv_func_mmap_fixed_mapped+set}\" = set"; then +echo "configure:2561: 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 if test "$cross_compiling" = yes; then ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 2641 "configure" +#line 2569 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -2777,7 +2705,7 @@ main() } EOF -if { (eval echo configure:2781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2709: \"$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 @@ -2805,17 +2733,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:2809: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:2737: 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 -#line 2814 "configure" +#line 2742 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2747: \"$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* @@ -2845,12 +2773,12 @@ done __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2849: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:2777: 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 <<EOF -#line 2854 "configure" +#line 2782 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2859,7 +2787,6 @@ else /* 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(); -char (*f)(); int main() { @@ -2869,12 +2796,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:2878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2805: \"$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 @@ -2903,12 +2830,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2907: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:2834: 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 <<EOF -#line 2912 "configure" +#line 2839 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2917,7 +2844,6 @@ else /* 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(); -char (*f)(); int main() { @@ -2927,12 +2853,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:2936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2862: \"$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 @@ -2966,19 +2892,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2970: checking for LC_MESSAGES" >&5 -if eval "test \"\${am_cv_val_LC_MESSAGES+set}\" = set"; then +echo "configure:2896: 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 <<EOF -#line 2975 "configure" +#line 2901 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2908: \"$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 @@ -2999,7 +2925,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3003: checking whether NLS is requested" >&5 +echo "configure:2929: 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" @@ -3019,7 +2945,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3023: checking whether included gettext is requested" >&5 +echo "configure:2949: 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" @@ -3038,17 +2964,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3042: checking for libintl.h" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:2968: 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 -#line 3047 "configure" +#line 2973 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2978: \"$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* @@ -3065,19 +2991,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:3069: checking for gettext in libc" >&5 -if eval "test \"\${gt_cv_func_gettext_libc+set}\" = set"; then +echo "configure:2995: 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 <<EOF -#line 3074 "configure" +#line 3000 "configure" #include "confdefs.h" #include <libintl.h> int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:3081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3007: \"$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 @@ -3093,15 +3019,15 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3097: checking for bindtextdomain in -lintl" >&5 -ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:3023: 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 else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3105 "configure" +#line 3031 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3112,7 +3038,7 @@ int main() { bindtextdomain() ; return 0; } EOF -if { (eval echo configure:3116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3042: \"$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 @@ -3128,19 +3054,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:3132: checking for gettext in libintl" >&5 -if eval "test \"\${gt_cv_func_gettext_libintl+set}\" = set"; then +echo "configure:3058: 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 <<EOF -#line 3137 "configure" +#line 3063 "configure" #include "confdefs.h" int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:3144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3070: \"$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 @@ -3168,8 +3094,8 @@ 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:3172: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_path_MSGFMT+set}\" = set"; then +echo "configure:3098: 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 case "$MSGFMT" in @@ -3202,12 +3128,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3206: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3132: 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 <<EOF -#line 3211 "configure" +#line 3137 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3216,7 +3142,6 @@ else /* 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(); -char (*f)(); int main() { @@ -3226,12 +3151,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:3235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3160: \"$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 @@ -3258,8 +3183,8 @@ 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:3262: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_path_GMSGFMT+set}\" = set"; then +echo "configure:3187: 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 case "$GMSGFMT" in @@ -3294,8 +3219,8 @@ 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:3298: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_path_XGETTEXT+set}\" = set"; then +echo "configure:3223: 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 case "$XGETTEXT" in @@ -3326,7 +3251,7 @@ else fi cat > conftest.$ac_ext <<EOF -#line 3330 "configure" +#line 3255 "configure" #include "confdefs.h" int main() { @@ -3334,7 +3259,7 @@ extern int _nl_msg_cat_cntr; return _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:3338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -3366,8 +3291,8 @@ 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:3370: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_path_MSGFMT+set}\" = set"; then +echo "configure:3295: 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 case "$MSGFMT" in @@ -3400,8 +3325,8 @@ 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:3404: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_path_GMSGFMT+set}\" = set"; then +echo "configure:3329: 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 case "$GMSGFMT" in @@ -3436,8 +3361,8 @@ 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:3440: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_path_XGETTEXT+set}\" = set"; then +echo "configure:3365: 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 case "$XGETTEXT" in @@ -3526,7 +3451,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3530: checking for catalogs to be installed" >&5 +echo "configure:3455: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -3554,17 +3479,17 @@ echo "configure:3530: checking for catalogs to be installed" >&5 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:3558: checking for linux/version.h" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:3483: 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 -#line 3563 "configure" +#line 3488 "configure" #include "confdefs.h" #include <linux/version.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3493: \"$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* @@ -3627,12 +3552,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:3631: checking for Cygwin environment" >&5 -if eval "test \"\${ac_cv_cygwin+set}\" = set"; then +echo "configure:3556: 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 <<EOF -#line 3636 "configure" +#line 3561 "configure" #include "confdefs.h" int main() { @@ -3643,7 +3568,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:3647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -3653,25 +3578,26 @@ else ac_cv_cygwin=no fi rm -f conftest* +rm -f conftest* fi 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:3663: checking for mingw32 environment" >&5 -if eval "test \"\${ac_cv_mingw32+set}\" = set"; then +echo "configure:3589: 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 <<EOF -#line 3668 "configure" +#line 3594 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:3675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -3681,57 +3607,29 @@ else ac_cv_mingw32=no fi rm -f conftest* +rm -f conftest* fi echo "$ac_t""$ac_cv_mingw32" 1>&6 MINGW32= test "$ac_cv_mingw32" = yes && MINGW32=yes -echo $ac_n "checking for EMX OS/2 environment""... $ac_c" 1>&6 -echo "configure:3691: checking for EMX OS/2 environment" >&5 -if eval "test \"\${ac_cv_emxos2+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 3696 "configure" -#include "confdefs.h" - -int main() { -return __EMX__; -; return 0; } -EOF -if { (eval echo configure:3703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_emxos2=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_emxos2=no -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_emxos2" 1>&6 -EMXOS2= -test "$ac_cv_emxos2" = yes && EMXOS2=yes - echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:3722: checking for executable suffix" >&5 -if eval "test \"\${ac_cv_exeext+set}\" = set"; then +echo "configure:3620: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + if test "$CYGWIN" = yes || test "$MINGW32" = yes; then ac_cv_exeext=.exe else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:3732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:3630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.C | *.o | *.obj | *.xcoff) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -3754,8 +3652,8 @@ 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:3758: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_YACC+set}\" = set"; then +echo "configure:3656: 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 if test -n "$YACC"; then @@ -3790,8 +3688,8 @@ 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:3794: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_LEX+set}\" = set"; then +echo "configure:3692: 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 if test -n "$LEX"; then @@ -3823,8 +3721,8 @@ test -n "$LEX" || LEX=""$missing_dir/missing flex"" # 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:3827: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_LEX+set}\" = set"; then +echo "configure:3725: 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 if test -n "$LEX"; then @@ -3857,15 +3755,15 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:3861: checking for yywrap in -l$ac_lib" >&5 -ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:3759: 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 else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 3869 "configure" +#line 3767 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3876,7 +3774,7 @@ int main() { yywrap() ; return 0; } EOF -if { (eval echo configure:3880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3778: \"$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 @@ -3899,8 +3797,8 @@ fi fi echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:3903: checking lex output file root" >&5 -if eval "test \"\${ac_cv_prog_lex_root+set}\" = set"; then +echo "configure:3801: 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 # The minimal lex program is just a single line: %%. But some broken lexes @@ -3920,8 +3818,8 @@ 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:3924: checking whether yytext is a pointer" >&5 -if eval "test \"\${ac_cv_prog_lex_yytext_pointer+set}\" = set"; then +echo "configure:3822: 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 # POSIX says lex can declare yytext either as a pointer or an array; the @@ -3932,14 +3830,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <<EOF -#line 3936 "configure" +#line 3834 "configure" #include "confdefs.h" `cat $LEX_OUTPUT_ROOT.c` int main() { ; return 0; } EOF -if { (eval echo configure:3943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3841: \"$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 @@ -3962,7 +3860,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:3966: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:3864: 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" @@ -3996,17 +3894,17 @@ for ac_hdr in string.h strings.h stdlib.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4000: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:3898: 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 -#line 4005 "configure" +#line 3903 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3908: \"$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* @@ -4035,12 +3933,12 @@ done for ac_func in sbrk do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4039: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3937: 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 <<EOF -#line 4044 "configure" +#line 3942 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4049,7 +3947,6 @@ else /* 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(); -char (*f)(); int main() { @@ -4059,12 +3956,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:4068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3965: \"$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 @@ -4093,12 +3990,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:4097: checking for $ac_hdr that defines DIR" >&5 -if eval "test \"\${ac_cv_header_dirent_$ac_safe+set}\" = set"; then +echo "configure:3994: checking for $ac_hdr that defines DIR" >&5 +if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4102 "configure" +#line 3999 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -4106,7 +4003,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:4110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -4131,15 +4028,15 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:4135: checking for opendir in -ldir" >&5 -ac_lib_var=`echo dir'_'opendir | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:4032: checking for opendir in -ldir" >&5 +ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 4143 "configure" +#line 4040 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4150,7 +4047,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:4154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4051: \"$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 @@ -4172,15 +4069,15 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:4176: checking for opendir in -lx" >&5 -ac_lib_var=`echo x'_'opendir | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:4073: checking for opendir in -lx" >&5 +ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 4184 "configure" +#line 4081 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4191,7 +4088,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:4195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4092: \"$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 @@ -4224,12 +4121,12 @@ EOF esac echo $ac_n "checking whether strstr must be declared""... $ac_c" 1>&6 -echo "configure:4228: checking whether strstr must be declared" >&5 -if eval "test \"\${bfd_cv_decl_needed_strstr+set}\" = set"; then +echo "configure:4125: checking whether strstr must be declared" >&5 +if eval "test \"`echo '$''{'bfd_cv_decl_needed_strstr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4233 "configure" +#line 4130 "configure" #include "confdefs.h" #include <stdio.h> @@ -4250,7 +4147,7 @@ int main() { char *(*pfn) = (char *(*)) strstr ; return 0; } EOF -if { (eval echo configure:4254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_strstr=no else @@ -4271,12 +4168,12 @@ EOF fi echo $ac_n "checking whether free must be declared""... $ac_c" 1>&6 -echo "configure:4275: checking whether free must be declared" >&5 -if eval "test \"\${bfd_cv_decl_needed_free+set}\" = set"; then +echo "configure:4172: checking whether free must be declared" >&5 +if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4280 "configure" +#line 4177 "configure" #include "confdefs.h" #include <stdio.h> @@ -4297,7 +4194,7 @@ int main() { char *(*pfn) = (char *(*)) free ; return 0; } EOF -if { (eval echo configure:4301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_free=no else @@ -4318,12 +4215,12 @@ EOF fi echo $ac_n "checking whether sbrk must be declared""... $ac_c" 1>&6 -echo "configure:4322: checking whether sbrk must be declared" >&5 -if eval "test \"\${bfd_cv_decl_needed_sbrk+set}\" = set"; then +echo "configure:4219: checking whether sbrk must be declared" >&5 +if eval "test \"`echo '$''{'bfd_cv_decl_needed_sbrk'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4327 "configure" +#line 4224 "configure" #include "confdefs.h" #include <stdio.h> @@ -4344,7 +4241,7 @@ int main() { char *(*pfn) = (char *(*)) sbrk ; return 0; } EOF -if { (eval echo configure:4348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_sbrk=no else @@ -4365,12 +4262,12 @@ EOF fi echo $ac_n "checking whether getenv must be declared""... $ac_c" 1>&6 -echo "configure:4369: checking whether getenv must be declared" >&5 -if eval "test \"\${bfd_cv_decl_needed_getenv+set}\" = set"; then +echo "configure:4266: checking whether getenv must be declared" >&5 +if eval "test \"`echo '$''{'bfd_cv_decl_needed_getenv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4374 "configure" +#line 4271 "configure" #include "confdefs.h" #include <stdio.h> @@ -4391,7 +4288,7 @@ int main() { char *(*pfn) = (char *(*)) getenv ; return 0; } EOF -if { (eval echo configure:4395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_getenv=no else @@ -4412,12 +4309,12 @@ EOF fi echo $ac_n "checking whether environ must be declared""... $ac_c" 1>&6 -echo "configure:4416: checking whether environ must be declared" >&5 -if eval "test \"\${bfd_cv_decl_needed_environ+set}\" = set"; then +echo "configure:4313: checking whether environ must be declared" >&5 +if eval "test \"`echo '$''{'bfd_cv_decl_needed_environ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4421 "configure" +#line 4318 "configure" #include "confdefs.h" #include <stdio.h> @@ -4438,7 +4335,7 @@ int main() { char *(*pfn) = (char *(*)) environ ; return 0; } EOF -if { (eval echo configure:4442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_environ=no else @@ -4466,19 +4363,19 @@ fi # constants, while still supporting pre-ANSI compilers which do not # support string concatenation. echo $ac_n "checking whether ANSI C string concatenation works""... $ac_c" 1>&6 -echo "configure:4470: checking whether ANSI C string concatenation works" >&5 -if eval "test \"\${ld_cv_string_concatenation+set}\" = set"; then +echo "configure:4367: checking whether ANSI C string concatenation works" >&5 +if eval "test \"`echo '$''{'ld_cv_string_concatenation'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4475 "configure" +#line 4372 "configure" #include "confdefs.h" int main() { char *a = "a" "a"; ; return 0; } EOF -if { (eval echo configure:4482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ld_cv_string_concatenation=yes else @@ -4694,7 +4591,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13.1" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -5028,5 +4925,5 @@ exit 0 EOF chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1 +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 diff --git a/contrib/binutils/ld/configure.in b/contrib/binutils/ld/configure.in index 32fc5f6..91916f7 100644 --- a/contrib/binutils/ld/configure.in +++ b/contrib/binutils/ld/configure.in @@ -5,7 +5,7 @@ AC_INIT(ldmain.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(ld, 2.9.5) +AM_INIT_AUTOMAKE(ld, 2.10) AM_PROG_LIBTOOL diff --git a/contrib/binutils/ld/configure.tgt b/contrib/binutils/ld/configure.tgt index 52715f4..8b23896 100644 --- a/contrib/binutils/ld/configure.tgt +++ b/contrib/binutils/ld/configure.tgt @@ -71,12 +71,16 @@ sparcv9-*-solaris2* | sparc64-*-solaris2*) ;; sparc*-*-solaris2*) targ_emul=elf32_sparc ;; sparc*-wrs-vxworks*) targ_emul=sparcaout ;; -sparc*-*-rtems*) targ_emul=sparcaout ;; +sparc*-*-rtemsaout*) targ_emul=sparcaout ;; +sparc*-*-rtemself*) targ_emul=elf32_sparc ;; +sparc*-*-rtems*) targ_emul=elf32_sparc ;; i960-wrs-vxworks5.0*) targ_emul=gld960 ;; i960-wrs-vxworks5*) targ_emul=gld960coff ;; i960-wrs-vxworks*) targ_emul=gld960 ;; i960-*-coff) targ_emul=gld960coff ;; i960-intel-nindy) targ_emul=gld960 ;; +i960-*-rtemscoff*) targ_emul=gld960coff ;; +i960-*-rtemself*) targ_emul=elf32_i960 ;; i960-*-rtems*) targ_emul=gld960coff ;; i960-*-elf*) targ_emul=elf32_i960 ;; m32r-*-*) targ_emul=m32relf ;; @@ -96,8 +100,9 @@ i[3456]86-*-sco*) targ_emul=i386coff ;; i[3456]86-*-isc*) targ_emul=i386coff ;; i[3456]86-*-lynxos*) targ_emul=i386lynx ;; i[3456]86-*-coff) targ_emul=i386coff ;; +i[3456]86-*-rtemscoff*) targ_emul=i386coff ;; i[3456]86-*-rtemself*) targ_emul=elf_i386 ;; -i[3456]86-*-rtems*) targ_emul=i386coff ;; +i[3456]86-*-rtems*) targ_emul=elf_i386 ;; i[3456]86-*-bsd) targ_emul=i386bsd ;; i[3456]86-*-bsd386) targ_emul=i386bsd ;; i[3456]86-*-bsdi*) targ_emul=i386bsd ;; @@ -177,7 +182,8 @@ sh-*-elf* | sh-*-rtemself*) ;; sh-*-pe) targ_emul=shpe ; targ_extra_ofiles="deffilep.o pe-dll.o" ;; -sh-*-*|sh-*-rtems*) targ_emul=sh; targ_extra_emuls=shl ;; +sh-*-rtemscoff* | sh-*-* | sh-*-rtems*) + targ_emul=sh; targ_extra_emuls=shl ;; m68k-sony-*) targ_emul=news ;; m68k-hp-bsd*) targ_emul=hp300bsd ;; m68*-motorola-sysv*) targ_emul=delta68 ;; @@ -198,7 +204,9 @@ m68*-*-lynxos*) targ_emul=m68klynx ;; m68*-hp*-netbsd*) targ_emul=m68k4knbsd ;; m68*-*-netbsd*) targ_emul=m68knbsd ;; m68*-*-psos*) targ_emul=m68kpsos ;; -m68*-*-rtems*) targ_emul=m68kcoff ;; +m68*-*-rtemscoff*) targ_emul=m68kcoff ;; +m68*-*-rtemself) targ_emul=m68kelf ;; +m68*-*-rtems*) targ_emul=m68kelf ;; hppa*w*-*) targ_emul=elf64hppa ;; hppa*-*-*elf*) targ_emul=hppaelf ;; hppa*-*-linux-gnu*) targ_emul=hppaelf ;; @@ -240,6 +248,7 @@ mips*-*-linux-gnu*) targ_emul=elf32bsmip mips*-*-lnews*) targ_emul=mipslnews ;; mn10200-*-*) targ_emul=mn10200 ;; mn10300-*-*) targ_emul=mn10300 ;; +alpha-*-freebsd*) targ_emul=elf64alpha ;; alpha*-*-linuxecoff*) targ_emul=alpha targ_extra_emuls=elf64alpha tdir_elf64alpha=`echo ${targ_alias} | sed -e 's/ecoff//'` ;; diff --git a/contrib/binutils/ld/ldmain.c b/contrib/binutils/ld/ldmain.c index ba2a592..676eeba 100644 --- a/contrib/binutils/ld/ldmain.c +++ b/contrib/binutils/ld/ldmain.c @@ -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 - Suite 330, Boston, MA #include "libiberty.h" #include "progress.h" #include "bfdlink.h" +#include "filenames.h" #include "ld.h" #include "ldmain.h" @@ -567,6 +568,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) { diff --git a/contrib/binutils/ld/lexsup.c b/contrib/binutils/ld/lexsup.c index 7b5e89c..e2aac47 100644 --- a/contrib/binutils/ld/lexsup.c +++ b/contrib/binutils/ld/lexsup.c @@ -877,7 +877,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 --git a/contrib/binutils/opcodes/ChangeLog b/contrib/binutils/opcodes/ChangeLog index 4e2cd47..e329df2 100644 --- a/contrib/binutils/opcodes/ChangeLog +++ b/contrib/binutils/opcodes/ChangeLog @@ -1,3 +1,20 @@ +2000-05-26 Scott Bambrough <scottb@netwinder.org> + + Port of patch to mainline by Nick Clifton <nickc@cygnus.com>: + * arm-opc.h: Use upper case for flags in MSR and MRS + instructions. Allow any bit to be set in the field_mask of + the MSR instruction. + + Port of patch to mainline by Nick Clifton <nickc@cygnus.com>: + * arm-dis.c (print_insn_arm): Decode _x and _s bits of + the field_mask of an MSR instruction. + +2000-05-26 Scott Bambrough <scottb@netwinder.org> + + Port of patch to mainline by Thomas de Lellis <tdel@windriver.com>: + * arm-opc.h: Disassembly of thumb ldsb/ldsh + instructions changed to ldrsb/ldrsh. + 2000-04-13 Michael Sokolov <msokolov@ivan.Harhan.ORG> * a29k-dis.c, alpha-dis.c, alpha-opc.c, arc-dis.c, arc-opc.c, diff --git a/contrib/binutils/opcodes/arm-dis.c b/contrib/binutils/opcodes/arm-dis.c index f131ada..a3e7112 100644 --- a/contrib/binutils/opcodes/arm-dis.c +++ b/contrib/binutils/opcodes/arm-dis.c @@ -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 --git a/contrib/binutils/opcodes/arm-opc.h b/contrib/binutils/opcodes/arm-opc.h index 44a16a4..5ecde4b 100644 --- a/contrib/binutils/opcodes/arm-opc.h +++ b/contrib/binutils/opcodes/arm-opc.h @@ -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]"}, |
