diff -Nrcpad gcc-4.4.4/ChangeLog gcc-4.4.5/ChangeLog *** gcc-4.4.4/ChangeLog Thu Apr 29 07:51:13 2010 --- gcc-4.4.5/ChangeLog Fri Oct 1 08:04:08 2010 *************** *** 1,3 **** --- 1,18 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + + 2010-06-07 Rainer Orth + + Backport from mainline: + 2010-03-01 Rainer Orth + + PR libstdc++/32499 + * configure.ac (RANLIB): Default to true. + (STRIP): Likewise. + (RANLIB_FOR_TARGET): Remove superfluous : argument. + * configure: Regenerate. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/INSTALL/specific.html gcc-4.4.5/INSTALL/specific.html *** gcc-4.4.4/INSTALL/specific.html Thu Apr 29 08:26:56 2010 --- gcc-4.4.5/INSTALL/specific.html Fri Oct 1 08:26:19 2010 *************** information are. *** 68,73 **** --- 68,74 ----
  • hppa*-hp-hpux11
  • *-*-linux-gnu
  • i?86-*-linux* +
  • i?86-*-solaris2.[89]
  • i?86-*-solaris2.10
  • ia64-*-linux
  • ia64-*-hpux* *************** found on i?86-*-solaris2.10

    Use this for Solaris 10 or later on x86 and x86-64 systems. This configuration is supported by GCC 4.0 and later versions only. --- 584,610 ----


    !

    i?86-*-solaris2.[89]

    ! !

    The Sun assembler in Solaris 8 and 9 has several bugs and limitations. ! While GCC works around them, several features are missing, so it is ! ! recommended to use the GNU assembler instead. There is no bundled ! version, but the current version, from GNU binutils 2.20.1, is known to ! work. ! !

    Solaris~2/x86 doesn't support the execution of SSE/SSE2 instructions ! before Solaris~9 4/04, even if the CPU supports them. Programs will ! receive SIGILL if they try. The fix is available both in ! Solaris~9 Update~6 and kernel patch 112234-12 or newer. There is no ! corresponding patch for Solaris 8. To avoid this problem, ! -march defaults to ‘pentiumpro’ on Solaris 8 and 9. If ! you have the patch installed, you can configure GCC with an appropriate ! --with-arch option, but need GNU as for SSE2 support. ! !


    ! !

    i?86-*-solaris2.10

    Use this for Solaris 10 or later on x86 and x86-64 systems. This configuration is supported by GCC 4.0 and later versions only. *************** configuration is supported by GCC 4.0 an *** 595,601 ****


    !

    ia64-*-linux

    IA-64 processor (also known as IPF, or Itanium Processor Family) running GNU/Linux. --- 616,622 ----


    !

    ia64-*-linux

    IA-64 processor (also known as IPF, or Itanium Processor Family) running GNU/Linux. *************** more major ABI changes are expected. *** 615,621 ****


    !

    ia64-*-hpux*

    Building GCC on this target requires the GNU Assembler. The bundled HP assembler will not work. To prevent GCC from using the wrong assembler, --- 636,642 ----


    !

    ia64-*-hpux*

    Building GCC on this target requires the GNU Assembler. The bundled HP assembler will not work. To prevent GCC from using the wrong assembler, *************** removed and the system libunwind library *** 630,636 ****


    !

    *-ibm-aix*

    Support for AIX version 3 and older was discontinued in GCC 3.4. --- 651,657 ----


    !

    *-ibm-aix*

    Support for AIX version 3 and older was discontinued in GCC 3.4. *************** switch and using the configure option


    !

    iq2000-*-elf

    Vitesse IQ2000 processors. These are used in embedded applications. There are no standard Unix configurations.


    !

    m32c-*-elf

    Renesas M32C processor. This configuration is intended for embedded systems.


    !

    m32r-*-elf

    Renesas M32R processor. This configuration is intended for embedded systems.


    !

    m6811-elf

    Motorola 68HC11 family micro controllers. These are used in embedded applications. There are no standard Unix configurations.


    !

    m6812-elf

    Motorola 68HC12 family micro controllers. These are used in embedded applications. There are no standard Unix configurations.


    !

    m68k-*-*

    By default, ‘m68k-*-aout’, ‘m68k-*-coff*’, ‘m68k-*-elf*’, ‘m68k-*-rtems’, ‘m68k-*-uclinux’ and --- 773,814 ----


    !

    iq2000-*-elf

    Vitesse IQ2000 processors. These are used in embedded applications. There are no standard Unix configurations.


    !

    m32c-*-elf

    Renesas M32C processor. This configuration is intended for embedded systems.


    !

    m32r-*-elf

    Renesas M32R processor. This configuration is intended for embedded systems.


    !

    m6811-elf

    Motorola 68HC11 family micro controllers. These are used in embedded applications. There are no standard Unix configurations.


    !

    m6812-elf

    Motorola 68HC12 family micro controllers. These are used in embedded applications. There are no standard Unix configurations.


    !

    m68k-*-*

    By default, ‘m68k-*-aout’, ‘m68k-*-coff*’, ‘m68k-*-elf*’, ‘m68k-*-rtems’, ‘m68k-*-uclinux’ and *************** be a -mcpu


    !

    m68k-*-uclinux

    GCC 4.3 changed the uClinux configuration so that it uses the ‘m68k-linux-gnu’ ABI rather than the ‘m68k-elf’ ABI. --- 834,840 ----


    !

    m68k-*-uclinux

    GCC 4.3 changed the uClinux configuration so that it uses the ‘m68k-linux-gnu’ ABI rather than the ‘m68k-elf’ ABI. *************** original ABI by configuring for ‘< *** 824,830 ****


    !

    mips-*-*

    If on a MIPS system you get an error message saying “does not have gp sections for all it's [sic] sectons [sic]”, don't worry about it. This --- 845,851 ----


    !

    mips-*-*

    If on a MIPS system you get an error message saying “does not have gp sections for all it's [sic] sectons [sic]”, don't worry about it. This *************** made after Nov. 9, 2006) should be free *** 881,887 ****


    !

    mips-sgi-irix5

    In order to compile GCC on an SGI running IRIX 5, the ‘compiler_dev.hdr’ subsystem must be installed from the IDO CD-ROM supplied by SGI. --- 902,908 ----


    !

    mips-sgi-irix5

    In order to compile GCC on an SGI running IRIX 5, the ‘compiler_dev.hdr’ subsystem must be installed from the IDO CD-ROM supplied by SGI. *************** This problem can be avoided by running t *** 908,914 ****


    !

    mips-sgi-irix6

    If you are using SGI's MIPSpro cc as your bootstrap compiler, you must ensure that the N32 ABI is in use. To test this, compile a simple C --- 929,935 ----


    !

    mips-sgi-irix6

    If you are using SGI's MIPSpro cc as your bootstrap compiler, you must ensure that the N32 ABI is in use. To test this, compile a simple C *************** information about using GCC on IRIX plat *** 981,987 ****


    !

    powerpc-*-*

    You can specify a default version for the -mcpu=cpu_type switch by using the configure option --with-cpu-cpu_type. --- 1002,1008 ----


    !

    powerpc-*-*

    You can specify a default version for the -mcpu=cpu_type switch by using the configure option --with-cpu-cpu_type. *************** or newer for a working GCC. *** 992,998 ****


    !

    powerpc-*-darwin*

    PowerPC running Darwin (Mac OS X kernel). --- 1013,1019 ----


    !

    powerpc-*-darwin*

    PowerPC running Darwin (Mac OS X kernel). *************** on systems older than 10.3.9 (aka darwin *** 1009,1077 ****


    !

    powerpc-*-elf

    PowerPC system in big endian mode, running System V.4.


    !

    powerpc*-*-linux-gnu*

    PowerPC system in big endian mode running Linux.


    !

    powerpc-*-netbsd*

    PowerPC system in big endian mode running NetBSD.


    !

    powerpc-*-eabisim

    Embedded PowerPC system in big endian mode for use in running under the PSIM simulator.


    !

    powerpc-*-eabi

    Embedded PowerPC system in big endian mode.


    !

    powerpcle-*-elf

    PowerPC system in little endian mode, running System V.4.


    !

    powerpcle-*-eabisim

    Embedded PowerPC system in little endian mode for use in running under the PSIM simulator.


    !

    powerpcle-*-eabi

    Embedded PowerPC system in little endian mode.


    !

    s390-*-linux*

    S/390 system running GNU/Linux for S/390.


    !

    s390x-*-linux*

    zSeries system (64-bit) running GNU/Linux for zSeries.


    !

    s390x-ibm-tpf*

    zSeries system (64-bit) running TPF. This platform is supported as cross-compilation target only. --- 1030,1098 ----


    !

    powerpc-*-elf

    PowerPC system in big endian mode, running System V.4.


    !

    powerpc*-*-linux-gnu*

    PowerPC system in big endian mode running Linux.


    !

    powerpc-*-netbsd*

    PowerPC system in big endian mode running NetBSD.


    !

    powerpc-*-eabisim

    Embedded PowerPC system in big endian mode for use in running under the PSIM simulator.


    !

    powerpc-*-eabi

    Embedded PowerPC system in big endian mode.


    !

    powerpcle-*-elf

    PowerPC system in little endian mode, running System V.4.


    !

    powerpcle-*-eabisim

    Embedded PowerPC system in little endian mode for use in running under the PSIM simulator.


    !

    powerpcle-*-eabi

    Embedded PowerPC system in little endian mode.


    !

    s390-*-linux*

    S/390 system running GNU/Linux for S/390.


    !

    s390x-*-linux*

    zSeries system (64-bit) running GNU/Linux for zSeries.


    !

    s390x-ibm-tpf*

    zSeries system (64-bit) running TPF. This platform is supported as cross-compilation target only. *************** supported as cross-compilation target on *** 1081,1087 **** !

    *-*-solaris2*

    Sun does not ship a C compiler with Solaris 2. To bootstrap and install GCC you first have to install a pre-built compiler, see the --- 1102,1108 ---- !

    *-*-solaris2*

    Sun does not ship a C compiler with Solaris 2. To bootstrap and install GCC you first have to install a pre-built compiler, see the *************** SPARC, 117172-11 or newer for Intel) tha *** 1168,1174 ****


    !

    sparc-sun-solaris2*

    When GCC is configured to use binutils 2.14 or later the binaries produced are smaller than the ones produced using Sun's native tools; --- 1189,1195 ----


    !

    sparc-sun-solaris2*

    When GCC is configured to use binutils 2.14 or later the binaries produced are smaller than the ones produced using Sun's native tools; *************** For example on a Solaris 7 system: *** 1225,1231 ****


    !

    sparc-sun-solaris2.7

    Sun patch 107058-01 (1999-01-13) for Solaris 7/SPARC triggers a bug in the dynamic linker. This problem (Sun bug 4210064) affects GCC 2.8 --- 1246,1252 ----


    !

    sparc-sun-solaris2.7

    Sun patch 107058-01 (1999-01-13) for Solaris 7/SPARC triggers a bug in the dynamic linker. This problem (Sun bug 4210064) affects GCC 2.8 *************** Sun assembler, which causes a bootstrap *** 1279,1285 ****


    !

    sparc-*-linux*

    GCC versions 3.0 and higher require binutils 2.11.2 and glibc 2.2.4 or newer on this platform. All earlier binutils and glibc --- 1300,1306 ----


    !

    sparc-*-linux*

    GCC versions 3.0 and higher require binutils 2.11.2 and glibc 2.2.4 or newer on this platform. All earlier binutils and glibc *************** releases mishandled unaligned relocation *** 1287,1293 ****


    !

    sparc64-*-solaris2*

    When configuring the GNU Multiple Precision Library (GMP) or the MPFR library, the canonical target triplet must be specified as --- 1308,1314 ----


    !

    sparc64-*-solaris2*

    When configuring the GNU Multiple Precision Library (GMP) or the MPFR library, the canonical target triplet must be specified as *************** and -xildoff< *** 1306,1318 ****


    !

    sparcv9-*-solaris2*

    This is a synonym for sparc64-*-solaris2*.


    !

    *-*-vxworks*

    Support for VxWorks is in flux. At present GCC supports only the very recent VxWorks 5.5 (aka Tornado 2.2) release, and only on PowerPC. --- 1327,1339 ----


    !

    sparcv9-*-solaris2*

    This is a synonym for sparc64-*-solaris2*.


    !

    *-*-vxworks*

    Support for VxWorks is in flux. At present GCC supports only the very recent VxWorks 5.5 (aka Tornado 2.2) release, and only on PowerPC. *************** VxWorks will incorporate this module.) *** 1347,1353 ****


    !

    x86_64-*-*, amd64-*-*

    GCC supports the x86-64 architecture implemented by the AMD64 processor (amd64-*-* is an alias for x86_64-*-*) on GNU/Linux, FreeBSD and NetBSD. --- 1368,1374 ----


    !

    x86_64-*-*, amd64-*-*

    GCC supports the x86-64 architecture implemented by the AMD64 processor (amd64-*-* is an alias for x86_64-*-*) on GNU/Linux, FreeBSD and NetBSD. *************** both 64-bit x86-64 and 32-bit x86 code ( *** 1356,1362 ****


    !

    xtensa*-*-elf

    This target is intended for embedded Xtensa systems using the ‘newlib’ C library. It uses ELF but does not support shared --- 1377,1383 ----


    !

    xtensa*-*-elf

    This target is intended for embedded Xtensa systems using the ‘newlib’ C library. It uses ELF but does not support shared *************** which you can use to replace the default *** 1373,1379 ****


    !

    xtensa*-*-linux*

    This target is for Xtensa systems running GNU/Linux. It supports ELF shared objects and the GNU C library (glibc). It also generates --- 1394,1400 ----


    !

    xtensa*-*-linux*

    This target is for Xtensa systems running GNU/Linux. It supports ELF shared objects and the GNU C library (glibc). It also generates *************** respects, this target is the same as the *** 1384,1392 ****


    !

    Microsoft Windows

    !

    Intel 16-bit versions

    The 16-bit versions of Microsoft Windows, such as Windows 3.1, are not supported. --- 1405,1413 ----


    !

    Microsoft Windows

    !

    Intel 16-bit versions

    The 16-bit versions of Microsoft Windows, such as Windows 3.1, are not supported. *************** supported. *** 1394,1400 ****

    However, the 32-bit port has limited support for Microsoft Windows 3.11 in the Win32s environment, as a target only. See below. !

    Intel 32-bit versions

    The 32-bit versions of Windows, including Windows 95, Windows NT, Windows XP, and Windows Vista, are supported by several different target --- 1415,1421 ----

    However, the 32-bit port has limited support for Microsoft Windows 3.11 in the Win32s environment, as a target only. See below. !

    Intel 32-bit versions

    The 32-bit versions of Windows, including Windows 95, Windows NT, Windows XP, and Windows Vista, are supported by several different target *************** the Win32 subsystem that provides a subs *** 1412,1418 **** http://www.mkssoftware.com/ for more information. !

    Intel 64-bit versions

    GCC contains support for x86-64 using the mingw-w64 runtime library, available from http://mingw-w64.sourceforge.net/. --- 1433,1439 ---- http://www.mkssoftware.com/ for more information. !

    Intel 64-bit versions

    GCC contains support for x86-64 using the mingw-w64 runtime library, available from http://mingw-w64.sourceforge.net/. *************** This library should be used with the tar *** 1420,1431 ****

    Presently Windows for Itanium is not supported. !

    Windows CE

    Windows CE is supported as a target only on ARM (arm-wince-pe), Hitachi SuperH (sh-wince-pe), and MIPS (mips-wince-pe). !

    Other Windows Platforms

    GCC no longer supports Windows NT on the Alpha or PowerPC. --- 1441,1452 ----

    Presently Windows for Itanium is not supported. !

    Windows CE

    Windows CE is supported as a target only on ARM (arm-wince-pe), Hitachi SuperH (sh-wince-pe), and MIPS (mips-wince-pe). !

    Other Windows Platforms

    GCC no longer supports Windows NT on the Alpha or PowerPC. *************** be inactive. See *-*-cygwin

    Ports of GCC are included with the Cygwin environment. --- 1462,1468 ----


    !

    *-*-cygwin

    Ports of GCC are included with the Cygwin environment. *************** with Microsoft's C++ compiler and there *** 1453,1459 ****


    !

    *-*-interix

    The Interix target is used by OpenNT, Interix, Services For UNIX (SFU), and Subsystem for UNIX-based Applications (SUA). Applications compiled --- 1474,1480 ----


    !

    *-*-interix

    The Interix target is used by OpenNT, Interix, Services For UNIX (SFU), and Subsystem for UNIX-based Applications (SUA). Applications compiled *************** the Win32 subsystem. This target was la *** 1464,1470 ****


    !

    *-*-mingw32

    GCC will build with and support only MinGW runtime 3.12 and later. Earlier versions of headers are incompatible with the new default semantics --- 1485,1491 ----


    !

    *-*-mingw32

    GCC will build with and support only MinGW runtime 3.12 and later. Earlier versions of headers are incompatible with the new default semantics *************** of extern inline in - *** 1472,1478 ****


    !

    OS/2

    GCC does not currently support OS/2. However, Andrew Zabolotny has been working on a generic OS/2 port with pgcc. The current code can be found --- 1493,1499 ----


    !

    OS/2

    GCC does not currently support OS/2. However, Andrew Zabolotny has been working on a generic OS/2 port with pgcc. The current code can be found *************** at Older systems

    GCC contains support files for many older (1980s and early 1990s) Unix variants. For the most part, support for these systems --- 1501,1507 ----


    !

    Older systems

    GCC contains support files for many older (1980s and early 1990s) Unix variants. For the most part, support for these systems *************** current GCC) is to be found in the GCC t *** 1524,1530 ****


    !

    all ELF targets (SVR4, Solaris 2, etc.)

    C++ support is significantly better on ELF targets if you use the GNU linker; duplicate copies of --- 1545,1551 ----


    !

    all ELF targets (SVR4, Solaris 2, etc.)

    C++ support is significantly better on ELF targets if you use the GNU linker; duplicate copies of diff -Nrcpad gcc-4.4.4/LAST_UPDATED gcc-4.4.5/LAST_UPDATED *** gcc-4.4.4/LAST_UPDATED Thu Apr 29 08:26:56 2010 --- gcc-4.4.5/LAST_UPDATED Fri Oct 1 08:26:19 2010 *************** *** 1 **** ! Obtained from SVN: tags/gcc_4_4_4_release revision 158895 --- 1 ---- ! Obtained from SVN: tags/gcc_4_4_5_release revision 164871 diff -Nrcpad gcc-4.4.4/MD5SUMS gcc-4.4.5/MD5SUMS *** gcc-4.4.4/MD5SUMS Thu Apr 29 10:16:17 2010 --- gcc-4.4.5/MD5SUMS Fri Oct 1 10:09:24 2010 *************** *** 1,5 **** # This file contains the MD5 checksums of the files in the ! # gcc-4.4.4.tar.bz2 tarball. # # Besides verifying that all files in the tarball were correctly expanded, # it also can be used to determine if any files have changed since the --- 1,5 ---- # This file contains the MD5 checksums of the files in the ! # gcc-4.4.5.tar.bz2 tarball. # # Besides verifying that all files in the tarball were correctly expanded, # it also can be used to determine if any files have changed since the *************** *** 14,20 **** fe60d87048567d4fe8c8a0ed2448bcc8 COPYING.RUNTIME d32239bcb673463ab874e80d47fae504 COPYING3 6a6a8e020838b23406c81b19c1d46df6 COPYING3.LIB ! 45e8a1be5e98841cb533acf1f0a468c0 ChangeLog 09538b708302f1735f6fa05b622ecf5e ChangeLog.tree-ssa 23b8927fe1fb0ab321c09a4f0500aa4c INSTALL/README 39e103fcd4b476e830ead537db0f0ce6 INSTALL/binaries.html --- 14,20 ---- fe60d87048567d4fe8c8a0ed2448bcc8 COPYING.RUNTIME d32239bcb673463ab874e80d47fae504 COPYING3 6a6a8e020838b23406c81b19c1d46df6 COPYING3.LIB ! 4a8c0d83fe3212701985eea836770d64 ChangeLog 09538b708302f1735f6fa05b622ecf5e ChangeLog.tree-ssa 23b8927fe1fb0ab321c09a4f0500aa4c INSTALL/README 39e103fcd4b476e830ead537db0f0ce6 INSTALL/binaries.html *************** caa67c170a7aced972a840872a2d8629 INSTAL *** 26,43 **** a318bb45318622a811182dc360aaef48 INSTALL/index.html 9f302849ed05dc2816dbdc2f8909b1c3 INSTALL/old.html f0d430e01b30f96a67254f13edba1704 INSTALL/prerequisites.html ! 8790051b5b47a876404f63c59431c1c0 INSTALL/specific.html 056de66b1c328aba85bcf9f25b628c7e INSTALL/test.html ! 6bb4026d7fc3021ac37f863737fbeb42 LAST_UPDATED 8ebaee0179044912b95c64f6fb6a8282 MAINTAINERS e7c586243a1211c8c2f1b88871d84b86 Makefile.def 042ff95b3e1cd0b93d9d4b3da6cca589 Makefile.in 42b7db4fa23a15a3d75a90aeee82f5d6 Makefile.tpl ! ee344fa3442b4e77c366983f67b019d0 NEWS 750a7546d281ac42eb2ce87949457731 README b510a5285eb05298b5f3d9f5ae920588 boehm-gc/AmigaOS.c 2caafacabf758bb76a9dfce1fc544b97 boehm-gc/BCC_MAKEFILE ! a517243eab99ad4b9f2a6d3c1a14d309 boehm-gc/ChangeLog c18075e3729cd116028480307a8e845d boehm-gc/EMX_MAKEFILE 3b7cc3be9ed3c2135bbda990e8a69303 boehm-gc/MacOS.c 5cf7764626b7dd7272b2fe11403d1b6a boehm-gc/MacProjects.sit.hqx --- 26,43 ---- a318bb45318622a811182dc360aaef48 INSTALL/index.html 9f302849ed05dc2816dbdc2f8909b1c3 INSTALL/old.html f0d430e01b30f96a67254f13edba1704 INSTALL/prerequisites.html ! f36d8282cc029e03920ed46c97e1ed4b INSTALL/specific.html 056de66b1c328aba85bcf9f25b628c7e INSTALL/test.html ! 098970cddf9da7b885a12b5ff72e9c92 LAST_UPDATED 8ebaee0179044912b95c64f6fb6a8282 MAINTAINERS e7c586243a1211c8c2f1b88871d84b86 Makefile.def 042ff95b3e1cd0b93d9d4b3da6cca589 Makefile.in 42b7db4fa23a15a3d75a90aeee82f5d6 Makefile.tpl ! 8951a41b2446c3592acfc9b65f6517b0 NEWS 750a7546d281ac42eb2ce87949457731 README b510a5285eb05298b5f3d9f5ae920588 boehm-gc/AmigaOS.c 2caafacabf758bb76a9dfce1fc544b97 boehm-gc/BCC_MAKEFILE ! b77f9f913648de89525702934b912b21 boehm-gc/ChangeLog c18075e3729cd116028480307a8e845d boehm-gc/EMX_MAKEFILE 3b7cc3be9ed3c2135bbda990e8a69303 boehm-gc/MacOS.c 5cf7764626b7dd7272b2fe11403d1b6a boehm-gc/MacProjects.sit.hqx *************** a48113a06665f2c4c3281455fadcb2b2 config *** 208,214 **** 334a5fe7049791025bea0a0ff23afaec config.guess 6df093e787b282178d1a49a18425857d config.rpath 6e12b36be82dce29d2800c809aa95e94 config.sub ! dc4ce1e0198bdebdec787843c39d90ee config/ChangeLog 0fcd4badfe2a2191778bdf5ab94aa40c config/acinclude.m4 a925fa6ab8c1f62bc4b4d1421516deaf config/acx.m4 04bdbef77f5fd2e282f7dee0bde60444 config/codeset.m4 --- 208,214 ---- 334a5fe7049791025bea0a0ff23afaec config.guess 6df093e787b282178d1a49a18425857d config.rpath 6e12b36be82dce29d2800c809aa95e94 config.sub ! a1576b91eb25147ceef9c11e36473992 config/ChangeLog 0fcd4badfe2a2191778bdf5ab94aa40c config/acinclude.m4 a925fa6ab8c1f62bc4b4d1421516deaf config/acx.m4 04bdbef77f5fd2e282f7dee0bde60444 config/codeset.m4 *************** e5f16579c830ccc42e238b49e8409e99 config *** 266,272 **** 33624cdc9c21800a4fbb3bd88ab4b7e4 config/multi.m4 120ec56e3aa27739a2945bc1c8a2530a config/nls.m4 2ca9a51841dae7be00e1969166c7e06a config/no-executables.m4 ! dad482bf874c7e5e40de5087477ff38c config/override.m4 08ac6e38b61b5cee2fa4129284da8fb9 config/po.m4 b2d511a8a77414eda79bdee0daccfea8 config/proginstall.m4 d3cecf02bb97035177818aefbb0e0833 config/progtest.m4 --- 266,272 ---- 33624cdc9c21800a4fbb3bd88ab4b7e4 config/multi.m4 120ec56e3aa27739a2945bc1c8a2530a config/nls.m4 2ca9a51841dae7be00e1969166c7e06a config/no-executables.m4 ! 45bb9be94eca093ac8ad615287f364cb config/override.m4 08ac6e38b61b5cee2fa4129284da8fb9 config/po.m4 b2d511a8a77414eda79bdee0daccfea8 config/proginstall.m4 d3cecf02bb97035177818aefbb0e0833 config/progtest.m4 *************** cd3fbac36bf83aca788388d678508c98 config *** 278,286 **** 6b1c349fb182e74fbc464c50c88fe2ee config/ulonglong.m4 49305b421244035f19bdccb38a800d5f config/unwind_ipinfo.m4 3510459bb8dffa5ea06682a29bcdbfa9 config/warnings.m4 ! 2763239b0a35057fe58042b53c90bbf8 configure ! e6c1ca217ddfca2559508e2706dc00a4 configure.ac ! 76e9c526cb235bef79411423931fa065 contrib/ChangeLog 7af8d2979bf1a7cfa88e30d05fa22be2 contrib/ChangeLog.tree-ssa e0ea80d7094bf66610f2f60db444f9a1 contrib/analyze_brprob 49fe5a4a8deb2ae714614e5bb8d2feb1 contrib/check_makefile_deps.sh --- 278,286 ---- 6b1c349fb182e74fbc464c50c88fe2ee config/ulonglong.m4 49305b421244035f19bdccb38a800d5f config/unwind_ipinfo.m4 3510459bb8dffa5ea06682a29bcdbfa9 config/warnings.m4 ! 0a7fe5d0ba46fa3e83be509c351b4220 configure ! 9c44d619b21bde445e28736eb750d375 configure.ac ! edd7ece250f9f364d159cf23aed2a017 contrib/ChangeLog 7af8d2979bf1a7cfa88e30d05fa22be2 contrib/ChangeLog.tree-ssa e0ea80d7094bf66610f2f60db444f9a1 contrib/analyze_brprob 49fe5a4a8deb2ae714614e5bb8d2feb1 contrib/check_makefile_deps.sh *************** d530ce9801dd3dcf0b4826cbd444ea6a contri *** 289,295 **** bc8bc1290a409ac41a763005f95b5758 contrib/compareSumTests3 8890cc897abd8f02950ea71ffab4c203 contrib/compare_tests f2ca7b2fcab4618447996996322c174f contrib/dg-cmp-results.sh ! 56bb6fbe1fd2ee60f92dd861fde75ae4 contrib/dg-extract-results.sh 87ae17b353cdce921324af084ec6dcb1 contrib/dglib.pm 174a1f43dfb4bc58a4fb430af65fec44 contrib/download_ecj 1630984090f8c7ed66e5a977c20664cf contrib/filter_gcc_for_doxygen --- 289,295 ---- bc8bc1290a409ac41a763005f95b5758 contrib/compareSumTests3 8890cc897abd8f02950ea71ffab4c203 contrib/compare_tests f2ca7b2fcab4618447996996322c174f contrib/dg-cmp-results.sh ! 5d65d883e7ba5a9be197b1bb8aa30f57 contrib/dg-extract-results.sh 87ae17b353cdce921324af084ec6dcb1 contrib/dglib.pm 174a1f43dfb4bc58a4fb430af65fec44 contrib/download_ecj 1630984090f8c7ed66e5a977c20664cf contrib/filter_gcc_for_doxygen *************** fa945bac89ee68b410027dcfe1312f4b contri *** 305,311 **** b747c8d95bb7534c2c0f5af32ae32520 contrib/paranoia.cc a710b8024ed1edced07e764add76de05 contrib/patch_tester.sh 87a19b40fbd220938cf6c23c42c255e2 contrib/prepare_patch.sh ! 183ec81da2be7bdb6d98881c009a3269 contrib/reghunt/ChangeLog cf247a580e49d212518de409793db0a8 contrib/reghunt/bin/gcc-build-full 724e70ea3e80f87f2a201bbe2f1eef37 contrib/reghunt/bin/gcc-build-simple 3f2318bae7562a4ad1639e686916a545 contrib/reghunt/bin/gcc-cleanup --- 305,311 ---- b747c8d95bb7534c2c0f5af32ae32520 contrib/paranoia.cc a710b8024ed1edced07e764add76de05 contrib/patch_tester.sh 87a19b40fbd220938cf6c23c42c255e2 contrib/prepare_patch.sh ! f8004031a28f9d4f4ba867e80ef9db37 contrib/reghunt/ChangeLog cf247a580e49d212518de409793db0a8 contrib/reghunt/bin/gcc-build-full 724e70ea3e80f87f2a201bbe2f1eef37 contrib/reghunt/bin/gcc-build-simple 3f2318bae7562a4ad1639e686916a545 contrib/reghunt/bin/gcc-cleanup *************** f251d49dd87647250fcd74dd50b7835f contri *** 364,370 **** e2829fc4af4f433a6a328a62d5ce8066 contrib/reghunt/examples/reg-watch afd863c2ec84c906e20f9b9787b1f0fe contrib/reghunt/examples/reg-watch.awk 8955535523d4b5f48006bcb851ba9b4b contrib/reghunt/examples/testall ! 0a060e3de000aa81e6487153a0129c85 contrib/regression/ChangeLog 30553bfced1b2b46bf7ca01ef6ba69d1 contrib/regression/GCC_Regression_Tester.wdgt/Default.png ad38ddd771df222eb9d413e3c7f6a751 contrib/regression/GCC_Regression_Tester.wdgt/Icon.png 777bd286c147cc02861811f66b9a4440 contrib/regression/GCC_Regression_Tester.wdgt/Info.plist --- 364,370 ---- e2829fc4af4f433a6a328a62d5ce8066 contrib/reghunt/examples/reg-watch afd863c2ec84c906e20f9b9787b1f0fe contrib/reghunt/examples/reg-watch.awk 8955535523d4b5f48006bcb851ba9b4b contrib/reghunt/examples/testall ! 6c6ad4a8ec5451a494ec04b4e8b4befc contrib/regression/ChangeLog 30553bfced1b2b46bf7ca01ef6ba69d1 contrib/regression/GCC_Regression_Tester.wdgt/Default.png ad38ddd771df222eb9d413e3c7f6a751 contrib/regression/GCC_Regression_Tester.wdgt/Icon.png 777bd286c147cc02861811f66b9a4440 contrib/regression/GCC_Regression_Tester.wdgt/Info.plist *************** fc6c0ab91eeb51273096aab37e9b6554 contri *** 378,389 **** 0896a4641e99b786e0e793cb239d65bd contrib/regression/objs-gcc.sh dc562ddb86567c65e82953825713dc4b contrib/regression/site.exp 3045d5f9c709a524c01686e1f93dc276 contrib/test_installed ! dcf330d02baecb44538243b4050d14e0 contrib/test_summary 9d30c537e2146ca357569fb83141f2c4 contrib/texi2pod.pl e00fa8f7dd72b80ca5a64130e85fe4f4 contrib/uninclude 7cb42cbdf8becd280d1e16191416fb62 contrib/warn_summary a9c51bc6c9c6d9b9d010ccd8bb4b465a depcomp ! 7df6bd7310c8ece21426f50bb62ceaf0 fixincludes/ChangeLog 277051b0951b9542a73d7889ca1c753e fixincludes/Makefile.in 90d82f1be59d23a26a23bcd9df46706a fixincludes/README 455903ad4ff71fa5c5340ef7ae41a0e6 fixincludes/README-fixinc --- 378,389 ---- 0896a4641e99b786e0e793cb239d65bd contrib/regression/objs-gcc.sh dc562ddb86567c65e82953825713dc4b contrib/regression/site.exp 3045d5f9c709a524c01686e1f93dc276 contrib/test_installed ! 8755916403b17cd2a87e6a6f45a92d74 contrib/test_summary 9d30c537e2146ca357569fb83141f2c4 contrib/texi2pod.pl e00fa8f7dd72b80ca5a64130e85fe4f4 contrib/uninclude 7cb42cbdf8becd280d1e16191416fb62 contrib/warn_summary a9c51bc6c9c6d9b9d010ccd8bb4b465a depcomp ! 3011a2bed8bf95c6c9cbaee2e81823c6 fixincludes/ChangeLog 277051b0951b9542a73d7889ca1c753e fixincludes/Makefile.in 90d82f1be59d23a26a23bcd9df46706a fixincludes/README 455903ad4ff71fa5c5340ef7ae41a0e6 fixincludes/README-fixinc *************** e06760e2aaa65a20f4f201cf50e62a16 fixinc *** 396,408 **** 3b864771b36ad36a02328078af336add fixincludes/fixinc.in ce6796d0d67772727f5971007034752a fixincludes/fixincl.c 33eafc45c2f2fff3597f318ca0dfb5a1 fixincludes/fixincl.tpl ! 665c52292297d5446a6aa08360aa68f9 fixincludes/fixincl.x 47da6e634225e1667c26a71bcf234bfa fixincludes/fixlib.c 469dfa8059d92542b178e8df4b9e4aa8 fixincludes/fixlib.h 9cf289e85930ac90c08f951213b89a46 fixincludes/fixopts.c b73f31951e4cf2a7b21d0ee98f56bf06 fixincludes/fixtests.c 1b9e8576fdc27c5574a47177b412ffee fixincludes/genfixes ! b5fb637ac4f7bf7a69b3bd5093ecf223 fixincludes/inclhack.def 3d350df0593201998e01e0de46fa4ce9 fixincludes/mkfixinc.sh 79b81ae59fc1165c91ef10d125da2516 fixincludes/mkheaders.in 3aa0563cd682ee61ecd9eb6eea0b0bce fixincludes/procopen.c --- 396,408 ---- 3b864771b36ad36a02328078af336add fixincludes/fixinc.in ce6796d0d67772727f5971007034752a fixincludes/fixincl.c 33eafc45c2f2fff3597f318ca0dfb5a1 fixincludes/fixincl.tpl ! b919742c18edd46fd8360fbc58668c92 fixincludes/fixincl.x 47da6e634225e1667c26a71bcf234bfa fixincludes/fixlib.c 469dfa8059d92542b178e8df4b9e4aa8 fixincludes/fixlib.h 9cf289e85930ac90c08f951213b89a46 fixincludes/fixopts.c b73f31951e4cf2a7b21d0ee98f56bf06 fixincludes/fixtests.c 1b9e8576fdc27c5574a47177b412ffee fixincludes/genfixes ! 39f244a1edbf8fd97a7bf7831c042716 fixincludes/inclhack.def 3d350df0593201998e01e0de46fa4ce9 fixincludes/mkfixinc.sh 79b81ae59fc1165c91ef10d125da2516 fixincludes/mkheaders.in 3aa0563cd682ee61ecd9eb6eea0b0bce fixincludes/procopen.c *************** d9c7ca6fb208946912442c6f766e7a13 fixinc *** 424,429 **** --- 424,430 ---- 2a7dfec79ab9872aa927f9c685175fcc fixincludes/tests/base/bsd/libc.h da032b0e10922af19cec10bde3ea8936 fixincludes/tests/base/c_asm.h 3e2bfa71664f5d54fa084387c5915349 fixincludes/tests/base/com_err.h + fbe9e1a0663b6b31bf8e3f839fef4af1 fixincludes/tests/base/complex.h 69f7247dd4e4cf4af4aff6d92ae29999 fixincludes/tests/base/ctrl-quotes-def-1.h 4887322d5ca3485f06af33e34f0b1e25 fixincludes/tests/base/ctype.h 454bd04221e478258462490dc2ed7ef2 fixincludes/tests/base/curses.h *************** f690db296a82aeefa0bfe9ad74a2b71c fixinc *** 449,455 **** 2649ccca3396541aeb5e612d4b4a3141 fixincludes/tests/base/netinet/ip.h f4a72388e98f34c098a3467dce9aa4e1 fixincludes/tests/base/obstack.h c24d1be3b5afd871e9f78e1a67b9cb82 fixincludes/tests/base/pixrect/memvar.h ! b190e1277e73bb25cda4e8b4817438fa fixincludes/tests/base/pthread.h 0af417a4255222a48d182d9f602c145e fixincludes/tests/base/reg_types.h 099702dfa122c22886a95f7c24ab7c13 fixincludes/tests/base/regex.h 723e68af94480e1ed60ef8abb667cfe6 fixincludes/tests/base/regexp.h --- 450,456 ---- 2649ccca3396541aeb5e612d4b4a3141 fixincludes/tests/base/netinet/ip.h f4a72388e98f34c098a3467dce9aa4e1 fixincludes/tests/base/obstack.h c24d1be3b5afd871e9f78e1a67b9cb82 fixincludes/tests/base/pixrect/memvar.h ! a84ff098b3aef64275e898867c3402e5 fixincludes/tests/base/pthread.h 0af417a4255222a48d182d9f602c145e fixincludes/tests/base/reg_types.h 099702dfa122c22886a95f7c24ab7c13 fixincludes/tests/base/regex.h 723e68af94480e1ed60ef8abb667cfe6 fixincludes/tests/base/regexp.h *************** c340da8e13edf5d70941b01670df6228 fixinc *** 494,505 **** c78e762f2c91f2af991feda7d3d7f4b2 fixincludes/tests/base/unistd.h 4f59f83f073afacc3f59c39952ec8a7b fixincludes/tests/base/wchar.h 174528657da1f7a179a039941810b764 gcc/ABOUT-GCC-NLS ! 15004d1e999fff8d6bb1675f684017f6 gcc/BASE-VER 59530bdf33659b29e73d4adb9f9f6552 gcc/COPYING a916467b91076e631dd8edb7424769c7 gcc/COPYING.LIB d32239bcb673463ab874e80d47fae504 gcc/COPYING3 6a6a8e020838b23406c81b19c1d46df6 gcc/COPYING3.LIB ! d3d98d5bb8e5b4fd1d5504930a313eec gcc/ChangeLog 0bb7e37d0205edea285403fa046364e9 gcc/ChangeLog-1997 e5efa68ab382be0d9d01c564d821c87f gcc/ChangeLog-1998 69bcc7c32f5b69af8e7d3df069413ff3 gcc/ChangeLog-1999 --- 495,506 ---- c78e762f2c91f2af991feda7d3d7f4b2 fixincludes/tests/base/unistd.h 4f59f83f073afacc3f59c39952ec8a7b fixincludes/tests/base/wchar.h 174528657da1f7a179a039941810b764 gcc/ABOUT-GCC-NLS ! 54f5bfaa126e3798d2c8546768afd04d gcc/BASE-VER 59530bdf33659b29e73d4adb9f9f6552 gcc/COPYING a916467b91076e631dd8edb7424769c7 gcc/COPYING.LIB d32239bcb673463ab874e80d47fae504 gcc/COPYING3 6a6a8e020838b23406c81b19c1d46df6 gcc/COPYING3.LIB ! c53c6709b8537cfa9a666c0807e76e3f gcc/ChangeLog 0bb7e37d0205edea285403fa046364e9 gcc/ChangeLog-1997 e5efa68ab382be0d9d01c564d821c87f gcc/ChangeLog-1998 69bcc7c32f5b69af8e7d3df069413ff3 gcc/ChangeLog-1999 *************** e76baed114b61da1d194f2bbb7fd0146 gcc/Ch *** 517,535 **** 206522a420b17e10401cce46f983e2ce gcc/ChangeLog.ptr f4dab29fb2c10234cb64e9c59a62f716 gcc/ChangeLog.tree-ssa 8999bd2c5951f1391f3b22cd7a46ef91 gcc/ChangeLog.tuples ! ab6b67d6f661b13ad2a5c02dac63605e gcc/DATESTAMP d41d8cd98f00b204e9800998ecf8427e gcc/DEV-PHASE 11fe4f34d2489126efc52b010ea6f5e6 gcc/FSFChangeLog 5af5721f6387aa8aa5fb200e025dd573 gcc/FSFChangeLog.10 f7f665544fb6aa08551b37283f6c56de gcc/FSFChangeLog.11 d6c8d8f4cf325cd24a60d312bb247f46 gcc/LANGUAGES ! e3e4553dbab095c5515ccc97b3ab0b7d gcc/Makefile.in 00919fda1a585fdc4a1be1fec2eeb0bb gcc/ONEWS f88d9228718a255b827d6f417063d62d gcc/README.Portability fed64e43bbe3916d38050f44c9da9dc7 gcc/acinclude.m4 53c02c20156f46418b4889d2bde689e9 gcc/aclocal.m4 30995d78221b41ce62c92b2f601b4ebb gcc/ada/9drpc.adb ! b4f070d9608398341faa3caf406b5f93 gcc/ada/ChangeLog 683be0b07dc4f64f118fd5e8ae9cb30d gcc/ada/ChangeLog-2001 7aff25efb203be4136b8776cdc812956 gcc/ada/ChangeLog-2002 cd2379152000f40157d349018fb9364d gcc/ada/ChangeLog-2003 --- 518,536 ---- 206522a420b17e10401cce46f983e2ce gcc/ChangeLog.ptr f4dab29fb2c10234cb64e9c59a62f716 gcc/ChangeLog.tree-ssa 8999bd2c5951f1391f3b22cd7a46ef91 gcc/ChangeLog.tuples ! 3703a5dd558fa1b12e751dcc00c5eed5 gcc/DATESTAMP d41d8cd98f00b204e9800998ecf8427e gcc/DEV-PHASE 11fe4f34d2489126efc52b010ea6f5e6 gcc/FSFChangeLog 5af5721f6387aa8aa5fb200e025dd573 gcc/FSFChangeLog.10 f7f665544fb6aa08551b37283f6c56de gcc/FSFChangeLog.11 d6c8d8f4cf325cd24a60d312bb247f46 gcc/LANGUAGES ! 9ec288f42a1f1d23a47d69694b04bd4e gcc/Makefile.in 00919fda1a585fdc4a1be1fec2eeb0bb gcc/ONEWS f88d9228718a255b827d6f417063d62d gcc/README.Portability fed64e43bbe3916d38050f44c9da9dc7 gcc/acinclude.m4 53c02c20156f46418b4889d2bde689e9 gcc/aclocal.m4 30995d78221b41ce62c92b2f601b4ebb gcc/ada/9drpc.adb ! 42015a2923d360f08685c43dbf8e1904 gcc/ada/ChangeLog 683be0b07dc4f64f118fd5e8ae9cb30d gcc/ada/ChangeLog-2001 7aff25efb203be4136b8776cdc812956 gcc/ada/ChangeLog-2002 cd2379152000f40157d349018fb9364d gcc/ada/ChangeLog-2003 *************** dff6c45dedc5b25498e3b38f561e4cc7 gcc/ad *** 2420,2426 **** 259475fd05cfa434a3df9b232287b8bd gcc/ada/xutil.adb f793c0fc3ad8d56b2f810ef22a2a1bae gcc/ada/xutil.ads c3fbd4434fd5a2fe96e64055b2d4a6df gcc/addresses.h ! 6db443f90baeeff7cc7815ea8e7e76b0 gcc/alias.c 9edada9175e31ecb4cbe278f573ed02a gcc/alias.h ba003d4e037d1469834e33e7dfa0bddb gcc/alloc-pool.c f8232afc6d7363b97fafb1dd6776af76 gcc/alloc-pool.h --- 2421,2427 ---- 259475fd05cfa434a3df9b232287b8bd gcc/ada/xutil.adb f793c0fc3ad8d56b2f810ef22a2a1bae gcc/ada/xutil.ads c3fbd4434fd5a2fe96e64055b2d4a6df gcc/addresses.h ! 6192e0c9311817c29aa05321499d0238 gcc/alias.c 9edada9175e31ecb4cbe278f573ed02a gcc/alias.h ba003d4e037d1469834e33e7dfa0bddb gcc/alloc-pool.c f8232afc6d7363b97fafb1dd6776af76 gcc/alloc-pool.h *************** b9c01436528929db1abeacb959495701 gcc/bt *** 2436,2442 **** 9c9d09ec0c1df451d68570e803b2ef26 gcc/builtins.c a255ee3446afb8cea4ebe90fa0fe039d gcc/builtins.def 73e94fd7d8fb1829d449a3e30e2afe5b gcc/c-aux-info.c ! 62d30a7d4af8d629829c99d02c07d970 gcc/c-common.c 3087eb6dfdb77b30e46747d87e22c86e gcc/c-common.def cff06fcb33b371f862382f90530c95d6 gcc/c-common.h 2ceb08a28d11926cd88da8c96f18c4c7 gcc/c-config-lang.in --- 2437,2443 ---- 9c9d09ec0c1df451d68570e803b2ef26 gcc/builtins.c a255ee3446afb8cea4ebe90fa0fe039d gcc/builtins.def 73e94fd7d8fb1829d449a3e30e2afe5b gcc/c-aux-info.c ! b73e001b2cf8cd000b38d0fe8f8a6e26 gcc/c-common.c 3087eb6dfdb77b30e46747d87e22c86e gcc/c-common.def cff06fcb33b371f862382f90530c95d6 gcc/c-common.h 2ceb08a28d11926cd88da8c96f18c4c7 gcc/c-config-lang.in *************** f95cb1190185fa6479c151fb3c6be772 gcc/c- *** 2452,2460 **** 00a399fd2525cb2d75af442b71464546 gcc/c-lex.c 524bae5125f3bcd8cdc53b003982432a gcc/c-objc-common.c 11eddfdc59a24de964125718c1ef7161 gcc/c-objc-common.h ! f8b20b5f283358ca9da1a48ade34e3d4 gcc/c-omp.c 862e74f9b1ff844572190a219461a683 gcc/c-opts.c ! 9184a376b51a416e5a0609636795b50a gcc/c-parser.c 76c4fd60dc01ae080aafef8f4dfc8686 gcc/c-pch.c fba6ef29ec98bac7054b7e56ca68baa0 gcc/c-ppoutput.c 65687cf9cc18784184c4fcaca07785a0 gcc/c-pragma.c --- 2453,2461 ---- 00a399fd2525cb2d75af442b71464546 gcc/c-lex.c 524bae5125f3bcd8cdc53b003982432a gcc/c-objc-common.c 11eddfdc59a24de964125718c1ef7161 gcc/c-objc-common.h ! 5c84f66fe17b30bd010427eb1e235c95 gcc/c-omp.c 862e74f9b1ff844572190a219461a683 gcc/c-opts.c ! ebbc1117fdf835ea93161c95ee4fa50b gcc/c-parser.c 76c4fd60dc01ae080aafef8f4dfc8686 gcc/c-pch.c fba6ef29ec98bac7054b7e56ca68baa0 gcc/c-ppoutput.c 65687cf9cc18784184c4fcaca07785a0 gcc/c-pragma.c *************** f096600761033f7e1b9793aad8f5b0b2 gcc/ca *** 2471,2477 **** cd05048afad409e6c12b47c5aae01538 gcc/cfganal.c c3fa1dc2919fc5e43bce5bb6da791ba3 gcc/cfgbuild.c e1f5dfc5e952ea80ab629d2934ed92d2 gcc/cfgcleanup.c ! 475f13541f378bd25295f16a534bb4b4 gcc/cfgexpand.c 1c33442424e3f0450a6e8c5dc9fabede gcc/cfghooks.c 56a338efdcf6fc90c65d811ea5945ae4 gcc/cfghooks.h 4c4db0af7c7fffab033314cbc9bc7908 gcc/cfglayout.c --- 2472,2478 ---- cd05048afad409e6c12b47c5aae01538 gcc/cfganal.c c3fa1dc2919fc5e43bce5bb6da791ba3 gcc/cfgbuild.c e1f5dfc5e952ea80ab629d2934ed92d2 gcc/cfgcleanup.c ! a99a43b8978101de88234f418e36c0c7 gcc/cfgexpand.c 1c33442424e3f0450a6e8c5dc9fabede gcc/cfghooks.c 56a338efdcf6fc90c65d811ea5945ae4 gcc/cfghooks.h 4c4db0af7c7fffab033314cbc9bc7908 gcc/cfglayout.c *************** c756f94c2865593913f9d653b50e44b7 gcc/cf *** 2480,2486 **** 392ddb58d1f2231ac2250b81393a35d9 gcc/cfgloop.h 4d5a0f9465bd5dd7404978d2d035e2e6 gcc/cfgloopanal.c a10689a1459ddefd7d28989bfacb3d71 gcc/cfgloopmanip.c ! 8e87e2b3415f74153cca744f62965377 gcc/cfgrtl.c cb4b40634f3c1def7b5730947c63aefb gcc/cgraph.c 9acf1d45b00d383e0b8d46c304d72bac gcc/cgraph.h a54c6129173f86ca06c644872a147a08 gcc/cgraphbuild.c --- 2481,2487 ---- 392ddb58d1f2231ac2250b81393a35d9 gcc/cfgloop.h 4d5a0f9465bd5dd7404978d2d035e2e6 gcc/cfgloopanal.c a10689a1459ddefd7d28989bfacb3d71 gcc/cfgloopmanip.c ! c7c7f25e9f6baff77c0517c9b505feaf gcc/cfgrtl.c cb4b40634f3c1def7b5730947c63aefb gcc/cgraph.c 9acf1d45b00d383e0b8d46c304d72bac gcc/cgraph.h a54c6129173f86ca06c644872a147a08 gcc/cgraphbuild.c *************** bb4cfd4d910574a8e2dbd629c02e2e5d gcc/co *** 2492,2500 **** c8f82300dbae721266534683a4f57887 gcc/common.opt 162c077c493d89717647c605b5b81996 gcc/conditions.h a8b63c89b69671c024a7c874bf4ae667 gcc/config.build ! 0303404c23cf8b0e96bbffc8c42644a6 gcc/config.gcc d5475a10fd7eaca715b416fd312e6131 gcc/config.host ! e72988e60debc250067b965b30acea78 gcc/config.in 8e697813dc96ca90f5d0f4c196efe2cc gcc/config/README 3acabb7bb274b8bf65a2a0860087641d gcc/config/alpha/alpha-modes.def 7efb6d3e66c4ad0f2a7dc5c971c0d2ba gcc/config/alpha/alpha-protos.h --- 2493,2501 ---- c8f82300dbae721266534683a4f57887 gcc/common.opt 162c077c493d89717647c605b5b81996 gcc/conditions.h a8b63c89b69671c024a7c874bf4ae667 gcc/config.build ! 6513358a209e9a87a2890f4366d84774 gcc/config.gcc d5475a10fd7eaca715b416fd312e6131 gcc/config.host ! e84fbddb4f27f8319b205e09b2dbbe74 gcc/config.in 8e697813dc96ca90f5d0f4c196efe2cc gcc/config/README 3acabb7bb274b8bf65a2a0860087641d gcc/config/alpha/alpha-modes.def 7efb6d3e66c4ad0f2a7dc5c971c0d2ba gcc/config/alpha/alpha-protos.h *************** b4dc0e55b7eb81cbe53a2184760cf4c6 gcc/co *** 2563,2569 **** 337e34a37f4734666b8e6d777f3f2808 gcc/config/arm/arm-modes.def b138ba59f6ab1eb39036be36d5e5740f gcc/config/arm/arm-protos.h 2e9f22a9b6c8d1e20458687a5ac9bd94 gcc/config/arm/arm-tune.md ! c822923ebefdd2e2220bd875bbe2f40f gcc/config/arm/arm.c 623bb67695b6863f49d2cde8349dd670 gcc/config/arm/arm.h 127918392bb55cbbe575c86a220e3a67 gcc/config/arm/arm.md 38766022e749c081f597bbaee891f44a gcc/config/arm/arm.opt --- 2564,2570 ---- 337e34a37f4734666b8e6d777f3f2808 gcc/config/arm/arm-modes.def b138ba59f6ab1eb39036be36d5e5740f gcc/config/arm/arm-protos.h 2e9f22a9b6c8d1e20458687a5ac9bd94 gcc/config/arm/arm-tune.md ! 4bee234f1f846680b06ecb10ef0e9191 gcc/config/arm/arm.c 623bb67695b6863f49d2cde8349dd670 gcc/config/arm/arm.h 127918392bb55cbbe575c86a220e3a67 gcc/config/arm/arm.md 38766022e749c081f597bbaee891f44a gcc/config/arm/arm.opt *************** d656df963edb12b100c20f043967378d gcc/co *** 2599,2605 **** 363b0a83dace8c34d9091d1ca7b67871 gcc/config/arm/lib1funcs.asm cfcfd5e8b171338d69363f5e982c2a06 gcc/config/arm/libgcc-bpabi.ver 494c670e0f21c37b8da05ba1c978dace gcc/config/arm/libunwind.S ! eb64e56e31523d96482d2dea2434cab2 gcc/config/arm/linux-atomic.c bfbabf64e5cdac49e7febee85286460f gcc/config/arm/linux-eabi.h 4d97c12fedaf29697766a208daa6c286 gcc/config/arm/linux-elf.h fffe0cd79badf432823a50259dd55831 gcc/config/arm/linux-gas.h --- 2600,2606 ---- 363b0a83dace8c34d9091d1ca7b67871 gcc/config/arm/lib1funcs.asm cfcfd5e8b171338d69363f5e982c2a06 gcc/config/arm/libgcc-bpabi.ver 494c670e0f21c37b8da05ba1c978dace gcc/config/arm/libunwind.S ! 786570a185a3ce120336cd56e359af95 gcc/config/arm/linux-atomic.c bfbabf64e5cdac49e7febee85286460f gcc/config/arm/linux-eabi.h 4d97c12fedaf29697766a208daa6c286 gcc/config/arm/linux-elf.h fffe0cd79badf432823a50259dd55831 gcc/config/arm/linux-gas.h *************** cbaf717e236eb4340b42f12e0e38b567 gcc/co *** 2686,2692 **** 837acee4d48ef7d26a71aa36e1858e10 gcc/config/cris/cris-protos.h f267fbf7ca4f235957063fb2ddda92b1 gcc/config/cris/cris.c 1e340d77535152b857b116a45dcd6705 gcc/config/cris/cris.h ! ddd4cc98f069211cf13dcde412c56465 gcc/config/cris/cris.md 9cce02c62a9c30fcb9e1004bcac40a0a gcc/config/cris/cris.opt 238f061ec7567f581637f02afd191e60 gcc/config/cris/cris_abi_symbol.c ea3bbe21b286235c5d86261c6f886609 gcc/config/cris/elf.opt --- 2687,2693 ---- 837acee4d48ef7d26a71aa36e1858e10 gcc/config/cris/cris-protos.h f267fbf7ca4f235957063fb2ddda92b1 gcc/config/cris/cris.c 1e340d77535152b857b116a45dcd6705 gcc/config/cris/cris.h ! 68645c40cfa5ea1791e17fe59f0e1a95 gcc/config/cris/cris.md 9cce02c62a9c30fcb9e1004bcac40a0a gcc/config/cris/cris.opt 238f061ec7567f581637f02afd191e60 gcc/config/cris/cris_abi_symbol.c ea3bbe21b286235c5d86261c6f886609 gcc/config/cris/elf.opt *************** b9e7ccf39ad6f3e2028606eed7a6338a gcc/co *** 2799,2805 **** 6b26dd2e16cb01e0789232d7832e1bf8 gcc/config/host-darwin.h ea47859147741a02b97829f70410bd38 gcc/config/host-hpux.c 53a3afa2f88db795549cdf839270a70d gcc/config/host-linux.c ! f4bd0fc4302169cfc048bf1277b70cae gcc/config/host-solaris.c 11b4e907792d4c0c7e842f217e3ea638 gcc/config/i386/ammintrin.h 710c97b56f0c583b243e9a235edb0ed4 gcc/config/i386/athlon.md 9c39dad7462857b6e0a056c212685265 gcc/config/i386/att.h --- 2800,2806 ---- 6b26dd2e16cb01e0789232d7832e1bf8 gcc/config/host-darwin.h ea47859147741a02b97829f70410bd38 gcc/config/host-hpux.c 53a3afa2f88db795549cdf839270a70d gcc/config/host-linux.c ! 2b3c932dd0b642effedd3a16c6b46ae1 gcc/config/host-solaris.c 11b4e907792d4c0c7e842f217e3ea638 gcc/config/i386/ammintrin.h 710c97b56f0c583b243e9a235edb0ed4 gcc/config/i386/athlon.md 9c39dad7462857b6e0a056c212685265 gcc/config/i386/att.h *************** ef9c61f3eb2226751bfc551dfeb39fc9 gcc/co *** 2847,2856 **** a5e3cd858e5d81aa77c49851af121053 gcc/config/i386/i386-interix.h f1be9e9dbf092b26488d3768a0d21a59 gcc/config/i386/i386-interix3.h 738261834af8766a7daf88a1900523c6 gcc/config/i386/i386-modes.def ! 85f8badc238af7d3e39112d0fb7ae468 gcc/config/i386/i386-protos.h ! 1289a64f3fddbf28b41cd3074b7a5743 gcc/config/i386/i386.c 1a5c4b2bb072a72d6dda538a833d90c8 gcc/config/i386/i386.h ! c2a72d5122cf2261bf304495ade03607 gcc/config/i386/i386.md cc683112908f30f1ddf58eb3cd9b454d gcc/config/i386/i386.opt 4d1dce03e59fae2e895691dbe2816ff6 gcc/config/i386/i386elf.h 9a1cd85c5ebadc9c1b91053f78010f0a gcc/config/i386/immintrin.h --- 2848,2857 ---- a5e3cd858e5d81aa77c49851af121053 gcc/config/i386/i386-interix.h f1be9e9dbf092b26488d3768a0d21a59 gcc/config/i386/i386-interix3.h 738261834af8766a7daf88a1900523c6 gcc/config/i386/i386-modes.def ! e559b68fedfd59e31e0e8812e5323376 gcc/config/i386/i386-protos.h ! 9f91177e8f0b7b70d9abe05b25ea8384 gcc/config/i386/i386.c 1a5c4b2bb072a72d6dda538a833d90c8 gcc/config/i386/i386.h ! 8182fc5dbde33b3c045f0cfee0df45e8 gcc/config/i386/i386.md cc683112908f30f1ddf58eb3cd9b454d gcc/config/i386/i386.opt 4d1dce03e59fae2e895691dbe2816ff6 gcc/config/i386/i386elf.h 9a1cd85c5ebadc9c1b91053f78010f0a gcc/config/i386/immintrin.h *************** f022112fa740928fc752cf5d5b74cf58 gcc/co *** 2894,2907 **** 5aaf9e5a27e6af65db4d947695469397 gcc/config/i386/rtemself.h a01a2ee6acd694a1911f023e9b830d14 gcc/config/i386/sfp-machine.h 62a8172c1d598948657bac57964cd1eb gcc/config/i386/smmintrin.h ! 673ea4570bf3f8023abe73cde9435ce7 gcc/config/i386/sol2-10.h 75c2c23d6f9d924cc8e2c6d4691bfd3d gcc/config/i386/sol2-c1.asm 6dffd719ed5e6996abc35c625b7af020 gcc/config/i386/sol2-ci.asm a7c56b573f7954c790824437069b36fc gcc/config/i386/sol2-cn.asm 59b63b053033b45a1ff136d858274f8a gcc/config/i386/sol2-gc1.asm ! ba54e99b242a3b186b050da8de7bb72c gcc/config/i386/sol2.h ! d3bc2e6a4cc5dc57634331e09c2376f1 gcc/config/i386/sse.md ! e4d06a9cea6c8fa19a844b5a96822934 gcc/config/i386/sync.md a69ad68d12e465d4dc457e6f7e335107 gcc/config/i386/sysv4.h 83d2b55a3f61c24c4920b42946f97f19 gcc/config/i386/t-crtfm b3624967c99966fdd644982087ecb8b3 gcc/config/i386/t-crtpc --- 2895,2910 ---- 5aaf9e5a27e6af65db4d947695469397 gcc/config/i386/rtemself.h a01a2ee6acd694a1911f023e9b830d14 gcc/config/i386/sfp-machine.h 62a8172c1d598948657bac57964cd1eb gcc/config/i386/smmintrin.h ! 8556143f480c922ceea5f88f905848c4 gcc/config/i386/sol2-10.h 75c2c23d6f9d924cc8e2c6d4691bfd3d gcc/config/i386/sol2-c1.asm 6dffd719ed5e6996abc35c625b7af020 gcc/config/i386/sol2-ci.asm a7c56b573f7954c790824437069b36fc gcc/config/i386/sol2-cn.asm + f61034c9f76cc7ca5f8300e0baab299e gcc/config/i386/sol2-gas.h 59b63b053033b45a1ff136d858274f8a gcc/config/i386/sol2-gc1.asm ! 9e65824b2322c40a67888390481f6b29 gcc/config/i386/sol2-unwind.h ! 14f6714053df8e660605f5fcdd1f10b1 gcc/config/i386/sol2.h ! 53bcdbbb74108c007a3e7c9f6191459f gcc/config/i386/sse.md ! 3436d453a8b1d63416a01c2c91a9ccfb gcc/config/i386/sync.md a69ad68d12e465d4dc457e6f7e335107 gcc/config/i386/sysv4.h 83d2b55a3f61c24c4920b42946f97f19 gcc/config/i386/t-crtfm b3624967c99966fdd644982087ecb8b3 gcc/config/i386/t-crtpc *************** af24a4211ecc5bef39097e175d346788 gcc/co *** 2935,2941 **** b80a5a4a8c8fc32ca318158abc98dc20 gcc/config/i386/t-vxworksae a3bc87d64567916b9ff13e21a71bb0d8 gcc/config/i386/tmmintrin.h f2391bd2043ea89890f2e52212f3aced gcc/config/i386/unix.h ! 39cb2254fd2c44e6347b3a72f319fa39 gcc/config/i386/vx-common.h e8ba2f275310d48d995304cb92c7b633 gcc/config/i386/vxworks.h 36c9098376271a91bd2946e39cfca659 gcc/config/i386/vxworksae.h 3609cec49e1f1f72221aef24385282de gcc/config/i386/w32-unwind.h --- 2938,2944 ---- b80a5a4a8c8fc32ca318158abc98dc20 gcc/config/i386/t-vxworksae a3bc87d64567916b9ff13e21a71bb0d8 gcc/config/i386/tmmintrin.h f2391bd2043ea89890f2e52212f3aced gcc/config/i386/unix.h ! 22fdfb6fb173665963d8e93ecb97acae gcc/config/i386/vx-common.h e8ba2f275310d48d995304cb92c7b633 gcc/config/i386/vxworks.h 36c9098376271a91bd2946e39cfca659 gcc/config/i386/vxworksae.h 3609cec49e1f1f72221aef24385282de gcc/config/i386/w32-unwind.h *************** aae76eb08d5c5a4c4e761c8d8d9b6d43 gcc/co *** 2983,2989 **** 42dfd5bbf8f4fd18a63dfe9c095b798b gcc/config/ia64/predicates.md daf9152ff755ff828138537657e1d468 gcc/config/ia64/quadlib.c 1c87c4ea06f06fef911c5d57e2ab79e6 gcc/config/ia64/sfp-machine.h ! c8bc772d2b8ed9b2b5e25e8b4365bb07 gcc/config/ia64/sync.md c3d5c2bc19a821b5578fb1b7844a148f gcc/config/ia64/sysv4.h d6753e473ab7dbf3df470721ac42bc2f gcc/config/ia64/t-fprules-softfp a687e8161232885646a8f72e1bb638c6 gcc/config/ia64/t-glibc --- 2986,2992 ---- 42dfd5bbf8f4fd18a63dfe9c095b798b gcc/config/ia64/predicates.md daf9152ff755ff828138537657e1d468 gcc/config/ia64/quadlib.c 1c87c4ea06f06fef911c5d57e2ab79e6 gcc/config/ia64/sfp-machine.h ! c61ade54c64dda023b96660890725347 gcc/config/ia64/sync.md c3d5c2bc19a821b5578fb1b7844a148f gcc/config/ia64/sysv4.h d6753e473ab7dbf3df470721ac42bc2f gcc/config/ia64/t-fprules-softfp a687e8161232885646a8f72e1bb638c6 gcc/config/ia64/t-glibc *************** fafe040d7a38b97e371a3c84845e4c5f gcc/co *** 3252,3260 **** 217a72bceca0c1711fbad3a7a23e4551 gcc/config/pa/pa-linux.h 01b8e14468e166bb285428fdc6a20bd3 gcc/config/pa/pa-modes.def 6a0aed342a87e2a6b888fb1788fdd100 gcc/config/pa/pa-protos.h ! ee1f19036e4311a2c6bcdc4fe9b79d05 gcc/config/pa/pa.c ! 4ca42937ab86c9c900c6a60a1f5833ad gcc/config/pa/pa.h ! ed01f1e19d5cc3ab6b476e7f1494cf60 gcc/config/pa/pa.md c17a7721fbfc548f190112cc544e0d7b gcc/config/pa/pa.opt 012a1e54461f76d78cd598a9cb40b3bf gcc/config/pa/pa32-linux.h 2454726670f3869f9c35f4de56656dad gcc/config/pa/pa32-regs.h --- 3255,3263 ---- 217a72bceca0c1711fbad3a7a23e4551 gcc/config/pa/pa-linux.h 01b8e14468e166bb285428fdc6a20bd3 gcc/config/pa/pa-modes.def 6a0aed342a87e2a6b888fb1788fdd100 gcc/config/pa/pa-protos.h ! 6009262fd25a9bd29f5d1798ae6d1a82 gcc/config/pa/pa.c ! 07656de2478973c2c8813cc927ba62de gcc/config/pa/pa.h ! b6dcbfd6f6f0f7f54d707ae69c8190dc gcc/config/pa/pa.md c17a7721fbfc548f190112cc544e0d7b gcc/config/pa/pa.opt 012a1e54461f76d78cd598a9cb40b3bf gcc/config/pa/pa32-linux.h 2454726670f3869f9c35f4de56656dad gcc/config/pa/pa32-regs.h *************** db2a66c2a7dc3e5b10ae66f5bff83823 gcc/co *** 3263,3269 **** 920f9702b9ea8edb3a7a6356990d4e6b gcc/config/pa/pa64-linux.h afb3f3b06cf73c110ff033dbaa900105 gcc/config/pa/pa64-regs.h a9a6afd79b827565ffb8de8330b4cfe6 gcc/config/pa/pa64-start.h ! 0bda28b81f711b8e481df375d7a0dc63 gcc/config/pa/predicates.md 66bfe8f73c383c39c3e03213a457f6cc gcc/config/pa/quadlib.c f8eefb3db148e0ec5bb2de180bcacc48 gcc/config/pa/som.h b047e2282b1832ef5600ff60bba0eccd gcc/config/pa/stublib.c --- 3266,3272 ---- 920f9702b9ea8edb3a7a6356990d4e6b gcc/config/pa/pa64-linux.h afb3f3b06cf73c110ff033dbaa900105 gcc/config/pa/pa64-regs.h a9a6afd79b827565ffb8de8330b4cfe6 gcc/config/pa/pa64-start.h ! fc44fd1f840fa075775bc4dd17f4cdb9 gcc/config/pa/predicates.md 66bfe8f73c383c39c3e03213a457f6cc gcc/config/pa/quadlib.c f8eefb3db148e0ec5bb2de180bcacc48 gcc/config/pa/som.h b047e2282b1832ef5600ff60bba0eccd gcc/config/pa/stublib.c *************** e207df51fd4bff35bb0857b68ea176c5 gcc/co *** 3420,3428 **** 7ce13eff703004f54e625b5bad1b9028 gcc/config/rs6000/rs6000-c.c efc5416944d2ad1ae38ca9475f7bea1c gcc/config/rs6000/rs6000-modes.def 7bbeda82512e62800355d415081cfba9 gcc/config/rs6000/rs6000-protos.h ! 12936a44840105f0c81b7898e935c601 gcc/config/rs6000/rs6000.c 47f2993778b499d3e73535ce102bb46e gcc/config/rs6000/rs6000.h ! 6303c914955b45a8eedc63c746ca4922 gcc/config/rs6000/rs6000.md 01e022fd78565f791eb0068a8b426e0c gcc/config/rs6000/rs6000.opt c810287e86ed85965f5aabc211ca0e79 gcc/config/rs6000/rs64.md 5b417581129378039142027ce8602389 gcc/config/rs6000/rtems.h --- 3423,3431 ---- 7ce13eff703004f54e625b5bad1b9028 gcc/config/rs6000/rs6000-c.c efc5416944d2ad1ae38ca9475f7bea1c gcc/config/rs6000/rs6000-modes.def 7bbeda82512e62800355d415081cfba9 gcc/config/rs6000/rs6000-protos.h ! ce0993c257b08d31d4c12af01be4ff79 gcc/config/rs6000/rs6000.c 47f2993778b499d3e73535ce102bb46e gcc/config/rs6000/rs6000.h ! 432948342229e5a38ca84ea61226d7aa gcc/config/rs6000/rs6000.md 01e022fd78565f791eb0068a8b426e0c gcc/config/rs6000/rs6000.opt c810287e86ed85965f5aabc211ca0e79 gcc/config/rs6000/rs64.md 5b417581129378039142027ce8602389 gcc/config/rs6000/rtems.h *************** d6d13472170e7bd22f385c6539d53afe gcc/co *** 3474,3480 **** 445109724521202eb7bfc983b3a5d03d gcc/config/rtems.h 9fd2f11c227089207172fd188d2c29af gcc/config/s390/2064.md 40a9dbc66dce81376c49aac58a345775 gcc/config/s390/2084.md ! 4bba40e954a32b99a66656c688feb1cb gcc/config/s390/2097.md 834b08227fb5d2f2ed04e9dc61dc962d gcc/config/s390/constraints.md bbf2b44b03be6c410b5ad5bf0d3d67f8 gcc/config/s390/fixdfdi.h 7b5e807ad596c64b0fa8dccd83b57812 gcc/config/s390/libgcc-glibc.ver --- 3477,3483 ---- 445109724521202eb7bfc983b3a5d03d gcc/config/rtems.h 9fd2f11c227089207172fd188d2c29af gcc/config/s390/2064.md 40a9dbc66dce81376c49aac58a345775 gcc/config/s390/2084.md ! 35b90aa1e4b7f215656fa7286eff0959 gcc/config/s390/2097.md 834b08227fb5d2f2ed04e9dc61dc962d gcc/config/s390/constraints.md bbf2b44b03be6c410b5ad5bf0d3d67f8 gcc/config/s390/fixdfdi.h 7b5e807ad596c64b0fa8dccd83b57812 gcc/config/s390/libgcc-glibc.ver *************** d4f9a916c2fd36b75823773c2b0d0c4f gcc/co *** 3483,3491 **** caa6fb0c0ade92561223e732c2d61a5c gcc/config/s390/predicates.md 9be5cd5b98ff9760eac4fca0d0f4a83f gcc/config/s390/s390-modes.def b5dfe80ee7b40a7dde47132e44df71ed gcc/config/s390/s390-protos.h ! 3a11ae6a26f6344039b87639108c06b3 gcc/config/s390/s390.c 35bb8f1c40f4eca8d2481ff838847811 gcc/config/s390/s390.h ! 001441aa3135df9e83f9ee8e436616b7 gcc/config/s390/s390.md 6f9250d15fa7fb4dbac18744755f8634 gcc/config/s390/s390.opt 0f3debf41179406f77530d752d92ad9a gcc/config/s390/s390x.h 14ef548e08c4fa033fbdeca7b33d2ac1 gcc/config/s390/t-crtstuff --- 3486,3494 ---- caa6fb0c0ade92561223e732c2d61a5c gcc/config/s390/predicates.md 9be5cd5b98ff9760eac4fca0d0f4a83f gcc/config/s390/s390-modes.def b5dfe80ee7b40a7dde47132e44df71ed gcc/config/s390/s390-protos.h ! efbbc8be5cfe1594809a6f639ff10120 gcc/config/s390/s390.c 35bb8f1c40f4eca8d2481ff838847811 gcc/config/s390/s390.h ! 765e2b480b34a7245b122dee9d825ac6 gcc/config/s390/s390.md 6f9250d15fa7fb4dbac18744755f8634 gcc/config/s390/s390.opt 0f3debf41179406f77530d752d92ad9a gcc/config/s390/s390x.h 14ef548e08c4fa033fbdeca7b33d2ac1 gcc/config/s390/t-crtstuff *************** eed405ae3c0540b5fe9a8ac739e01238 gcc/co *** 3543,3549 **** 9d3923de50cf7b332d51751588012204 gcc/config/sh/sh-c.c 8d439712ff37bef737b9454a03cfa4b5 gcc/config/sh/sh-modes.def fa1083ace6e7486da8661c57722c9b57 gcc/config/sh/sh-protos.h ! b53e4d4a8809fdd800ff9ce89f5e7913 gcc/config/sh/sh.c 378b75cefcab061c4d651b82f9fff7fe gcc/config/sh/sh.h 641900da37b8f1c036adbca909cc164f gcc/config/sh/sh.md ae9ef8347fab74648bbdc3113e4ef223 gcc/config/sh/sh.opt --- 3546,3552 ---- 9d3923de50cf7b332d51751588012204 gcc/config/sh/sh-c.c 8d439712ff37bef737b9454a03cfa4b5 gcc/config/sh/sh-modes.def fa1083ace6e7486da8661c57722c9b57 gcc/config/sh/sh-protos.h ! acadabfa9f62718b22ef87f34ab3c6d5 gcc/config/sh/sh.c 378b75cefcab061c4d651b82f9fff7fe gcc/config/sh/sh.h 641900da37b8f1c036adbca909cc164f gcc/config/sh/sh.md ae9ef8347fab74648bbdc3113e4ef223 gcc/config/sh/sh.opt *************** d0731d7f14b54855bc2ef3c2c94390a3 gcc/co *** 3684,3694 **** 718cbe7b32b8fbeac37fad81795c6b2d gcc/config/soft-fp/unordtf2.c 3a39f42e2a85ae362843400ba1a695fd gcc/config/sol2-10.h 6e858ae9ae4f693f82f2f0e7a2352f6c gcc/config/sol2-c.c 10c616009534345eceafd19a2fce4a26 gcc/config/sol2-protos.h ! 26658dcd4b832cfe58ab1a15c2b7c68b gcc/config/sol2.c ! 778b9a7d4ae9bbefa46d7ab0bcc1add7 gcc/config/sol2.h 6f5d33500d53a79c9b0a47a19a8935c1 gcc/config/sparc/biarch64.h ! fafa2c1bb6c0d4c74ddb4cab16e236d3 gcc/config/sparc/constraints.md 6a18382e601c2b80e23008d4e87f1a5b gcc/config/sparc/crtfastmath.c 802612f098c92898ab482cc55a77811d gcc/config/sparc/cypress.md 42c76466662bc5141d054c11221ff75d gcc/config/sparc/freebsd.h --- 3687,3698 ---- 718cbe7b32b8fbeac37fad81795c6b2d gcc/config/soft-fp/unordtf2.c 3a39f42e2a85ae362843400ba1a695fd gcc/config/sol2-10.h 6e858ae9ae4f693f82f2f0e7a2352f6c gcc/config/sol2-c.c + 05978bc165fd3f1208359b0ae7a06e2b gcc/config/sol2-gld.h 10c616009534345eceafd19a2fce4a26 gcc/config/sol2-protos.h ! 3a135be353ae47db4ea980fce1306bf4 gcc/config/sol2.c ! 67a2af8c504c2a298443599d4472f1e2 gcc/config/sol2.h 6f5d33500d53a79c9b0a47a19a8935c1 gcc/config/sparc/biarch64.h ! a06eacf1cadd96c7f226ea9207e87a15 gcc/config/sparc/constraints.md 6a18382e601c2b80e23008d4e87f1a5b gcc/config/sparc/crtfastmath.c 802612f098c92898ab482cc55a77811d gcc/config/sparc/cypress.md 42c76466662bc5141d054c11221ff75d gcc/config/sparc/freebsd.h *************** a3f50820813526cb4b0658ad2dbd5b49 gcc/co *** 3717,3737 **** 79fe5361f0786b900be9037c4ade70b7 gcc/config/sparc/sol2-cn.asm 8be586729cd965c170e47735f936cd52 gcc/config/sparc/sol2-gas-bi.h 6733ce092d34dc5958b197197e0fd597 gcc/config/sparc/sol2-gas.h ! 5c9a6c989580e362ce23c14e97313f8b gcc/config/sparc/sol2-gld-bi.h ! f60a6317c6a87306eb56bda7d115c703 gcc/config/sparc/sol2-gld.h ! 9d25bcdd7739fc7a2398f5b04fdfcf24 gcc/config/sparc/sol2.h d6ac1866a639d5a4a8c811c8b148058c gcc/config/sparc/sp-elf.h ea1204fcf09118442f22dbbdfad5d91a gcc/config/sparc/sp64-elf.h 4e17170225e4c97fa22650f81efb0c19 gcc/config/sparc/sparc-modes.def 7d3b72e93b1365865629900559bb3f0a gcc/config/sparc/sparc-protos.h ! 42c902a15e3bd9466e09cfb083d106ce gcc/config/sparc/sparc.c a86c95037ee75097322fffcb3799f235 gcc/config/sparc/sparc.h adaf74a6c60bbb94368ad00b71dd2320 gcc/config/sparc/sparc.md 75efbb9728e482e14e8ccf95301f6466 gcc/config/sparc/sparc.opt e085c3934f5520c64222de26b11c11c6 gcc/config/sparc/sparclet.md f271a2c5c69010bdc36679b647809dcf gcc/config/sparc/supersparc.md aa2db0e1c98e511487c1c400162c7b52 gcc/config/sparc/sync.md ! 8c2db2ad41af7b5ce38f54cbbacb93fb gcc/config/sparc/sysv4.h ea7daa17a613a41bfe721bba0ab4e86e gcc/config/sparc/t-crtfm d49449c5d80d6ac9e122a041935aa404 gcc/config/sparc/t-elf 8c85cbe49459289aa252b81c98de0605 gcc/config/sparc/t-linux --- 3721,3740 ---- 79fe5361f0786b900be9037c4ade70b7 gcc/config/sparc/sol2-cn.asm 8be586729cd965c170e47735f936cd52 gcc/config/sparc/sol2-gas-bi.h 6733ce092d34dc5958b197197e0fd597 gcc/config/sparc/sol2-gas.h ! cb8a5cbb8b710e0562b0c2ef01cbcaac gcc/config/sparc/sol2-gld-bi.h ! 7cc3b4dbe775130da863ac015454513e gcc/config/sparc/sol2.h d6ac1866a639d5a4a8c811c8b148058c gcc/config/sparc/sp-elf.h ea1204fcf09118442f22dbbdfad5d91a gcc/config/sparc/sp64-elf.h 4e17170225e4c97fa22650f81efb0c19 gcc/config/sparc/sparc-modes.def 7d3b72e93b1365865629900559bb3f0a gcc/config/sparc/sparc-protos.h ! 256820fd71ee1b960f67201930305136 gcc/config/sparc/sparc.c a86c95037ee75097322fffcb3799f235 gcc/config/sparc/sparc.h adaf74a6c60bbb94368ad00b71dd2320 gcc/config/sparc/sparc.md 75efbb9728e482e14e8ccf95301f6466 gcc/config/sparc/sparc.opt e085c3934f5520c64222de26b11c11c6 gcc/config/sparc/sparclet.md f271a2c5c69010bdc36679b647809dcf gcc/config/sparc/supersparc.md aa2db0e1c98e511487c1c400162c7b52 gcc/config/sparc/sync.md ! 5e1b0f895a5b10717b1b9e8b1736bc24 gcc/config/sparc/sysv4.h ea7daa17a613a41bfe721bba0ab4e86e gcc/config/sparc/t-crtfm d49449c5d80d6ac9e122a041935aa404 gcc/config/sparc/t-elf 8c85cbe49459289aa252b81c98de0605 gcc/config/sparc/t-linux *************** bde4daebc13d31b07671caedea749601 gcc/co *** 3763,3769 **** 15e1f2ec75f5c3729c8b1e87e9ee5946 gcc/config/spu/spu-elf.h 3f6cd1148d08429aedb2066ac8d6b7c7 gcc/config/spu/spu-modes.def f236b9877726d4ced11cdeb0ce0f8fbb gcc/config/spu/spu-protos.h ! 7f00b9fb072e5274d0f360caa8f9f655 gcc/config/spu/spu.c 20b3ec6101bd559aa2d568e0b327b24c gcc/config/spu/spu.h 4e71e68bf288f1b3ed78b5eecaf4c4ee gcc/config/spu/spu.md c51a5ff6ee29035296427a61a5034ced gcc/config/spu/spu.opt --- 3766,3772 ---- 15e1f2ec75f5c3729c8b1e87e9ee5946 gcc/config/spu/spu-elf.h 3f6cd1148d08429aedb2066ac8d6b7c7 gcc/config/spu/spu-modes.def f236b9877726d4ced11cdeb0ce0f8fbb gcc/config/spu/spu-protos.h ! 8d6b2c22c83995b7296a26d8cc9055c2 gcc/config/spu/spu.c 20b3ec6101bd559aa2d568e0b327b24c gcc/config/spu/spu.h 4e71e68bf288f1b3ed78b5eecaf4c4ee gcc/config/spu/spu.md c51a5ff6ee29035296427a61a5034ced gcc/config/spu/spu.opt *************** dfbbef43b3c190ba6f05149d80336b1b gcc/co *** 3868,3881 **** a62a04395adea9e8fb15234ce93c99e8 gcc/config/xtensa/xtensa.h 1b3fbf71aaae0b7da3739d0e146ec343 gcc/config/xtensa/xtensa.md 817d70283ee9515a6bc94ecdf0574903 gcc/config/xtensa/xtensa.opt ! e624d686fd26723c2d2d58bacc59f6c9 gcc/configure ! e5607ff31370d3c99109ba1bc9401311 gcc/configure.ac 0fc9cbec1c22b0236a7f5248b4dc79fb gcc/convert.c 8e8d379b495b79ad19b6260bb3fc43b2 gcc/convert.h ff670e1fb66afb7e147476e295f3d60d gcc/coretypes.h 15415fb6900d9eef3016912a0bd54224 gcc/coverage.c 1a69bad83c84b193b55d89f3edb77ab4 gcc/coverage.h ! dab4fe932880e046df9d5a3cbb86a2aa gcc/cp/ChangeLog bd4aeac90a5befe0218090fe3d3d6542 gcc/cp/ChangeLog-1993 08674355375d2734400e90d47d048ccc gcc/cp/ChangeLog-1994 ba73c2557bcf66206e3cb4f90a4f81a1 gcc/cp/ChangeLog-1995 --- 3871,3884 ---- a62a04395adea9e8fb15234ce93c99e8 gcc/config/xtensa/xtensa.h 1b3fbf71aaae0b7da3739d0e146ec343 gcc/config/xtensa/xtensa.md 817d70283ee9515a6bc94ecdf0574903 gcc/config/xtensa/xtensa.opt ! 04241273935ed46781b9b644f5bb2ec7 gcc/configure ! 905807d27dbc2153b1e696d83f55cee5 gcc/configure.ac 0fc9cbec1c22b0236a7f5248b4dc79fb gcc/convert.c 8e8d379b495b79ad19b6260bb3fc43b2 gcc/convert.h ff670e1fb66afb7e147476e295f3d60d gcc/coretypes.h 15415fb6900d9eef3016912a0bd54224 gcc/coverage.c 1a69bad83c84b193b55d89f3edb77ab4 gcc/coverage.h ! 641e4127f1749b5d2dec9a85cf622284 gcc/cp/ChangeLog bd4aeac90a5befe0218090fe3d3d6542 gcc/cp/ChangeLog-1993 08674355375d2734400e90d47d048ccc gcc/cp/ChangeLog-1994 ba73c2557bcf66206e3cb4f90a4f81a1 gcc/cp/ChangeLog-1995 *************** bf58dc9f53704ab06bb6633dd79b479d gcc/cp *** 3910,3925 **** 5ff049045c746e41c3381f25609eea9c gcc/cp/cvt.c f32993deb820146f598ba32cdb47557e gcc/cp/cxx-pretty-print.c 57f04bb8af29de0486e3be8141ca0035 gcc/cp/cxx-pretty-print.h ! 0c3c1a5c184f4c9cf2f80a1142f17ec0 gcc/cp/decl.c 0eeec2a7ef53b590eb313368952584ab gcc/cp/decl.h e0c93acb3fc7cd26c1ac38f4b1af7aea gcc/cp/decl2.c a009584a5d3113881556b1b41458d6dd gcc/cp/dump.c ! e1799e9728db94f7a0a05d1bb379987d gcc/cp/error.c 0a140550646258446120c6db1551c5ce gcc/cp/except.c df402f15d9dab032a7242c387e30f8f5 gcc/cp/expr.c 887ff1049a055a68f3dbb0a43c308b2e gcc/cp/friend.c f5cdc595822e9627aaa7eb04b81f44e0 gcc/cp/g++spec.c ! 5f5cb494343f9453cfe6ab6c7cd2b55e gcc/cp/init.c 9a34b66a3f562bb915158e929108deb8 gcc/cp/lang-specs.h 992d66abb65f75f760d515b342f24b41 gcc/cp/lex.c 4893efefdd7dc01c384674c06875dccf gcc/cp/mangle.c --- 3913,3928 ---- 5ff049045c746e41c3381f25609eea9c gcc/cp/cvt.c f32993deb820146f598ba32cdb47557e gcc/cp/cxx-pretty-print.c 57f04bb8af29de0486e3be8141ca0035 gcc/cp/cxx-pretty-print.h ! 7349d0361e3ab298b53e4c302c0c3fdd gcc/cp/decl.c 0eeec2a7ef53b590eb313368952584ab gcc/cp/decl.h e0c93acb3fc7cd26c1ac38f4b1af7aea gcc/cp/decl2.c a009584a5d3113881556b1b41458d6dd gcc/cp/dump.c ! f02ad81086d74280dd96fb1d9d0eff02 gcc/cp/error.c 0a140550646258446120c6db1551c5ce gcc/cp/except.c df402f15d9dab032a7242c387e30f8f5 gcc/cp/expr.c 887ff1049a055a68f3dbb0a43c308b2e gcc/cp/friend.c f5cdc595822e9627aaa7eb04b81f44e0 gcc/cp/g++spec.c ! 565eb747e360e54bb2007038a9c0bda7 gcc/cp/init.c 9a34b66a3f562bb915158e929108deb8 gcc/cp/lang-specs.h 992d66abb65f75f760d515b342f24b41 gcc/cp/lex.c 4893efefdd7dc01c384674c06875dccf gcc/cp/mangle.c *************** a3d9bc49954ab9f0a7ecd89fc327dab1 gcc/cp *** 3928,3940 **** a721dbea3ad1268918bce607c4fb7bf0 gcc/cp/name-lookup.h b080bcfe8e8b473de78c2cb0483a21eb gcc/cp/operators.def 5288d9bc16e1d5de8f23f84297420e47 gcc/cp/optimize.c ! e262357d623f062b2a6f13e3f5498faa gcc/cp/parser.c ! 5040876a9c28cab6df05b5c21aee0af7 gcc/cp/pt.c 2a331e99786b101d129fa8b7d66581bb gcc/cp/ptree.c ef6d9b7df3512756ad8d60ec703caa12 gcc/cp/repo.c 4cd606661f72aa421b0652f601dea0e4 gcc/cp/rtti.c 20dc67cad9bc0638789e6134326a118c gcc/cp/search.c ! 0b4a6d9d425cee8086db7d777f4279d9 gcc/cp/semantics.c af27ade65f7b941bad45c6ddd41eb90f gcc/cp/tree.c 96d58f0f28e427d9e1cb78eaa3293d65 gcc/cp/typeck.c e72171c196904a0bd6d1a6de21deed42 gcc/cp/typeck2.c --- 3931,3943 ---- a721dbea3ad1268918bce607c4fb7bf0 gcc/cp/name-lookup.h b080bcfe8e8b473de78c2cb0483a21eb gcc/cp/operators.def 5288d9bc16e1d5de8f23f84297420e47 gcc/cp/optimize.c ! 0ad0639fbdcf7efc515461ec11861371 gcc/cp/parser.c ! 48fa5281a5a9f10b4072e4d9256558b5 gcc/cp/pt.c 2a331e99786b101d129fa8b7d66581bb gcc/cp/ptree.c ef6d9b7df3512756ad8d60ec703caa12 gcc/cp/repo.c 4cd606661f72aa421b0652f601dea0e4 gcc/cp/rtti.c 20dc67cad9bc0638789e6134326a118c gcc/cp/search.c ! 3a4b805b009b207754e16de462407e59 gcc/cp/semantics.c af27ade65f7b941bad45c6ddd41eb90f gcc/cp/tree.c 96d58f0f28e427d9e1cb78eaa3293d65 gcc/cp/typeck.c e72171c196904a0bd6d1a6de21deed42 gcc/cp/typeck2.c *************** e1c4e1f2c1dc649ac373e700eefc95cd gcc/db *** 3953,3959 **** 4294fea5f2914d14a0fcce8aad5ac8e5 gcc/dbxout.h cadedebd308d7043805c7f2364618320 gcc/dce.c 79d36cacb8519e31bbf0fe0dc8d8a8d9 gcc/dce.h ! c90efc3a1f2eec136b405807a58e4f4b gcc/ddg.c 2c9de43c41933786c4f1675bcffd9fe8 gcc/ddg.h 372973ff2cbc342bb8e68dc890a2abcb gcc/debug.c 98ef67d40f13fe48ebd76eea0707c40b gcc/debug.h --- 3956,3962 ---- 4294fea5f2914d14a0fcce8aad5ac8e5 gcc/dbxout.h cadedebd308d7043805c7f2364618320 gcc/dce.c 79d36cacb8519e31bbf0fe0dc8d8a8d9 gcc/dce.h ! 3df41b6ecb65a15a7791e0f21cd83016 gcc/ddg.c 2c9de43c41933786c4f1675bcffd9fe8 gcc/ddg.h 372973ff2cbc342bb8e68dc890a2abcb gcc/debug.c 98ef67d40f13fe48ebd76eea0707c40b gcc/debug.h *************** a6aa0cd8a984f8a49d8fdf4a7a02524c gcc/de *** 3961,3974 **** c1e3dadb783bfedd79c3d4c4d62cbb24 gcc/df-byte-scan.c 6e6284b2b0b6d1d8ae0ad08118f44f9a gcc/df-core.c 8eebee2f43f38b989f7eb0e26db2fa2b gcc/df-problems.c ! 528606fcb93516ae7a894f77057e8484 gcc/df-scan.c 4e5bd79c9b1ca1e026a0b3da6d5510e1 gcc/df.h a068025293fde475bf00e1fb5d05923d gcc/dfp.c 348ca5583aa3bdcb1d4790a2284d86d7 gcc/dfp.h 85330ce8910c600f99b937e0b41158ee gcc/diagnostic.c 9c4ce2161f78ceb6373a2fea71018067 gcc/diagnostic.def 1eeca1eb4586a7f2bb81aa7b2dce6b30 gcc/diagnostic.h ! f0cdea1f361564c409fea00e75fc4867 gcc/doc/aot-compile.1 fab6e6245c13a86c0526862b93a171f5 gcc/doc/arm-neon-intrinsics.texi f14bb72f864987edc101885b31399d41 gcc/doc/bugreport.texi 60d66885a7ec8aee190214a16e4b1735 gcc/doc/c-tree.texi --- 3964,3977 ---- c1e3dadb783bfedd79c3d4c4d62cbb24 gcc/df-byte-scan.c 6e6284b2b0b6d1d8ae0ad08118f44f9a gcc/df-core.c 8eebee2f43f38b989f7eb0e26db2fa2b gcc/df-problems.c ! 9f24fcd8891ad2c5182f435a0fee2da1 gcc/df-scan.c 4e5bd79c9b1ca1e026a0b3da6d5510e1 gcc/df.h a068025293fde475bf00e1fb5d05923d gcc/dfp.c 348ca5583aa3bdcb1d4790a2284d86d7 gcc/dfp.h 85330ce8910c600f99b937e0b41158ee gcc/diagnostic.c 9c4ce2161f78ceb6373a2fea71018067 gcc/diagnostic.def 1eeca1eb4586a7f2bb81aa7b2dce6b30 gcc/diagnostic.h ! 0a650f4a3fdd7d8202b7174146f2198d gcc/doc/aot-compile.1 fab6e6245c13a86c0526862b93a171f5 gcc/doc/arm-neon-intrinsics.texi f14bb72f864987edc101885b31399d41 gcc/doc/bugreport.texi 60d66885a7ec8aee190214a16e4b1735 gcc/doc/c-tree.texi *************** e025c163542a9ac9aecf10594125f181 gcc/do *** 3979,4016 **** 6ed911b9535d38ab2eef4969854f0581 gcc/doc/configterms.texi 9c5bb383466ed0828e95db55aeb3dc74 gcc/doc/contrib.texi 532efd24ba5590c6aed6cc4fa92638d8 gcc/doc/contribute.texi ! 57114086589a358415516256a075a920 gcc/doc/cpp.1 ! ee41b3f208798564e2c15854cc1c3f53 gcc/doc/cpp.info 4f7bbbd170a2d217a88bfc4811988d2b gcc/doc/cpp.texi 8462a717da44ca316c8c9ac975457a32 gcc/doc/cppenv.texi ! a4752cbc286eab093b6ae3866e1d4b80 gcc/doc/cppinternals.info 55cf8ff7895a619dde004d75de18d584 gcc/doc/cppinternals.texi d5e457163f18dbaf28a84995b7545447 gcc/doc/cppopts.texi ce2f84bca5ea14dcd5d5fc4d68b6d4ff gcc/doc/extend.texi ee150f91929d3eeab1448e2abedb89f6 gcc/doc/fragments.texi 456af151776849fe8c9cbd2c5db5fc36 gcc/doc/frontends.texi ! 6346fa73aa8493209f4f7afbc2ea3ef1 gcc/doc/fsf-funding.7 ! 237dec02d081d12d48fe4cbb5d826055 gcc/doc/g++.1 ! f8ff49ad55c89b679257115918c43898 gcc/doc/gc-analyze.1 ! 237dec02d081d12d48fe4cbb5d826055 gcc/doc/gcc.1 ! ef9740bf9993df8b379bdcd598768e19 gcc/doc/gcc.info f4987f24f0b85b7f7af2aa44d097d232 gcc/doc/gcc.texi ! 30f194962e7c5420a4e3d3428cc2349d gcc/doc/gccinstall.info ! 4702894ac9fbc063aa5edf037e3fc185 gcc/doc/gccint.info 839d52ff2dd686433e4d2a60f2ad7900 gcc/doc/gccint.texi ! 759514a50b343eb377e3baa6b3d26c30 gcc/doc/gcj-dbtool.1 ! ded155a655beb50af118e930b86a6476 gcc/doc/gcj.1 ! f7ad8d506e686d823b60228b9880ef44 gcc/doc/gcj.info ! 780831fc56591e5a5cd84f1c49037f6c gcc/doc/gcov.1 284df058ae86fddc2593727db8ae96d6 gcc/doc/gcov.texi a9ec4aa8679b2b09e2fd9870b5374fdc gcc/doc/generic.texi ! 935504c7ede7863bf2318296cd6afb24 gcc/doc/gfdl.7 ! 5509b7d1272474a7fb7ab0bdfee486f6 gcc/doc/gfortran.1 ! d04a165adcbe1912697dddd159c4865c gcc/doc/gij.1 87d63a516d5d9384f41a918b6539c88f gcc/doc/gimple.texi 290370669f02bef1502ada9273e5261f gcc/doc/gnu.texi ! 6dec408a0c0d6a7c971e97a15cfbbbaf gcc/doc/gpl.7 ! d0788db6328b07bbe5ff2eb8bf155b07 gcc/doc/grmic.1 5ba6e85d0d744497eeb8e9277744bb5c gcc/doc/gty.texi 12712ad63a56e9d549562b21b42b1454 gcc/doc/headerdirs.texi 6fa9f66c50758cf8a1260ee0c320553b gcc/doc/hostconfig.texi --- 3982,4019 ---- 6ed911b9535d38ab2eef4969854f0581 gcc/doc/configterms.texi 9c5bb383466ed0828e95db55aeb3dc74 gcc/doc/contrib.texi 532efd24ba5590c6aed6cc4fa92638d8 gcc/doc/contribute.texi ! e2d359810c9501e3f84c126104c7cfed gcc/doc/cpp.1 ! 4db890f214f196d920de9d38e2c3e9e8 gcc/doc/cpp.info 4f7bbbd170a2d217a88bfc4811988d2b gcc/doc/cpp.texi 8462a717da44ca316c8c9ac975457a32 gcc/doc/cppenv.texi ! bd36be137778acad5c7f30540d0a9e85 gcc/doc/cppinternals.info 55cf8ff7895a619dde004d75de18d584 gcc/doc/cppinternals.texi d5e457163f18dbaf28a84995b7545447 gcc/doc/cppopts.texi ce2f84bca5ea14dcd5d5fc4d68b6d4ff gcc/doc/extend.texi ee150f91929d3eeab1448e2abedb89f6 gcc/doc/fragments.texi 456af151776849fe8c9cbd2c5db5fc36 gcc/doc/frontends.texi ! 0ad83dcee793cc4950d37e81a5a53bed gcc/doc/fsf-funding.7 ! 06ff2fb2ba1b17e0a4d0b81bf5c28a8d gcc/doc/g++.1 ! a01e94846a8991661e651f48d13cd44a gcc/doc/gc-analyze.1 ! 06ff2fb2ba1b17e0a4d0b81bf5c28a8d gcc/doc/gcc.1 ! 9d9125cd79e35a2a7a111201e3a81e1c gcc/doc/gcc.info f4987f24f0b85b7f7af2aa44d097d232 gcc/doc/gcc.texi ! e037ddaed9c5d5e15d2502004da26faa gcc/doc/gccinstall.info ! b6afd8f17f199ebef707804b8c9ce495 gcc/doc/gccint.info 839d52ff2dd686433e4d2a60f2ad7900 gcc/doc/gccint.texi ! 66e072ab5f0c1fb76ffaaac90876fb32 gcc/doc/gcj-dbtool.1 ! 585dc2e4b70d0fd40cd4146df26cd586 gcc/doc/gcj.1 ! 0644245ec1a0eeaf996c101208b151d4 gcc/doc/gcj.info ! 4824926dd105a65e1b4a5992d68d09a6 gcc/doc/gcov.1 284df058ae86fddc2593727db8ae96d6 gcc/doc/gcov.texi a9ec4aa8679b2b09e2fd9870b5374fdc gcc/doc/generic.texi ! 42fd6aca2d81adc5d38f39806b73750d gcc/doc/gfdl.7 ! 80da309f11b5f92a922bbd83357c0f55 gcc/doc/gfortran.1 ! 1ce589d8e2a2371222517a457b364360 gcc/doc/gij.1 87d63a516d5d9384f41a918b6539c88f gcc/doc/gimple.texi 290370669f02bef1502ada9273e5261f gcc/doc/gnu.texi ! 4fa970fe5dd4f42e6e72d46945e5f859 gcc/doc/gpl.7 ! c9e27b0bd70bdab3933458b15fb0abcf gcc/doc/grmic.1 5ba6e85d0d744497eeb8e9277744bb5c gcc/doc/gty.texi 12712ad63a56e9d549562b21b42b1454 gcc/doc/headerdirs.texi 6fa9f66c50758cf8a1260ee0c320553b gcc/doc/hostconfig.texi *************** be9b425ec8b2ca65e2fdbad1029e2dff gcc/do *** 4022,4033 **** 5f5adc2c6c4ebdcf03cc0125250f5995 gcc/doc/include/gpl_v3.texi dee9095d1a927726aff2b0f71fd1f9f5 gcc/doc/include/texinfo.tex 86355f77ae147b0b5ac0b6127c8259f8 gcc/doc/install-old.texi ! dc9f42e3de7ab0f394df6e6af0850f59 gcc/doc/install.texi 4b06ff09435cecf7fcd8d0c095b73464 gcc/doc/install.texi2html 5407c66b804884426ce94dcac22864d1 gcc/doc/interface.texi ! 5d290b2c6c67d2f37ec1176a6ca8d516 gcc/doc/invoke.texi ! c9d5addcb0e61f36bbac503b9740a020 gcc/doc/jcf-dump.1 ! 2e4797ef67f8da618bcee1928add5641 gcc/doc/jv-convert.1 a01aca1d7da7f482653b521ba6447f85 gcc/doc/languages.texi 368c6334d0fd27a14c988b146cb70bcb gcc/doc/libgcc.texi 83fa2ab5d6f29a73570387a1a75a425c gcc/doc/loop.texi --- 4025,4036 ---- 5f5adc2c6c4ebdcf03cc0125250f5995 gcc/doc/include/gpl_v3.texi dee9095d1a927726aff2b0f71fd1f9f5 gcc/doc/include/texinfo.tex 86355f77ae147b0b5ac0b6127c8259f8 gcc/doc/install-old.texi ! 5fcd61ec724a496dea5f450574cafe82 gcc/doc/install.texi 4b06ff09435cecf7fcd8d0c095b73464 gcc/doc/install.texi2html 5407c66b804884426ce94dcac22864d1 gcc/doc/interface.texi ! 6eca8b46bd3e7ff653404fd0383af7f5 gcc/doc/invoke.texi ! d17c8ff5955dcfaa5eddc072afef5828 gcc/doc/jcf-dump.1 ! b2083bd734bb84c61a162866183757e0 gcc/doc/jv-convert.1 a01aca1d7da7f482653b521ba6447f85 gcc/doc/languages.texi 368c6334d0fd27a14c988b146cb70bcb gcc/doc/libgcc.texi 83fa2ab5d6f29a73570387a1a75a425c gcc/doc/loop.texi *************** b07adddd8f6f4eeb877a1d5df2f00aa7 gcc/do *** 4037,4047 **** a7829c305285858ae6d689e9b67e27fb gcc/doc/options.texi 935b0ead8db1245baa3edb3b52ca324d gcc/doc/passes.texi 72136dc6e58c1bb1790f0f25bbaf8897 gcc/doc/portability.texi ! dea5ea15b3d4c89f66dfa38654865374 gcc/doc/rebuild-gcj-db.1 c1b0a7fb3a88c4bf76b0a842b66b041b gcc/doc/rtl.texi d65d49dcfee4f97f1aea81855a0c20d6 gcc/doc/service.texi ! e7293f1df3af714324f8d1eeab23d902 gcc/doc/sourcebuild.texi ! 730fa18f95591a7df439f3a796948687 gcc/doc/standards.texi a6f50eb7c226c99b4ff80106816193eb gcc/doc/tm.texi 7db47935a7b0df964f4b7c6a3eab6f29 gcc/doc/tree-ssa.texi 37ec9518ff7f2e37eb431bbefd0c8527 gcc/doc/trouble.texi --- 4040,4050 ---- a7829c305285858ae6d689e9b67e27fb gcc/doc/options.texi 935b0ead8db1245baa3edb3b52ca324d gcc/doc/passes.texi 72136dc6e58c1bb1790f0f25bbaf8897 gcc/doc/portability.texi ! 929bc73499b44416c12bb47e21bb7d81 gcc/doc/rebuild-gcj-db.1 c1b0a7fb3a88c4bf76b0a842b66b041b gcc/doc/rtl.texi d65d49dcfee4f97f1aea81855a0c20d6 gcc/doc/service.texi ! 8b5876c6910c20b5fe0829c8109808c9 gcc/doc/sourcebuild.texi ! 121034b1613b68da3be40d2afe6f1b1a gcc/doc/standards.texi a6f50eb7c226c99b4ff80106816193eb gcc/doc/tm.texi 7db47935a7b0df964f4b7c6a3eab6f29 gcc/doc/tree-ssa.texi 37ec9518ff7f2e37eb431bbefd0c8527 gcc/doc/trouble.texi *************** c867dfc8f5c7aed6e6160d6bfccc191a gcc/et *** 4073,4080 **** a953cde132db16cd166c8593b0408a8b gcc/except.h f84d0b7f8dabbf46705426b4ad362f39 gcc/exec-tool.in 84d356f102e3adef6cd1d97466907ae9 gcc/explow.c ! f94aeade9bb8bd0d2b6f69e0cef250fb gcc/expmed.c ! 94bd587f3b3368ce8f633dfd5d42e846 gcc/expr.c bd583da7402f63e31de347a73320976a gcc/expr.h 095d52f188656feb5f2be0c888428de4 gcc/final.c ec7a07adbaf86d2fb1c17bcae84c5592 gcc/fix-header.c --- 4076,4083 ---- a953cde132db16cd166c8593b0408a8b gcc/except.h f84d0b7f8dabbf46705426b4ad362f39 gcc/exec-tool.in 84d356f102e3adef6cd1d97466907ae9 gcc/explow.c ! 8156bfe294cde0702321de6965ae9168 gcc/expmed.c ! 73f1db0c76bf8decd6bc900533567b13 gcc/expr.c bd583da7402f63e31de347a73320976a gcc/expr.h 095d52f188656feb5f2be0c888428de4 gcc/final.c ec7a07adbaf86d2fb1c17bcae84c5592 gcc/fix-header.c *************** c85a214f8431f0606a03372b2d506a13 gcc/fi *** 4082,4089 **** 4a30b20a32ac06014df613761d7da1d5 gcc/fixed-value.h 0ecd4665279781e595a21268f5efdad6 gcc/fixproto 7acc1e466d7ae1f9de507b6e83d4575a gcc/flags.h ! 7f935bbfbe03ecb4753bbad005abb0a1 gcc/fold-const.c ! 08f105072a7b31438f72c1f783d47637 gcc/fortran/ChangeLog a7663343404e5c8cd4fe22f4e5f8039b gcc/fortran/ChangeLog-2002 aaf400b0b954b39bafbe84581b01c429 gcc/fortran/ChangeLog-2003 7953574a6e41aeb016026a502e8baafe gcc/fortran/ChangeLog-2004 --- 4085,4092 ---- 4a30b20a32ac06014df613761d7da1d5 gcc/fixed-value.h 0ecd4665279781e595a21268f5efdad6 gcc/fixproto 7acc1e466d7ae1f9de507b6e83d4575a gcc/flags.h ! 49d94e38f3512ac2625c94c64fe68e26 gcc/fold-const.c ! 33342036ba05ee511d5d7d0440c86e66 gcc/fortran/ChangeLog a7663343404e5c8cd4fe22f4e5f8039b gcc/fortran/ChangeLog-2002 aaf400b0b954b39bafbe84581b01c429 gcc/fortran/ChangeLog-2003 7953574a6e41aeb016026a502e8baafe gcc/fortran/ChangeLog-2004 *************** bfc6c4a48a5ec9ae3d8b5b7169f57ed1 gcc/fo *** 4097,4171 **** 928ce810d7feb7a2c5cee78be11d5f99 gcc/fortran/arith.h 3b5371aa1987fcb77374e6c8f2525c74 gcc/fortran/array.c 817271155e80b1be166eb5e28fd06cb8 gcc/fortran/bbt.c ! 84058044925e06c02e9f010a26619dff gcc/fortran/check.c e03bf33a41c92eb20e30bc7e3f9b09da gcc/fortran/config-lang.in 634bca5f415d68980b2793df6b88b2e2 gcc/fortran/convert.c ! cbc6032b4645662885302b80ba0b91df gcc/fortran/cpp.c ! e32cf5fa33da12f16a34a345c4aab0c7 gcc/fortran/cpp.h 1c6328f889abcb320aaf40a7255a5cc7 gcc/fortran/data.c 0aa9443da916c0d6fdee7f808f5778ac gcc/fortran/data.h 23340f8c34a7b241accaec7d5e6eafaa gcc/fortran/decl.c ! 573528414f988468e59628dcca742c7e gcc/fortran/dependency.c e115b5c303a340fdb41109a739622308 gcc/fortran/dependency.h da6312570ea8006796301d02fea994b3 gcc/fortran/dump-parse-tree.c fa89ce8ce39f0895be37b20edad0fa6b gcc/fortran/error.c 21362083dc5f881d4db8cdaa903cc0b2 gcc/fortran/expr.c ! d827d57fe122b539a6e8994dc6e614ee gcc/fortran/f95-lang.c 92bbc75b96e5988e57703619b5aaa538 gcc/fortran/gfc-internals.texi ! 995d2bdbe59047c0cdfe3f555c373ab6 gcc/fortran/gfortran.h ! b8019a01f1983acb4bb4bf73fc28de3a gcc/fortran/gfortran.info ! 9844a4b95fb9675a2130f8e860d25efa gcc/fortran/gfortran.texi ! c10e6e8727bc5532181f50b1d6517f8f gcc/fortran/gfortranspec.c ! 304aad78fba0dfd3e4aa255008ef283c gcc/fortran/interface.c ! bc2dc28e794044f7bbfd7810619cc5cd gcc/fortran/intrinsic.c ! f60d6a021a936d18e15f9eb3a2bd3423 gcc/fortran/intrinsic.h cf442205ede5a46876ef60d2141e60f6 gcc/fortran/intrinsic.texi ! 02c2edcf129b9ba5a0297fabc30a83c3 gcc/fortran/invoke.texi be7aabc021029a3daffc42fe1ab9145d gcc/fortran/io.c 30167608d6a2acc7d18284466e376629 gcc/fortran/ioparm.def 88f017c435e082bc76d47edf50697bdb gcc/fortran/iresolve.c 086da0813ad848d1c24327367192309e gcc/fortran/iso-c-binding.def 43a207c87fced96da51c89a9a3e251d2 gcc/fortran/iso-fortran-env.def ! 65f7735fcc93959b76ba6bdff3d36ca5 gcc/fortran/lang-specs.h ! aad2eaecb9669a342e9cfb15b2bd85db gcc/fortran/lang.opt be4361b4d91e38b40417e0c0bb243c67 gcc/fortran/libgfortran.h ! 05f4461cb0ca94afbf9b0ff66d3f7802 gcc/fortran/match.c 2db1dc9dfed96601d741ff8ce77e6c69 gcc/fortran/match.h 7f57f6028a9fe976526c175bbc2419b6 gcc/fortran/matchexp.c 34830427abf048e42ce3bc7a698a9a99 gcc/fortran/mathbuiltins.def 66bc72b499f7c53d559cb00aad80f3c9 gcc/fortran/misc.c ! e9fcfe38e9957d36b26786d37bfce8f5 gcc/fortran/module.c ! f18fe4ec7dd6360400fada5cbccc3ce6 gcc/fortran/openmp.c f1982ab6691fad627a7f60d69f63dea0 gcc/fortran/options.c ! 9e2cb360da09726019b416d8f4e67e31 gcc/fortran/parse.c 3fa472426721f9cff361ad9daefa6745 gcc/fortran/parse.h 6d56bbe0a90a69da4fd16a0f5d16f0e7 gcc/fortran/primary.c ! 8478d929b611fa4412170cf7190230df gcc/fortran/resolve.c ! b5e56e0b94899d7a5678f301e4fc076a gcc/fortran/scanner.c 4c0d6ab7cea4845d981d9ec54a5ec6c2 gcc/fortran/simplify.c 0396796ab8ded0b7ffd90ab0832ad332 gcc/fortran/st.c ! 73ed18b92429e0aeb69ce035550a5daa gcc/fortran/symbol.c d0bc1c21358a981f371449b6f24d7448 gcc/fortran/target-memory.c 09fcbfd12ac93ba16ee5738f5edd71bc gcc/fortran/target-memory.h ! ef44b8fd4f3e949fcdfe0d6af0d22d55 gcc/fortran/trans-array.c e0ed115dac3b6d68cc5a0c5818f083b4 gcc/fortran/trans-array.h 7e3f4fd2f985618ee4aa5b1d3f9f871b gcc/fortran/trans-common.c 55bb83e12e540f6fe1551452dd46d86d gcc/fortran/trans-const.c 42384247e17c678b53520bc1a6085cb4 gcc/fortran/trans-const.h 691acac45d84267ef292ee3e343d774d gcc/fortran/trans-decl.c ! 695f61a2c9734a1e084e35cf400087a6 gcc/fortran/trans-expr.c 43391d21cfc0558d4e4a9298e9c6a9fc gcc/fortran/trans-intrinsic.c c4bae5c4b9bc693dda76eccd631af5a8 gcc/fortran/trans-io.c ! 5bcbba2d60572591394a1efc651ba367 gcc/fortran/trans-openmp.c c47faa8b7fed07955b9628c65360e9bc gcc/fortran/trans-stmt.c 23394537fcf50dd57acd80090140e6ae gcc/fortran/trans-stmt.h 854535ca88645782abe0948a94dc1790 gcc/fortran/trans-types.c e00df4bca357ed3a2a55df0f4cccf181 gcc/fortran/trans-types.h ca8e9e91068fcb4cd2bf97c1cc50f5e3 gcc/fortran/trans.c ! 5a3787678dc52175c7a259e1765636cd gcc/fortran/trans.h e83cc8321fe62c08e6d975eaece78b64 gcc/fortran/types.def dcbfb5f59aa7c840c77285967d94c409 gcc/fp-test.c ! de9c9daa70bf5e4ad0589ab3d64554ae gcc/function.c 11d27af2cc8506096fb550ad1fbe47e7 gcc/function.h 6eeeb28677c110262d147c3551f5260d gcc/fwprop.c f4a32f1bb7c588ee3336df3c519c89e1 gcc/gbl-ctors.h --- 4100,4174 ---- 928ce810d7feb7a2c5cee78be11d5f99 gcc/fortran/arith.h 3b5371aa1987fcb77374e6c8f2525c74 gcc/fortran/array.c 817271155e80b1be166eb5e28fd06cb8 gcc/fortran/bbt.c ! 275334a0af62892bf84a0e6b28b00a40 gcc/fortran/check.c e03bf33a41c92eb20e30bc7e3f9b09da gcc/fortran/config-lang.in 634bca5f415d68980b2793df6b88b2e2 gcc/fortran/convert.c ! 3af543bd9824b6e589b1de9b68e5aa1e gcc/fortran/cpp.c ! 99e48c3aa20e155f0d6d4320d74faf77 gcc/fortran/cpp.h 1c6328f889abcb320aaf40a7255a5cc7 gcc/fortran/data.c 0aa9443da916c0d6fdee7f808f5778ac gcc/fortran/data.h 23340f8c34a7b241accaec7d5e6eafaa gcc/fortran/decl.c ! 76eeaafb9e3d59833033673a6609d4c1 gcc/fortran/dependency.c e115b5c303a340fdb41109a739622308 gcc/fortran/dependency.h da6312570ea8006796301d02fea994b3 gcc/fortran/dump-parse-tree.c fa89ce8ce39f0895be37b20edad0fa6b gcc/fortran/error.c 21362083dc5f881d4db8cdaa903cc0b2 gcc/fortran/expr.c ! 14f32c5b40c393131f24ddd103017384 gcc/fortran/f95-lang.c 92bbc75b96e5988e57703619b5aaa538 gcc/fortran/gfc-internals.texi ! 025e137860923b015d424066cbe7737d gcc/fortran/gfortran.h ! 2fab68cffdc3020f3f08e7dab658278e gcc/fortran/gfortran.info ! 063962a8931ad0dde0f4adfedfa5b008 gcc/fortran/gfortran.texi ! f08349670219b4994af0324dba2513f5 gcc/fortran/gfortranspec.c ! 8de13299635b485c57ffc1870f5645ee gcc/fortran/interface.c ! e3e90e050359c7fccf534bf7c6025bc9 gcc/fortran/intrinsic.c ! d888f7b1ecc110f9b867cf259fc40492 gcc/fortran/intrinsic.h cf442205ede5a46876ef60d2141e60f6 gcc/fortran/intrinsic.texi ! 1e3b4cc6b428d609ed354353d5dd10bc gcc/fortran/invoke.texi be7aabc021029a3daffc42fe1ab9145d gcc/fortran/io.c 30167608d6a2acc7d18284466e376629 gcc/fortran/ioparm.def 88f017c435e082bc76d47edf50697bdb gcc/fortran/iresolve.c 086da0813ad848d1c24327367192309e gcc/fortran/iso-c-binding.def 43a207c87fced96da51c89a9a3e251d2 gcc/fortran/iso-fortran-env.def ! 810c63e3f382132693de3314a0bbaa3a gcc/fortran/lang-specs.h ! 21b8dda31d934f30bd060296180239e3 gcc/fortran/lang.opt be4361b4d91e38b40417e0c0bb243c67 gcc/fortran/libgfortran.h ! 4c442c254c8412b879b7a9620dc2986b gcc/fortran/match.c 2db1dc9dfed96601d741ff8ce77e6c69 gcc/fortran/match.h 7f57f6028a9fe976526c175bbc2419b6 gcc/fortran/matchexp.c 34830427abf048e42ce3bc7a698a9a99 gcc/fortran/mathbuiltins.def 66bc72b499f7c53d559cb00aad80f3c9 gcc/fortran/misc.c ! 5d95568421b0d129833f2633e917657e gcc/fortran/module.c ! c3a188e77b2418488a36805e2fbbb4f5 gcc/fortran/openmp.c f1982ab6691fad627a7f60d69f63dea0 gcc/fortran/options.c ! c8345ebee72c9554f96de35a2d4cb6c6 gcc/fortran/parse.c 3fa472426721f9cff361ad9daefa6745 gcc/fortran/parse.h 6d56bbe0a90a69da4fd16a0f5d16f0e7 gcc/fortran/primary.c ! 444f09bdf236b4757c840caa62a4176a gcc/fortran/resolve.c ! 5a7ff473d5062b23798e403be8b4bd5c gcc/fortran/scanner.c 4c0d6ab7cea4845d981d9ec54a5ec6c2 gcc/fortran/simplify.c 0396796ab8ded0b7ffd90ab0832ad332 gcc/fortran/st.c ! 736753ac41500a3bc30df692940fbc59 gcc/fortran/symbol.c d0bc1c21358a981f371449b6f24d7448 gcc/fortran/target-memory.c 09fcbfd12ac93ba16ee5738f5edd71bc gcc/fortran/target-memory.h ! c9bb6da5ab8eed2874405a51c385e90c gcc/fortran/trans-array.c e0ed115dac3b6d68cc5a0c5818f083b4 gcc/fortran/trans-array.h 7e3f4fd2f985618ee4aa5b1d3f9f871b gcc/fortran/trans-common.c 55bb83e12e540f6fe1551452dd46d86d gcc/fortran/trans-const.c 42384247e17c678b53520bc1a6085cb4 gcc/fortran/trans-const.h 691acac45d84267ef292ee3e343d774d gcc/fortran/trans-decl.c ! d9270a52e93a6cbba6344275645dd4e5 gcc/fortran/trans-expr.c 43391d21cfc0558d4e4a9298e9c6a9fc gcc/fortran/trans-intrinsic.c c4bae5c4b9bc693dda76eccd631af5a8 gcc/fortran/trans-io.c ! f3e1edd774ffc5dabe059aff2b3da7ee gcc/fortran/trans-openmp.c c47faa8b7fed07955b9628c65360e9bc gcc/fortran/trans-stmt.c 23394537fcf50dd57acd80090140e6ae gcc/fortran/trans-stmt.h 854535ca88645782abe0948a94dc1790 gcc/fortran/trans-types.c e00df4bca357ed3a2a55df0f4cccf181 gcc/fortran/trans-types.h ca8e9e91068fcb4cd2bf97c1cc50f5e3 gcc/fortran/trans.c ! 2e8a6c601527a5f455b401d07c921dbf gcc/fortran/trans.h e83cc8321fe62c08e6d975eaece78b64 gcc/fortran/types.def dcbfb5f59aa7c840c77285967d94c409 gcc/fp-test.c ! 209074448e113e380b11f26ec8d41c47 gcc/function.c 11d27af2cc8506096fb550ad1fbe47e7 gcc/function.h 6eeeb28677c110262d147c3551f5260d gcc/fwprop.c f4a32f1bb7c588ee3336df3c519c89e1 gcc/gbl-ctors.h *************** daab6e6009c7f2a7a222c7b210a5dd6c gcc/ge *** 4194,4200 **** 607570cb8bfacb1f7a22e15212a73a25 gcc/genextract.c e916713c67d4bd0ee15de2e23d625b1a gcc/genflags.c ac69af0b2bcdd35b25174278ccd40aca gcc/gengenrtl.c ! f7a3d6e6570165e374c094337ecff487 gcc/gengtype-lex.c d10bfac52c72465a413d4fae948a1f7c gcc/gengtype-lex.l 5e264825a46ac960fd04df6c4e6fe749 gcc/gengtype-parse.c ba8ea742fdd6e6e343047d328ca7d6d6 gcc/gengtype.c --- 4197,4203 ---- 607570cb8bfacb1f7a22e15212a73a25 gcc/genextract.c e916713c67d4bd0ee15de2e23d625b1a gcc/genflags.c ac69af0b2bcdd35b25174278ccd40aca gcc/gengenrtl.c ! 26dbb3ce4376d4a695137d7855e5a54c gcc/gengtype-lex.c d10bfac52c72465a413d4fae948a1f7c gcc/gengtype-lex.l 5e264825a46ac960fd04df6c4e6fe749 gcc/gengtype-parse.c ba8ea742fdd6e6e343047d328ca7d6d6 gcc/gengtype.c *************** fefdd804cedf0ff3aaeb41b3bf49b7e5 gcc/gi *** 4220,4226 **** 985c19bc50597831c6424e03d3462e65 gcc/gimple.c 6ada5e35d8381902d289685420266a69 gcc/gimple.def b22fd270c7b6042776250b8eaa4817c6 gcc/gimple.h ! 26643bc521d3d33a2b7954291edb0414 gcc/gimplify.c b3220d6ec518f1daa75b938e8cf0e203 gcc/ginclude/float.h 798164dd63bdd388c276bdda934db337 gcc/ginclude/iso646.h 6a912263540a2dfa8d258931158882d5 gcc/ginclude/stdarg.h --- 4223,4229 ---- 985c19bc50597831c6424e03d3462e65 gcc/gimple.c 6ada5e35d8381902d289685420266a69 gcc/gimple.def b22fd270c7b6042776250b8eaa4817c6 gcc/gimple.h ! 25c9eabd9c663987f5413ee4fa4c8adf gcc/gimplify.c b3220d6ec518f1daa75b938e8cf0e203 gcc/ginclude/float.h 798164dd63bdd388c276bdda934db337 gcc/ginclude/iso646.h 6a912263540a2dfa8d258931158882d5 gcc/ginclude/stdarg.h *************** da006bfa44f93ebeff4dcfc6d402ab00 gcc/ip *** 4291,4305 **** 017073f8caef914b5ff479648a205a50 gcc/ipa-utils.h 80e6acc22af87e7599412199be89076d gcc/ipa.c 46551f6e0bbf0e0204c0e903a3df2f14 gcc/ira-build.c ! 0e92f4870003b6f59cc35df4ac7ee580 gcc/ira-color.c 563aaec12680777f4d864836fff19a9a gcc/ira-conflicts.c 3452d1c00b518776530ce1ea173338dc gcc/ira-costs.c 88c4b720b8f837bf45d6853c4ec62328 gcc/ira-emit.c 3585adbf245837b1274a133c9ba80b28 gcc/ira-int.h 8f725eb9fa3ac85e9d5ef84ce846038c gcc/ira-lives.c ! 1309c084ff9e75838ba4df0adb4be39f gcc/ira.c 6e9fa63752c66d23752f24f7c3351d0f gcc/ira.h ! 072e776519a3c5e0ced01ab454a4698c gcc/java/ChangeLog 3ac37a9f1ad274538f2de05e991e7fb3 gcc/java/ChangeLog.ptr 5daac56e6d929be638ed287da3720f51 gcc/java/ChangeLog.tree-ssa 85367b2efe44791f0249fcc76f2f806b gcc/java/Make-lang.in --- 4294,4308 ---- 017073f8caef914b5ff479648a205a50 gcc/ipa-utils.h 80e6acc22af87e7599412199be89076d gcc/ipa.c 46551f6e0bbf0e0204c0e903a3df2f14 gcc/ira-build.c ! 067ac18830c22f256f7f4ac6e38c213b gcc/ira-color.c 563aaec12680777f4d864836fff19a9a gcc/ira-conflicts.c 3452d1c00b518776530ce1ea173338dc gcc/ira-costs.c 88c4b720b8f837bf45d6853c4ec62328 gcc/ira-emit.c 3585adbf245837b1274a133c9ba80b28 gcc/ira-int.h 8f725eb9fa3ac85e9d5ef84ce846038c gcc/ira-lives.c ! 45156f820fa8d120b2a537d0830dfb53 gcc/ira.c 6e9fa63752c66d23752f24f7c3351d0f gcc/ira.h ! 2b200c36aa5a5cb6f6bbe7a1155f7996 gcc/java/ChangeLog 3ac37a9f1ad274538f2de05e991e7fb3 gcc/java/ChangeLog.ptr 5daac56e6d929be638ed287da3720f51 gcc/java/ChangeLog.tree-ssa 85367b2efe44791f0249fcc76f2f806b gcc/java/Make-lang.in *************** e2f4feffb765f7b493cdb9967c13b392 gcc/ju *** 4347,4355 **** 2c145797505c5bd1556fe9acf02c9465 gcc/lambda-mat.c a1d3f04e6bc0f7a9b524ee10d5e0f409 gcc/lambda-trans.c 19d13bfdfa3604d65013103f9f5acdc7 gcc/lambda.h ! 2c9f7de99ba8fb705f3e60647dce9d73 gcc/langhooks-def.h ! e4a25f180a827bbc7c9decae44f7655f gcc/langhooks.c ! 1037bbc5d0e6aeb721123ab56e5b8854 gcc/langhooks.h 1094c41a57211a83547e2d60c167633c gcc/lcm.c 54d22e2089e03d54469057519b787da0 gcc/libfuncs.h e6a2279a042967b85644b19e1525b6da gcc/libgcc-std.ver --- 4350,4358 ---- 2c145797505c5bd1556fe9acf02c9465 gcc/lambda-mat.c a1d3f04e6bc0f7a9b524ee10d5e0f409 gcc/lambda-trans.c 19d13bfdfa3604d65013103f9f5acdc7 gcc/lambda.h ! 01f79b315bfbdc79a5f41b32f07722ac gcc/langhooks-def.h ! b68e5b5551ac0608c746fe868a3f867f gcc/langhooks.c ! 47ddfb2c4c49923ccdb8dfeb368fb5fb gcc/langhooks.h 1094c41a57211a83547e2d60c167633c gcc/lcm.c 54d22e2089e03d54469057519b787da0 gcc/libfuncs.h e6a2279a042967b85644b19e1525b6da gcc/libgcc-std.ver *************** e3337b83ef2cb6432c676362d67a1e21 gcc/mi *** 4380,4386 **** 2569a0ab9b2c9f2c2b8e980aee6fbbe3 gcc/mode-classes.def 1f0275897f3a2efb5fcf26e73a67df57 gcc/mode-switching.c 5995091cdf192f93cb32cb9aebfe0f39 gcc/modulo-sched.c ! fb934874ec5efc2fc16a1a6779b94fec gcc/objc/ChangeLog 6db8e709895834ffea707a6c1f2ed235 gcc/objc/Make-lang.in aa5319dd541cdb0eb8622f9adf66b761 gcc/objc/README 079d3dc27e9567936ebcc70e9662b3c8 gcc/objc/config-lang.in --- 4383,4389 ---- 2569a0ab9b2c9f2c2b8e980aee6fbbe3 gcc/mode-classes.def 1f0275897f3a2efb5fcf26e73a67df57 gcc/mode-switching.c 5995091cdf192f93cb32cb9aebfe0f39 gcc/modulo-sched.c ! 3275613fbc87bcfef3f31c5d77f042fb gcc/objc/ChangeLog 6db8e709895834ffea707a6c1f2ed235 gcc/objc/Make-lang.in aa5319dd541cdb0eb8622f9adf66b761 gcc/objc/README 079d3dc27e9567936ebcc70e9662b3c8 gcc/objc/config-lang.in *************** aa5319dd541cdb0eb8622f9adf66b761 gcc/ob *** 4389,4395 **** 8dac305da629383aaa6696e6e28b3ea3 gcc/objc/objc-act.h b4908117ca50eef79835fdfaec14f075 gcc/objc/objc-lang.c 6779d586f851c44361fe2884d2d9192c gcc/objc/objc-tree.def ! ac3f804c49108c8e23624c2bee1b60de gcc/objcp/ChangeLog a56c8048658b152b957cd35f057d5822 gcc/objcp/Make-lang.in 871a47a5d40ed19c0d393bb1a52229c2 gcc/objcp/config-lang.in b69e6fb8f98a0eca7d27309f950a6974 gcc/objcp/lang-specs.h --- 4392,4398 ---- 8dac305da629383aaa6696e6e28b3ea3 gcc/objc/objc-act.h b4908117ca50eef79835fdfaec14f075 gcc/objc/objc-lang.c 6779d586f851c44361fe2884d2d9192c gcc/objc/objc-tree.def ! d71a11542a05ea9a94cb6f015749c7fe gcc/objcp/ChangeLog a56c8048658b152b957cd35f057d5822 gcc/objcp/Make-lang.in 871a47a5d40ed19c0d393bb1a52229c2 gcc/objcp/config-lang.in b69e6fb8f98a0eca7d27309f950a6974 gcc/objcp/lang-specs.h *************** dc4785c464bb65b3283b1eb6be191e68 gcc/ou *** 4414,4420 **** ec5e4fd4d422805e3ad97793f01cfb9f gcc/params.def 6521f298f456d022fb134b601239a41b gcc/params.h ef2875efcc80e05eaa1c0becbe397361 gcc/passes.c ! e785340277e6e5ad06d3a8337a523aad gcc/po/ChangeLog 954b21fb36cc0d8e9f6e2d6507152f23 gcc/po/EXCLUDES 1d2722d5e15bb9d2538537ca110eee3a gcc/po/be.gmo 7a473a685fe0c9058330e0e69aea9157 gcc/po/be.po --- 4417,4423 ---- ec5e4fd4d422805e3ad97793f01cfb9f gcc/params.def 6521f298f456d022fb134b601239a41b gcc/params.h ef2875efcc80e05eaa1c0becbe397361 gcc/passes.c ! 339bdb0118ca6130353a5afecb339b3e gcc/po/ChangeLog 954b21fb36cc0d8e9f6e2d6507152f23 gcc/po/EXCLUDES 1d2722d5e15bb9d2538537ca110eee3a gcc/po/be.gmo 7a473a685fe0c9058330e0e69aea9157 gcc/po/be.po *************** f56f15c3e0e79210253dfe668b1ca28b gcc/re *** 4473,4486 **** 3209bbbe30e61efabe7ef8361318c6d8 gcc/recog.h 253d10a5dc55738274fc51fa2fd759b9 gcc/reg-notes.def c6a4cd620bb24b0622f9af5c3b1e98ab gcc/reg-stack.c ! d295ce254514c273533d7d60035390ae gcc/reginfo.c 0b6bcdd1e61d4a15270ad73220bf2069 gcc/regmove.c db556cefd6fbad5a901646e1653a7557 gcc/regrename.c 9f878368e024e1ca5ab65feac637e0c2 gcc/regs.h 332678c4bea66009d413e45a26db0b13 gcc/regstat.c 67673b0df664f97f1db8bf1526836709 gcc/reload.c b001064f4f19f9817fda66ee8827b533 gcc/reload.h ! 05df02ccb9f86104abb446accc33b0fa gcc/reload1.c 5d36a985f65efc52dde3558fc6aac4a1 gcc/reorg.c 9bb477d46544816b6fc70549e7de9ada gcc/resource.c 9f394cc88571b8c03e25b5b6efd57c7b gcc/resource.h --- 4476,4489 ---- 3209bbbe30e61efabe7ef8361318c6d8 gcc/recog.h 253d10a5dc55738274fc51fa2fd759b9 gcc/reg-notes.def c6a4cd620bb24b0622f9af5c3b1e98ab gcc/reg-stack.c ! e846550adfc8e660aefd6c5e46131041 gcc/reginfo.c 0b6bcdd1e61d4a15270ad73220bf2069 gcc/regmove.c db556cefd6fbad5a901646e1653a7557 gcc/regrename.c 9f878368e024e1ca5ab65feac637e0c2 gcc/regs.h 332678c4bea66009d413e45a26db0b13 gcc/regstat.c 67673b0df664f97f1db8bf1526836709 gcc/reload.c b001064f4f19f9817fda66ee8827b533 gcc/reload.h ! 83749877ecbbec8b24a8c425fc54d7de gcc/reload1.c 5d36a985f65efc52dde3558fc6aac4a1 gcc/reorg.c 9bb477d46544816b6fc70549e7de9ada gcc/resource.c 9f394cc88571b8c03e25b5b6efd57c7b gcc/resource.h *************** d966c78cd1e903bf4bc4cd9dc250330c gcc/sc *** 4498,4516 **** c42e740dbb03072238bc5c6f5d21f933 gcc/scan-types.sh 4329ae6f7c10d9a68ff239d4b2aacb6a gcc/scan.c 239058ea37f4efb430b522ff2e6a5b3e gcc/scan.h ! 806392aae7b91c3732003c6cb2292286 gcc/sched-deps.c ! a3d32f7522809951f75738ddc3f348fe gcc/sched-ebb.c ! 4956e25918984043a4efe52a9853fb2f gcc/sched-int.h ! 4647339c5dae8ed9b150eebdd77b5383 gcc/sched-rgn.c 975f93e6b3f3804b39c1792f5351b91d gcc/sched-vis.c dd117d83c12c5f0ad04cab047b62e23a gcc/sdbout.c 2bf1c375dc117d4f9b701a7aee5fd59c gcc/sdbout.h 3cbe4a3eaca96cf02bcb11d4d7e7e234 gcc/see.c ! c716653d40107762c83a4991f42c806b gcc/sel-sched-dump.c ! 01e044f42146937fa3e17b8b709fc2e3 gcc/sel-sched-dump.h ! 1885a8224920ef5cc166d474222a370c gcc/sel-sched-ir.c ! 823b054af4db790fdb125a1caff13a5b gcc/sel-sched-ir.h ! 4418ed09786c256afde20d2d6b352c8b gcc/sel-sched.c 35d088dd9940150e00ee4e6463c3fa39 gcc/sel-sched.h 046306b2e7fcccce45ba071834c680d0 gcc/simplify-rtx.c 8e865a71c4e2c43eae4afbcf143af4a6 gcc/sort-protos --- 4501,4519 ---- c42e740dbb03072238bc5c6f5d21f933 gcc/scan-types.sh 4329ae6f7c10d9a68ff239d4b2aacb6a gcc/scan.c 239058ea37f4efb430b522ff2e6a5b3e gcc/scan.h ! 538fd15dd406bf2a76955f19dc867071 gcc/sched-deps.c ! ffb01920de738deafe8b5b22c0e02be3 gcc/sched-ebb.c ! 1e83a2f8dfd8022f6a2af4d5fa666c09 gcc/sched-int.h ! 731e202968e500166c743c45e98daccc gcc/sched-rgn.c 975f93e6b3f3804b39c1792f5351b91d gcc/sched-vis.c dd117d83c12c5f0ad04cab047b62e23a gcc/sdbout.c 2bf1c375dc117d4f9b701a7aee5fd59c gcc/sdbout.h 3cbe4a3eaca96cf02bcb11d4d7e7e234 gcc/see.c ! f674f7c9336cfa975c0fec8fc8d545cb gcc/sel-sched-dump.c ! 149444fe68510bb84acc5b9cc8fa8762 gcc/sel-sched-dump.h ! cb07236d14a5fe37b4cb9699383ff996 gcc/sel-sched-ir.c ! 31e1a8a6e66573c51624b25745be9d74 gcc/sel-sched-ir.h ! 8269a266d05c549304d6a594d7fe7cb4 gcc/sel-sched.c 35d088dd9940150e00ee4e6463c3fa39 gcc/sel-sched.h 046306b2e7fcccce45ba071834c680d0 gcc/simplify-rtx.c 8e865a71c4e2c43eae4afbcf143af4a6 gcc/sort-protos *************** ebfdd2c5dd54f706eb6c336d717d9322 gcc/sy *** 4534,4540 **** ae4dce65dd83d608af62fade75f7d7e8 gcc/target.h e61b6e1a81185a8b2041114c6db5fb94 gcc/targhooks.c db9c3c56fd4a14315b9a82443ccd5488 gcc/targhooks.h ! e2e1b19e61faf417b0b2f75e6b0382f3 gcc/testsuite/ChangeLog 627c767d2c955635f6476cec53eb0361 gcc/testsuite/ChangeLog-1993-2007 d01c0009edf6d948d50bf0075b7772d0 gcc/testsuite/ChangeLog-2008 6c2ceb0138a4f779fd6d8b6327fa8611 gcc/testsuite/ChangeLog.ptr --- 4537,4543 ---- ae4dce65dd83d608af62fade75f7d7e8 gcc/target.h e61b6e1a81185a8b2041114c6db5fb94 gcc/targhooks.c db9c3c56fd4a14315b9a82443ccd5488 gcc/targhooks.h ! ba045cd15f395a510d33ba9142d74bf1 gcc/testsuite/ChangeLog 627c767d2c955635f6476cec53eb0361 gcc/testsuite/ChangeLog-1993-2007 d01c0009edf6d948d50bf0075b7772d0 gcc/testsuite/ChangeLog-2008 6c2ceb0138a4f779fd6d8b6327fa8611 gcc/testsuite/ChangeLog.ptr *************** c2eb2f892b7b914e0a687ca43783d1f3 gcc/te *** 4547,4553 **** 4004844198395fe50ecb798ed5d30f4b gcc/testsuite/ada/acats/elabd.lst 03cf8258e72032ed61d82d449e3ff3ef gcc/testsuite/ada/acats/norun.lst d5748b449a081324237ae22a21f32a3f gcc/testsuite/ada/acats/overflow.lst ! a861f60b3bd96c5eb4942bade6c1e65a gcc/testsuite/ada/acats/run_acats d3a8c986c49258ada6f23ab241f36ad3 gcc/testsuite/ada/acats/run_all.sh 5723a26fced8721c3e90e6e7a9ba2a23 gcc/testsuite/ada/acats/stackcheck.lst d45e1c07702f81b7fa521c99282fd51b gcc/testsuite/ada/acats/support/acats25.lst --- 4550,4556 ---- 4004844198395fe50ecb798ed5d30f4b gcc/testsuite/ada/acats/elabd.lst 03cf8258e72032ed61d82d449e3ff3ef gcc/testsuite/ada/acats/norun.lst d5748b449a081324237ae22a21f32a3f gcc/testsuite/ada/acats/overflow.lst ! f781cb4a623ea7d9a15741eb93716a48 gcc/testsuite/ada/acats/run_acats d3a8c986c49258ada6f23ab241f36ad3 gcc/testsuite/ada/acats/run_all.sh 5723a26fced8721c3e90e6e7a9ba2a23 gcc/testsuite/ada/acats/stackcheck.lst d45e1c07702f81b7fa521c99282fd51b gcc/testsuite/ada/acats/support/acats25.lst *************** f511f2cd46e1fa5fad1320edf3b06bdc gcc/te *** 7225,7231 **** c5d5176bf2a0d86ae5769b300e777296 gcc/testsuite/g++.dg/abi/mangle33.C 98d74115f2d27834eff6022eecd4d051 gcc/testsuite/g++.dg/abi/mangle34.C 200f21813a4ee7cb051aaf6d88d18b5b gcc/testsuite/g++.dg/abi/mangle4.C ! 46bf2e513d420128b64e0c1fc9d77169 gcc/testsuite/g++.dg/abi/mangle42.C 8d713f873b380f7cb5bf13fe8019b486 gcc/testsuite/g++.dg/abi/mangle5.C 91c28df1b9796be812f1b833d650c6b1 gcc/testsuite/g++.dg/abi/mangle6.C 3ca84e7c044b9a2c08f1b773db1d5f4f gcc/testsuite/g++.dg/abi/mangle7.C --- 7228,7234 ---- c5d5176bf2a0d86ae5769b300e777296 gcc/testsuite/g++.dg/abi/mangle33.C 98d74115f2d27834eff6022eecd4d051 gcc/testsuite/g++.dg/abi/mangle34.C 200f21813a4ee7cb051aaf6d88d18b5b gcc/testsuite/g++.dg/abi/mangle4.C ! a5b781ae74209f4ef543228c9af88faf gcc/testsuite/g++.dg/abi/mangle42.C 8d713f873b380f7cb5bf13fe8019b486 gcc/testsuite/g++.dg/abi/mangle5.C 91c28df1b9796be812f1b833d650c6b1 gcc/testsuite/g++.dg/abi/mangle6.C 3ca84e7c044b9a2c08f1b773db1d5f4f gcc/testsuite/g++.dg/abi/mangle7.C *************** fd8b8fe7fe5a5692d13a285ecdb8f37d gcc/te *** 7484,7490 **** 4859776496a16f821d24207a79fe1ecc gcc/testsuite/g++.dg/cpp0x/bracket3.C 36e9e29872771c502d6bd3626d7e167f gcc/testsuite/g++.dg/cpp0x/bracket4.C 7a47c96ccc25ad3c9076e60422fc834f gcc/testsuite/g++.dg/cpp0x/cast-bug.C ! 62a7f347a0ca8319ed02c912432716b2 gcc/testsuite/g++.dg/cpp0x/cast.C 7a2dbf79945c55067480b8e1f8c3a065 gcc/testsuite/g++.dg/cpp0x/collapse-bug.C e6e5db803fed31ae5912983c195924e3 gcc/testsuite/g++.dg/cpp0x/collapse.C 9a0ace8a7ebbf5d7255b172011b808ca gcc/testsuite/g++.dg/cpp0x/decltype-33837.C --- 7487,7493 ---- 4859776496a16f821d24207a79fe1ecc gcc/testsuite/g++.dg/cpp0x/bracket3.C 36e9e29872771c502d6bd3626d7e167f gcc/testsuite/g++.dg/cpp0x/bracket4.C 7a47c96ccc25ad3c9076e60422fc834f gcc/testsuite/g++.dg/cpp0x/cast-bug.C ! 1a977380a1d43b958a2201bcbf61ff11 gcc/testsuite/g++.dg/cpp0x/cast.C 7a2dbf79945c55067480b8e1f8c3a065 gcc/testsuite/g++.dg/cpp0x/collapse-bug.C e6e5db803fed31ae5912983c195924e3 gcc/testsuite/g++.dg/cpp0x/collapse.C 9a0ace8a7ebbf5d7255b172011b808ca gcc/testsuite/g++.dg/cpp0x/decltype-33837.C *************** a6aeee2987d053f8706edc0683945314 gcc/te *** 7568,7577 **** d3a348c4b49e1b0531708a46d1a74cce gcc/testsuite/g++.dg/cpp0x/initlist8.C b047a90d8ab317f72f56eb04c872d3e7 gcc/testsuite/g++.dg/cpp0x/initlist9.C 3d2ad7021dde84320aec4eda4fa51879 gcc/testsuite/g++.dg/cpp0x/inline-ns3.C ! 297afa54623d300c4e7d43895152f309 gcc/testsuite/g++.dg/cpp0x/iop.C 4a0e724ac30f59cb40f4cf66c5eb935c gcc/testsuite/g++.dg/cpp0x/long_long.C d6c971d57aa73f0e85d3dc1d3ecf603f gcc/testsuite/g++.dg/cpp0x/named.C ! 7ca5e76f5da4289322f6b0b01f1db381 gcc/testsuite/g++.dg/cpp0x/named_refs.C 75397e30f20c5491ae8c425601267794 gcc/testsuite/g++.dg/cpp0x/not_special.C 3a17cd678756b6b530cc9d447f967678 gcc/testsuite/g++.dg/cpp0x/overload-conv-1.C a280ecf17238784796b3effb1fd26248 gcc/testsuite/g++.dg/cpp0x/overload-conv-2.C --- 7571,7580 ---- d3a348c4b49e1b0531708a46d1a74cce gcc/testsuite/g++.dg/cpp0x/initlist8.C b047a90d8ab317f72f56eb04c872d3e7 gcc/testsuite/g++.dg/cpp0x/initlist9.C 3d2ad7021dde84320aec4eda4fa51879 gcc/testsuite/g++.dg/cpp0x/inline-ns3.C ! 71298831ed8b873656233fc648a273d3 gcc/testsuite/g++.dg/cpp0x/iop.C 4a0e724ac30f59cb40f4cf66c5eb935c gcc/testsuite/g++.dg/cpp0x/long_long.C d6c971d57aa73f0e85d3dc1d3ecf603f gcc/testsuite/g++.dg/cpp0x/named.C ! d1578249c6b8e3a3fdb48e627e169426 gcc/testsuite/g++.dg/cpp0x/named_refs.C 75397e30f20c5491ae8c425601267794 gcc/testsuite/g++.dg/cpp0x/not_special.C 3a17cd678756b6b530cc9d447f967678 gcc/testsuite/g++.dg/cpp0x/overload-conv-1.C a280ecf17238784796b3effb1fd26248 gcc/testsuite/g++.dg/cpp0x/overload-conv-2.C *************** e21108436dc5ce57312ddc9a096ec2db gcc/te *** 7614,7633 **** 502f5ac10c2ab96a80d6c603bdf2cfd2 gcc/testsuite/g++.dg/cpp0x/rv-trivial-bug.C 5cd3e13f4cef7d25383fdec4ba84fae2 gcc/testsuite/g++.dg/cpp0x/rv10.C 515c22f2491f2538ef1856d4849193c8 gcc/testsuite/g++.dg/cpp0x/rv1n.C ! 18338cd95adbf6caae8732e735474beb gcc/testsuite/g++.dg/cpp0x/rv1p.C 2e4634a4536f9a33b503f1c17c37e809 gcc/testsuite/g++.dg/cpp0x/rv2n.C ! 2c4bd4b466f8ccc772160cc823ec1a40 gcc/testsuite/g++.dg/cpp0x/rv2p.C 25844518c6a118cce05cbe065baca9e4 gcc/testsuite/g++.dg/cpp0x/rv3n.C ! e3984a55baa52a01cb63dfc0e8dd87f3 gcc/testsuite/g++.dg/cpp0x/rv3p.C 0a9fa2b71927c4fbeab0d8e5a0984da7 gcc/testsuite/g++.dg/cpp0x/rv4n.C ! d8af4afa414adc82e3101251097e7b2b gcc/testsuite/g++.dg/cpp0x/rv4p.C e0ce83c49b788d80830771302f42cc3d gcc/testsuite/g++.dg/cpp0x/rv5n.C ! 8b9713189146673d291c40fa2aa20a8a gcc/testsuite/g++.dg/cpp0x/rv5p.C 44e4d6d548ed9b97f422bb3979a620ba gcc/testsuite/g++.dg/cpp0x/rv6n.C ! 3dda037dd9cb215ac9bf203f6665ca1d gcc/testsuite/g++.dg/cpp0x/rv6p.C b07f962b94ee79481226ab7d685bfea3 gcc/testsuite/g++.dg/cpp0x/rv7n.C ! cb664a15a4903289c2dbf39470cc428e gcc/testsuite/g++.dg/cpp0x/rv7p.C ! db9c73cee851a3426d9f24047e6126c4 gcc/testsuite/g++.dg/cpp0x/rv8p.C b873eb6dd4e6daa5c9f634ffe8e7b919 gcc/testsuite/g++.dg/cpp0x/rv9p.C af38f46a8c779fe96c1d3cbf6782dc05 gcc/testsuite/g++.dg/cpp0x/rvo.C 2c7626e10d7406f8f1f38d9d9b3c93eb gcc/testsuite/g++.dg/cpp0x/scoped_enum.C --- 7617,7636 ---- 502f5ac10c2ab96a80d6c603bdf2cfd2 gcc/testsuite/g++.dg/cpp0x/rv-trivial-bug.C 5cd3e13f4cef7d25383fdec4ba84fae2 gcc/testsuite/g++.dg/cpp0x/rv10.C 515c22f2491f2538ef1856d4849193c8 gcc/testsuite/g++.dg/cpp0x/rv1n.C ! 072685a52a83e06913f8bef35556361e gcc/testsuite/g++.dg/cpp0x/rv1p.C 2e4634a4536f9a33b503f1c17c37e809 gcc/testsuite/g++.dg/cpp0x/rv2n.C ! 274ebe622a3a1993533af6d978c1c0da gcc/testsuite/g++.dg/cpp0x/rv2p.C 25844518c6a118cce05cbe065baca9e4 gcc/testsuite/g++.dg/cpp0x/rv3n.C ! 0388f00767e866023398059396f5d8e7 gcc/testsuite/g++.dg/cpp0x/rv3p.C 0a9fa2b71927c4fbeab0d8e5a0984da7 gcc/testsuite/g++.dg/cpp0x/rv4n.C ! b59640ab4936987421c4d35e0d85565e gcc/testsuite/g++.dg/cpp0x/rv4p.C e0ce83c49b788d80830771302f42cc3d gcc/testsuite/g++.dg/cpp0x/rv5n.C ! 785203ddcf1e14da027bb23496795fed gcc/testsuite/g++.dg/cpp0x/rv5p.C 44e4d6d548ed9b97f422bb3979a620ba gcc/testsuite/g++.dg/cpp0x/rv6n.C ! cc74fd1254ae9879b6e8bb53416c5243 gcc/testsuite/g++.dg/cpp0x/rv6p.C b07f962b94ee79481226ab7d685bfea3 gcc/testsuite/g++.dg/cpp0x/rv7n.C ! 4c0d2b28a299f9537b89c6add1db942d gcc/testsuite/g++.dg/cpp0x/rv7p.C ! 09b7b39173e2c648eec4b630ddbdb286 gcc/testsuite/g++.dg/cpp0x/rv8p.C b873eb6dd4e6daa5c9f634ffe8e7b919 gcc/testsuite/g++.dg/cpp0x/rv9p.C af38f46a8c779fe96c1d3cbf6782dc05 gcc/testsuite/g++.dg/cpp0x/rvo.C 2c7626e10d7406f8f1f38d9d9b3c93eb gcc/testsuite/g++.dg/cpp0x/scoped_enum.C *************** dff8e484f5ebc462a610d96381bb6352 gcc/te *** 7649,7655 **** f98e26ccc799118e5c38e6b008728fdf gcc/testsuite/g++.dg/cpp0x/trailing3.C 01cafd9f1aeadd5ffc9bd644563a50b9 gcc/testsuite/g++.dg/cpp0x/trailing4.C d0d8f484e5d5d333ca0101b985fc1397 gcc/testsuite/g++.dg/cpp0x/trailing5.C ! a460b87cdd4f4e41763d048e0fd1c15b gcc/testsuite/g++.dg/cpp0x/unnamed_refs.C 3dcf280a61a31db3b901338f80bd09bb gcc/testsuite/g++.dg/cpp0x/variadic-bind.C 09d0cfdb30531a4ad803dbcbe2f0a1cd gcc/testsuite/g++.dg/cpp0x/variadic-crash1.C 554a7c17abf02e2bda69bbb7d98c12dd gcc/testsuite/g++.dg/cpp0x/variadic-crash2.C --- 7652,7658 ---- f98e26ccc799118e5c38e6b008728fdf gcc/testsuite/g++.dg/cpp0x/trailing3.C 01cafd9f1aeadd5ffc9bd644563a50b9 gcc/testsuite/g++.dg/cpp0x/trailing4.C d0d8f484e5d5d333ca0101b985fc1397 gcc/testsuite/g++.dg/cpp0x/trailing5.C ! 0f0b0dbf38ad612177286a1eeb1adcb0 gcc/testsuite/g++.dg/cpp0x/unnamed_refs.C 3dcf280a61a31db3b901338f80bd09bb gcc/testsuite/g++.dg/cpp0x/variadic-bind.C 09d0cfdb30531a4ad803dbcbe2f0a1cd gcc/testsuite/g++.dg/cpp0x/variadic-crash1.C 554a7c17abf02e2bda69bbb7d98c12dd gcc/testsuite/g++.dg/cpp0x/variadic-crash2.C *************** f3e5e740f9e7210ccece705c6d548267 gcc/te *** 7825,7831 **** a11c6bcd4c8cdca98697be5126edd6c1 gcc/testsuite/g++.dg/debug/dwarf2-2.C 151f7421a1ad0956296abb84d05dca7d gcc/testsuite/g++.dg/debug/dwarf2/const1.C e70f88144abfc6a69a1241301a9b5e68 gcc/testsuite/g++.dg/debug/dwarf2/const2.C ! 45f49e130f4058bb515ffb8e4099d40e gcc/testsuite/g++.dg/debug/dwarf2/const2b.C f17c0387f7c5577bdb7e7f0dde303067 gcc/testsuite/g++.dg/debug/dwarf2/dwarf2.exp 2853ac7b025c77719bcb8d67c97d88d0 gcc/testsuite/g++.dg/debug/dwarf2/fesd-any.C 9b015014257af56d73a48e0f2e546d29 gcc/testsuite/g++.dg/debug/dwarf2/fesd-any.h --- 7828,7834 ---- a11c6bcd4c8cdca98697be5126edd6c1 gcc/testsuite/g++.dg/debug/dwarf2-2.C 151f7421a1ad0956296abb84d05dca7d gcc/testsuite/g++.dg/debug/dwarf2/const1.C e70f88144abfc6a69a1241301a9b5e68 gcc/testsuite/g++.dg/debug/dwarf2/const2.C ! 2d24d844a24f965b21c1790720011113 gcc/testsuite/g++.dg/debug/dwarf2/const2b.C f17c0387f7c5577bdb7e7f0dde303067 gcc/testsuite/g++.dg/debug/dwarf2/dwarf2.exp 2853ac7b025c77719bcb8d67c97d88d0 gcc/testsuite/g++.dg/debug/dwarf2/fesd-any.C 9b015014257af56d73a48e0f2e546d29 gcc/testsuite/g++.dg/debug/dwarf2/fesd-any.h *************** e44d460202c349fcf4bb0de15b410685 gcc/te *** 8144,8152 **** 9dd60e46feb4216f1dac3c4779c9a6b4 gcc/testsuite/g++.dg/ext/attrib32.C b4d4dad31de4936353878d38d9bf3387 gcc/testsuite/g++.dg/ext/attrib33.C 6ca90338cc7b2eaecb90e6f07f49d349 gcc/testsuite/g++.dg/ext/attrib34.C ! 72dcf6393fd2127116d516c2816413ba gcc/testsuite/g++.dg/ext/attrib35.C c85b15ec7059c950864ba0f66b044e14 gcc/testsuite/g++.dg/ext/attrib36.C 3314c5f2f3a9674141029db687c58ae3 gcc/testsuite/g++.dg/ext/attrib37.C 0689e86022776421672cfd3ac67e3153 gcc/testsuite/g++.dg/ext/attrib4.C ec01dbb0bb96c7cda806a516a5cf87d4 gcc/testsuite/g++.dg/ext/attrib5.C 76284b29c6fce52f56ddbcc04acd3a97 gcc/testsuite/g++.dg/ext/attrib6.C --- 8147,8156 ---- 9dd60e46feb4216f1dac3c4779c9a6b4 gcc/testsuite/g++.dg/ext/attrib32.C b4d4dad31de4936353878d38d9bf3387 gcc/testsuite/g++.dg/ext/attrib33.C 6ca90338cc7b2eaecb90e6f07f49d349 gcc/testsuite/g++.dg/ext/attrib34.C ! 74124e62efa8465c0f8f134a720a227e gcc/testsuite/g++.dg/ext/attrib35.C c85b15ec7059c950864ba0f66b044e14 gcc/testsuite/g++.dg/ext/attrib36.C 3314c5f2f3a9674141029db687c58ae3 gcc/testsuite/g++.dg/ext/attrib37.C + 1da29ca3a8314b01760d953e1dd3e965 gcc/testsuite/g++.dg/ext/attrib39.C 0689e86022776421672cfd3ac67e3153 gcc/testsuite/g++.dg/ext/attrib4.C ec01dbb0bb96c7cda806a516a5cf87d4 gcc/testsuite/g++.dg/ext/attrib5.C 76284b29c6fce52f56ddbcc04acd3a97 gcc/testsuite/g++.dg/ext/attrib6.C *************** f0ce7d14c6af3b42645a73bd7a9fd205 gcc/te *** 8414,8420 **** 86631ce973fe08bf3f9ad84e595fb594 gcc/testsuite/g++.dg/ext/vector11.C 173dc80ba2834a9afdc07f599ac08c74 gcc/testsuite/g++.dg/ext/vector12.C 0b89905c123e9d47c7e0b5514f4c50e2 gcc/testsuite/g++.dg/ext/vector13.C ! c96dec2f72294844f5ad12c23c748db0 gcc/testsuite/g++.dg/ext/vector14.C 609de4a1bd102907e8c94926e720e269 gcc/testsuite/g++.dg/ext/vector15.C 3f2ba0450158ad5c221f98dd0e641cbf gcc/testsuite/g++.dg/ext/vector2.C 06e44a4208434952189cfd9cd55ae2d8 gcc/testsuite/g++.dg/ext/vector3.C --- 8418,8424 ---- 86631ce973fe08bf3f9ad84e595fb594 gcc/testsuite/g++.dg/ext/vector11.C 173dc80ba2834a9afdc07f599ac08c74 gcc/testsuite/g++.dg/ext/vector12.C 0b89905c123e9d47c7e0b5514f4c50e2 gcc/testsuite/g++.dg/ext/vector13.C ! baf76aeff499a9319bfcd692a783cd98 gcc/testsuite/g++.dg/ext/vector14.C 609de4a1bd102907e8c94926e720e269 gcc/testsuite/g++.dg/ext/vector15.C 3f2ba0450158ad5c221f98dd0e641cbf gcc/testsuite/g++.dg/ext/vector2.C 06e44a4208434952189cfd9cd55ae2d8 gcc/testsuite/g++.dg/ext/vector3.C *************** f603634b7e2ab93b87e602f38ebcc397 gcc/te *** 8494,8499 **** --- 8498,8504 ---- 4cff2904bf7edbed976d3dd3f67c25ba gcc/testsuite/g++.dg/ext/vla6.C f339c929810ba11885868c48c99722f6 gcc/testsuite/g++.dg/ext/vla7.C 527f30cd7292076034b829d15a5232ca gcc/testsuite/g++.dg/ext/vla8.C + 9bb5caf7c99329edf52d7e4bc97626a1 gcc/testsuite/g++.dg/ext/vla9.C 11bcf00b0a6402fad7b9569e02318690 gcc/testsuite/g++.dg/ext/vlm1.C 678b0a6bbf7e0629efdf82de5e5ed01a gcc/testsuite/g++.dg/ext/vlm2.C 8c86ea641b4518800fb5154a1a151e06 gcc/testsuite/g++.dg/ext/weak1.C *************** a7c093e32d8e0cc08e02c3253748979c gcc/te *** 8509,8514 **** --- 8514,8523 ---- ac07fef320ed28f2a3aefaf473d9285a gcc/testsuite/g++.dg/gcov/gcov.exp 450622eac3970da63e43723374af5da7 gcc/testsuite/g++.dg/gomp/atomic-1.C 965328e0df7ea1eac39b1c9ed586468c gcc/testsuite/g++.dg/gomp/atomic-10.C + 0ff1c3a6c0628a5b02b5f2f75d16b718 gcc/testsuite/g++.dg/gomp/atomic-11.C + dd8d68c289cb1c26144acf8dc1acf162 gcc/testsuite/g++.dg/gomp/atomic-12.C + 7e932cfe67a56047f2793f8f073026d8 gcc/testsuite/g++.dg/gomp/atomic-13.C + 09e1ac78dfc242ef6814ae3e2736e858 gcc/testsuite/g++.dg/gomp/atomic-14.C 02a1665574401bc7491c754880894569 gcc/testsuite/g++.dg/gomp/atomic-2.C 1d9b409e9e1f767bd2def30a1129c2a3 gcc/testsuite/g++.dg/gomp/atomic-3.C b2ce89f1ba635f8d6701308583cd4759 gcc/testsuite/g++.dg/gomp/atomic-4.C *************** f5892df2ecb52226b652c40258f42f73 gcc/te *** 8918,8923 **** --- 8927,8933 ---- a07f29cc13922f46ee402c672bab1763 gcc/testsuite/g++.dg/init/value5.C ca385abd9d6b36d0667c2ad521a0233e gcc/testsuite/g++.dg/init/value6.C 4487271d3a3d8cbbe87a8aa0dee4b541 gcc/testsuite/g++.dg/init/value7.C + 8301ee378a2cddfa351a850b83e9542a gcc/testsuite/g++.dg/init/value8.C 75fa012514803aa0a98113ff8b7474c6 gcc/testsuite/g++.dg/init/vector1.C 6a507132cbee807fabd3c9dfd0f81093 gcc/testsuite/g++.dg/init/volatile1.C 93fc3984527ffae879d436a763ed1b27 gcc/testsuite/g++.dg/ipa/iinline-1.C *************** e3e63ced4f57071fce511810c74aa7be gcc/te *** 9257,9263 **** 4f1c59fff71e91fcca07fc5604a22f07 gcc/testsuite/g++.dg/opt/pr36187.C cf0bf4d4ab4024bd8b79002f9cfced1e gcc/testsuite/g++.dg/opt/pr36449.C 8fad458588ec31543de9506cdbd39461 gcc/testsuite/g++.dg/opt/pr39607.C ! a10d4b77b14c3ef4080f99f298383120 gcc/testsuite/g++.dg/opt/pr40496.C ac2356162f00cd5e8804482480f1795a gcc/testsuite/g++.dg/opt/pr6713.C 90bdbfd9313461944756a9e9f01ce788 gcc/testsuite/g++.dg/opt/pr7503-1.C 1451eba24eea82cbd0c1ab87885c0f77 gcc/testsuite/g++.dg/opt/preinc1.C --- 9267,9274 ---- 4f1c59fff71e91fcca07fc5604a22f07 gcc/testsuite/g++.dg/opt/pr36187.C cf0bf4d4ab4024bd8b79002f9cfced1e gcc/testsuite/g++.dg/opt/pr36449.C 8fad458588ec31543de9506cdbd39461 gcc/testsuite/g++.dg/opt/pr39607.C ! d6a356e006ceb7cfd944f66314b28fac gcc/testsuite/g++.dg/opt/pr40496.C ! 1ed877c670581a2f25c6aa50f70334d0 gcc/testsuite/g++.dg/opt/pr44919.C ac2356162f00cd5e8804482480f1795a gcc/testsuite/g++.dg/opt/pr6713.C 90bdbfd9313461944756a9e9f01ce788 gcc/testsuite/g++.dg/opt/pr7503-1.C 1451eba24eea82cbd0c1ab87885c0f77 gcc/testsuite/g++.dg/opt/preinc1.C *************** ee0489aeeac7a4238f28b53289c9c6b3 gcc/te *** 9411,9420 **** bc5371eb8e8dcf79efb0889828991560 gcc/testsuite/g++.dg/other/gc2.C 710d41055b4bb35ff1473bcd3c776607 gcc/testsuite/g++.dg/other/gc3.C 88d3ce293bea84b74d7f26a42a8538fb gcc/testsuite/g++.dg/other/gc4.C ! a4ba2b7b6eafda312857cd7cbde61596 gcc/testsuite/g++.dg/other/i386-1.C 776484aeaac5f448596bac23197ace79 gcc/testsuite/g++.dg/other/i386-2.C fb90694e8cdc0e8e1ac0022c6778f988 gcc/testsuite/g++.dg/other/i386-3.C ! a4ad4c2cb3c1448496351241a77aedb7 gcc/testsuite/g++.dg/other/i386-4.C fb90694e8cdc0e8e1ac0022c6778f988 gcc/testsuite/g++.dg/other/i386-5.C 776484aeaac5f448596bac23197ace79 gcc/testsuite/g++.dg/other/i386-6.C cc1ca2bf9b477d018fa43d900031841d gcc/testsuite/g++.dg/other/incomplete1.C --- 9422,9431 ---- bc5371eb8e8dcf79efb0889828991560 gcc/testsuite/g++.dg/other/gc2.C 710d41055b4bb35ff1473bcd3c776607 gcc/testsuite/g++.dg/other/gc3.C 88d3ce293bea84b74d7f26a42a8538fb gcc/testsuite/g++.dg/other/gc4.C ! b278d029e43a1a6f84f91e1a2d865eae gcc/testsuite/g++.dg/other/i386-1.C 776484aeaac5f448596bac23197ace79 gcc/testsuite/g++.dg/other/i386-2.C fb90694e8cdc0e8e1ac0022c6778f988 gcc/testsuite/g++.dg/other/i386-3.C ! ff752c7e92e18f7df274ee6e1588049e gcc/testsuite/g++.dg/other/i386-4.C fb90694e8cdc0e8e1ac0022c6778f988 gcc/testsuite/g++.dg/other/i386-5.C 776484aeaac5f448596bac23197ace79 gcc/testsuite/g++.dg/other/i386-6.C cc1ca2bf9b477d018fa43d900031841d gcc/testsuite/g++.dg/other/incomplete1.C *************** cbeaf45e0171e3fe5619451df416f658 gcc/te *** 9431,9437 **** b00a3ef2f2c7c47e551480d60abbc84f gcc/testsuite/g++.dg/other/linkage1.C a9c2bd4786300d7cf805e7ef57335a2c gcc/testsuite/g++.dg/other/macro-1.C 7603e3e5185c1b4aaf6b806ea7dc4dee gcc/testsuite/g++.dg/other/main1.C ! 688ada87fb447bcc4f314e612d65b84b gcc/testsuite/g++.dg/other/mmintrin.C 6b0d71cb40f690a059f35fa91d64ee5f gcc/testsuite/g++.dg/other/mult-stor1.C 34552611e0ea3221799b7ea6c572fbc0 gcc/testsuite/g++.dg/other/nested-extern-1.C 2d4374350b7c46b467d19f44539be761 gcc/testsuite/g++.dg/other/nested-extern-2.C --- 9442,9449 ---- b00a3ef2f2c7c47e551480d60abbc84f gcc/testsuite/g++.dg/other/linkage1.C a9c2bd4786300d7cf805e7ef57335a2c gcc/testsuite/g++.dg/other/macro-1.C 7603e3e5185c1b4aaf6b806ea7dc4dee gcc/testsuite/g++.dg/other/main1.C ! 44260bb88181e7a7be33fda91f991e2c gcc/testsuite/g++.dg/other/method1.C ! 400bdf525a13a7c3210dc1c807be7d2c gcc/testsuite/g++.dg/other/mmintrin.C 6b0d71cb40f690a059f35fa91d64ee5f gcc/testsuite/g++.dg/other/mult-stor1.C 34552611e0ea3221799b7ea6c572fbc0 gcc/testsuite/g++.dg/other/nested-extern-1.C 2d4374350b7c46b467d19f44539be761 gcc/testsuite/g++.dg/other/nested-extern-2.C *************** de07ec93dc9f688d2fe2f33f07228d16 gcc/te *** 9465,9471 **** 28e9a172de1c6ea38bcb3af18a9eb52c gcc/testsuite/g++.dg/other/pr29610.C 7c1a4ef9dd889bd9a64eeb9657827800 gcc/testsuite/g++.dg/other/pr31078.C 47c3e5b8844cd1d867dcffd6b821201f gcc/testsuite/g++.dg/other/pr33601.C ! 9eb130318208524d6d7856f3fba7336a gcc/testsuite/g++.dg/other/pr34435.C 4ab0218701107940b50c945a0965a43d gcc/testsuite/g++.dg/other/pr35011.C ca790c339fe54a884f32d8e5cd3c7e53 gcc/testsuite/g++.dg/other/pr35504.C 8063a4cb70e924f46779754da6c98175 gcc/testsuite/g++.dg/other/pr36944.C --- 9477,9483 ---- 28e9a172de1c6ea38bcb3af18a9eb52c gcc/testsuite/g++.dg/other/pr29610.C 7c1a4ef9dd889bd9a64eeb9657827800 gcc/testsuite/g++.dg/other/pr31078.C 47c3e5b8844cd1d867dcffd6b821201f gcc/testsuite/g++.dg/other/pr33601.C ! e9879cc8f4bc9dcd17ffbec9a930a86a gcc/testsuite/g++.dg/other/pr34435.C 4ab0218701107940b50c945a0965a43d gcc/testsuite/g++.dg/other/pr35011.C ca790c339fe54a884f32d8e5cd3c7e53 gcc/testsuite/g++.dg/other/pr35504.C 8063a4cb70e924f46779754da6c98175 gcc/testsuite/g++.dg/other/pr36944.C *************** ca790c339fe54a884f32d8e5cd3c7e53 gcc/te *** 9473,9480 **** 491c4cb5cc2f40f08cea9aa3d5e50268 gcc/testsuite/g++.dg/other/pr37789.C e7318945c51d3bbaf1fa1d922b1661f3 gcc/testsuite/g++.dg/other/pr38706.C b5e1f069377d2f6c229e4b9cec2afc7d gcc/testsuite/g++.dg/other/pr39060.C ! 13032d4b520ba4039fd6df337bd67601 gcc/testsuite/g++.dg/other/pr39496.C ! 0d511a95d0c5ac404e6fa3583409d6b6 gcc/testsuite/g++.dg/other/pr40446.C e18e3ba20f03468900780d327126e381 gcc/testsuite/g++.dg/other/pr43116.C d21dda28ccc09de70408d08632e8b5a7 gcc/testsuite/g++.dg/other/pragma-ep-1.C 7459c97728e6ffd98a446fba2d38d258 gcc/testsuite/g++.dg/other/pragma-re-1.C --- 9485,9492 ---- 491c4cb5cc2f40f08cea9aa3d5e50268 gcc/testsuite/g++.dg/other/pr37789.C e7318945c51d3bbaf1fa1d922b1661f3 gcc/testsuite/g++.dg/other/pr38706.C b5e1f069377d2f6c229e4b9cec2afc7d gcc/testsuite/g++.dg/other/pr39060.C ! 7a166dbfd529c34d5a65d3585e023308 gcc/testsuite/g++.dg/other/pr39496.C ! 840f2b1569007f2b17b575f1acb6ebf6 gcc/testsuite/g++.dg/other/pr40446.C e18e3ba20f03468900780d327126e381 gcc/testsuite/g++.dg/other/pr43116.C d21dda28ccc09de70408d08632e8b5a7 gcc/testsuite/g++.dg/other/pragma-ep-1.C 7459c97728e6ffd98a446fba2d38d258 gcc/testsuite/g++.dg/other/pragma-re-1.C *************** bb7141945a25ded3ef95f8a4fab53bff gcc/te *** 9513,9519 **** 195390f264266be35f2d327ceae6b25a gcc/testsuite/g++.dg/other/typedef1.C 2ae83dd33030d45c71b8674e327b61aa gcc/testsuite/g++.dg/other/typedef2.C d4120067ea2a2f801d8e1d6c528e17e6 gcc/testsuite/g++.dg/other/typedef3.C ! 257a7ccb9a00dcf8f78b7667d6ccb94f gcc/testsuite/g++.dg/other/ucnid-1.C 5c2adc76f21ce8f7182fe1930db8db73 gcc/testsuite/g++.dg/other/unreachable1.C cc513aeb7f5663dd2ffdcdfbd13e2aa1 gcc/testsuite/g++.dg/other/unused1.C 48e6c51fcf67034346e0b186aada3bc1 gcc/testsuite/g++.dg/other/var_copy-1.C --- 9525,9531 ---- 195390f264266be35f2d327ceae6b25a gcc/testsuite/g++.dg/other/typedef1.C 2ae83dd33030d45c71b8674e327b61aa gcc/testsuite/g++.dg/other/typedef2.C d4120067ea2a2f801d8e1d6c528e17e6 gcc/testsuite/g++.dg/other/typedef3.C ! ba6518028576345919a1e9c87a39c36a gcc/testsuite/g++.dg/other/ucnid-1.C 5c2adc76f21ce8f7182fe1930db8db73 gcc/testsuite/g++.dg/other/unreachable1.C cc513aeb7f5663dd2ffdcdfbd13e2aa1 gcc/testsuite/g++.dg/other/unused1.C 48e6c51fcf67034346e0b186aada3bc1 gcc/testsuite/g++.dg/other/var_copy-1.C *************** d72df6d061e8fff8ce0bb0717e4f05bc gcc/te *** 9707,9712 **** --- 9719,9725 ---- 8086d4d520d7e89a2d70a435922ff9e4 gcc/testsuite/g++.dg/parse/defarg12.C 1cf50bc21def35642a12800d770e0609 gcc/testsuite/g++.dg/parse/defarg13.C 010df34c714b830e2adbcaf95afdec27 gcc/testsuite/g++.dg/parse/defarg14.C + 940fdfa84af569b5525f54e635438b5b gcc/testsuite/g++.dg/parse/defarg15.C 1bff48df8c11aeda15e3471bf1a33226 gcc/testsuite/g++.dg/parse/defarg2.C 09fddda5e825bb04b1493087728c9162 gcc/testsuite/g++.dg/parse/defarg3.C acfa06861c017963f9c07523acb57fdf gcc/testsuite/g++.dg/parse/defarg4.C *************** a5379c2bad433698a01b3bc2d5473a2e gcc/te *** 9988,9993 **** --- 10001,10007 ---- 3c027648f765cf5846e0b1be267760f6 gcc/testsuite/g++.dg/pch/wchar-1.C 67d1ff82e247bea84a92bc888972c000 gcc/testsuite/g++.dg/pch/wchar-1.Hs 2ac64817a39fe1a5c2dc328f4233cda1 gcc/testsuite/g++.dg/pr37742.C + 32b2fbda29ffd2ac2181c43c971f3a7d gcc/testsuite/g++.dg/pr44328.C ff03ae43e2f7b271b014ab72b2a538fd gcc/testsuite/g++.dg/pubtypes.C 7345c9463c7d47c7d425463846af6b14 gcc/testsuite/g++.dg/rtti/crash1.C 34c4c8f1721c4f70c2261dcc1b0a7630 gcc/testsuite/g++.dg/rtti/crash2.C *************** d9a08dd82988a25d2840d767d582837f gcc/te *** 10354,10359 **** --- 10368,10374 ---- f8aa89e0edae3ef78836a8cc046f0550 gcc/testsuite/g++.dg/template/field1.C 1581f9141ad183d6d31a009275ebf7a4 gcc/testsuite/g++.dg/template/fnspec1.C 8f101d84c90c958381606b762e3df298 gcc/testsuite/g++.dg/template/fntry1.C + c3025665d58f3b1443b5cbb53b5bd0f6 gcc/testsuite/g++.dg/template/fntype1.C c6cdc41eef6b33a55c43db84fd711a3f gcc/testsuite/g++.dg/template/friend.C bdf8365204c19eeb87434d85b7139d2d gcc/testsuite/g++.dg/template/friend10.C c1eab5b806b63596b0fa26a471273823 gcc/testsuite/g++.dg/template/friend11.C *************** c341261c190bf4a6a9280b8bf11ebfd2 gcc/te *** 10612,10617 **** --- 10627,10634 ---- 5512deff68cfd95af05439dc39d36f5c gcc/testsuite/g++.dg/template/qual1.C 4bcab05d2626fd45890af6154fa22221 gcc/testsuite/g++.dg/template/qual2.C b4f42285bb7e66d3c4ef4a890e194c54 gcc/testsuite/g++.dg/template/qualified-id1.C + 760d233b1e82d77a4e17829a3a0eb589 gcc/testsuite/g++.dg/template/qualified-id2.C + fad1a581d3e6217feeeb3fff313d6615 gcc/testsuite/g++.dg/template/qualified-id3.C b21ab1ce79ce2d2e11762d15de7d8e95 gcc/testsuite/g++.dg/template/qualttp1.C cf85da2c6ae4bcc2396f5f90e574f5cd gcc/testsuite/g++.dg/template/qualttp10.C 07ba931fb2075a068c2bb8f171d57bb1 gcc/testsuite/g++.dg/template/qualttp11.C *************** eb50f7b8b6b7679ccdd519260c76e1ce gcc/te *** 10979,10984 **** --- 10996,11003 ---- 7ed9e7f486e83f1d5786530f3058eef7 gcc/testsuite/g++.dg/torture/pr42890.C dd22df6fbe8eea710f762c4b9dc3234b gcc/testsuite/g++.dg/torture/pr43068.C 3109f22b098cf163176faafc44391d82 gcc/testsuite/g++.dg/torture/pr43257.C + 172ba6975c5550b7f36f1bb6ee577c98 gcc/testsuite/g++.dg/torture/pr45709-2.C + 3602e5f346573cec2da3e7ddcadb3fb7 gcc/testsuite/g++.dg/torture/pr45709.C 9832be91178ec7c78651fc4d49380a93 gcc/testsuite/g++.dg/torture/predcom-1.C d28910105d9c9253d94d70eacd5e19d4 gcc/testsuite/g++.dg/torture/pushpop_macro.C a1b47b9c3e69d79d1895ebc4fd11032b gcc/testsuite/g++.dg/torture/stackalign/check.h *************** d6c099217c434349a17ddddba1755f12 gcc/te *** 11130,11136 **** bb02984184613c4e23cd3b598fd11bf4 gcc/testsuite/g++.dg/vect/pr37143.C 2dff334c9a92b9aeb51b6a2dec8696ab gcc/testsuite/g++.dg/vect/pr37174.cc 9f2e7f6f898f51a14fd95fcb8729c8d4 gcc/testsuite/g++.dg/vect/pr43771.cc ! 513092e9b3007754383f6199b4dc25a9 gcc/testsuite/g++.dg/vect/vect.exp 38c1d3bcd70aac8e2e1f0e19b075e6a9 gcc/testsuite/g++.dg/warn/Wall-write-strings.C 31374840ed3137c47aa43f8aefc76125 gcc/testsuite/g++.dg/warn/Walways-true-1.C 72a7c932ad74d7d7a693d30ccd2d397c gcc/testsuite/g++.dg/warn/Walways-true-2.C --- 11149,11155 ---- bb02984184613c4e23cd3b598fd11bf4 gcc/testsuite/g++.dg/vect/pr37143.C 2dff334c9a92b9aeb51b6a2dec8696ab gcc/testsuite/g++.dg/vect/pr37174.cc 9f2e7f6f898f51a14fd95fcb8729c8d4 gcc/testsuite/g++.dg/vect/pr43771.cc ! 97c4fe94b87a9c94422008b39a85f351 gcc/testsuite/g++.dg/vect/vect.exp 38c1d3bcd70aac8e2e1f0e19b075e6a9 gcc/testsuite/g++.dg/warn/Wall-write-strings.C 31374840ed3137c47aa43f8aefc76125 gcc/testsuite/g++.dg/warn/Walways-true-1.C 72a7c932ad74d7d7a693d30ccd2d397c gcc/testsuite/g++.dg/warn/Walways-true-2.C *************** e4681da1536da14176b6242aa0cde9a4 gcc/te *** 12428,12434 **** 40fcdd9ac5d7df502c6154f385d814a8 gcc/testsuite/g++.old-deja/g++.jason/this.C 9c846445e2018745dcc34b2f1642858c gcc/testsuite/g++.old-deja/g++.jason/thunk1.C e009d9b91513051053d5ef3a438adbd8 gcc/testsuite/g++.old-deja/g++.jason/thunk2.C ! 945476c3cb8f0b60a4e8b09fa58c09c9 gcc/testsuite/g++.old-deja/g++.jason/thunk3.C 776a6eba4666d06b4325a2d0850afe81 gcc/testsuite/g++.old-deja/g++.jason/tredecl.C bed2e0f518532685396e3880a1588ea1 gcc/testsuite/g++.old-deja/g++.jason/tredecl2.C bb1e0f3963c848d63c1da72405f295ce gcc/testsuite/g++.old-deja/g++.jason/tredecl3.C --- 12447,12453 ---- 40fcdd9ac5d7df502c6154f385d814a8 gcc/testsuite/g++.old-deja/g++.jason/this.C 9c846445e2018745dcc34b2f1642858c gcc/testsuite/g++.old-deja/g++.jason/thunk1.C e009d9b91513051053d5ef3a438adbd8 gcc/testsuite/g++.old-deja/g++.jason/thunk2.C ! 009e4a44aaed357e34d0fabea6879d02 gcc/testsuite/g++.old-deja/g++.jason/thunk3.C 776a6eba4666d06b4325a2d0850afe81 gcc/testsuite/g++.old-deja/g++.jason/tredecl.C bed2e0f518532685396e3880a1588ea1 gcc/testsuite/g++.old-deja/g++.jason/tredecl2.C bb1e0f3963c848d63c1da72405f295ce gcc/testsuite/g++.old-deja/g++.jason/tredecl3.C *************** c35d4a2175cf5f6443d0cbea273e9b35 gcc/te *** 12757,12764 **** cd58fc804b26fda0deffec80193914d1 gcc/testsuite/g++.old-deja/g++.mike/eh13.C 1fe4fb4231b46caade9d671e6932e03b gcc/testsuite/g++.old-deja/g++.mike/eh14.C 4060fa805a5ae72a9abac66a6a83a995 gcc/testsuite/g++.old-deja/g++.mike/eh15.C ! d8057d47556f32631490894f3a1f70fb gcc/testsuite/g++.old-deja/g++.mike/eh16.C ! b8b2dfa966319e0e48c6f37b3e92179f gcc/testsuite/g++.old-deja/g++.mike/eh17.C dd1383b0cb6f173f9f961cead9f6f5ba gcc/testsuite/g++.old-deja/g++.mike/eh18.C 8721262eddd81a7ccc7e7ef297cd63b1 gcc/testsuite/g++.old-deja/g++.mike/eh19.C d2317ef5d92257ff3b64c851c3c43fc5 gcc/testsuite/g++.old-deja/g++.mike/eh2.C --- 12776,12783 ---- cd58fc804b26fda0deffec80193914d1 gcc/testsuite/g++.old-deja/g++.mike/eh13.C 1fe4fb4231b46caade9d671e6932e03b gcc/testsuite/g++.old-deja/g++.mike/eh14.C 4060fa805a5ae72a9abac66a6a83a995 gcc/testsuite/g++.old-deja/g++.mike/eh15.C ! 2a1ad4ea9a5b8d754af1ff9d9bcd764a gcc/testsuite/g++.old-deja/g++.mike/eh16.C ! 3a7f673346cfa5c7d7baaa6becc18bda gcc/testsuite/g++.old-deja/g++.mike/eh17.C dd1383b0cb6f173f9f961cead9f6f5ba gcc/testsuite/g++.old-deja/g++.mike/eh18.C 8721262eddd81a7ccc7e7ef297cd63b1 gcc/testsuite/g++.old-deja/g++.mike/eh19.C d2317ef5d92257ff3b64c851c3c43fc5 gcc/testsuite/g++.old-deja/g++.mike/eh2.C *************** c1acbf8597dd2cbb95d9cb9fc5e04912 gcc/te *** 12973,12979 **** 8ac43191f98210fa0bcfdc44d55770e3 gcc/testsuite/g++.old-deja/g++.mike/p4750.C 1a935fddf8f373c48dd3eee1ba9c897d gcc/testsuite/g++.old-deja/g++.mike/p5469.C 8ea133c89aeac2630522f766a59283bf gcc/testsuite/g++.old-deja/g++.mike/p5469a.C ! 95e9251a18ee82201148603c549d4910 gcc/testsuite/g++.old-deja/g++.mike/p5571.C 18364084554acc54c8f6a87f5c8462e1 gcc/testsuite/g++.old-deja/g++.mike/p5611.C 7f521645b6bf7842d609aec10c16b92d gcc/testsuite/g++.old-deja/g++.mike/p5673.C a53415421f9c5d14bbcdc1a2a69b56f0 gcc/testsuite/g++.old-deja/g++.mike/p5718.C --- 12992,12998 ---- 8ac43191f98210fa0bcfdc44d55770e3 gcc/testsuite/g++.old-deja/g++.mike/p4750.C 1a935fddf8f373c48dd3eee1ba9c897d gcc/testsuite/g++.old-deja/g++.mike/p5469.C 8ea133c89aeac2630522f766a59283bf gcc/testsuite/g++.old-deja/g++.mike/p5469a.C ! 7862ccbfc24631e1c8cc9f04873dfb41 gcc/testsuite/g++.old-deja/g++.mike/p5571.C 18364084554acc54c8f6a87f5c8462e1 gcc/testsuite/g++.old-deja/g++.mike/p5611.C 7f521645b6bf7842d609aec10c16b92d gcc/testsuite/g++.old-deja/g++.mike/p5673.C a53415421f9c5d14bbcdc1a2a69b56f0 gcc/testsuite/g++.old-deja/g++.mike/p5718.C *************** c0116d02edfe6d83a6e0319b7ae43310 gcc/te *** 13202,13208 **** ea73badcef0f5166a559e07a0c263a92 gcc/testsuite/g++.old-deja/g++.ns/using7.C e592ac6b9789af1e806b4791c984da05 gcc/testsuite/g++.old-deja/g++.ns/using8.C 10a3890377e72341f4119f4affe2c8cb gcc/testsuite/g++.old-deja/g++.ns/using9.C ! c8f5dd00f8c0903dc882cf9d14f395ad gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog c17ab5a5d39a20786219d5cb72e8a956 gcc/testsuite/g++.old-deja/g++.oliva/ctor1.C d5a79bc5cd269747572d454134bc7e04 gcc/testsuite/g++.old-deja/g++.oliva/delete1.C 8c0b3f49c2e5d5c224c1e0aae235e1d8 gcc/testsuite/g++.old-deja/g++.oliva/delete2.C --- 13221,13227 ---- ea73badcef0f5166a559e07a0c263a92 gcc/testsuite/g++.old-deja/g++.ns/using7.C e592ac6b9789af1e806b4791c984da05 gcc/testsuite/g++.old-deja/g++.ns/using8.C 10a3890377e72341f4119f4affe2c8cb gcc/testsuite/g++.old-deja/g++.ns/using9.C ! f71569b93ac02b214e7a5cfa9cd362b8 gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog c17ab5a5d39a20786219d5cb72e8a956 gcc/testsuite/g++.old-deja/g++.oliva/ctor1.C d5a79bc5cd269747572d454134bc7e04 gcc/testsuite/g++.old-deja/g++.oliva/delete1.C 8c0b3f49c2e5d5c224c1e0aae235e1d8 gcc/testsuite/g++.old-deja/g++.oliva/delete2.C *************** d5a79bc5cd269747572d454134bc7e04 gcc/te *** 13210,13217 **** 0616469546aadbf2505636e6282105c3 gcc/testsuite/g++.old-deja/g++.oliva/delete4.C 5b756dec74fffa3f353f5ca224de4022 gcc/testsuite/g++.old-deja/g++.oliva/delete5.C e0d3e8aef40e06d214dac0b24734a598 gcc/testsuite/g++.old-deja/g++.oliva/dwarf1.C ! 6d5a12efcc966b979f87620e3d24780f gcc/testsuite/g++.old-deja/g++.oliva/dwarf2.C ! 02919b6670f78e6a0527967376c827d8 gcc/testsuite/g++.old-deja/g++.oliva/dwarf3.C f8dc1e3b047760a647ca3fc66b22ab14 gcc/testsuite/g++.old-deja/g++.oliva/expr1.C c0514fbc4a06765f363ceaa37f304896 gcc/testsuite/g++.old-deja/g++.oliva/expr2.C 0207e523c92eab8efadd6a868b5b3fe1 gcc/testsuite/g++.old-deja/g++.oliva/ext1.C --- 13229,13236 ---- 0616469546aadbf2505636e6282105c3 gcc/testsuite/g++.old-deja/g++.oliva/delete4.C 5b756dec74fffa3f353f5ca224de4022 gcc/testsuite/g++.old-deja/g++.oliva/delete5.C e0d3e8aef40e06d214dac0b24734a598 gcc/testsuite/g++.old-deja/g++.oliva/dwarf1.C ! 92860e45834b96d5710a5ff0a0506262 gcc/testsuite/g++.old-deja/g++.oliva/dwarf2.C ! 71f5a0ec45bdcfe033c493171d92e5ee gcc/testsuite/g++.old-deja/g++.oliva/dwarf3.C f8dc1e3b047760a647ca3fc66b22ab14 gcc/testsuite/g++.old-deja/g++.oliva/expr1.C c0514fbc4a06765f363ceaa37f304896 gcc/testsuite/g++.old-deja/g++.oliva/expr2.C 0207e523c92eab8efadd6a868b5b3fe1 gcc/testsuite/g++.old-deja/g++.oliva/ext1.C *************** acbc04d2aab1cb7f7fdd4569759a9c75 gcc/te *** 13505,13511 **** 3a30cb3e5ae697139f2bcd67859bffad gcc/testsuite/g++.old-deja/g++.other/init16.C cc3c1af250386499471f365de78ad096 gcc/testsuite/g++.old-deja/g++.other/init17.C 63447b995770773e72d3dad0494ab43c gcc/testsuite/g++.old-deja/g++.other/init18.C ! 26ec57de6560c0aac7851fcd80111d7f gcc/testsuite/g++.old-deja/g++.other/init19.C 09cdc6f15b9f59aca7cb90db7fa556d5 gcc/testsuite/g++.old-deja/g++.other/init2.C 63abea026a929f3b0c80bcda371963b9 gcc/testsuite/g++.old-deja/g++.other/init3.C 9586910c917e9757eb948e6ba2dc14d7 gcc/testsuite/g++.old-deja/g++.other/init4.C --- 13524,13530 ---- 3a30cb3e5ae697139f2bcd67859bffad gcc/testsuite/g++.old-deja/g++.other/init16.C cc3c1af250386499471f365de78ad096 gcc/testsuite/g++.old-deja/g++.other/init17.C 63447b995770773e72d3dad0494ab43c gcc/testsuite/g++.old-deja/g++.other/init18.C ! 2105fe89b72cc2ac105e2fc09f009a61 gcc/testsuite/g++.old-deja/g++.other/init19.C 09cdc6f15b9f59aca7cb90db7fa556d5 gcc/testsuite/g++.old-deja/g++.other/init2.C 63abea026a929f3b0c80bcda371963b9 gcc/testsuite/g++.old-deja/g++.other/init3.C 9586910c917e9757eb948e6ba2dc14d7 gcc/testsuite/g++.old-deja/g++.other/init4.C *************** dfbc2317c7fa9d675ee5c2302422d2b6 gcc/te *** 15360,15366 **** fe23d373fefbb1f73641cf2629aafdf5 gcc/testsuite/gcc.c-torture/compile/limits-enumconst.c afe4aef5d3378c3de0bf57047eb44e18 gcc/testsuite/gcc.c-torture/compile/limits-exprparen.c 5b7186b86538dc952f4c95318fdce09c gcc/testsuite/gcc.c-torture/compile/limits-externalid.c ! f93709f7ae185e4dd07cfede517e9ab5 gcc/testsuite/gcc.c-torture/compile/limits-fnargs.c 8e49c6924c93756d8f7e4c607a0c519c gcc/testsuite/gcc.c-torture/compile/limits-fndefn.c e654525b67ca3025d522d3690364a827 gcc/testsuite/gcc.c-torture/compile/limits-idexternal.c 8e1beed96cc2ce74ced2ed0fb7ca7126 gcc/testsuite/gcc.c-torture/compile/limits-idinternal.c --- 15379,15385 ---- fe23d373fefbb1f73641cf2629aafdf5 gcc/testsuite/gcc.c-torture/compile/limits-enumconst.c afe4aef5d3378c3de0bf57047eb44e18 gcc/testsuite/gcc.c-torture/compile/limits-exprparen.c 5b7186b86538dc952f4c95318fdce09c gcc/testsuite/gcc.c-torture/compile/limits-externalid.c ! 36d72264f5e696b511dde1637d841085 gcc/testsuite/gcc.c-torture/compile/limits-fnargs.c 8e49c6924c93756d8f7e4c607a0c519c gcc/testsuite/gcc.c-torture/compile/limits-fndefn.c e654525b67ca3025d522d3690364a827 gcc/testsuite/gcc.c-torture/compile/limits-idexternal.c 8e1beed96cc2ce74ced2ed0fb7ca7126 gcc/testsuite/gcc.c-torture/compile/limits-idinternal.c *************** be4337453199a5db560abe6909a52488 gcc/te *** 15693,15698 **** --- 15712,15720 ---- e803f7181a8b15f8ce255b1667ffa8fb gcc/testsuite/gcc.c-torture/compile/pr43367.c 742dd4fe334952d63199ef2d52ab6d8f gcc/testsuite/gcc.c-torture/compile/pr43415.c 9ecdf91a562bb8fd41b46d26a2d43184 gcc/testsuite/gcc.c-torture/compile/pr43614.c + 5b915eddb9c5e5a4bdce250e8c0c6257 gcc/testsuite/gcc.c-torture/compile/pr43845.c + f741604289cd8e5966d45cfb69f30b10 gcc/testsuite/gcc.c-torture/compile/pr45109.c + f9cc67f546fc87c0c4aea55f71835b8e gcc/testsuite/gcc.c-torture/compile/pr45728.c b9e6ce52b90320c1c3803c25113844c5 gcc/testsuite/gcc.c-torture/compile/pta-1.c 8d869e3426345f0cf8837c5eaafd43b5 gcc/testsuite/gcc.c-torture/compile/simd-1.c 7249a75cf6b955efed52b5ec5cee3a79 gcc/testsuite/gcc.c-torture/compile/simd-2.c *************** d3232dd352e9bcd62387703d83589e5a gcc/te *** 16157,16162 **** --- 16179,16185 ---- d3b47ec4afbb561dffc8b6525730f54f gcc/testsuite/gcc.c-torture/execute/20090219-1.c 8c9a29fe3843c2aab2075c3c9006bc7c gcc/testsuite/gcc.c-torture/execute/20091229-1.c 27aeeeb89a91b17af98d81bf871d2aac gcc/testsuite/gcc.c-torture/execute/20100209-1.c + 414137574ad2141ad2516adde2b82f7d gcc/testsuite/gcc.c-torture/execute/20100430-1.c 65f01ac7346bd4d47ed9c1ca94ab74ff gcc/testsuite/gcc.c-torture/execute/900409-1.c 5aefab4daab0bd29ecf2a389f3c44f40 gcc/testsuite/gcc.c-torture/execute/920202-1.c 655936aaf9a63e991a555cbc16738485 gcc/testsuite/gcc.c-torture/execute/920302-1.c *************** fbeb736f7cea1b233d24bfe61c2d12fe gcc/te *** 16347,16352 **** --- 16370,16376 ---- 96be1e5fff7d09902767847ca34f967c gcc/testsuite/gcc.c-torture/execute/960312-1.x db2d64bf1d224055c2bfcd575cd0a85c gcc/testsuite/gcc.c-torture/execute/960317-1.c 4b83a1d4a67ab5df67a907842c96a846 gcc/testsuite/gcc.c-torture/execute/960321-1.c + 814c63106ed73916979575f829419c19 gcc/testsuite/gcc.c-torture/execute/960321-1.x 40f926583731a3bbbb07cba5c584dca5 gcc/testsuite/gcc.c-torture/execute/960326-1.c 9fa59787835958f2b7e6a86f27a0cd62 gcc/testsuite/gcc.c-torture/execute/960327-1.c 87037da82fb6e20eb6543f078e3204f3 gcc/testsuite/gcc.c-torture/execute/960402-1.c *************** a00550642c778d3e9743b700d0236937 gcc/te *** 16950,16955 **** --- 16974,16981 ---- 7f211adc21d2698e15fe8482583be425 gcc/testsuite/gcc.c-torture/execute/pr39501.x 44a7d5a28650b4f1803271992adefe72 gcc/testsuite/gcc.c-torture/execute/pr40022.c 595addd89ccea71ac4e1c1f996001aca gcc/testsuite/gcc.c-torture/execute/pr40057.c + f711b3c88e26bf4d6c5cba4940e2f66d gcc/testsuite/gcc.c-torture/execute/pr40386.c + 0f6bb895ae4bc3dde0085c33d67a8fae gcc/testsuite/gcc.c-torture/execute/pr40386.x 2d937c84c86fb4270b1b897de3135ba1 gcc/testsuite/gcc.c-torture/execute/pr40404.c eed39b9698966a4cfde4a5e93ea90194 gcc/testsuite/gcc.c-torture/execute/pr40493.c dc861ea4ab9373f64dc8037e7bcb4a12 gcc/testsuite/gcc.c-torture/execute/pr40579.c *************** bcf3ae2b3f1d2e9e126f255f7fd66a45 gcc/te *** 16978,16983 **** --- 17004,17015 ---- e1c90e5d63e50e72d3af2ef2ef99702a gcc/testsuite/gcc.c-torture/execute/pr43438.c 2202cff26e335eac3459e1004691c3ba gcc/testsuite/gcc.c-torture/execute/pr43560.c 567b622287769b340f5289a5e6a8f9af gcc/testsuite/gcc.c-torture/execute/pr43629.c + 14e636b8947495b5a4ac0db6391958fe gcc/testsuite/gcc.c-torture/execute/pr44202-1.c + 3ae706159e58df0e71fc74d1c9b10618 gcc/testsuite/gcc.c-torture/execute/pr44555.c + 4eabb9e388d89fdb2a4ff27f51d02d37 gcc/testsuite/gcc.c-torture/execute/pr44683.c + fe960a0bc83fd1d8728f2845dda1f813 gcc/testsuite/gcc.c-torture/execute/pr44942.c + f4b3616d4d62cfceadbb1843b733d08e gcc/testsuite/gcc.c-torture/execute/pr45070.c + 509d36229d4008b8450961f8917cc772 gcc/testsuite/gcc.c-torture/execute/pr45262.c ecfc31f12ce09d6ccbcced04ff04deba gcc/testsuite/gcc.c-torture/execute/pr7284-1.c 89f3c7ee990221eeb33cb08a0772e024 gcc/testsuite/gcc.c-torture/execute/pr7284-1.x f4610e3bba97324f7005c428fe41e597 gcc/testsuite/gcc.c-torture/execute/printf-1.c *************** f624e0acdc4cf507ceeea3c01ebd027f gcc/te *** 17409,17415 **** 0bc0a613df9e226c6994a04c3f7c16d7 gcc/testsuite/gcc.dg/20020319-1.c d525aa9027ce4af66aeb2ce69b2e3457 gcc/testsuite/gcc.dg/20020411-1.c b82efecd155412cde71b56c7917b355b gcc/testsuite/gcc.dg/20020415-1.c ! 216ced595dd868895ba4767e730d8ab2 gcc/testsuite/gcc.dg/20020418-1.c 187dd05b606033f5f260d21c9aa8cfea gcc/testsuite/gcc.dg/20020418-2.c ce207448761f35f27d916772755b3de5 gcc/testsuite/gcc.dg/20020425-1.c 46eebc58ef6f202053c3877205419fc5 gcc/testsuite/gcc.dg/20020426-2.c --- 17441,17447 ---- 0bc0a613df9e226c6994a04c3f7c16d7 gcc/testsuite/gcc.dg/20020319-1.c d525aa9027ce4af66aeb2ce69b2e3457 gcc/testsuite/gcc.dg/20020411-1.c b82efecd155412cde71b56c7917b355b gcc/testsuite/gcc.dg/20020415-1.c ! 9e6cd484dfa249b260ac3b36102e175c gcc/testsuite/gcc.dg/20020418-1.c 187dd05b606033f5f260d21c9aa8cfea gcc/testsuite/gcc.dg/20020418-2.c ce207448761f35f27d916772755b3de5 gcc/testsuite/gcc.dg/20020425-1.c 46eebc58ef6f202053c3877205419fc5 gcc/testsuite/gcc.dg/20020426-2.c *************** eb267873b81efdb29f2e973998cda2d0 gcc/te *** 18340,18346 **** 3eb5809860fa034797ad4c31a4733156 gcc/testsuite/gcc.dg/compat/union-defs.h bbac606ab4bf05fb0344b3f2c3fbb45b gcc/testsuite/gcc.dg/compat/union-init.h 628b90f6dbcdc364b1b13508c725e200 gcc/testsuite/gcc.dg/compat/union-m128-1.h ! 6d9388f05cb160a040a115844cc345bf gcc/testsuite/gcc.dg/compat/union-m128-1_main.c 4926d32bdcbafe27cc379f1f55b8f7d9 gcc/testsuite/gcc.dg/compat/union-m128-1_x.c 61d59afb74085346642ba28e622df5fc gcc/testsuite/gcc.dg/compat/union-m128-1_y.c e4449019b1294664801d1ef336214885 gcc/testsuite/gcc.dg/compat/union-return-1_main.c --- 18372,18378 ---- 3eb5809860fa034797ad4c31a4733156 gcc/testsuite/gcc.dg/compat/union-defs.h bbac606ab4bf05fb0344b3f2c3fbb45b gcc/testsuite/gcc.dg/compat/union-init.h 628b90f6dbcdc364b1b13508c725e200 gcc/testsuite/gcc.dg/compat/union-m128-1.h ! fd69828baa61d31623d42477fac6cf0a gcc/testsuite/gcc.dg/compat/union-m128-1_main.c 4926d32bdcbafe27cc379f1f55b8f7d9 gcc/testsuite/gcc.dg/compat/union-m128-1_x.c 61d59afb74085346642ba28e622df5fc gcc/testsuite/gcc.dg/compat/union-m128-1_y.c e4449019b1294664801d1ef336214885 gcc/testsuite/gcc.dg/compat/union-return-1_main.c *************** ca32818d81a5718c7a1cf836b8c60560 gcc/te *** 18349,18355 **** 282e8b8641be27d23d9f569ecbc15be5 gcc/testsuite/gcc.dg/compat/vector-1_main.c eda11737921b071bebd1810a4d3da605 gcc/testsuite/gcc.dg/compat/vector-1_x.c 81ba9c26a5c2692a89bd2050eefc7bf8 gcc/testsuite/gcc.dg/compat/vector-1_y.c ! 24d8674b7994cc0d437fd91fa3fe79b8 gcc/testsuite/gcc.dg/compat/vector-1a_main.c fd764079349d671653fffc1d215ba631 gcc/testsuite/gcc.dg/compat/vector-1a_x.c f0f216703643c4ce3900187194ae74b5 gcc/testsuite/gcc.dg/compat/vector-1a_y.c afbcb8f69f31b03948c4f1fa14269e88 gcc/testsuite/gcc.dg/compat/vector-1b_main.c --- 18381,18387 ---- 282e8b8641be27d23d9f569ecbc15be5 gcc/testsuite/gcc.dg/compat/vector-1_main.c eda11737921b071bebd1810a4d3da605 gcc/testsuite/gcc.dg/compat/vector-1_x.c 81ba9c26a5c2692a89bd2050eefc7bf8 gcc/testsuite/gcc.dg/compat/vector-1_y.c ! 730085a5cb3368627c7011d311fdcef8 gcc/testsuite/gcc.dg/compat/vector-1a_main.c fd764079349d671653fffc1d215ba631 gcc/testsuite/gcc.dg/compat/vector-1a_x.c f0f216703643c4ce3900187194ae74b5 gcc/testsuite/gcc.dg/compat/vector-1a_y.c afbcb8f69f31b03948c4f1fa14269e88 gcc/testsuite/gcc.dg/compat/vector-1b_main.c *************** afbcb8f69f31b03948c4f1fa14269e88 gcc/te *** 18358,18364 **** 3185a6ea8d4d8eae316c44bab95012e1 gcc/testsuite/gcc.dg/compat/vector-2_main.c 042fd118bf8a75d2fc66e443e1d8782f gcc/testsuite/gcc.dg/compat/vector-2_x.c c6b9b018c9e2d16bd91ef5c686b95732 gcc/testsuite/gcc.dg/compat/vector-2_y.c ! da75b52f1444ad8524da8a51b2cca90f gcc/testsuite/gcc.dg/compat/vector-2a_main.c 58beed9d7e519857a4510813cf5c64ac gcc/testsuite/gcc.dg/compat/vector-2a_x.c cd2d980901bfa683b8a3ee536e5d482f gcc/testsuite/gcc.dg/compat/vector-2a_y.c 2d82ca00b9aa719717a78113508ea385 gcc/testsuite/gcc.dg/compat/vector-2b_main.c --- 18390,18396 ---- 3185a6ea8d4d8eae316c44bab95012e1 gcc/testsuite/gcc.dg/compat/vector-2_main.c 042fd118bf8a75d2fc66e443e1d8782f gcc/testsuite/gcc.dg/compat/vector-2_x.c c6b9b018c9e2d16bd91ef5c686b95732 gcc/testsuite/gcc.dg/compat/vector-2_y.c ! 92b9d229cf04c0212ed63899bbf70bd3 gcc/testsuite/gcc.dg/compat/vector-2a_main.c 58beed9d7e519857a4510813cf5c64ac gcc/testsuite/gcc.dg/compat/vector-2a_x.c cd2d980901bfa683b8a3ee536e5d482f gcc/testsuite/gcc.dg/compat/vector-2a_y.c 2d82ca00b9aa719717a78113508ea385 gcc/testsuite/gcc.dg/compat/vector-2b_main.c *************** b0c60ff09545a99e7a174f8d22cf8c1e gcc/te *** 18883,18889 **** ed2892bbe639d1358ce1ade41d107602 gcc/testsuite/gcc.dg/debug/dwarf2/c99-typedef1.c 803467d21d941bb7904a5b90b32d3cac gcc/testsuite/gcc.dg/debug/dwarf2/const-1.c ff30520c3b6c44ea03dcdea791633348 gcc/testsuite/gcc.dg/debug/dwarf2/const-2.c ! 69f6b014558fe301a2c0f61eb8c3c948 gcc/testsuite/gcc.dg/debug/dwarf2/const-2b.c b189cd1b8304954666b27772172a7cd0 gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char1.c 8f908ab465ff4e1db8a0e8c86c2ec047 gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char2.c b6138ba76286fa4b5466891a0fd36ee7 gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char3.c --- 18915,18921 ---- ed2892bbe639d1358ce1ade41d107602 gcc/testsuite/gcc.dg/debug/dwarf2/c99-typedef1.c 803467d21d941bb7904a5b90b32d3cac gcc/testsuite/gcc.dg/debug/dwarf2/const-1.c ff30520c3b6c44ea03dcdea791633348 gcc/testsuite/gcc.dg/debug/dwarf2/const-2.c ! c6c23e66f648243ffd4971f0d6a84864 gcc/testsuite/gcc.dg/debug/dwarf2/const-2b.c b189cd1b8304954666b27772172a7cd0 gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char1.c 8f908ab465ff4e1db8a0e8c86c2ec047 gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char2.c b6138ba76286fa4b5466891a0fd36ee7 gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char3.c *************** d485cdf7af6d505f7224c28e47668766 gcc/te *** 19362,19368 **** f582da0656b867c1b1d6dfddcbd67151 gcc/testsuite/gcc.dg/format/ms_null-1.c d373072e3ae3a59a2ef428d23e090e7f gcc/testsuite/gcc.dg/format/ms_plus-1.c a38c670594e15f63137c8cd2eb1ff6b9 gcc/testsuite/gcc.dg/format/ms_sec-1.c ! 063a2b1585e52ea8f68a5e52ea99be90 gcc/testsuite/gcc.dg/format/ms_unnamed-1.c 625b5d02f4d2233164c5c80cdb4946e3 gcc/testsuite/gcc.dg/format/ms_va-1.c 9c8857f9de744a8117774b9653429875 gcc/testsuite/gcc.dg/format/ms_zero-length-1.c 1ff57728a622a3a1ecab0e743bfdde91 gcc/testsuite/gcc.dg/format/multattr-1.c --- 19394,19400 ---- f582da0656b867c1b1d6dfddcbd67151 gcc/testsuite/gcc.dg/format/ms_null-1.c d373072e3ae3a59a2ef428d23e090e7f gcc/testsuite/gcc.dg/format/ms_plus-1.c a38c670594e15f63137c8cd2eb1ff6b9 gcc/testsuite/gcc.dg/format/ms_sec-1.c ! 95138a17b00d870419fb0217037b63dc gcc/testsuite/gcc.dg/format/ms_unnamed-1.c 625b5d02f4d2233164c5c80cdb4946e3 gcc/testsuite/gcc.dg/format/ms_va-1.c 9c8857f9de744a8117774b9653429875 gcc/testsuite/gcc.dg/format/ms_zero-length-1.c 1ff57728a622a3a1ecab0e743bfdde91 gcc/testsuite/gcc.dg/format/multattr-1.c *************** a5e5757327ee9e4157e7c1abee28e939 gcc/te *** 19389,19395 **** a5646814dd913a529583463f2ec601f9 gcc/testsuite/gcc.dg/format/strfmon-1.c 0580b4faa6d69e15b3dbd3564bef3b03 gcc/testsuite/gcc.dg/format/strfmon-2.c 4e657e701841e398dd65ba221d93dd1d gcc/testsuite/gcc.dg/format/sys_format.c ! c0d7348b8aed9c4969489c5c331b9bf6 gcc/testsuite/gcc.dg/format/unnamed-1.c 96c511d7514c3e9a59f36399a27e37c2 gcc/testsuite/gcc.dg/format/va-1.c 24f35f900d41b5f6d0a7f00b75e01677 gcc/testsuite/gcc.dg/format/warnll-1.c bbf547838099a8bba46af1adcf879d70 gcc/testsuite/gcc.dg/format/xopen-1.c --- 19421,19427 ---- a5646814dd913a529583463f2ec601f9 gcc/testsuite/gcc.dg/format/strfmon-1.c 0580b4faa6d69e15b3dbd3564bef3b03 gcc/testsuite/gcc.dg/format/strfmon-2.c 4e657e701841e398dd65ba221d93dd1d gcc/testsuite/gcc.dg/format/sys_format.c ! 1a5dac79fc2aba332f2846ff13cb42ba gcc/testsuite/gcc.dg/format/unnamed-1.c 96c511d7514c3e9a59f36399a27e37c2 gcc/testsuite/gcc.dg/format/va-1.c 24f35f900d41b5f6d0a7f00b75e01677 gcc/testsuite/gcc.dg/format/warnll-1.c bbf547838099a8bba46af1adcf879d70 gcc/testsuite/gcc.dg/format/xopen-1.c *************** acb5ff1fe34bdf360b3e8e1e27057c7c gcc/te *** 19469,19474 **** --- 19501,19509 ---- 450622eac3970da63e43723374af5da7 gcc/testsuite/gcc.dg/gomp/atomic-1.c 4bf591ce56c0f95b411704dfda840a7e gcc/testsuite/gcc.dg/gomp/atomic-10.c 6661cb5407aeaf224e604d059258691e gcc/testsuite/gcc.dg/gomp/atomic-11.c + 0ff1c3a6c0628a5b02b5f2f75d16b718 gcc/testsuite/gcc.dg/gomp/atomic-12.c + c2e14df2c3c1f90d28c611400c8d66df gcc/testsuite/gcc.dg/gomp/atomic-13.c + 7e932cfe67a56047f2793f8f073026d8 gcc/testsuite/gcc.dg/gomp/atomic-14.c 02a1665574401bc7491c754880894569 gcc/testsuite/gcc.dg/gomp/atomic-2.c 1d9b409e9e1f767bd2def30a1129c2a3 gcc/testsuite/gcc.dg/gomp/atomic-3.c b2ce89f1ba635f8d6701308583cd4759 gcc/testsuite/gcc.dg/gomp/atomic-4.c *************** ca3e6f1780ac0a60027cbe93e57cbbf1 gcc/te *** 19580,19585 **** --- 19615,19621 ---- 514cd6cfd6d72a935e5dbc2d1b3609f4 gcc/testsuite/gcc.dg/gomp/pr38676.c d202c807b4080808baf99ab9f32b21a4 gcc/testsuite/gcc.dg/gomp/pr39495-1.c 35cf7eb4f7b153b629899db048a7b747 gcc/testsuite/gcc.dg/gomp/pr39495-2.c + 4a61a37a3515bf0dfee678cc9b365685 gcc/testsuite/gcc.dg/gomp/pr44085.c 32d1b4709fce01c7b0f596da5c040f2a gcc/testsuite/gcc.dg/gomp/preprocess-1.c 536359d59fc418a1570a6d8574a66ca1 gcc/testsuite/gcc.dg/gomp/sections-1.c c8fdbed05305ecb29a74eae041f265e9 gcc/testsuite/gcc.dg/gomp/sections-2.c *************** d6698b2c6df907644ecb01b750853e01 gcc/te *** 19625,19631 **** 100138c2fc69370cda0ec2c9b9e12815 gcc/testsuite/gcc.dg/graphite/pr39260.c 6ad1ed1da1d95a4414c996de5e13e225 gcc/testsuite/gcc.dg/graphite/pr39335.c 2e1264174319212bfe16edce2701120b gcc/testsuite/gcc.dg/graphite/pr39335_1.c ! 495b86bd8b74dd308a5a68e7dff6041f gcc/testsuite/gcc.dg/graphite/pr40281.c f4a92006bcc2113a0982261adc37bc65 gcc/testsuite/gcc.dg/graphite/scop-0.c 1e4a4fff232dc56bd9f4df2348cba2d7 gcc/testsuite/gcc.dg/graphite/scop-1.c 6777d4c6459af7ab94bdb6d8b105319f gcc/testsuite/gcc.dg/graphite/scop-10.c --- 19661,19667 ---- 100138c2fc69370cda0ec2c9b9e12815 gcc/testsuite/gcc.dg/graphite/pr39260.c 6ad1ed1da1d95a4414c996de5e13e225 gcc/testsuite/gcc.dg/graphite/pr39335.c 2e1264174319212bfe16edce2701120b gcc/testsuite/gcc.dg/graphite/pr39335_1.c ! acae5b35ea52a06eb7052886b0364131 gcc/testsuite/gcc.dg/graphite/pr40281.c f4a92006bcc2113a0982261adc37bc65 gcc/testsuite/gcc.dg/graphite/scop-0.c 1e4a4fff232dc56bd9f4df2348cba2d7 gcc/testsuite/gcc.dg/graphite/scop-1.c 6777d4c6459af7ab94bdb6d8b105319f gcc/testsuite/gcc.dg/graphite/scop-10.c *************** b19f78cc8cfdc1d6a96b2f1f9d2b1da6 gcc/te *** 20004,20010 **** b01e42858e0423266a42ce48f5963765 gcc/testsuite/gcc.dg/pch/macro-3.hs 98eb40fd35afc99b8d7a0d9037913d4a gcc/testsuite/gcc.dg/pch/macro-4.c 9dfd3f4bded8093e1bd9fe58412b43c6 gcc/testsuite/gcc.dg/pch/macro-4.hs ! 748dc3710b0255f9f86be6f561098ede gcc/testsuite/gcc.dg/pch/pch.exp 10e7aa3c9c88169c37fec51ab85d804b gcc/testsuite/gcc.dg/pch/pushpop-1.c 8dd7fa6bfb17e08908378d5179a15dcd gcc/testsuite/gcc.dg/pch/pushpop-1.hs 046fa096e19252044dc223b9025b6b66 gcc/testsuite/gcc.dg/pch/save-temps-1.c --- 20040,20046 ---- b01e42858e0423266a42ce48f5963765 gcc/testsuite/gcc.dg/pch/macro-3.hs 98eb40fd35afc99b8d7a0d9037913d4a gcc/testsuite/gcc.dg/pch/macro-4.c 9dfd3f4bded8093e1bd9fe58412b43c6 gcc/testsuite/gcc.dg/pch/macro-4.hs ! 04c4cb1030a8bad68f1b7fedd3b3c921 gcc/testsuite/gcc.dg/pch/pch.exp 10e7aa3c9c88169c37fec51ab85d804b gcc/testsuite/gcc.dg/pch/pushpop-1.c 8dd7fa6bfb17e08908378d5179a15dcd gcc/testsuite/gcc.dg/pch/pushpop-1.hs 046fa096e19252044dc223b9025b6b66 gcc/testsuite/gcc.dg/pch/save-temps-1.c *************** a29a24c1f50a3b069d643951fa60c05b gcc/te *** 20298,20304 **** d426df2de8e4ba3c7e102dfd67d72538 gcc/testsuite/gcc.dg/pr32041.c dd4ec8625a31f09b63b9af420e1c0ccc gcc/testsuite/gcc.dg/pr32069.c 25dc74f00cf88e0e19e9654fd36e6a0d gcc/testsuite/gcc.dg/pr32135.c ! e473f0861510bdc1a2d25b527891858d gcc/testsuite/gcc.dg/pr32176.c f554a620305731f761b143db2240c306 gcc/testsuite/gcc.dg/pr32293.c 6831718762e6e153f6f27fe7c8d51a45 gcc/testsuite/gcc.dg/pr32328.c 78b49d5d4526c45e5d0ca9500a95637a gcc/testsuite/gcc.dg/pr32338-1.c --- 20334,20340 ---- d426df2de8e4ba3c7e102dfd67d72538 gcc/testsuite/gcc.dg/pr32041.c dd4ec8625a31f09b63b9af420e1c0ccc gcc/testsuite/gcc.dg/pr32069.c 25dc74f00cf88e0e19e9654fd36e6a0d gcc/testsuite/gcc.dg/pr32135.c ! 328c63b4fbaa776c69c1d855653e4817 gcc/testsuite/gcc.dg/pr32176.c f554a620305731f761b143db2240c306 gcc/testsuite/gcc.dg/pr32293.c 6831718762e6e153f6f27fe7c8d51a45 gcc/testsuite/gcc.dg/pr32328.c 78b49d5d4526c45e5d0ca9500a95637a gcc/testsuite/gcc.dg/pr32338-1.c *************** e118ec591b0e6a5481f00e5d6bcff992 gcc/te *** 20365,20371 **** 19495b4652c3d3cbd16d035b827b856c gcc/testsuite/gcc.dg/pr34668-1.c 359814ad5181c471257a63c810847ed3 gcc/testsuite/gcc.dg/pr34668-2.c 84bc6c2687230ade3e6e58fcd8a4de5a gcc/testsuite/gcc.dg/pr34825.c ! e3b60aa1b95a4082e8894114d96867f5 gcc/testsuite/gcc.dg/pr34856.c c6ec44106e2b0ff4fa9d0683f6a15a2a gcc/testsuite/gcc.dg/pr34965.c 5b5b5499ef74c27909997d5aebf4a308 gcc/testsuite/gcc.dg/pr34969.c 78c676c6637b4d7cf784aaf33aaa6b18 gcc/testsuite/gcc.dg/pr34985.c --- 20401,20407 ---- 19495b4652c3d3cbd16d035b827b856c gcc/testsuite/gcc.dg/pr34668-1.c 359814ad5181c471257a63c810847ed3 gcc/testsuite/gcc.dg/pr34668-2.c 84bc6c2687230ade3e6e58fcd8a4de5a gcc/testsuite/gcc.dg/pr34825.c ! f89d5b25fbfd7b3e1bad6d9cec3614d2 gcc/testsuite/gcc.dg/pr34856.c c6ec44106e2b0ff4fa9d0683f6a15a2a gcc/testsuite/gcc.dg/pr34965.c 5b5b5499ef74c27909997d5aebf4a308 gcc/testsuite/gcc.dg/pr34969.c 78c676c6637b4d7cf784aaf33aaa6b18 gcc/testsuite/gcc.dg/pr34985.c *************** a351c46ab7b7896d89c0aaf343781a79 gcc/te *** 20400,20406 **** 6e918e959631706539f163db55bf114d gcc/testsuite/gcc.dg/pr36489.c 436fcb1d85751479b736b18a4389197e gcc/testsuite/gcc.dg/pr36504.c 4230163fa07e95514269629938c48117 gcc/testsuite/gcc.dg/pr36508.c ! c419e7fec8e624cc4576590c2ec3e6e7 gcc/testsuite/gcc.dg/pr36584.c e2c86a9176f1dd0d4bc2d4b0221ff6bc gcc/testsuite/gcc.dg/pr36901-1.c 92ea538d330b68ead0f1017da40d561c gcc/testsuite/gcc.dg/pr36901-2.c d041a0d2eb83f24136dc258b720ecabe gcc/testsuite/gcc.dg/pr36901-3.c --- 20436,20442 ---- 6e918e959631706539f163db55bf114d gcc/testsuite/gcc.dg/pr36489.c 436fcb1d85751479b736b18a4389197e gcc/testsuite/gcc.dg/pr36504.c 4230163fa07e95514269629938c48117 gcc/testsuite/gcc.dg/pr36508.c ! 9253a321eab456c3a96273dabe156f13 gcc/testsuite/gcc.dg/pr36584.c e2c86a9176f1dd0d4bc2d4b0221ff6bc gcc/testsuite/gcc.dg/pr36901-1.c 92ea538d330b68ead0f1017da40d561c gcc/testsuite/gcc.dg/pr36901-2.c d041a0d2eb83f24136dc258b720ecabe gcc/testsuite/gcc.dg/pr36901-3.c *************** fbbeb08274f944fdf084a23f06a97a9e gcc/te *** 20408,20414 **** 3abaecbd23b125aa36860d265e8a06ab gcc/testsuite/gcc.dg/pr36901-system.h 81ff7b6d52684c17f0a913a3890a8d34 gcc/testsuite/gcc.dg/pr36901.h 41b78959b7b4fbc7b49e985dd96b0396 gcc/testsuite/gcc.dg/pr36991.c ! 856108e6acdb9b39b3810e5f230ee80f gcc/testsuite/gcc.dg/pr36997.c b7d0129ae8065eb92898d2d2a302a90c gcc/testsuite/gcc.dg/pr36998.c 22313230afab4bcd1da2571bf01d2fe9 gcc/testsuite/gcc.dg/pr37106-1.c 4912382cb5c6f6dbef93e53d057a436c gcc/testsuite/gcc.dg/pr37106-2.c --- 20444,20450 ---- 3abaecbd23b125aa36860d265e8a06ab gcc/testsuite/gcc.dg/pr36901-system.h 81ff7b6d52684c17f0a913a3890a8d34 gcc/testsuite/gcc.dg/pr36901.h 41b78959b7b4fbc7b49e985dd96b0396 gcc/testsuite/gcc.dg/pr36991.c ! 1906f2b97e110478d74f35d8fafc3f24 gcc/testsuite/gcc.dg/pr36997.c b7d0129ae8065eb92898d2d2a302a90c gcc/testsuite/gcc.dg/pr36998.c 22313230afab4bcd1da2571bf01d2fe9 gcc/testsuite/gcc.dg/pr37106-1.c 4912382cb5c6f6dbef93e53d057a436c gcc/testsuite/gcc.dg/pr37106-2.c *************** cd2f440a37d57e45c10dbe1adac5d6bb gcc/te *** 20421,20427 **** b488d34c7b3aa12ead8ec9d6366fd38f gcc/testsuite/gcc.dg/pr37353.c b4f39bb14424202664b8450647ba91bf gcc/testsuite/gcc.dg/pr37438.c 37c7e3fbf5444b1ef503314253488c4d gcc/testsuite/gcc.dg/pr37529.c ! da36f03bd3590ea731c2e1322814d1a0 gcc/testsuite/gcc.dg/pr37544.c d4d135817b21eab776e0fba170cfc6d6 gcc/testsuite/gcc.dg/pr37561.c d146e832dd4ee057ad8214694a2ac46a gcc/testsuite/gcc.dg/pr37645.c 4b53a60f878553b9bffbbfe5f70a29b4 gcc/testsuite/gcc.dg/pr37663.c --- 20457,20463 ---- b488d34c7b3aa12ead8ec9d6366fd38f gcc/testsuite/gcc.dg/pr37353.c b4f39bb14424202664b8450647ba91bf gcc/testsuite/gcc.dg/pr37438.c 37c7e3fbf5444b1ef503314253488c4d gcc/testsuite/gcc.dg/pr37529.c ! 6e7e6c90dc3dbb611ab08717e34440d4 gcc/testsuite/gcc.dg/pr37544.c d4d135817b21eab776e0fba170cfc6d6 gcc/testsuite/gcc.dg/pr37561.c d146e832dd4ee057ad8214694a2ac46a gcc/testsuite/gcc.dg/pr37645.c 4b53a60f878553b9bffbbfe5f70a29b4 gcc/testsuite/gcc.dg/pr37663.c *************** f69671bec212d3eb69f7d8932beee7cb gcc/te *** 20451,20456 **** --- 20487,20493 ---- 6430e6e80c0c887c96c4f4d6a181a732 gcc/testsuite/gcc.dg/pr39226.c dbec20e368332784b5d957e46f018804 gcc/testsuite/gcc.dg/pr39343.c 444e8128d551fe122a35fd53af1dfabb gcc/testsuite/gcc.dg/pr39443.c + 9b6f81e778023e26704b75e6fab35bfe gcc/testsuite/gcc.dg/pr39453.c eec9ad8ff24b46240ab218f066057a5b gcc/testsuite/gcc.dg/pr39455.c 6e760dc9f03affa708b1435f8d2de243 gcc/testsuite/gcc.dg/pr39565.c 4eb3572c75ad9380263b22a7eefa3631 gcc/testsuite/gcc.dg/pr39666-1.c *************** a945b6f5e0e3e17d7d257953c86d9330 gcc/te *** 20466,20472 **** fc6a4a60a9fa7345ab39a119eeaba289 gcc/testsuite/gcc.dg/pr40340-4.c a276b310feb4f095bbadc25ff3ec96c9 gcc/testsuite/gcc.dg/pr40340-5.c c7fee427826263cc31c617e0cdedfa6a gcc/testsuite/gcc.dg/pr40340.h ! 9d6bb1f3256773fc6310d0b8d1933bd7 gcc/testsuite/gcc.dg/pr40550.c a5fbef8dc1ac30ffbaa04bb729109b3b gcc/testsuite/gcc.dg/pr40669.c 4355b9d97eecc32453e1b9a6a2207fa4 gcc/testsuite/gcc.dg/pr40792.c 673ce1a4238d31429263d591c75bdd28 gcc/testsuite/gcc.dg/pr40861.c --- 20503,20509 ---- fc6a4a60a9fa7345ab39a119eeaba289 gcc/testsuite/gcc.dg/pr40340-4.c a276b310feb4f095bbadc25ff3ec96c9 gcc/testsuite/gcc.dg/pr40340-5.c c7fee427826263cc31c617e0cdedfa6a gcc/testsuite/gcc.dg/pr40340.h ! 7d534f5e8e61fd0fb2c8683493006686 gcc/testsuite/gcc.dg/pr40550.c a5fbef8dc1ac30ffbaa04bb729109b3b gcc/testsuite/gcc.dg/pr40669.c 4355b9d97eecc32453e1b9a6a2207fa4 gcc/testsuite/gcc.dg/pr40792.c 673ce1a4238d31429263d591c75bdd28 gcc/testsuite/gcc.dg/pr40861.c *************** a5fbef8dc1ac30ffbaa04bb729109b3b gcc/te *** 20478,20483 **** --- 20515,20521 ---- 36150015563bcedc89d2fab0060de5af gcc/testsuite/gcc.dg/pr41248.c bc059809ab4e6daf50b7a02da5cbf86b gcc/testsuite/gcc.dg/pr41295.c a7440be101088a22f8a5d9e279945a7a gcc/testsuite/gcc.dg/pr41470.c + 945b209a85fb23e7864f77d58e360490 gcc/testsuite/gcc.dg/pr41551.c 84a38326fd86393828d30ef78b78b65d gcc/testsuite/gcc.dg/pr41573.c b8458e231103ae2deb4f77330a083286 gcc/testsuite/gcc.dg/pr41574.c 9c4b10ac05eee1cf7484812291015ee7 gcc/testsuite/gcc.dg/pr41643.c *************** a1d8b0e7ece2ac1ae4afa75a4df75675 gcc/te *** 20488,20496 **** c9b7dda201bc71d4b86aff390065b9c4 gcc/testsuite/gcc.dg/pr42078.c 76e69d75aa59a8bcc99483071273d8f7 gcc/testsuite/gcc.dg/pr42084.c 98dc622b6172cee1aaec9c5d3266e877 gcc/testsuite/gcc.dg/pr42215.c fe25d38294019a33aa98d31b31407950 gcc/testsuite/gcc.dg/pr42250.c f48f96a6a73333a80e4e214699c1ad78 gcc/testsuite/gcc.dg/pr42388.c ! db90f9a9e645e0a657e3e10b075b5dfa gcc/testsuite/gcc.dg/pr42427.c 991dbffb574b25d1cc587f088dbc8e79 gcc/testsuite/gcc.dg/pr42475.c 83d7dcce1cf568f9d5d11fbc065f1957 gcc/testsuite/gcc.dg/pr42611.c fe703f1c5408673830a0564d9b17522c gcc/testsuite/gcc.dg/pr42662.c --- 20526,20537 ---- c9b7dda201bc71d4b86aff390065b9c4 gcc/testsuite/gcc.dg/pr42078.c 76e69d75aa59a8bcc99483071273d8f7 gcc/testsuite/gcc.dg/pr42084.c 98dc622b6172cee1aaec9c5d3266e877 gcc/testsuite/gcc.dg/pr42215.c + b98599f17dc8ff99851f4c0653f2b09b gcc/testsuite/gcc.dg/pr42246.c + 86db6defcb6347561e13e8516d742590 gcc/testsuite/gcc.dg/pr42249.c fe25d38294019a33aa98d31b31407950 gcc/testsuite/gcc.dg/pr42250.c f48f96a6a73333a80e4e214699c1ad78 gcc/testsuite/gcc.dg/pr42388.c ! 8ee09cffcd2f924173161a4f7cc0b262 gcc/testsuite/gcc.dg/pr42389.c ! 9d758c686aba9588e97354634f03d502 gcc/testsuite/gcc.dg/pr42427.c 991dbffb574b25d1cc587f088dbc8e79 gcc/testsuite/gcc.dg/pr42475.c 83d7dcce1cf568f9d5d11fbc065f1957 gcc/testsuite/gcc.dg/pr42611.c fe703f1c5408673830a0564d9b17522c gcc/testsuite/gcc.dg/pr42662.c *************** f27673af6d2f2632fe2e6f6b79fc9677 gcc/te *** 20504,20510 **** da6af28fb1665b4dd70740580e168bc9 gcc/testsuite/gcc.dg/pr43402.c d6273061f6f2ba294fd93343573dba0b gcc/testsuite/gcc.dg/pr43419.c d99f23b3a3c3fc3eb2ae1a4a37dcab7a gcc/testsuite/gcc.dg/pr43562.c ! 8ffa5d5718813dc00c6aed5e54e4e932 gcc/testsuite/gcc.dg/pr43643.c 8b7d73da2d5d78000716492365a85d5a gcc/testsuite/gcc.dg/pr8715.c 3d08410b2dd57259aa63f0e1c64b376e gcc/testsuite/gcc.dg/pr8788-1.c be04382a35ebb1cfae1b2168f1693a94 gcc/testsuite/gcc.dg/pr8835-1.c --- 20545,20551 ---- da6af28fb1665b4dd70740580e168bc9 gcc/testsuite/gcc.dg/pr43402.c d6273061f6f2ba294fd93343573dba0b gcc/testsuite/gcc.dg/pr43419.c d99f23b3a3c3fc3eb2ae1a4a37dcab7a gcc/testsuite/gcc.dg/pr43562.c ! d88647bf3a0b9bfd2f38c4b057a6bca3 gcc/testsuite/gcc.dg/pr43643.c 8b7d73da2d5d78000716492365a85d5a gcc/testsuite/gcc.dg/pr8715.c 3d08410b2dd57259aa63f0e1c64b376e gcc/testsuite/gcc.dg/pr8788-1.c be04382a35ebb1cfae1b2168f1693a94 gcc/testsuite/gcc.dg/pr8835-1.c *************** f5a6621de9434f09398b8b22de880cf9 gcc/te *** 20538,20544 **** 6f9ada327b2aba3d10c820c065c2f53f gcc/testsuite/gcc.dg/pragma-re-3.c 1038abf6d391d461077488d280386e7c gcc/testsuite/gcc.dg/pragma-re-4.c efa6034cc39517afbb457a507e9ce345 gcc/testsuite/gcc.dg/precedence-1.c ! 8a76eebe9635034c8bc4ffcf182fdd56 gcc/testsuite/gcc.dg/prefetch-loop-arrays-1.c 4332c57ab1915596a389ac917d047359 gcc/testsuite/gcc.dg/profile-dir-1.c 30cc5eb2dce0c3dea6b69ee98edc57ee gcc/testsuite/gcc.dg/profile-dir-2.c 341097e9fc7095b9bc6aeb12e8c4b8bb gcc/testsuite/gcc.dg/profile-dir-3.c --- 20579,20585 ---- 6f9ada327b2aba3d10c820c065c2f53f gcc/testsuite/gcc.dg/pragma-re-3.c 1038abf6d391d461077488d280386e7c gcc/testsuite/gcc.dg/pragma-re-4.c efa6034cc39517afbb457a507e9ce345 gcc/testsuite/gcc.dg/precedence-1.c ! 1b6dce2d505591fc90f7f6121b06982b gcc/testsuite/gcc.dg/prefetch-loop-arrays-1.c 4332c57ab1915596a389ac917d047359 gcc/testsuite/gcc.dg/profile-dir-1.c 30cc5eb2dce0c3dea6b69ee98edc57ee gcc/testsuite/gcc.dg/profile-dir-2.c 341097e9fc7095b9bc6aeb12e8c4b8bb gcc/testsuite/gcc.dg/profile-dir-3.c *************** aa8cb0db7596e9b0e87edb8ba4d89392 gcc/te *** 20787,20794 **** 616ba8292d1667a3872fba7a56a0c6a3 gcc/testsuite/gcc.dg/torture/dg-torture.exp c7193c3a55681849a60a8019763547be gcc/testsuite/gcc.dg/torture/fp-int-convert-double.c 740b8077c12192879798984879fe4c76 gcc/testsuite/gcc.dg/torture/fp-int-convert-float.c ! 48cf228cef8e597a9a40466b1f579f1f gcc/testsuite/gcc.dg/torture/fp-int-convert-float128-timode.c ! bc0467f96f8340a44838f93689215df9 gcc/testsuite/gcc.dg/torture/fp-int-convert-float128.c 5198f0512b202dc3bfe42ace6860fcad gcc/testsuite/gcc.dg/torture/fp-int-convert-float80-timode.c 55b7dc542b219e0ef16ee001197d2ce4 gcc/testsuite/gcc.dg/torture/fp-int-convert-float80.c 28b0ca6c0ca3b0b2753f947ec78b1041 gcc/testsuite/gcc.dg/torture/fp-int-convert-long-double.c --- 20828,20835 ---- 616ba8292d1667a3872fba7a56a0c6a3 gcc/testsuite/gcc.dg/torture/dg-torture.exp c7193c3a55681849a60a8019763547be gcc/testsuite/gcc.dg/torture/fp-int-convert-double.c 740b8077c12192879798984879fe4c76 gcc/testsuite/gcc.dg/torture/fp-int-convert-float.c ! 7c1974dc02bb735d48840d8de387522b gcc/testsuite/gcc.dg/torture/fp-int-convert-float128-timode.c ! 230197bd3160e180d1f82a23ef0f90ed gcc/testsuite/gcc.dg/torture/fp-int-convert-float128.c 5198f0512b202dc3bfe42ace6860fcad gcc/testsuite/gcc.dg/torture/fp-int-convert-float80-timode.c 55b7dc542b219e0ef16ee001197d2ce4 gcc/testsuite/gcc.dg/torture/fp-int-convert-float80.c 28b0ca6c0ca3b0b2753f947ec78b1041 gcc/testsuite/gcc.dg/torture/fp-int-convert-long-double.c *************** e18294d3404279a1f70b16e5f321d933 gcc/te *** 20801,20807 **** 1abf12b9acfb448748d27d943f5b2ba8 gcc/testsuite/gcc.dg/torture/mips-hilo-2.c d07ecd707fac97fa40042e04a59d4b1e gcc/testsuite/gcc.dg/torture/mips-sdata-1.c ba222bffc08c28a180298a0d4c6d6aea gcc/testsuite/gcc.dg/torture/nested-fn-1.c ! d7c1c353e52b755d56881ba72c8ecabc gcc/testsuite/gcc.dg/torture/pr16104-1.c 8bd6cd6dbfd5ee169d5305f23b88620c gcc/testsuite/gcc.dg/torture/pr17526.c 01c583edb41b632b835aa892b9c1cb14 gcc/testsuite/gcc.dg/torture/pr17933-1.c 9a101464bb6b9086c793a8354f1ce0ee gcc/testsuite/gcc.dg/torture/pr18582-1.c --- 20842,20848 ---- 1abf12b9acfb448748d27d943f5b2ba8 gcc/testsuite/gcc.dg/torture/mips-hilo-2.c d07ecd707fac97fa40042e04a59d4b1e gcc/testsuite/gcc.dg/torture/mips-sdata-1.c ba222bffc08c28a180298a0d4c6d6aea gcc/testsuite/gcc.dg/torture/nested-fn-1.c ! 96e2a9c0fdc7cdac2fea0823e5757653 gcc/testsuite/gcc.dg/torture/pr16104-1.c 8bd6cd6dbfd5ee169d5305f23b88620c gcc/testsuite/gcc.dg/torture/pr17526.c 01c583edb41b632b835aa892b9c1cb14 gcc/testsuite/gcc.dg/torture/pr17933-1.c 9a101464bb6b9086c793a8354f1ce0ee gcc/testsuite/gcc.dg/torture/pr18582-1.c *************** c4530d640c7f846995331b76d4083006 gcc/te *** 20874,20883 **** e058c22f847c18707bcf18b94eb38510 gcc/testsuite/gcc.dg/torture/pr34330.c 61a0bc4511bb62033561c46ecfb2f576 gcc/testsuite/gcc.dg/torture/pr35227.c d86fe7d9bf6b2c5db61eac2b119cf719 gcc/testsuite/gcc.dg/torture/pr35400.c ! 7abf9459bcf608a5c3a809d565023394 gcc/testsuite/gcc.dg/torture/pr35771-1.c ! 018260f2704f41a9e8f757bd95bf79e8 gcc/testsuite/gcc.dg/torture/pr35771-2.c ! ca978767abc8c904a14f6e2f1cd2853b gcc/testsuite/gcc.dg/torture/pr35771-3.c ! 56d71465b1a7ad0feaf26f2088f1d976 gcc/testsuite/gcc.dg/torture/pr35771.h d97a385195a1793eb09a6b2e3bbb9db2 gcc/testsuite/gcc.dg/torture/pr35833.c b52336e14f46845ce0ac2fe80bf5a293 gcc/testsuite/gcc.dg/torture/pr35842.c 88112c1f6759ea66cad7a9c556bd9281 gcc/testsuite/gcc.dg/torture/pr36066.c --- 20915,20924 ---- e058c22f847c18707bcf18b94eb38510 gcc/testsuite/gcc.dg/torture/pr34330.c 61a0bc4511bb62033561c46ecfb2f576 gcc/testsuite/gcc.dg/torture/pr35227.c d86fe7d9bf6b2c5db61eac2b119cf719 gcc/testsuite/gcc.dg/torture/pr35400.c ! 22841e5865c960692582581d35b1f52a gcc/testsuite/gcc.dg/torture/pr35771-1.c ! b06b6c5a1603f4d72accef9ed986ce3f gcc/testsuite/gcc.dg/torture/pr35771-2.c ! 9f7ddfa0d1deb7be4deb34771fa0fac1 gcc/testsuite/gcc.dg/torture/pr35771-3.c ! 9966d02212246363d23e1def3ea28d78 gcc/testsuite/gcc.dg/torture/pr35771.h d97a385195a1793eb09a6b2e3bbb9db2 gcc/testsuite/gcc.dg/torture/pr35833.c b52336e14f46845ce0ac2fe80bf5a293 gcc/testsuite/gcc.dg/torture/pr35842.c 88112c1f6759ea66cad7a9c556bd9281 gcc/testsuite/gcc.dg/torture/pr36066.c *************** f2a7b5173c69abcf698a3d605b83ecd0 gcc/te *** 20894,20900 **** 1f9fb6ec720c3be83897fd8a7ef4b3e3 gcc/testsuite/gcc.dg/torture/pr36373-8.c 286142cc71326a236fa3b2db3ae1fe98 gcc/testsuite/gcc.dg/torture/pr36373-9.c 522d2177e1177b1792c69a2650ca0579 gcc/testsuite/gcc.dg/torture/pr36400.c ! 9c5ca6577c455ff892b7bc85c31846f3 gcc/testsuite/gcc.dg/torture/pr36891.c 28ff1c11e63f8aff60bd106162b1b065 gcc/testsuite/gcc.dg/torture/pr36978.c 8463c4cd1a5689d043f4fd9b0a3a25f5 gcc/testsuite/gcc.dg/torture/pr37731-1.c 30170e773c2084c27b89f8f9d8069c9d gcc/testsuite/gcc.dg/torture/pr37731-2.c --- 20935,20941 ---- 1f9fb6ec720c3be83897fd8a7ef4b3e3 gcc/testsuite/gcc.dg/torture/pr36373-8.c 286142cc71326a236fa3b2db3ae1fe98 gcc/testsuite/gcc.dg/torture/pr36373-9.c 522d2177e1177b1792c69a2650ca0579 gcc/testsuite/gcc.dg/torture/pr36400.c ! c290f63133af9961b2ddde3cc57f7278 gcc/testsuite/gcc.dg/torture/pr36891.c 28ff1c11e63f8aff60bd106162b1b065 gcc/testsuite/gcc.dg/torture/pr36978.c 8463c4cd1a5689d043f4fd9b0a3a25f5 gcc/testsuite/gcc.dg/torture/pr37731-1.c 30170e773c2084c27b89f8f9d8069c9d gcc/testsuite/gcc.dg/torture/pr37731-2.c *************** e1652b70737288d33007ee4dd65e0d03 gcc/te *** 20933,20945 **** c681430ad406566d57567a8530445e23 gcc/testsuite/gcc.dg/torture/pr43165.c b8264f7b6c46154892ef6b375aef1320 gcc/testsuite/gcc.dg/torture/pr43360.c cb44e593f120096c426da56573f45fa9 gcc/testsuite/gcc.dg/torture/pr43560.c 4aa5c6ba57ce4b8ecba813c14459e755 gcc/testsuite/gcc.dg/torture/pta-ptrarith-1.c 69d4c2db789443b421badc94aa305fe7 gcc/testsuite/gcc.dg/torture/pta-ptrarith-2.c c0cfd51fe6f1e14871c143f73aad0044 gcc/testsuite/gcc.dg/torture/reassoc-1.c defeb00223ffe8a31ce8ce429c3dc00c gcc/testsuite/gcc.dg/torture/stackalign/alloca-1.c ! 56acda3b9be2c39dee8d75e5341fc9f1 gcc/testsuite/gcc.dg/torture/stackalign/alloca-2.c ! 63b1708f6a914122427bc481dbe39ab6 gcc/testsuite/gcc.dg/torture/stackalign/alloca-3.c ! 30c2b5b64cfa25ee68598a34aa7cf393 gcc/testsuite/gcc.dg/torture/stackalign/alloca-4.c b1edc038c34059aecce0deb693dc33c3 gcc/testsuite/gcc.dg/torture/stackalign/builtin-apply-1.c dfd8cb769a07bf65b72b1976f33f8f8b gcc/testsuite/gcc.dg/torture/stackalign/builtin-apply-2.c 6155415e6a9c81e35eba3dbe00f4cc71 gcc/testsuite/gcc.dg/torture/stackalign/builtin-apply-3.c --- 20974,20989 ---- c681430ad406566d57567a8530445e23 gcc/testsuite/gcc.dg/torture/pr43165.c b8264f7b6c46154892ef6b375aef1320 gcc/testsuite/gcc.dg/torture/pr43360.c cb44e593f120096c426da56573f45fa9 gcc/testsuite/gcc.dg/torture/pr43560.c + 06f567c8058b608c2932d1b30cbea59b gcc/testsuite/gcc.dg/torture/pr44977.c + eaa49b0337d908785072443bc42ea213 gcc/testsuite/gcc.dg/torture/pr45678-1.c + 4d881533ec86feee449ba36182655ea7 gcc/testsuite/gcc.dg/torture/pr45678-2.c 4aa5c6ba57ce4b8ecba813c14459e755 gcc/testsuite/gcc.dg/torture/pta-ptrarith-1.c 69d4c2db789443b421badc94aa305fe7 gcc/testsuite/gcc.dg/torture/pta-ptrarith-2.c c0cfd51fe6f1e14871c143f73aad0044 gcc/testsuite/gcc.dg/torture/reassoc-1.c defeb00223ffe8a31ce8ce429c3dc00c gcc/testsuite/gcc.dg/torture/stackalign/alloca-1.c ! c9dd0f82599f09ad72be3c25ad77e3d7 gcc/testsuite/gcc.dg/torture/stackalign/alloca-2.c ! 72d91a06e9e7c0b065a1d7a27823326d gcc/testsuite/gcc.dg/torture/stackalign/alloca-3.c ! e5171fa27a42c2f6f84021ff54a4a302 gcc/testsuite/gcc.dg/torture/stackalign/alloca-4.c b1edc038c34059aecce0deb693dc33c3 gcc/testsuite/gcc.dg/torture/stackalign/builtin-apply-1.c dfd8cb769a07bf65b72b1976f33f8f8b gcc/testsuite/gcc.dg/torture/stackalign/builtin-apply-2.c 6155415e6a9c81e35eba3dbe00f4cc71 gcc/testsuite/gcc.dg/torture/stackalign/builtin-apply-3.c *************** d662170db2b75d04c0207f94f0ae7627 gcc/te *** 20965,20971 **** d9381abb31a6e068bd5be577d4e68c7f gcc/testsuite/gcc.dg/torture/stackalign/pr16660-1.c 3ebddd9714e1530c9027453d202e8486 gcc/testsuite/gcc.dg/torture/stackalign/pr16660-2.c e34ec60b1fcb0cca46521597ed7494a6 gcc/testsuite/gcc.dg/torture/stackalign/pr16660-3.c ! 7b70a8356582de509bcbd81a91097174 gcc/testsuite/gcc.dg/torture/stackalign/push-1.c 6ed0d7042fa78f9ce877aea1c1f99288 gcc/testsuite/gcc.dg/torture/stackalign/regparm-1.c 95c0c9ba8f1c8c425fb83a2044ca96e1 gcc/testsuite/gcc.dg/torture/stackalign/ret-struct-1.c a9dc4007cbe83e693dc867158418be2f gcc/testsuite/gcc.dg/torture/stackalign/setjmp-1.c --- 21009,21015 ---- d9381abb31a6e068bd5be577d4e68c7f gcc/testsuite/gcc.dg/torture/stackalign/pr16660-1.c 3ebddd9714e1530c9027453d202e8486 gcc/testsuite/gcc.dg/torture/stackalign/pr16660-2.c e34ec60b1fcb0cca46521597ed7494a6 gcc/testsuite/gcc.dg/torture/stackalign/pr16660-3.c ! 92553928005c616a5babfbb45d5f245a gcc/testsuite/gcc.dg/torture/stackalign/push-1.c 6ed0d7042fa78f9ce877aea1c1f99288 gcc/testsuite/gcc.dg/torture/stackalign/regparm-1.c 95c0c9ba8f1c8c425fb83a2044ca96e1 gcc/testsuite/gcc.dg/torture/stackalign/ret-struct-1.c a9dc4007cbe83e693dc867158418be2f gcc/testsuite/gcc.dg/torture/stackalign/setjmp-1.c *************** d5f1bd4db95109ffff76eb7c721a95be gcc/te *** 20977,20983 **** fac74e95a055a5155ad1a5c2031a7aec gcc/testsuite/gcc.dg/torture/stackalign/struct-1.c 8446d39d760889c0773d54cdb03e364f gcc/testsuite/gcc.dg/torture/stackalign/vararg-1.c 11e0a47f4bb9093c3bf9a57d7975a42e gcc/testsuite/gcc.dg/torture/stackalign/vararg-2.c ! 6be5bb1ea96cbbaeb99689c413990882 gcc/testsuite/gcc.dg/torture/stackalign/vararg-3.c d870c565ecc3624fb4fbcb1510c36484 gcc/testsuite/gcc.dg/torture/tree-loop-1.c 3cf74125c6c3d1c9c3fd021db41a374a gcc/testsuite/gcc.dg/torture/type-generic-1.c e9fd20c6a5ee817fc329cc085c9032eb gcc/testsuite/gcc.dg/trampoline-1.c --- 21021,21027 ---- fac74e95a055a5155ad1a5c2031a7aec gcc/testsuite/gcc.dg/torture/stackalign/struct-1.c 8446d39d760889c0773d54cdb03e364f gcc/testsuite/gcc.dg/torture/stackalign/vararg-1.c 11e0a47f4bb9093c3bf9a57d7975a42e gcc/testsuite/gcc.dg/torture/stackalign/vararg-2.c ! dbe688f9392af41346f3c4a01550ee8f gcc/testsuite/gcc.dg/torture/stackalign/vararg-3.c d870c565ecc3624fb4fbcb1510c36484 gcc/testsuite/gcc.dg/torture/tree-loop-1.c 3cf74125c6c3d1c9c3fd021db41a374a gcc/testsuite/gcc.dg/torture/type-generic-1.c e9fd20c6a5ee817fc329cc085c9032eb gcc/testsuite/gcc.dg/trampoline-1.c *************** a2f2a9ec83434966867bdc2c672ebca7 gcc/te *** 21285,21297 **** 22c8b44555ae25363f7e28a8d51410eb gcc/testsuite/gcc.dg/tree-ssa/loop-7.c 0548607f834c2c8592b37c8b232f3d5d gcc/testsuite/gcc.dg/tree-ssa/loop-8.c ca60d15c705ab307b185849a6d684577 gcc/testsuite/gcc.dg/tree-ssa/loop-9.c ! 9bdb74320cd656668a767881ea775552 gcc/testsuite/gcc.dg/tree-ssa/ltrans-1.c 95cd694feed544a896156c157ce485d6 gcc/testsuite/gcc.dg/tree-ssa/ltrans-2.c ! 01dff0c214d6cfc5ebd5807dcb650366 gcc/testsuite/gcc.dg/tree-ssa/ltrans-3.c ! a1a3e21684097331472ba97baec9038a gcc/testsuite/gcc.dg/tree-ssa/ltrans-4.c ! 1be6f16b490e311340c5f4de73a82b05 gcc/testsuite/gcc.dg/tree-ssa/ltrans-5.c ! df41cd3134a7bf07abe27b5e2a415cb4 gcc/testsuite/gcc.dg/tree-ssa/ltrans-6.c ! 1f3c943a7f20ec743dd66004f3ee5794 gcc/testsuite/gcc.dg/tree-ssa/ltrans-8.c c91abdfc532fcffae48d19d97620f337 gcc/testsuite/gcc.dg/tree-ssa/phi-opt-1.c 81c23b6e31c1af326035a3bd6b03da8f gcc/testsuite/gcc.dg/tree-ssa/phi-opt-2.c 0b64e5a601bd4064c37ea0ed5439599c gcc/testsuite/gcc.dg/tree-ssa/phi-opt-3.c --- 21329,21341 ---- 22c8b44555ae25363f7e28a8d51410eb gcc/testsuite/gcc.dg/tree-ssa/loop-7.c 0548607f834c2c8592b37c8b232f3d5d gcc/testsuite/gcc.dg/tree-ssa/loop-8.c ca60d15c705ab307b185849a6d684577 gcc/testsuite/gcc.dg/tree-ssa/loop-9.c ! 105845b6421fb783a4cad2ff037a33be gcc/testsuite/gcc.dg/tree-ssa/ltrans-1.c 95cd694feed544a896156c157ce485d6 gcc/testsuite/gcc.dg/tree-ssa/ltrans-2.c ! 2a102a52e6ed3a7460d8c3a88a96ecd0 gcc/testsuite/gcc.dg/tree-ssa/ltrans-3.c ! 5e36c0b7581c1451749f392c3bfdb829 gcc/testsuite/gcc.dg/tree-ssa/ltrans-4.c ! 07c94828a788bf5c4557d138eecde6cf gcc/testsuite/gcc.dg/tree-ssa/ltrans-5.c ! 35bc7727ae09cf22048a892ac7b46c1a gcc/testsuite/gcc.dg/tree-ssa/ltrans-6.c ! 5005d91aeb50ea020a2c21e51485d93d gcc/testsuite/gcc.dg/tree-ssa/ltrans-8.c c91abdfc532fcffae48d19d97620f337 gcc/testsuite/gcc.dg/tree-ssa/phi-opt-1.c 81c23b6e31c1af326035a3bd6b03da8f gcc/testsuite/gcc.dg/tree-ssa/phi-opt-2.c 0b64e5a601bd4064c37ea0ed5439599c gcc/testsuite/gcc.dg/tree-ssa/phi-opt-3.c *************** fc1e919fddfcef98a2b69ae2a177b21c gcc/te *** 21337,21343 **** 5d799389f8b190ed0384da3e7aff1d4b gcc/testsuite/gcc.dg/tree-ssa/pr21001.c 3df7eb8e85d5e3fbf792b99dc93158cb gcc/testsuite/gcc.dg/tree-ssa/pr21029.c beffffe8293288a651397a70142190f5 gcc/testsuite/gcc.dg/tree-ssa/pr21031.c ! dcf8eeccab765aca414df6a431ab070d gcc/testsuite/gcc.dg/tree-ssa/pr21086.c 8aed0c1dfd77e22d2d43fe232dbc352e gcc/testsuite/gcc.dg/tree-ssa/pr21090.c 3e02d544881c319c121a1d5356c728c5 gcc/testsuite/gcc.dg/tree-ssa/pr21171.c 9e38aa90fde138228e81ac5f21d70b74 gcc/testsuite/gcc.dg/tree-ssa/pr21294.c --- 21381,21387 ---- 5d799389f8b190ed0384da3e7aff1d4b gcc/testsuite/gcc.dg/tree-ssa/pr21001.c 3df7eb8e85d5e3fbf792b99dc93158cb gcc/testsuite/gcc.dg/tree-ssa/pr21029.c beffffe8293288a651397a70142190f5 gcc/testsuite/gcc.dg/tree-ssa/pr21031.c ! bed7d15be697b7a6f152388eb00cf9e4 gcc/testsuite/gcc.dg/tree-ssa/pr21086.c 8aed0c1dfd77e22d2d43fe232dbc352e gcc/testsuite/gcc.dg/tree-ssa/pr21090.c 3e02d544881c319c121a1d5356c728c5 gcc/testsuite/gcc.dg/tree-ssa/pr21171.c 9e38aa90fde138228e81ac5f21d70b74 gcc/testsuite/gcc.dg/tree-ssa/pr21294.c *************** b2c213b56845286c19564ed5bc45625b gcc/te *** 21455,21462 **** a4b5e368ece10c56e099660a8f5674d0 gcc/testsuite/gcc.dg/tree-ssa/prefetch-3.c 2be7b7332af17f3337f620db8f45a9b9 gcc/testsuite/gcc.dg/tree-ssa/prefetch-4.c b481120a2093044384b17462a8bc95db gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c ! 29c94df783d506bd579af75b70e774de gcc/testsuite/gcc.dg/tree-ssa/prefetch-6.c ! 3ac184f1ec4e5f6f65c6e8b5875f1c39 gcc/testsuite/gcc.dg/tree-ssa/prefetch-7.c a4598ee785c26c12db9120b92849b17d gcc/testsuite/gcc.dg/tree-ssa/pta-callused.c 923d6d03adf8bcce0dee1b461a6de19a gcc/testsuite/gcc.dg/tree-ssa/pta-fp.c 352d7dea1ea1592106214f1b7e49f869 gcc/testsuite/gcc.dg/tree-ssa/reassoc-1.c --- 21499,21506 ---- a4b5e368ece10c56e099660a8f5674d0 gcc/testsuite/gcc.dg/tree-ssa/prefetch-3.c 2be7b7332af17f3337f620db8f45a9b9 gcc/testsuite/gcc.dg/tree-ssa/prefetch-4.c b481120a2093044384b17462a8bc95db gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c ! 427d1d95c17cbd6e1f4e9c072285ec1a gcc/testsuite/gcc.dg/tree-ssa/prefetch-6.c ! 6d01ee923854f8173cf79ede1c00a4a9 gcc/testsuite/gcc.dg/tree-ssa/prefetch-7.c a4598ee785c26c12db9120b92849b17d gcc/testsuite/gcc.dg/tree-ssa/pta-callused.c 923d6d03adf8bcce0dee1b461a6de19a gcc/testsuite/gcc.dg/tree-ssa/pta-fp.c 352d7dea1ea1592106214f1b7e49f869 gcc/testsuite/gcc.dg/tree-ssa/reassoc-1.c *************** ea8c997490d7929a33d49e7d7055ffb0 gcc/te *** 21667,21673 **** 9bf048958e86351cbf561caf69e31fe9 gcc/testsuite/gcc.dg/tree-ssa/vrp44.c 4a6e8dbe7719b76bfaefc33af58c14d0 gcc/testsuite/gcc.dg/tree-ssa/vrp45.c 8abba3fd75abaf96f531f734feb21e46 gcc/testsuite/gcc.dg/tree-ssa/vrp46.c ! 2f28f561e9be38df52711b950363bff0 gcc/testsuite/gcc.dg/tree-ssa/vrp47.c 63176004cb8d9a996e6fed7812d7df94 gcc/testsuite/gcc.dg/tree-ssa/wholeprogram-1.c 22cecfb6e50e9a0bfcb8417c616ecff4 gcc/testsuite/gcc.dg/tree-ssa/wholeprogram-2.c 99aa4b3086bd54b2fa365b5e4b9c58fa gcc/testsuite/gcc.dg/trunc-1.c --- 21711,21717 ---- 9bf048958e86351cbf561caf69e31fe9 gcc/testsuite/gcc.dg/tree-ssa/vrp44.c 4a6e8dbe7719b76bfaefc33af58c14d0 gcc/testsuite/gcc.dg/tree-ssa/vrp45.c 8abba3fd75abaf96f531f734feb21e46 gcc/testsuite/gcc.dg/tree-ssa/vrp46.c ! 1f6b0b1e7ad0a0e6153b99578fe10699 gcc/testsuite/gcc.dg/tree-ssa/vrp47.c 63176004cb8d9a996e6fed7812d7df94 gcc/testsuite/gcc.dg/tree-ssa/wholeprogram-1.c 22cecfb6e50e9a0bfcb8417c616ecff4 gcc/testsuite/gcc.dg/tree-ssa/wholeprogram-2.c 99aa4b3086bd54b2fa365b5e4b9c58fa gcc/testsuite/gcc.dg/trunc-1.c *************** ea8c997490d7929a33d49e7d7055ffb0 gcc/te *** 21678,21688 **** 0347a7dc32b8dfb279bdfe3b50e84008 gcc/testsuite/gcc.dg/typeof-1.c 38f4467be27d0432adea9abcaf9cc366 gcc/testsuite/gcc.dg/typespec-1.c 1cc7d04808baa8f231877b2a2f8ec29f gcc/testsuite/gcc.dg/ucnid-1.c ! 115d9287c288e297e7ecffc8d0d640bf gcc/testsuite/gcc.dg/ucnid-2.c ! 44e76ff56bf4ec03ed8a9004fde7509f gcc/testsuite/gcc.dg/ucnid-3.c ! 41260c5d5996e3291b79557a3e93a529 gcc/testsuite/gcc.dg/ucnid-4.c 77b30d02c92cf96d4e82d9469912a366 gcc/testsuite/gcc.dg/ucnid-5.c ! 6cf5a2f6c7fe4117abbd1f600ed3ff81 gcc/testsuite/gcc.dg/ucnid-6.c 79a7a8c0948ae5bcfa1991de6867e0c1 gcc/testsuite/gcc.dg/unaligned-1.c 7ae6ec0a00cfc8c6623bf6575c1ec67b gcc/testsuite/gcc.dg/uninit-1-O0.c f0a8a0b26965879e40a88ebccf31030c gcc/testsuite/gcc.dg/uninit-1.c --- 21722,21732 ---- 0347a7dc32b8dfb279bdfe3b50e84008 gcc/testsuite/gcc.dg/typeof-1.c 38f4467be27d0432adea9abcaf9cc366 gcc/testsuite/gcc.dg/typespec-1.c 1cc7d04808baa8f231877b2a2f8ec29f gcc/testsuite/gcc.dg/ucnid-1.c ! 3160b88d3c0582bd9112369c1cb39315 gcc/testsuite/gcc.dg/ucnid-2.c ! f980ae8bdbd3bf1dd5cea4f08a819b5d gcc/testsuite/gcc.dg/ucnid-3.c ! 377ca1b45ed17c8813cbd110c41164d0 gcc/testsuite/gcc.dg/ucnid-4.c 77b30d02c92cf96d4e82d9469912a366 gcc/testsuite/gcc.dg/ucnid-5.c ! 38de40a835bb39aff4a60a39ea531f95 gcc/testsuite/gcc.dg/ucnid-6.c 79a7a8c0948ae5bcfa1991de6867e0c1 gcc/testsuite/gcc.dg/unaligned-1.c 7ae6ec0a00cfc8c6623bf6575c1ec67b gcc/testsuite/gcc.dg/uninit-1-O0.c f0a8a0b26965879e40a88ebccf31030c gcc/testsuite/gcc.dg/uninit-1.c *************** e4901a657ce787d90d2d366eb697359a gcc/te *** 21801,21807 **** 9c24467aafda1d6b6bf0c57af48b4832 gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-33.c e7a411dffcf9b2cb08db7f673f1b2317 gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-68.c d6d76f114f830b067acd4c244d653ce0 gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-reduc-1char.c ! 43770fd0483c112c92fb7659442e60c0 gcc/testsuite/gcc.dg/vect/costmodel/i386/i386-costmodel-vect.exp 156a82e8bc9b1b8fe5143367dfc1bae4 gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-fast-math-vect-pr29925.c 8334641143225456a1847fea7acf87e2 gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-pr37194.c fc7ac78504f3cdfc1375c2a3d903b99e gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-12.c --- 21845,21851 ---- 9c24467aafda1d6b6bf0c57af48b4832 gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-33.c e7a411dffcf9b2cb08db7f673f1b2317 gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-68.c d6d76f114f830b067acd4c244d653ce0 gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-reduc-1char.c ! d5bb424012cd6f3b7d20cdde9698e81f gcc/testsuite/gcc.dg/vect/costmodel/i386/i386-costmodel-vect.exp 156a82e8bc9b1b8fe5143367dfc1bae4 gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-fast-math-vect-pr29925.c 8334641143225456a1847fea7acf87e2 gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-pr37194.c fc7ac78504f3cdfc1375c2a3d903b99e gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-12.c *************** f1229356180ad90687d100f9305b20cd gcc/te *** 22167,22173 **** a0cb6598100ff4b2ffb39f2de1c7afd2 gcc/testsuite/gcc.dg/vect/vect-complex-2.c 8ba2b66b23af0854a386cba354154145 gcc/testsuite/gcc.dg/vect/vect-complex-4.c 34d66dadfadf90c9d4352d645c7328bd gcc/testsuite/gcc.dg/vect/vect-complex-5.c ! c6b6654864748ca914d9800ad6d45ed5 gcc/testsuite/gcc.dg/vect/vect-debug-pr41926.c 34f34a67876b23053b9654dc17287ade gcc/testsuite/gcc.dg/vect/vect-dv-1.c 510ad5398f116a03d59e3bbfa6eb3124 gcc/testsuite/gcc.dg/vect/vect-float-extend-1.c 91a5665fd80c33178f21583704e9314e gcc/testsuite/gcc.dg/vect/vect-float-truncate-1.c --- 22211,22217 ---- a0cb6598100ff4b2ffb39f2de1c7afd2 gcc/testsuite/gcc.dg/vect/vect-complex-2.c 8ba2b66b23af0854a386cba354154145 gcc/testsuite/gcc.dg/vect/vect-complex-4.c 34d66dadfadf90c9d4352d645c7328bd gcc/testsuite/gcc.dg/vect/vect-complex-5.c ! 8850bf3235e15d194feffc9c4f25534d gcc/testsuite/gcc.dg/vect/vect-debug-pr41926.c 34f34a67876b23053b9654dc17287ade gcc/testsuite/gcc.dg/vect/vect-dv-1.c 510ad5398f116a03d59e3bbfa6eb3124 gcc/testsuite/gcc.dg/vect/vect-float-extend-1.c 91a5665fd80c33178f21583704e9314e gcc/testsuite/gcc.dg/vect/vect-float-truncate-1.c *************** e7f401759cf41b85007c44682cfa0bf5 gcc/te *** 22311,22317 **** 6401dad6f05f4ad9e635727b628512c1 gcc/testsuite/gcc.dg/vect/vect-widen-mult-sum.c 0ab99604e1c91848c8e17073f4fbd2fe gcc/testsuite/gcc.dg/vect/vect-widen-mult-u16.c 6d8fee4f4b171e847575ecdf093062ed gcc/testsuite/gcc.dg/vect/vect-widen-mult-u8.c ! 3527c7af0603dbe8e3d4bec44cfccfac gcc/testsuite/gcc.dg/vect/vect.exp 70f5bfe5c3206bb27ef00df04395f1b4 gcc/testsuite/gcc.dg/vect/wrapv-vect-7.c c1a258213052c3dfbc9b6a8c1c0d6d6c gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-2char.c 1e23759ae2d20580a48c9849cfca511f gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-2short.c --- 22355,22361 ---- 6401dad6f05f4ad9e635727b628512c1 gcc/testsuite/gcc.dg/vect/vect-widen-mult-sum.c 0ab99604e1c91848c8e17073f4fbd2fe gcc/testsuite/gcc.dg/vect/vect-widen-mult-u16.c 6d8fee4f4b171e847575ecdf093062ed gcc/testsuite/gcc.dg/vect/vect-widen-mult-u8.c ! 1d1a6d07b59d367160b10c6610a3ba01 gcc/testsuite/gcc.dg/vect/vect.exp 70f5bfe5c3206bb27ef00df04395f1b4 gcc/testsuite/gcc.dg/vect/wrapv-vect-7.c c1a258213052c3dfbc9b6a8c1c0d6d6c gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-2char.c 1e23759ae2d20580a48c9849cfca511f gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-2short.c *************** cecbda394313eabaf737f33035ce4e65 gcc/te *** 22568,22574 **** fb02e2ec866a19814c77a674e27c5530 gcc/testsuite/gcc.misc-tests/i386-prefetch.exp 51bca646196e93b1c8a68319441e0595 gcc/testsuite/gcc.misc-tests/linkage-x.c 4020995d3b08e117c48c529d5bc0b3ec gcc/testsuite/gcc.misc-tests/linkage-y.c ! 6d361aadb5b6f4af6325f45428286638 gcc/testsuite/gcc.misc-tests/linkage.exp 1d8fa0a1210ed4c4bf0ff4dfa959f060 gcc/testsuite/gcc.misc-tests/matrix1.c df12121eb39030141d2c4eaadc9fe0f3 gcc/testsuite/gcc.misc-tests/matrix1.exp b45579fdac6008721502ddecb5df29d8 gcc/testsuite/gcc.misc-tests/mg-2.c --- 22612,22618 ---- fb02e2ec866a19814c77a674e27c5530 gcc/testsuite/gcc.misc-tests/i386-prefetch.exp 51bca646196e93b1c8a68319441e0595 gcc/testsuite/gcc.misc-tests/linkage-x.c 4020995d3b08e117c48c529d5bc0b3ec gcc/testsuite/gcc.misc-tests/linkage-y.c ! 3280fd6082b6be6a0b573b0148847de1 gcc/testsuite/gcc.misc-tests/linkage.exp 1d8fa0a1210ed4c4bf0ff4dfa959f060 gcc/testsuite/gcc.misc-tests/matrix1.c df12121eb39030141d2c4eaadc9fe0f3 gcc/testsuite/gcc.misc-tests/matrix1.exp b45579fdac6008721502ddecb5df29d8 gcc/testsuite/gcc.misc-tests/mg-2.c *************** f2091ba6325cc1c82cb42e225edecf94 gcc/te *** 24610,24624 **** e42ece46b9162197da33170eb29e9c26 gcc/testsuite/gcc.target/i386/20000904-1.c 400a0faf59d7e0d0a4371ccfe8486fa6 gcc/testsuite/gcc.target/i386/20001127-1.c 32d7aafbba3c3766e5be966131eab9a6 gcc/testsuite/gcc.target/i386/20010520-1.c ! e0a69f3b626da5a3720530bc9017bc81 gcc/testsuite/gcc.target/i386/20011009-1.c 8f7d01a349468b43eff367215877d497 gcc/testsuite/gcc.target/i386/20011029-2.c d51ba1a7a0c4133dbc56fe94a5180335 gcc/testsuite/gcc.target/i386/20011107-1.c d26f4aa797efceb4b9765729c2dd261d gcc/testsuite/gcc.target/i386/20011119-1.c 7496045fc030b9e28afba7c5464c2207 gcc/testsuite/gcc.target/i386/20020201-3.c ! 48909e67e4800c59934f7f7a98f4824b gcc/testsuite/gcc.target/i386/20020218-1.c ba54f9b0c866b8f8b35145c85e815cee gcc/testsuite/gcc.target/i386/20020224-1.c 8c6ac3ccbfa7309d7f004530bc027745 gcc/testsuite/gcc.target/i386/20020426-1.c ! 2e75607a1ac9f82f9c83e35133b80367 gcc/testsuite/gcc.target/i386/20020523.c 84c40a03d2d79e5bebb4a73ab2b24f5a gcc/testsuite/gcc.target/i386/20020531-1.c 3e98081101baa76ab3afa9eb2aabed4f gcc/testsuite/gcc.target/i386/20020616-1.c 75d6049760e90b02715564a670611c3f gcc/testsuite/gcc.target/i386/20020729-1.c --- 24654,24668 ---- e42ece46b9162197da33170eb29e9c26 gcc/testsuite/gcc.target/i386/20000904-1.c 400a0faf59d7e0d0a4371ccfe8486fa6 gcc/testsuite/gcc.target/i386/20001127-1.c 32d7aafbba3c3766e5be966131eab9a6 gcc/testsuite/gcc.target/i386/20010520-1.c ! 3b762a1f3add0b9d50f36004a5e7a667 gcc/testsuite/gcc.target/i386/20011009-1.c 8f7d01a349468b43eff367215877d497 gcc/testsuite/gcc.target/i386/20011029-2.c d51ba1a7a0c4133dbc56fe94a5180335 gcc/testsuite/gcc.target/i386/20011107-1.c d26f4aa797efceb4b9765729c2dd261d gcc/testsuite/gcc.target/i386/20011119-1.c 7496045fc030b9e28afba7c5464c2207 gcc/testsuite/gcc.target/i386/20020201-3.c ! 5ef7ede8002a71b91ab5638673040a54 gcc/testsuite/gcc.target/i386/20020218-1.c ba54f9b0c866b8f8b35145c85e815cee gcc/testsuite/gcc.target/i386/20020224-1.c 8c6ac3ccbfa7309d7f004530bc027745 gcc/testsuite/gcc.target/i386/20020426-1.c ! 81bebcf75e16cf88e51a784c865c16d7 gcc/testsuite/gcc.target/i386/20020523.c 84c40a03d2d79e5bebb4a73ab2b24f5a gcc/testsuite/gcc.target/i386/20020531-1.c 3e98081101baa76ab3afa9eb2aabed4f gcc/testsuite/gcc.target/i386/20020616-1.c 75d6049760e90b02715564a670611c3f gcc/testsuite/gcc.target/i386/20020729-1.c *************** ba54f9b0c866b8f8b35145c85e815cee gcc/te *** 24629,24637 **** 0ee82d6847f29cad4145933b9937b67e gcc/testsuite/gcc.target/i386/20060125-1.c c4beb13be5cda6b7d8432a985c573190 gcc/testsuite/gcc.target/i386/20060125-2.c a7556e3d9e8e29562f1ee775c2ab8d47 gcc/testsuite/gcc.target/i386/20060218-1.c ! 5631ec42291746525ef3249bceac1f32 gcc/testsuite/gcc.target/i386/20060512-1.c cd0c80ed7dbd6bf544227bf24498ca62 gcc/testsuite/gcc.target/i386/20060512-2.c ! c1a12b056f76caf27c52b8e03d172bac gcc/testsuite/gcc.target/i386/20060512-3.c 0e07685dce30a90b401304a4ec9a9cb1 gcc/testsuite/gcc.target/i386/20060512-4.c 02d11e0dc4e9cc70cf526ceb09b6243a gcc/testsuite/gcc.target/i386/20060821-1.c d7eaa92960303dbce8fb31590427bb11 gcc/testsuite/gcc.target/i386/20080723-1.c --- 24673,24681 ---- 0ee82d6847f29cad4145933b9937b67e gcc/testsuite/gcc.target/i386/20060125-1.c c4beb13be5cda6b7d8432a985c573190 gcc/testsuite/gcc.target/i386/20060125-2.c a7556e3d9e8e29562f1ee775c2ab8d47 gcc/testsuite/gcc.target/i386/20060218-1.c ! 790fee539ad95f54848932573a28c080 gcc/testsuite/gcc.target/i386/20060512-1.c cd0c80ed7dbd6bf544227bf24498ca62 gcc/testsuite/gcc.target/i386/20060512-2.c ! 51dd91a6e23b6cc0885ba32a12fd3206 gcc/testsuite/gcc.target/i386/20060512-3.c 0e07685dce30a90b401304a4ec9a9cb1 gcc/testsuite/gcc.target/i386/20060512-4.c 02d11e0dc4e9cc70cf526ceb09b6243a gcc/testsuite/gcc.target/i386/20060821-1.c d7eaa92960303dbce8fb31590427bb11 gcc/testsuite/gcc.target/i386/20080723-1.c *************** a022b021fe9e8a32142ad65dd4f28cb3 gcc/te *** 24647,24656 **** 4b26afcfe86b9c98ea698f098caecbe1 gcc/testsuite/gcc.target/i386/387-7.c 8ed9dc779f89ed4d10e5fbda12299def gcc/testsuite/gcc.target/i386/387-8.c 71cb969f7de4850f5b46cf91368fb21e gcc/testsuite/gcc.target/i386/387-9.c ! 66d5bd7fce96cc384222dcb7d3b23c73 gcc/testsuite/gcc.target/i386/3dnow-1.c ! c03154973a9ff94c6596ae50d23e3fe1 gcc/testsuite/gcc.target/i386/3dnow-2.c ! 83302e2406339ea84ff036ef9cfa75d3 gcc/testsuite/gcc.target/i386/3dnowA-1.c ! 0e2498a4d32ca7d1ab40e7ef316dd67b gcc/testsuite/gcc.target/i386/3dnowA-2.c 6b6352a48b6c05341b0d070066b47816 gcc/testsuite/gcc.target/i386/980211-1.c 13b4620f57ed2cb06f634015ce93dc3e gcc/testsuite/gcc.target/i386/980226-1.c b000b1e3939194b5dacc0db4ca401bc2 gcc/testsuite/gcc.target/i386/980312-1.c --- 24691,24700 ---- 4b26afcfe86b9c98ea698f098caecbe1 gcc/testsuite/gcc.target/i386/387-7.c 8ed9dc779f89ed4d10e5fbda12299def gcc/testsuite/gcc.target/i386/387-8.c 71cb969f7de4850f5b46cf91368fb21e gcc/testsuite/gcc.target/i386/387-9.c ! edd5dce88e6d5cf6a9940257fb9a1ecc gcc/testsuite/gcc.target/i386/3dnow-1.c ! 5aad1ce33dc6f835d0b3e393eb7bc173 gcc/testsuite/gcc.target/i386/3dnow-2.c ! 41054e930800f99418ac5e3ecbbb9f4b gcc/testsuite/gcc.target/i386/3dnowA-1.c ! 05bf5ba354bee80cc1e8e45c0a605497 gcc/testsuite/gcc.target/i386/3dnowA-2.c 6b6352a48b6c05341b0d070066b47816 gcc/testsuite/gcc.target/i386/980211-1.c 13b4620f57ed2cb06f634015ce93dc3e gcc/testsuite/gcc.target/i386/980226-1.c b000b1e3939194b5dacc0db4ca401bc2 gcc/testsuite/gcc.target/i386/980312-1.c *************** f6d750439e32998ec0dcfd8eac6d7bae gcc/te *** 24668,24675 **** ed39fac01137b1fe7fa6aa0aed6f57d9 gcc/testsuite/gcc.target/i386/991209-1.c 5f30bdc2f0412c42a215d31ecf02816a gcc/testsuite/gcc.target/i386/991214-1.c 8f781c8f79a0efa2691c8d2f9acc438f gcc/testsuite/gcc.target/i386/991230-1.c ! f735456052a700dd38243bb3e18ed960 gcc/testsuite/gcc.target/i386/abi-1.c ! 5e2762ab357f8bceff376726df91ccb5 gcc/testsuite/gcc.target/i386/abi-2.c 694fb560a7ccd2e52932322b7e1f58be gcc/testsuite/gcc.target/i386/addr-sel-1.c 9f2dec108c4d89475cbe0b9cce61e977 gcc/testsuite/gcc.target/i386/aes-avx-check.h c6e7bd4e88988a1bfc2d2c78141f8fb9 gcc/testsuite/gcc.target/i386/aes-check.h --- 24712,24719 ---- ed39fac01137b1fe7fa6aa0aed6f57d9 gcc/testsuite/gcc.target/i386/991209-1.c 5f30bdc2f0412c42a215d31ecf02816a gcc/testsuite/gcc.target/i386/991214-1.c 8f781c8f79a0efa2691c8d2f9acc438f gcc/testsuite/gcc.target/i386/991230-1.c ! 40d5d7ea5cca5cc5166f8915c0ef8ede gcc/testsuite/gcc.target/i386/abi-1.c ! a5fd7d4d12ea2aeddad50be0766e9b70 gcc/testsuite/gcc.target/i386/abi-2.c 694fb560a7ccd2e52932322b7e1f58be gcc/testsuite/gcc.target/i386/addr-sel-1.c 9f2dec108c4d89475cbe0b9cce61e977 gcc/testsuite/gcc.target/i386/aes-avx-check.h c6e7bd4e88988a1bfc2d2c78141f8fb9 gcc/testsuite/gcc.target/i386/aes-check.h *************** ca57a5bdecbad49758cb531a697e54f8 gcc/te *** 24684,24690 **** aac0c899308992c99032a1f2753f7f3d gcc/testsuite/gcc.target/i386/align-main-3.c bd3f7cf2a9121af36023c0458b83d0eb gcc/testsuite/gcc.target/i386/amd64-abi-1.c c71ef98be1c3520f24d925a4d7d239a7 gcc/testsuite/gcc.target/i386/amd64-abi-2.c ! b3ecc6a18a533a51a8989626011f99fd gcc/testsuite/gcc.target/i386/amd64-abi-3.c a6a3172e3efc8d83c7a22ad1d06e4969 gcc/testsuite/gcc.target/i386/amd64-abi-4.c 7f6d7a21a67dad4cc1dfd41ea81a8b3f gcc/testsuite/gcc.target/i386/amd64-abi-5.c 2d30ee9a25670b3c2dd1fdba035229ed gcc/testsuite/gcc.target/i386/amd64-abi-6.c --- 24728,24734 ---- aac0c899308992c99032a1f2753f7f3d gcc/testsuite/gcc.target/i386/align-main-3.c bd3f7cf2a9121af36023c0458b83d0eb gcc/testsuite/gcc.target/i386/amd64-abi-1.c c71ef98be1c3520f24d925a4d7d239a7 gcc/testsuite/gcc.target/i386/amd64-abi-2.c ! 4cda4ac89e1eb27e871678908fc26cf2 gcc/testsuite/gcc.target/i386/amd64-abi-3.c a6a3172e3efc8d83c7a22ad1d06e4969 gcc/testsuite/gcc.target/i386/amd64-abi-4.c 7f6d7a21a67dad4cc1dfd41ea81a8b3f gcc/testsuite/gcc.target/i386/amd64-abi-5.c 2d30ee9a25670b3c2dd1fdba035229ed gcc/testsuite/gcc.target/i386/amd64-abi-6.c *************** a18212631cd120a6a1d404a12f87a62a gcc/te *** 24771,24782 **** ceeba3b496c4e5ed30f832bcd0fdddfb gcc/testsuite/gcc.target/i386/avx-vbroadcastsd-1.c a93acefab8b1bd8c2a32268a23d5a4f3 gcc/testsuite/gcc.target/i386/avx-vbroadcastss-1.c 298702f696a9055bd03da629fdec8e7a gcc/testsuite/gcc.target/i386/avx-vbroadcastss-2.c ! 3cc8eb8ed5c0c005c73d1a3db8ca7b4e gcc/testsuite/gcc.target/i386/avx-vcmppd-1.c ! 9f8b1e39c6e757552145a30472edf088 gcc/testsuite/gcc.target/i386/avx-vcmppd-256-1.c ! ecbfc8f0c3ef33f2dd0476b4d22dc995 gcc/testsuite/gcc.target/i386/avx-vcmpps-1.c ! 85492d34ac5a405e01b65175c12d8887 gcc/testsuite/gcc.target/i386/avx-vcmpps-256-1.c ! 440980d68a6e842d77c1de66995f0150 gcc/testsuite/gcc.target/i386/avx-vcmpsd-1.c ! 085b60764f6dcdc7730fa988de1eb285 gcc/testsuite/gcc.target/i386/avx-vcmpss-1.c 2e1abad2d7f4ca67b07926595665adc1 gcc/testsuite/gcc.target/i386/avx-vcomisd-1.c df177c04a3a1c5945c0dbf6e4029866d gcc/testsuite/gcc.target/i386/avx-vcomisd-2.c d96f0c65f45ec07edea7b117f82635e3 gcc/testsuite/gcc.target/i386/avx-vcomisd-3.c --- 24815,24826 ---- ceeba3b496c4e5ed30f832bcd0fdddfb gcc/testsuite/gcc.target/i386/avx-vbroadcastsd-1.c a93acefab8b1bd8c2a32268a23d5a4f3 gcc/testsuite/gcc.target/i386/avx-vbroadcastss-1.c 298702f696a9055bd03da629fdec8e7a gcc/testsuite/gcc.target/i386/avx-vbroadcastss-2.c ! e8bc7295db5adff2f1c72d4cc462537e gcc/testsuite/gcc.target/i386/avx-vcmppd-1.c ! 4e8b43b36bd829a021b162f6d12ce2b5 gcc/testsuite/gcc.target/i386/avx-vcmppd-256-1.c ! 47c2d434dbd0d332424cd27f6857a9a4 gcc/testsuite/gcc.target/i386/avx-vcmpps-1.c ! f7f10f537aed6602749ac5c69daab148 gcc/testsuite/gcc.target/i386/avx-vcmpps-256-1.c ! 9895569b28ab9e2314aeb212ae59b3ef gcc/testsuite/gcc.target/i386/avx-vcmpsd-1.c ! 3a0c9f2f97486f759e2c012bafd15d66 gcc/testsuite/gcc.target/i386/avx-vcmpss-1.c 2e1abad2d7f4ca67b07926595665adc1 gcc/testsuite/gcc.target/i386/avx-vcomisd-1.c df177c04a3a1c5945c0dbf6e4029866d gcc/testsuite/gcc.target/i386/avx-vcomisd-2.c d96f0c65f45ec07edea7b117f82635e3 gcc/testsuite/gcc.target/i386/avx-vcomisd-3.c *************** b03abd84a19de83d8394b1c2d6e9f38e gcc/te *** 24830,24835 **** --- 24874,24881 ---- d41b913a333af02d40f814f1b2a84c7c gcc/testsuite/gcc.target/i386/avx-vdpps-2.c e5cb22bdafe51c2904331984447ab773 gcc/testsuite/gcc.target/i386/avx-vextractf128-256-1.c a9f944657af22095cf4764500f8a8087 gcc/testsuite/gcc.target/i386/avx-vextractf128-256-2.c + fadd9b138827f3e4b81282e2fdb850df gcc/testsuite/gcc.target/i386/avx-vextractf128-256-3.c + a4c850d4972aa84e6f2003724d615b35 gcc/testsuite/gcc.target/i386/avx-vextractf128-256-4.c a4458e4645d2ce40ebc49078341db980 gcc/testsuite/gcc.target/i386/avx-vextractps-1.c a0bbdb49b0a37c0ad013325207919a4b gcc/testsuite/gcc.target/i386/avx-vhaddpd-1.c 1facc3478c1166750bc4775843cf2955 gcc/testsuite/gcc.target/i386/avx-vhaddpd-256-1.c *************** a10441579d2b177bca2939688f1d171f gcc/te *** 25158,25163 **** --- 25204,25210 ---- 371f18813dae88e704517a2270da2fa7 gcc/testsuite/gcc.target/i386/call-1.c 23b2a9c534988bae4d3d9b6eb90cec09 gcc/testsuite/gcc.target/i386/cleanup-1.c 0b3d7c8dea2bff98d1d6a2893b499fc3 gcc/testsuite/gcc.target/i386/cleanup-2.c + e0242c2120b4d7e26149885baf8fd877 gcc/testsuite/gcc.target/i386/clearcap.map b135d11a6585be7ce7c1a705a1592d1c gcc/testsuite/gcc.target/i386/clobbers.c 538ab6e8a06c514c724312c46aa4c439 gcc/testsuite/gcc.target/i386/cmov1.c 86cfb515b99e6eea4c48ca1ca4343c48 gcc/testsuite/gcc.target/i386/cmov2.c *************** e352a7d2b4c7a6248c4c7b14470aeec8 gcc/te *** 25177,25195 **** 5fd03b35b48008d1dfb8990591365620 gcc/testsuite/gcc.target/i386/compress-float-387.c cde6e2771dc656071b1646b0508f22ab gcc/testsuite/gcc.target/i386/compress-float-sse-pic.c 21be6a931562b1a7073368c851c40151 gcc/testsuite/gcc.target/i386/compress-float-sse.c 256d1574b662793ad6c14c7c38a3d045 gcc/testsuite/gcc.target/i386/cvt-1.c 58fd94cd5ec0af1baeb2e221c3acb8e4 gcc/testsuite/gcc.target/i386/darwin-fpmath.c bfbac75bbc2903bc9ce6d39c53d89c68 gcc/testsuite/gcc.target/i386/defines-1.c 73d516febd7b11c39305fc45aeb62e82 gcc/testsuite/gcc.target/i386/defines-2.c c8661d46af4e71184c4904ae6ab3be9b gcc/testsuite/gcc.target/i386/fastcall-1.c ! 7e0b7f38550cfba24b56599bd22a6ccd gcc/testsuite/gcc.target/i386/fastcall-sseregparm.c ! c821392192f7fcd5a642f49a55bfff5d gcc/testsuite/gcc.target/i386/float128-1.c ! c42cc21d4a8595352b729d7d8f6afdb1 gcc/testsuite/gcc.target/i386/float128-2.c ! a21243e6c5ef06fe0eedd00861ce8063 gcc/testsuite/gcc.target/i386/fpcvt-1.c ! 4d6cca7379c2d9b60e3696c7800f0bdd gcc/testsuite/gcc.target/i386/fpcvt-2.c ! 249831672ec191eb83ff68513e244291 gcc/testsuite/gcc.target/i386/fpcvt-3.c f4728a5ddd8f5b7d2932dd853b2fc88f gcc/testsuite/gcc.target/i386/fpcvt-4.c ! 637627936274584b63032b3a3d043aa3 gcc/testsuite/gcc.target/i386/fpprec-1.c 70cd0a18e80869c974d9622bddb14e72 gcc/testsuite/gcc.target/i386/funcspec-1.c 0f0cd5e55a44d7e2f01777f4cb151b37 gcc/testsuite/gcc.target/i386/funcspec-10.c 71f4090050096f9f61b0b94bd657e482 gcc/testsuite/gcc.target/i386/funcspec-11.c --- 25224,25244 ---- 5fd03b35b48008d1dfb8990591365620 gcc/testsuite/gcc.target/i386/compress-float-387.c cde6e2771dc656071b1646b0508f22ab gcc/testsuite/gcc.target/i386/compress-float-sse-pic.c 21be6a931562b1a7073368c851c40151 gcc/testsuite/gcc.target/i386/compress-float-sse.c + ddfbe1b9870a464a4e78fc3977287c3d gcc/testsuite/gcc.target/i386/crc32-3.c + a0a241c5d2087916d712b101d166d85e gcc/testsuite/gcc.target/i386/crc32-4.c 256d1574b662793ad6c14c7c38a3d045 gcc/testsuite/gcc.target/i386/cvt-1.c 58fd94cd5ec0af1baeb2e221c3acb8e4 gcc/testsuite/gcc.target/i386/darwin-fpmath.c bfbac75bbc2903bc9ce6d39c53d89c68 gcc/testsuite/gcc.target/i386/defines-1.c 73d516febd7b11c39305fc45aeb62e82 gcc/testsuite/gcc.target/i386/defines-2.c c8661d46af4e71184c4904ae6ab3be9b gcc/testsuite/gcc.target/i386/fastcall-1.c ! 640296f07d14087f73d37e7c0d833b7e gcc/testsuite/gcc.target/i386/fastcall-sseregparm.c ! f6d092ca79fa176c8241829def867be2 gcc/testsuite/gcc.target/i386/float128-1.c ! fbac138928aaeb91f11bf6fbfa1c583a gcc/testsuite/gcc.target/i386/float128-2.c ! 37f43080f019ea0ca6035c78f1ef3286 gcc/testsuite/gcc.target/i386/fpcvt-1.c ! 491ba0b9ab6a71554c57c7af00d201a8 gcc/testsuite/gcc.target/i386/fpcvt-2.c ! c3e3bfb1747a8da101a08639fea3585a gcc/testsuite/gcc.target/i386/fpcvt-3.c f4728a5ddd8f5b7d2932dd853b2fc88f gcc/testsuite/gcc.target/i386/fpcvt-4.c ! de21850aa1ee59ff7fed86c89e17eb4a gcc/testsuite/gcc.target/i386/fpprec-1.c 70cd0a18e80869c974d9622bddb14e72 gcc/testsuite/gcc.target/i386/funcspec-1.c 0f0cd5e55a44d7e2f01777f4cb151b37 gcc/testsuite/gcc.target/i386/funcspec-10.c 71f4090050096f9f61b0b94bd657e482 gcc/testsuite/gcc.target/i386/funcspec-11.c *************** a9c690d64612d4f7a2be4ef9a00c4984 gcc/te *** 25200,25215 **** c18f13f7d14c1e41c93278ec25d184a4 gcc/testsuite/gcc.target/i386/funcspec-6.c 35655de5c9348f2a36254312a8d17908 gcc/testsuite/gcc.target/i386/funcspec-7.c 69a64b4be96acccc01726c36c4f8b6b5 gcc/testsuite/gcc.target/i386/funcspec-8.c ! 077f57986a9b44376b137572c3ea53ef gcc/testsuite/gcc.target/i386/funcspec-9.c 1a73834d51aecadfe97515b4ee015ec8 gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-1.c ca2c63909bfb9a2713785beb934dc830 gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-2.c 18aa0ec98890539ed5c5e0a3ceedd108 gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-3.c a50a926593ca45b7df7670c1731cdaab gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-4.c ! 62f7900b1fe42be2461457815da6e77d gcc/testsuite/gcc.target/i386/i386.exp ! 917619f36e77066e954739e85df8b539 gcc/testsuite/gcc.target/i386/incoming-1.c ! 4ec6ef72764ac7d20118f9c784558f3c gcc/testsuite/gcc.target/i386/incoming-2.c ! 332f33da6d71c355cf6ec6f9b93d9951 gcc/testsuite/gcc.target/i386/incoming-3.c ! a98cb552a63ca4b79d0b78d2cdeb9b04 gcc/testsuite/gcc.target/i386/incoming-4.c dea43e4b3eadc88cc2253e54061fa81d gcc/testsuite/gcc.target/i386/incoming-5.c c1d89aa2bd9994ea302a1802eeb608c9 gcc/testsuite/gcc.target/i386/inline-mcpy.c b97892391a113a3adf256236a1bf77ff gcc/testsuite/gcc.target/i386/isa-1.c --- 25249,25264 ---- c18f13f7d14c1e41c93278ec25d184a4 gcc/testsuite/gcc.target/i386/funcspec-6.c 35655de5c9348f2a36254312a8d17908 gcc/testsuite/gcc.target/i386/funcspec-7.c 69a64b4be96acccc01726c36c4f8b6b5 gcc/testsuite/gcc.target/i386/funcspec-8.c ! 54842f1edd8364789d487f5c0e033ad7 gcc/testsuite/gcc.target/i386/funcspec-9.c 1a73834d51aecadfe97515b4ee015ec8 gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-1.c ca2c63909bfb9a2713785beb934dc830 gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-2.c 18aa0ec98890539ed5c5e0a3ceedd108 gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-3.c a50a926593ca45b7df7670c1731cdaab gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-4.c ! 71825425ed53b461bea106e7b1ab2509 gcc/testsuite/gcc.target/i386/i386.exp ! 65b2b1ead393e1b43069d6d3926a478b gcc/testsuite/gcc.target/i386/incoming-1.c ! 69e4ba1f4cbd5006c9298140ad84d93c gcc/testsuite/gcc.target/i386/incoming-2.c ! 868f3dad6fb23030110625473140f87c gcc/testsuite/gcc.target/i386/incoming-3.c ! 1c595b17464e17be115c5cb4b06026e5 gcc/testsuite/gcc.target/i386/incoming-4.c dea43e4b3eadc88cc2253e54061fa81d gcc/testsuite/gcc.target/i386/incoming-5.c c1d89aa2bd9994ea302a1802eeb608c9 gcc/testsuite/gcc.target/i386/inline-mcpy.c b97892391a113a3adf256236a1bf77ff gcc/testsuite/gcc.target/i386/isa-1.c *************** a697ff9e2f8fc0bffc90007a1118893e gcc/te *** 25242,25248 **** 2b719a429ba467512cb34ad73352ab1f gcc/testsuite/gcc.target/i386/math-torture/lfloor.c 90c0fcbde458b9688e1e20332b2f1308 gcc/testsuite/gcc.target/i386/math-torture/lrint.c 75c95d53b12109ed3e501ca632f0035d gcc/testsuite/gcc.target/i386/math-torture/lround.c ! d212a0464dffb601fc56ad94990e139d gcc/testsuite/gcc.target/i386/math-torture/math-torture.exp b8987de7098b84e004093b3d86b59425 gcc/testsuite/gcc.target/i386/math-torture/nearbyint.c 9b512770257f2687cde1774f56f4d64d gcc/testsuite/gcc.target/i386/math-torture/rint.c 29b89b8d60fbc8ee9eb2fb986ae17c23 gcc/testsuite/gcc.target/i386/math-torture/round.c --- 25291,25297 ---- 2b719a429ba467512cb34ad73352ab1f gcc/testsuite/gcc.target/i386/math-torture/lfloor.c 90c0fcbde458b9688e1e20332b2f1308 gcc/testsuite/gcc.target/i386/math-torture/lrint.c 75c95d53b12109ed3e501ca632f0035d gcc/testsuite/gcc.target/i386/math-torture/lround.c ! b8cccd15ddee216cbcf6651df85b01c5 gcc/testsuite/gcc.target/i386/math-torture/math-torture.exp b8987de7098b84e004093b3d86b59425 gcc/testsuite/gcc.target/i386/math-torture/nearbyint.c 9b512770257f2687cde1774f56f4d64d gcc/testsuite/gcc.target/i386/math-torture/rint.c 29b89b8d60fbc8ee9eb2fb986ae17c23 gcc/testsuite/gcc.target/i386/math-torture/round.c *************** bb0703a0cfe126aeba12e7589d46db56 gcc/te *** 25268,25276 **** f3b09be597872ff56a816e7108198cc2 gcc/testsuite/gcc.target/i386/movti.c 0e6e9e397831921b702df0167f01b9d2 gcc/testsuite/gcc.target/i386/mul.c 3e8f31e1c16780a72f99af3af4428318 gcc/testsuite/gcc.target/i386/nrv1.c ! ab704af33e49e62dd54634ca28d77447 gcc/testsuite/gcc.target/i386/opt-1.c ! beb8c6fdb176b8b7dd9eea678b2fda2e gcc/testsuite/gcc.target/i386/opt-2.c ! 768e6e106257ef723b64a10eb89e9811 gcc/testsuite/gcc.target/i386/ordcmp-1.c 8d18c90795c1653930445593d44b2171 gcc/testsuite/gcc.target/i386/parity-1.c 750dae867b72e3ec6e017b6d6be8b646 gcc/testsuite/gcc.target/i386/parity-2.c 368260be3440a27836a656273eb46c9d gcc/testsuite/gcc.target/i386/pclmul-avx-check.h --- 25317,25325 ---- f3b09be597872ff56a816e7108198cc2 gcc/testsuite/gcc.target/i386/movti.c 0e6e9e397831921b702df0167f01b9d2 gcc/testsuite/gcc.target/i386/mul.c 3e8f31e1c16780a72f99af3af4428318 gcc/testsuite/gcc.target/i386/nrv1.c ! 1147a1993a79ddc69e4654c16985bcb6 gcc/testsuite/gcc.target/i386/opt-1.c ! 547c93afc6596e78a75f8a09409375a3 gcc/testsuite/gcc.target/i386/opt-2.c ! 79ddfd2e4c8179a891a396e881d43d6a gcc/testsuite/gcc.target/i386/ordcmp-1.c 8d18c90795c1653930445593d44b2171 gcc/testsuite/gcc.target/i386/parity-1.c 750dae867b72e3ec6e017b6d6be8b646 gcc/testsuite/gcc.target/i386/parity-2.c 368260be3440a27836a656273eb46c9d gcc/testsuite/gcc.target/i386/pclmul-avx-check.h *************** f2961b113a187971d8c265513b16a3a5 gcc/te *** 25290,25309 **** 27f57729aea057bdb268886140eaba10 gcc/testsuite/gcc.target/i386/pr11001-strlen-3.c b7c1027e39ee212e2332b0575582c16c gcc/testsuite/gcc.target/i386/pr12092-1.c 559d97e3f695b650764f7558433acf01 gcc/testsuite/gcc.target/i386/pr12329.c ! 8951a1fa31f2d45ef9eacfff6a733f77 gcc/testsuite/gcc.target/i386/pr13366.c ! ff668720aeef372aa8ae71597abc2571 gcc/testsuite/gcc.target/i386/pr13685.c 31ead0ee84b382ba03e3561931bc6e40 gcc/testsuite/gcc.target/i386/pr14289-1.c 6a09a31c8162440929d99a05b6983c5a gcc/testsuite/gcc.target/i386/pr14552.c d4aa6113ea62bc36639d93e1e44a1210 gcc/testsuite/gcc.target/i386/pr17390.c ! e09aee999f6555d054fbc943434e9e4e gcc/testsuite/gcc.target/i386/pr17692.c ! 3349f4269d5aaa75a184e9bf79fa22ed gcc/testsuite/gcc.target/i386/pr18614-1.c 38fee1aa0d3782b970829ff2bc7e52e5 gcc/testsuite/gcc.target/i386/pr19236-1.c 8abb8ec7b5449c8612f29a0874c3c7ca gcc/testsuite/gcc.target/i386/pr20204.c fdacb6b61a5d36e161500b14166654ae gcc/testsuite/gcc.target/i386/pr21101.c 6043d0b4998dd913e2d9e533a24f6a55 gcc/testsuite/gcc.target/i386/pr21291.c f829dfea175a6096095bf939fcacd377 gcc/testsuite/gcc.target/i386/pr21518.c ! 62dd8f6bac47c850787996a86016f6d3 gcc/testsuite/gcc.target/i386/pr22076.c ! d3337a5d25f796db71427508cdd0bf2a gcc/testsuite/gcc.target/i386/pr22152.c 036875bffbf4f4acfbb2f1daa06251d4 gcc/testsuite/gcc.target/i386/pr22362.c da34aa28d537d18fc2a008104a8373ff gcc/testsuite/gcc.target/i386/pr22432.c afafb70a7eff18b56ebd35e19b0ee05c gcc/testsuite/gcc.target/i386/pr22576.c --- 25339,25358 ---- 27f57729aea057bdb268886140eaba10 gcc/testsuite/gcc.target/i386/pr11001-strlen-3.c b7c1027e39ee212e2332b0575582c16c gcc/testsuite/gcc.target/i386/pr12092-1.c 559d97e3f695b650764f7558433acf01 gcc/testsuite/gcc.target/i386/pr12329.c ! 4d8dc95edc17588e051b13b36c28f62d gcc/testsuite/gcc.target/i386/pr13366.c ! 9a752a4b3b77930d91d3c8b0c8897b90 gcc/testsuite/gcc.target/i386/pr13685.c 31ead0ee84b382ba03e3561931bc6e40 gcc/testsuite/gcc.target/i386/pr14289-1.c 6a09a31c8162440929d99a05b6983c5a gcc/testsuite/gcc.target/i386/pr14552.c d4aa6113ea62bc36639d93e1e44a1210 gcc/testsuite/gcc.target/i386/pr17390.c ! 267767eee12404a3762980f8a618c167 gcc/testsuite/gcc.target/i386/pr17692.c ! 553d44d0435bcd8fd6806b73ecbe8ff1 gcc/testsuite/gcc.target/i386/pr18614-1.c 38fee1aa0d3782b970829ff2bc7e52e5 gcc/testsuite/gcc.target/i386/pr19236-1.c 8abb8ec7b5449c8612f29a0874c3c7ca gcc/testsuite/gcc.target/i386/pr20204.c fdacb6b61a5d36e161500b14166654ae gcc/testsuite/gcc.target/i386/pr21101.c 6043d0b4998dd913e2d9e533a24f6a55 gcc/testsuite/gcc.target/i386/pr21291.c f829dfea175a6096095bf939fcacd377 gcc/testsuite/gcc.target/i386/pr21518.c ! 215632b163794ee9bcbe68e74405c60c gcc/testsuite/gcc.target/i386/pr22076.c ! 45a5004152f88d0edbb3f4497f8b119f gcc/testsuite/gcc.target/i386/pr22152.c 036875bffbf4f4acfbb2f1daa06251d4 gcc/testsuite/gcc.target/i386/pr22362.c da34aa28d537d18fc2a008104a8373ff gcc/testsuite/gcc.target/i386/pr22432.c afafb70a7eff18b56ebd35e19b0ee05c gcc/testsuite/gcc.target/i386/pr22576.c *************** afafb70a7eff18b56ebd35e19b0ee05c gcc/te *** 25311,25338 **** 694f671653d0ebf33272ecf4c4b318a3 gcc/testsuite/gcc.target/i386/pr23098.c a52819317d1b1c66a5d3850f5bbfd0fa gcc/testsuite/gcc.target/i386/pr23268.c a9d6d2150599c08a2860af0cfe78073e gcc/testsuite/gcc.target/i386/pr23376.c ! f4eabc468c231361cd601d816312cb56 gcc/testsuite/gcc.target/i386/pr23570.c ! 17eab0967ccfb5e6f292d53f3bf04c6c gcc/testsuite/gcc.target/i386/pr23575.c 91f253f1f0b0f3f3dbebf51b37d8ce93 gcc/testsuite/gcc.target/i386/pr23943.c e99eb064d503f38b5a9c419915b38ae9 gcc/testsuite/gcc.target/i386/pr24055.c ! c9de66095903db78e0d1dbfe9d431328 gcc/testsuite/gcc.target/i386/pr24306.c 32fe0462a1b53d3fc2901ef49c868f00 gcc/testsuite/gcc.target/i386/pr24315.c 60b726fd0c2c4e16793b5392148048fc gcc/testsuite/gcc.target/i386/pr25196.c e2e1fa15682cd42c52206538adc05f64 gcc/testsuite/gcc.target/i386/pr25254.c fa176122821be9d08a71a2fabbe6df9e gcc/testsuite/gcc.target/i386/pr25293.c 6e1c0db984387e9607654a5cb7f5774d gcc/testsuite/gcc.target/i386/pr25654.c ! 82cf377f6b582d46333adcb696649be6 gcc/testsuite/gcc.target/i386/pr25993.c ! a37e8fbf089324a5de12e4d5b7ae7c1c gcc/testsuite/gcc.target/i386/pr26449-1.c 7541ddd679210840ac148fdb88a9812b gcc/testsuite/gcc.target/i386/pr26449.c ! ee266f94e0209d8de18305aac3b4e4e3 gcc/testsuite/gcc.target/i386/pr26600.c 445e7e8ec66519333a01febb59bbde2b gcc/testsuite/gcc.target/i386/pr26778.c 51d6ca728f5c875f6f416d467d531b8c gcc/testsuite/gcc.target/i386/pr26826.c af9bc77296c25758ba2399a1f774e827 gcc/testsuite/gcc.target/i386/pr27266.c eefea3f3d3ef9a6ff440c58ee4f46894 gcc/testsuite/gcc.target/i386/pr27696.c ! 184de3fa2cdd678f427a91639a253afa gcc/testsuite/gcc.target/i386/pr27790.c 21aaf61df4c93c03c7bc7996e2935b31 gcc/testsuite/gcc.target/i386/pr27827.c c7d996c52232934c0c422ecca2dc3500 gcc/testsuite/gcc.target/i386/pr27971.c ! c5e38f94d34776548cce9b30a886d383 gcc/testsuite/gcc.target/i386/pr28839.c 5f4936c9d4c31140f8ee0ea81c6aa658 gcc/testsuite/gcc.target/i386/pr28946.c 44691681f997bca3985b9f7b41aa21b7 gcc/testsuite/gcc.target/i386/pr29978.c 7dc3bb9ffdd974f461d453f9756e2cde gcc/testsuite/gcc.target/i386/pr30120.c --- 25360,25387 ---- 694f671653d0ebf33272ecf4c4b318a3 gcc/testsuite/gcc.target/i386/pr23098.c a52819317d1b1c66a5d3850f5bbfd0fa gcc/testsuite/gcc.target/i386/pr23268.c a9d6d2150599c08a2860af0cfe78073e gcc/testsuite/gcc.target/i386/pr23376.c ! b44e61ec90410f27b42db5dafeca5055 gcc/testsuite/gcc.target/i386/pr23570.c ! 1415254495f345a26932d2461e341708 gcc/testsuite/gcc.target/i386/pr23575.c 91f253f1f0b0f3f3dbebf51b37d8ce93 gcc/testsuite/gcc.target/i386/pr23943.c e99eb064d503f38b5a9c419915b38ae9 gcc/testsuite/gcc.target/i386/pr24055.c ! 7757504bdc3b5bd70de1a5960fb48a38 gcc/testsuite/gcc.target/i386/pr24306.c 32fe0462a1b53d3fc2901ef49c868f00 gcc/testsuite/gcc.target/i386/pr24315.c 60b726fd0c2c4e16793b5392148048fc gcc/testsuite/gcc.target/i386/pr25196.c e2e1fa15682cd42c52206538adc05f64 gcc/testsuite/gcc.target/i386/pr25254.c fa176122821be9d08a71a2fabbe6df9e gcc/testsuite/gcc.target/i386/pr25293.c 6e1c0db984387e9607654a5cb7f5774d gcc/testsuite/gcc.target/i386/pr25654.c ! ddc825cdd6a0997e7978a7c62261f358 gcc/testsuite/gcc.target/i386/pr25993.c ! 0667f43ca032d19b336b8ff96971b604 gcc/testsuite/gcc.target/i386/pr26449-1.c 7541ddd679210840ac148fdb88a9812b gcc/testsuite/gcc.target/i386/pr26449.c ! 9c0d3316bb3472e910b339ef0ebc0aeb gcc/testsuite/gcc.target/i386/pr26600.c 445e7e8ec66519333a01febb59bbde2b gcc/testsuite/gcc.target/i386/pr26778.c 51d6ca728f5c875f6f416d467d531b8c gcc/testsuite/gcc.target/i386/pr26826.c af9bc77296c25758ba2399a1f774e827 gcc/testsuite/gcc.target/i386/pr27266.c eefea3f3d3ef9a6ff440c58ee4f46894 gcc/testsuite/gcc.target/i386/pr27696.c ! 8043786abc347fcc894dc18a675e10da gcc/testsuite/gcc.target/i386/pr27790.c 21aaf61df4c93c03c7bc7996e2935b31 gcc/testsuite/gcc.target/i386/pr27827.c c7d996c52232934c0c422ecca2dc3500 gcc/testsuite/gcc.target/i386/pr27971.c ! c05179b8a0af80012dcb23e9054af20e gcc/testsuite/gcc.target/i386/pr28839.c 5f4936c9d4c31140f8ee0ea81c6aa658 gcc/testsuite/gcc.target/i386/pr28946.c 44691681f997bca3985b9f7b41aa21b7 gcc/testsuite/gcc.target/i386/pr29978.c 7dc3bb9ffdd974f461d453f9756e2cde gcc/testsuite/gcc.target/i386/pr30120.c *************** c9d5a1ffb954d5b026f25ea9c5206d35 gcc/te *** 25341,25366 **** 1c7884b37dccc4d3c130623900aa5f11 gcc/testsuite/gcc.target/i386/pr30505.c cc7150857198a660bd08df2767715c77 gcc/testsuite/gcc.target/i386/pr30848.c b7966f2f9fdc4beb89ebaa9e4162fa22 gcc/testsuite/gcc.target/i386/pr30961-1.c ! 4544802009750c348f36317b70c1521a gcc/testsuite/gcc.target/i386/pr30970.c b4a60f2d5153a51d8bdf208f573648b5 gcc/testsuite/gcc.target/i386/pr31167.c ! 6b372be26ff91d2b7b242c1a551bccc6 gcc/testsuite/gcc.target/i386/pr31486.c e1baf53eb72abb455c67a55e3b519f2a gcc/testsuite/gcc.target/i386/pr31628.c 9131ed1be82a4a4fecdc9d0aa2021134 gcc/testsuite/gcc.target/i386/pr31854.c ! 35460bd25cafd5c7a6c4a08373d71658 gcc/testsuite/gcc.target/i386/pr32000-1.c ! e848111ccb17dc2b45377c5054a523a1 gcc/testsuite/gcc.target/i386/pr32000-2.c ! 9b916b67c68cce873259ce7198b6593b gcc/testsuite/gcc.target/i386/pr32065-1.c ! 01fc4fa972bcf03c1ea6f618261bfb34 gcc/testsuite/gcc.target/i386/pr32065-2.c 1f9ce93e6d6ec25c764294b90cdb8d4a gcc/testsuite/gcc.target/i386/pr32191.c 21bc9f21324d734a892d9ede71a270d9 gcc/testsuite/gcc.target/i386/pr32268.c ! 96040750978b2f2afa3e9004ff1d974c gcc/testsuite/gcc.target/i386/pr32280.c ! 073344a6b5ac1bfef276dfd06d4d31e4 gcc/testsuite/gcc.target/i386/pr32389.c 2f5cc3dfa06fd9847171592401dba089 gcc/testsuite/gcc.target/i386/pr32661-1.c ! 0ed6b159110a7b2d49a20f8947d66359 gcc/testsuite/gcc.target/i386/pr32661.c ! 02e79699ad467b9119ab95ea95ce85de gcc/testsuite/gcc.target/i386/pr32708-1.c 50c5b7cccc09c8a11bc86548da54ebe2 gcc/testsuite/gcc.target/i386/pr32708-2.c 08e81ce5f89ebb00cd6d14d273c86994 gcc/testsuite/gcc.target/i386/pr32708-3.c ! 10dc3d7f8f6698d02fa13e80847ac4a7 gcc/testsuite/gcc.target/i386/pr32961.c ! 21840387a442a960534c4a1a0bd0efbe gcc/testsuite/gcc.target/i386/pr33329.c e9cdc80fa02a4b7ad68dd49b31747716 gcc/testsuite/gcc.target/i386/pr33483.c 6b3787186a803f6117649c218620273f gcc/testsuite/gcc.target/i386/pr33524.c d8be6de338f5e76966d751a49d985341 gcc/testsuite/gcc.target/i386/pr33552.c --- 25390,25415 ---- 1c7884b37dccc4d3c130623900aa5f11 gcc/testsuite/gcc.target/i386/pr30505.c cc7150857198a660bd08df2767715c77 gcc/testsuite/gcc.target/i386/pr30848.c b7966f2f9fdc4beb89ebaa9e4162fa22 gcc/testsuite/gcc.target/i386/pr30961-1.c ! a5e497cc47256f5f9ac494e1ae47d870 gcc/testsuite/gcc.target/i386/pr30970.c b4a60f2d5153a51d8bdf208f573648b5 gcc/testsuite/gcc.target/i386/pr31167.c ! 0c6c6989d82a74c1a03331014a534994 gcc/testsuite/gcc.target/i386/pr31486.c e1baf53eb72abb455c67a55e3b519f2a gcc/testsuite/gcc.target/i386/pr31628.c 9131ed1be82a4a4fecdc9d0aa2021134 gcc/testsuite/gcc.target/i386/pr31854.c ! dfd05b1f491f52c6fed332039ead357a gcc/testsuite/gcc.target/i386/pr32000-1.c ! d8159b174b6a1e23df10ac5d79cf2df1 gcc/testsuite/gcc.target/i386/pr32000-2.c ! 912e442d1aeaea6a8b7c446acd78c56c gcc/testsuite/gcc.target/i386/pr32065-1.c ! 694842da5eb4c5254d8b4bfe1dc8c111 gcc/testsuite/gcc.target/i386/pr32065-2.c 1f9ce93e6d6ec25c764294b90cdb8d4a gcc/testsuite/gcc.target/i386/pr32191.c 21bc9f21324d734a892d9ede71a270d9 gcc/testsuite/gcc.target/i386/pr32268.c ! 72372c02b72364b15fb7b4c01497f649 gcc/testsuite/gcc.target/i386/pr32280.c ! fc5290623289e6ebe01769acfb60cbcb gcc/testsuite/gcc.target/i386/pr32389.c 2f5cc3dfa06fd9847171592401dba089 gcc/testsuite/gcc.target/i386/pr32661-1.c ! 27bcc8e3188aebb8326e7b64b65e90b1 gcc/testsuite/gcc.target/i386/pr32661.c ! 405c3e8b006cafdb8683fdbcadadf6ef gcc/testsuite/gcc.target/i386/pr32708-1.c 50c5b7cccc09c8a11bc86548da54ebe2 gcc/testsuite/gcc.target/i386/pr32708-2.c 08e81ce5f89ebb00cd6d14d273c86994 gcc/testsuite/gcc.target/i386/pr32708-3.c ! 306f8f0983bf9fc4958ba0544e8fb50b gcc/testsuite/gcc.target/i386/pr32961.c ! 2f439b7a90b20864be0cfb8089abad10 gcc/testsuite/gcc.target/i386/pr33329.c e9cdc80fa02a4b7ad68dd49b31747716 gcc/testsuite/gcc.target/i386/pr33483.c 6b3787186a803f6117649c218620273f gcc/testsuite/gcc.target/i386/pr33524.c d8be6de338f5e76966d751a49d985341 gcc/testsuite/gcc.target/i386/pr33552.c *************** cf87e9d47fc057aa2a1648a564e9b82a gcc/te *** 25376,25463 **** fccdf3705dbdd548ecd5a376564df05d gcc/testsuite/gcc.target/i386/pr35160.c 004eaffde0b2ccfd2b0cd9ba1acef829 gcc/testsuite/gcc.target/i386/pr35281.c efaec1d47687ebdae33b8db7c666c96b gcc/testsuite/gcc.target/i386/pr35540.c ! 78ed428e27d35c9aa34632150aefbedb gcc/testsuite/gcc.target/i386/pr35714.c ! af6cbb3225fa92430f9b10197f39bf0f gcc/testsuite/gcc.target/i386/pr35767-1.c ! 49222438833af5df8382e7163cf5704a gcc/testsuite/gcc.target/i386/pr35767-1d.c ! a265836cedc3a3dbf630f1d56cc851a6 gcc/testsuite/gcc.target/i386/pr35767-1i.c ! 60cc12335299ea997f734083d4b7036f gcc/testsuite/gcc.target/i386/pr35767-2.c ! 04caf0981ebc5fb504bf38469921cc4e gcc/testsuite/gcc.target/i386/pr35767-2d.c ! 5468ff5fad00c668dc51f7571d911238 gcc/testsuite/gcc.target/i386/pr35767-2i.c ! c01f5a966267241d39727dec7cec20fe gcc/testsuite/gcc.target/i386/pr35767-3.c c92d9a438f7ac0d1ee5a61257e4732d8 gcc/testsuite/gcc.target/i386/pr35767-4.c ! 6033585fd9ee7d1d4814c6961baa1c37 gcc/testsuite/gcc.target/i386/pr35767-5.c a4f1947b39428a2873d3ef8795360c4c gcc/testsuite/gcc.target/i386/pr36064.c 8da4b5bffe9df26a97e450f98785ee76 gcc/testsuite/gcc.target/i386/pr36073.c ! 2487cda0c9392bef89e11cfe6221e209 gcc/testsuite/gcc.target/i386/pr36222-1.c e9aeb3a52695f5674857749b23ba9237 gcc/testsuite/gcc.target/i386/pr36246.c 5886a4917e0dd3164417fecf37624385 gcc/testsuite/gcc.target/i386/pr36438.c fda8fc040885ed8c91744daa2e291cca gcc/testsuite/gcc.target/i386/pr36533.c ! ae6f244cfcf23eebdadf9de248ffb1de gcc/testsuite/gcc.target/i386/pr36578-1.c ! 1837eec293e3eddfe531768d6b6a353a gcc/testsuite/gcc.target/i386/pr36578-2.c 84b2be21daede2c427d4e3e2d250b0f1 gcc/testsuite/gcc.target/i386/pr36613.c 221966b04378ad04902b38cf38d317b5 gcc/testsuite/gcc.target/i386/pr36753.c b471deec57cdb18348ffb2e73c06b078 gcc/testsuite/gcc.target/i386/pr36786.c ! 4b43b0feff43424dd228fde12b35a29d gcc/testsuite/gcc.target/i386/pr36992-1.c fc49d993699502eee53c167b851dc474 gcc/testsuite/gcc.target/i386/pr36992-2.c ! 98a17548dba7e71b8d4c016379138207 gcc/testsuite/gcc.target/i386/pr37101.c 23d0f8848d395cb799e422dba52430b8 gcc/testsuite/gcc.target/i386/pr37184.c 76bdd32784d8c178aba8815828578d4e gcc/testsuite/gcc.target/i386/pr37191.c 0be613d9f543ec7125d4a8f6f53c766a gcc/testsuite/gcc.target/i386/pr37197.c 211ddbed14cf4f1b4ac66996f790d0b3 gcc/testsuite/gcc.target/i386/pr37248-1.c 989555aaf35b5d1e8c9feb8f8e6ddef2 gcc/testsuite/gcc.target/i386/pr37248-2.c cef4cb1e0836d0598c44ff5be3d3bf15 gcc/testsuite/gcc.target/i386/pr37248-3.c ! f4dec02f18e5515760572fa8a57b3b22 gcc/testsuite/gcc.target/i386/pr37275.c ! 3c899d0d2dc97700ebe4aaf82bfd8cfd gcc/testsuite/gcc.target/i386/pr37434-1.c ! c3c7d897c0da2d1e4d3cd87e924d9416 gcc/testsuite/gcc.target/i386/pr37434-2.c f6688f22c0449564e0537243233fc354 gcc/testsuite/gcc.target/i386/pr37434-3.c b8fb20ff9f130acf24134773fc951336 gcc/testsuite/gcc.target/i386/pr37434-4.c 0f2f07da9d91916bbb15a2ea69d7bcd7 gcc/testsuite/gcc.target/i386/pr37843-1.c 5646123979ba4a17a93766a52e3362bb gcc/testsuite/gcc.target/i386/pr37843-2.c ! e4248ed3c3cf4f472a0fa7864b91eb66 gcc/testsuite/gcc.target/i386/pr37843-3.c 3acca5fb3d92cf4b7d64f29e7dd9bfd2 gcc/testsuite/gcc.target/i386/pr37870.c 66db28c964871d1cf5b53a83b4707bcf gcc/testsuite/gcc.target/i386/pr38151-1.c f1d8a67ec5853431d232b7caac1c995d gcc/testsuite/gcc.target/i386/pr38240.c ! 53f615768378a15ebce0e6bf2d355b22 gcc/testsuite/gcc.target/i386/pr38824.c ! cc52fb6e855215f99580b9fa0002669f gcc/testsuite/gcc.target/i386/pr38931.c 5ee1c39d4916d76f523ef5b7f134bc78 gcc/testsuite/gcc.target/i386/pr38988.c 0495503134d0243cba2c75d416517136 gcc/testsuite/gcc.target/i386/pr39013-1.c 1561edfc0fc165b0182cc2cab6e632b4 gcc/testsuite/gcc.target/i386/pr39013-2.c feb8f591ba5163f89986ad64e6633226 gcc/testsuite/gcc.target/i386/pr39058.c a506e6376ddca5e774effb08fee967e0 gcc/testsuite/gcc.target/i386/pr39082-1.c 793c899a7057511a44e5423e8f3400f1 gcc/testsuite/gcc.target/i386/pr39139.c ! 52394e00ed1e14433ecd4120a3f51f50 gcc/testsuite/gcc.target/i386/pr39162.c 24944e4970576070f705c2ffd6bad757 gcc/testsuite/gcc.target/i386/pr39431.c ! 636b4e808c2307ea792f5af8133d24c6 gcc/testsuite/gcc.target/i386/pr39445.c 7c17680e533837c9b14c3d0b271a5474 gcc/testsuite/gcc.target/i386/pr39482.c ! 0e7b109529fd50e2bcf466502b5c1777 gcc/testsuite/gcc.target/i386/pr39496.c 9b91d84cfac86ffe17d0edf9b79a4632 gcc/testsuite/gcc.target/i386/pr39543-1.c 895c3ffc9400f6433d4ebdd446568e4d gcc/testsuite/gcc.target/i386/pr39543-2.c 9b78ec4b52d4d3e3dc087003443f701e gcc/testsuite/gcc.target/i386/pr39543-3.c 92f0facf58e3bef5c5279570755c9e31 gcc/testsuite/gcc.target/i386/pr39545-1.c 374125e2e76c2fa03de930dfc48be191 gcc/testsuite/gcc.target/i386/pr39545-2.c ! 76971f59dde5fd3a23ed5c836b50b6f8 gcc/testsuite/gcc.target/i386/pr39592-1.c 66579629d75d59f33fb13cd1143fb092 gcc/testsuite/gcc.target/i386/pr39678.c 120fd1a41c7db1156c42fcb74ab978e5 gcc/testsuite/gcc.target/i386/pr39804.c 063e1a0fc57c0617d489448bb3a2817f gcc/testsuite/gcc.target/i386/pr40718.c ! 75e6f28e5f64dbb3c072bf586fb7c2ea gcc/testsuite/gcc.target/i386/pr40809.c 110f04ecbff7febf5845915fa56e3551 gcc/testsuite/gcc.target/i386/pr40906-1.c 8989fb87bbd97ca95493e10881600545 gcc/testsuite/gcc.target/i386/pr40906-2.c ! 87625b50b9303c6ca9ee1c08d5825b26 gcc/testsuite/gcc.target/i386/pr40906-3.c 78473935934f8f9ea9ee6952b28304be gcc/testsuite/gcc.target/i386/pr40934.c e4a2506d3c1d617b0f97ab69192105ad gcc/testsuite/gcc.target/i386/pr40957.c ! 5e38fdd02a4b90c3927596703b556ccf gcc/testsuite/gcc.target/i386/pr41019.c 0384ebd83a4490e8cd4ca9c512b1815c gcc/testsuite/gcc.target/i386/pr41900.c f6fe69844b5e6689ec6d7f4fae4cd61f gcc/testsuite/gcc.target/i386/pr41963.c ! 7bb914e551b6d7b6e3e0856c2f49ae69 gcc/testsuite/gcc.target/i386/pr42542-1.c 019e7ec723b534d3accdf359f4d871c0 gcc/testsuite/gcc.target/i386/pr42542-1a.c 6a70bef51b3b1698f54247a6789b8ebd gcc/testsuite/gcc.target/i386/pr42542-1b.c ! 56957e8b5eea073a52be2bdcd2487ed0 gcc/testsuite/gcc.target/i386/pr42542-2.c f801f2aa117f55630e7f354a6fb47a97 gcc/testsuite/gcc.target/i386/pr42542-2a.c a3368b0415f9d03e43b203c89a2e8980 gcc/testsuite/gcc.target/i386/pr42542-2b.c ! 2a7f29e3fb46a16f23b2e683c0d1bee5 gcc/testsuite/gcc.target/i386/pr42542-3.c ! 761a94219c4b6801b40876cc2df724dc gcc/testsuite/gcc.target/i386/pr42542-3a.c ! 831ac40c091f8fecabc1e04f1c749092 gcc/testsuite/gcc.target/i386/pr42549.c ! 5ba8800e6255e077d7c5f9159a73bb93 gcc/testsuite/gcc.target/i386/pr42881.c c91c6015a1130478e24fe506bc452e64 gcc/testsuite/gcc.target/i386/pr42891.c 4c2109921be5d78814d378b4018cfca2 gcc/testsuite/gcc.target/i386/pr43107.c f959f9b7f68ec9300176ea5f3b5b723a gcc/testsuite/gcc.target/i386/pr43524.c --- 25425,25512 ---- fccdf3705dbdd548ecd5a376564df05d gcc/testsuite/gcc.target/i386/pr35160.c 004eaffde0b2ccfd2b0cd9ba1acef829 gcc/testsuite/gcc.target/i386/pr35281.c efaec1d47687ebdae33b8db7c666c96b gcc/testsuite/gcc.target/i386/pr35540.c ! 54ddf225eb1de499eacd1033671cf748 gcc/testsuite/gcc.target/i386/pr35714.c ! 37e33c0dbefca253118b40d73b61058f gcc/testsuite/gcc.target/i386/pr35767-1.c ! af4857834a6769654091e321e4580c3c gcc/testsuite/gcc.target/i386/pr35767-1d.c ! fffa37e8fa1934443a42060db6a7ce45 gcc/testsuite/gcc.target/i386/pr35767-1i.c ! b9888d86cb52d4f1657d7db7c15e33b9 gcc/testsuite/gcc.target/i386/pr35767-2.c ! 14f22d52499c8197c6d125063563abb8 gcc/testsuite/gcc.target/i386/pr35767-2d.c ! 7f35c66c30d5283c79b3b4839174a6fa gcc/testsuite/gcc.target/i386/pr35767-2i.c ! 22d4ca5351d9540b5570d10017191547 gcc/testsuite/gcc.target/i386/pr35767-3.c c92d9a438f7ac0d1ee5a61257e4732d8 gcc/testsuite/gcc.target/i386/pr35767-4.c ! 0d18b891dd33a9910c60feda9d749c29 gcc/testsuite/gcc.target/i386/pr35767-5.c a4f1947b39428a2873d3ef8795360c4c gcc/testsuite/gcc.target/i386/pr36064.c 8da4b5bffe9df26a97e450f98785ee76 gcc/testsuite/gcc.target/i386/pr36073.c ! 5e3164736bc0290694fb3cfc29fa5151 gcc/testsuite/gcc.target/i386/pr36222-1.c e9aeb3a52695f5674857749b23ba9237 gcc/testsuite/gcc.target/i386/pr36246.c 5886a4917e0dd3164417fecf37624385 gcc/testsuite/gcc.target/i386/pr36438.c fda8fc040885ed8c91744daa2e291cca gcc/testsuite/gcc.target/i386/pr36533.c ! 585e2cb4674c5ee82965fec4b0284097 gcc/testsuite/gcc.target/i386/pr36578-1.c ! 9fe8f00ac3674139c4119674f480be5b gcc/testsuite/gcc.target/i386/pr36578-2.c 84b2be21daede2c427d4e3e2d250b0f1 gcc/testsuite/gcc.target/i386/pr36613.c 221966b04378ad04902b38cf38d317b5 gcc/testsuite/gcc.target/i386/pr36753.c b471deec57cdb18348ffb2e73c06b078 gcc/testsuite/gcc.target/i386/pr36786.c ! dd053882ddba08a9402913d1f2368241 gcc/testsuite/gcc.target/i386/pr36992-1.c fc49d993699502eee53c167b851dc474 gcc/testsuite/gcc.target/i386/pr36992-2.c ! 32d6aa0d686a7324d831e319b5ec5259 gcc/testsuite/gcc.target/i386/pr37101.c 23d0f8848d395cb799e422dba52430b8 gcc/testsuite/gcc.target/i386/pr37184.c 76bdd32784d8c178aba8815828578d4e gcc/testsuite/gcc.target/i386/pr37191.c 0be613d9f543ec7125d4a8f6f53c766a gcc/testsuite/gcc.target/i386/pr37197.c 211ddbed14cf4f1b4ac66996f790d0b3 gcc/testsuite/gcc.target/i386/pr37248-1.c 989555aaf35b5d1e8c9feb8f8e6ddef2 gcc/testsuite/gcc.target/i386/pr37248-2.c cef4cb1e0836d0598c44ff5be3d3bf15 gcc/testsuite/gcc.target/i386/pr37248-3.c ! f0b264a191f53bbba6e1a031756bbdd5 gcc/testsuite/gcc.target/i386/pr37275.c ! b0a90eb266666add22394bb108205ed4 gcc/testsuite/gcc.target/i386/pr37434-1.c ! 2425d5a45ec2ef86be2fbf9806876132 gcc/testsuite/gcc.target/i386/pr37434-2.c f6688f22c0449564e0537243233fc354 gcc/testsuite/gcc.target/i386/pr37434-3.c b8fb20ff9f130acf24134773fc951336 gcc/testsuite/gcc.target/i386/pr37434-4.c 0f2f07da9d91916bbb15a2ea69d7bcd7 gcc/testsuite/gcc.target/i386/pr37843-1.c 5646123979ba4a17a93766a52e3362bb gcc/testsuite/gcc.target/i386/pr37843-2.c ! 8460afbe852ce0f1a8c248d24b8d84d6 gcc/testsuite/gcc.target/i386/pr37843-3.c 3acca5fb3d92cf4b7d64f29e7dd9bfd2 gcc/testsuite/gcc.target/i386/pr37870.c 66db28c964871d1cf5b53a83b4707bcf gcc/testsuite/gcc.target/i386/pr38151-1.c f1d8a67ec5853431d232b7caac1c995d gcc/testsuite/gcc.target/i386/pr38240.c ! 248a00d788d1bb34556c2c8bdd4ac07a gcc/testsuite/gcc.target/i386/pr38824.c ! d713f95843fbb3d0f032811290165a3a gcc/testsuite/gcc.target/i386/pr38931.c 5ee1c39d4916d76f523ef5b7f134bc78 gcc/testsuite/gcc.target/i386/pr38988.c 0495503134d0243cba2c75d416517136 gcc/testsuite/gcc.target/i386/pr39013-1.c 1561edfc0fc165b0182cc2cab6e632b4 gcc/testsuite/gcc.target/i386/pr39013-2.c feb8f591ba5163f89986ad64e6633226 gcc/testsuite/gcc.target/i386/pr39058.c a506e6376ddca5e774effb08fee967e0 gcc/testsuite/gcc.target/i386/pr39082-1.c 793c899a7057511a44e5423e8f3400f1 gcc/testsuite/gcc.target/i386/pr39139.c ! 230e36682c5da041532f12125688f662 gcc/testsuite/gcc.target/i386/pr39162.c 24944e4970576070f705c2ffd6bad757 gcc/testsuite/gcc.target/i386/pr39431.c ! 15b4c1439368e8a359f27552f2958d80 gcc/testsuite/gcc.target/i386/pr39445.c 7c17680e533837c9b14c3d0b271a5474 gcc/testsuite/gcc.target/i386/pr39482.c ! b54e1088ecd0b94dc517504a54a45c38 gcc/testsuite/gcc.target/i386/pr39496.c 9b91d84cfac86ffe17d0edf9b79a4632 gcc/testsuite/gcc.target/i386/pr39543-1.c 895c3ffc9400f6433d4ebdd446568e4d gcc/testsuite/gcc.target/i386/pr39543-2.c 9b78ec4b52d4d3e3dc087003443f701e gcc/testsuite/gcc.target/i386/pr39543-3.c 92f0facf58e3bef5c5279570755c9e31 gcc/testsuite/gcc.target/i386/pr39545-1.c 374125e2e76c2fa03de930dfc48be191 gcc/testsuite/gcc.target/i386/pr39545-2.c ! 38497c297a8ae560a851b1553e268508 gcc/testsuite/gcc.target/i386/pr39592-1.c 66579629d75d59f33fb13cd1143fb092 gcc/testsuite/gcc.target/i386/pr39678.c 120fd1a41c7db1156c42fcb74ab978e5 gcc/testsuite/gcc.target/i386/pr39804.c 063e1a0fc57c0617d489448bb3a2817f gcc/testsuite/gcc.target/i386/pr40718.c ! 3e7b7dca7c655569773e5887a949f6f5 gcc/testsuite/gcc.target/i386/pr40809.c 110f04ecbff7febf5845915fa56e3551 gcc/testsuite/gcc.target/i386/pr40906-1.c 8989fb87bbd97ca95493e10881600545 gcc/testsuite/gcc.target/i386/pr40906-2.c ! 1d4bd70e5987f9b1489954e84f159921 gcc/testsuite/gcc.target/i386/pr40906-3.c 78473935934f8f9ea9ee6952b28304be gcc/testsuite/gcc.target/i386/pr40934.c e4a2506d3c1d617b0f97ab69192105ad gcc/testsuite/gcc.target/i386/pr40957.c ! 5013a115d093f798e1fd9122ccb36062 gcc/testsuite/gcc.target/i386/pr41019.c 0384ebd83a4490e8cd4ca9c512b1815c gcc/testsuite/gcc.target/i386/pr41900.c f6fe69844b5e6689ec6d7f4fae4cd61f gcc/testsuite/gcc.target/i386/pr41963.c ! a144cea3343cdee3d364c62fd7cf10e3 gcc/testsuite/gcc.target/i386/pr42542-1.c 019e7ec723b534d3accdf359f4d871c0 gcc/testsuite/gcc.target/i386/pr42542-1a.c 6a70bef51b3b1698f54247a6789b8ebd gcc/testsuite/gcc.target/i386/pr42542-1b.c ! bcba42c95c2d7540a1cff752dac29d44 gcc/testsuite/gcc.target/i386/pr42542-2.c f801f2aa117f55630e7f354a6fb47a97 gcc/testsuite/gcc.target/i386/pr42542-2a.c a3368b0415f9d03e43b203c89a2e8980 gcc/testsuite/gcc.target/i386/pr42542-2b.c ! 4fae9bda376607afe46d5b89389a5c09 gcc/testsuite/gcc.target/i386/pr42542-3.c ! b2854718f506812fbce18d263dc3d7bc gcc/testsuite/gcc.target/i386/pr42542-3a.c ! 25da94247270c7288fc43956239d95d6 gcc/testsuite/gcc.target/i386/pr42549.c ! bbf1d6823b089cf961e02e65c1f23d3d gcc/testsuite/gcc.target/i386/pr42881.c c91c6015a1130478e24fe506bc452e64 gcc/testsuite/gcc.target/i386/pr42891.c 4c2109921be5d78814d378b4018cfca2 gcc/testsuite/gcc.target/i386/pr43107.c f959f9b7f68ec9300176ea5f3b5b723a gcc/testsuite/gcc.target/i386/pr43524.c *************** f959f9b7f68ec9300176ea5f3b5b723a gcc/te *** 25465,25480 **** 5635dcc46744c1f49edb4c954be65a2a gcc/testsuite/gcc.target/i386/pr43638.c d33e784836ddea334b7dbd70a03bd489 gcc/testsuite/gcc.target/i386/pr43662.c 5fc034f7335e1d13da593214c69166d4 gcc/testsuite/gcc.target/i386/pr43668.c 5e93a2c631ad41e334cfdad124bfff8e gcc/testsuite/gcc.target/i386/pr9771-1.c ! c605ce6b9a51e90fdc02a1a65c4b5130 gcc/testsuite/gcc.target/i386/push-1.c ! 267203167ae369a7a0f5d3c309117f35 gcc/testsuite/gcc.target/i386/quad-sse.c ! e2839913fadc6a00676c8f02deb3f59e gcc/testsuite/gcc.target/i386/recip-divf.c ! 4557dbe9ae51590eba29dc37199cf9e4 gcc/testsuite/gcc.target/i386/recip-sqrtf.c ! 5c7d2ec2e5aecca430447737cf4ed58f gcc/testsuite/gcc.target/i386/recip-vec-divf.c ! 93eaf54971affada0e4ffec2dcb80346 gcc/testsuite/gcc.target/i386/recip-vec-sqrtf.c 02adbe6793bd8331bb32af90439f574f gcc/testsuite/gcc.target/i386/regparm-stdcall.c 0ef63b8e56ca8074c003e8314b87d97a gcc/testsuite/gcc.target/i386/regparm.c ! bc5ca09620e661535ea781d468936903 gcc/testsuite/gcc.target/i386/reload-1.c d4b86eaf340e28987dfe279378a7d61c gcc/testsuite/gcc.target/i386/rotate-1.c 8fe36ae5ff2b4bac66cad558d27e43e8 gcc/testsuite/gcc.target/i386/set-v16qi-1.h 6915570db34df8b6c58fb59297c73851 gcc/testsuite/gcc.target/i386/set-v16qi-2.h --- 25514,25533 ---- 5635dcc46744c1f49edb4c954be65a2a gcc/testsuite/gcc.target/i386/pr43638.c d33e784836ddea334b7dbd70a03bd489 gcc/testsuite/gcc.target/i386/pr43662.c 5fc034f7335e1d13da593214c69166d4 gcc/testsuite/gcc.target/i386/pr43668.c + 17193ba789f96cb169035e20c411e7c1 gcc/testsuite/gcc.target/i386/pr43671.c + 953d6c29b36cbfae20828d5d5d2d597f gcc/testsuite/gcc.target/i386/pr44481.c + 12346d2175efaca989d8ecbcdb72e3d9 gcc/testsuite/gcc.target/i386/pr44942.c + 1af14ebc3db802429179b5797220c237 gcc/testsuite/gcc.target/i386/pr45296.c 5e93a2c631ad41e334cfdad124bfff8e gcc/testsuite/gcc.target/i386/pr9771-1.c ! c825f1b4299a0c26ff290762ed96ae84 gcc/testsuite/gcc.target/i386/push-1.c ! bc19b38ccc6a25ccee9e6fa95e9158a4 gcc/testsuite/gcc.target/i386/quad-sse.c ! 5481df787ace1b105d56909f3bb2ed4b gcc/testsuite/gcc.target/i386/recip-divf.c ! 514ae9478389b8e06d5c6adfbf7564ce gcc/testsuite/gcc.target/i386/recip-sqrtf.c ! a97c0be0157110eed069b704eaf70dd5 gcc/testsuite/gcc.target/i386/recip-vec-divf.c ! ac4ff90736b33ceb438c792437793db9 gcc/testsuite/gcc.target/i386/recip-vec-sqrtf.c 02adbe6793bd8331bb32af90439f574f gcc/testsuite/gcc.target/i386/regparm-stdcall.c 0ef63b8e56ca8074c003e8314b87d97a gcc/testsuite/gcc.target/i386/regparm.c ! d197b0dca182d9f94594e679c59d159e gcc/testsuite/gcc.target/i386/reload-1.c d4b86eaf340e28987dfe279378a7d61c gcc/testsuite/gcc.target/i386/rotate-1.c 8fe36ae5ff2b4bac66cad558d27e43e8 gcc/testsuite/gcc.target/i386/set-v16qi-1.h 6915570db34df8b6c58fb59297c73851 gcc/testsuite/gcc.target/i386/set-v16qi-2.h *************** df7fe464f1a66a5f86ee8844223864bf gcc/te *** 25485,25748 **** 5284fcc983471f12858a4548278e7ba8 gcc/testsuite/gcc.target/i386/signbit-1.c c85c9e90131aec3192a00164bb0bd0c9 gcc/testsuite/gcc.target/i386/signbit-2.c e4e964c41e6d4ce52de6ff059a66864a gcc/testsuite/gcc.target/i386/signbit-3.c ! adcdec8ed0466d3411f5313513271763 gcc/testsuite/gcc.target/i386/sse-1.c ! fb511061f55570cebc35e3a67e68473e gcc/testsuite/gcc.target/i386/sse-10.c ! 2ee6aa702c48378142e510945729957e gcc/testsuite/gcc.target/i386/sse-11.c 564af1ee23ebd4f5364c4a80866cd116 gcc/testsuite/gcc.target/i386/sse-12.c 374a66aa7fbdae0bca3f39901dc0dca5 gcc/testsuite/gcc.target/i386/sse-13.c da4d3c4ce113068166bcb53ce60b7f80 gcc/testsuite/gcc.target/i386/sse-14.c ! 92ad37b5ad7426d489b1b6f1ba0f41ea gcc/testsuite/gcc.target/i386/sse-15.c ! 2e7b115c4bd7984925f1a8d17a5faf67 gcc/testsuite/gcc.target/i386/sse-16.c ! 7829f7e5b466dbddc40f201949e98abf gcc/testsuite/gcc.target/i386/sse-17.c ! 6f7dc5122ee106ebba14b572defa8077 gcc/testsuite/gcc.target/i386/sse-18.c ! 7ed1b64c225767c6e65aea76cf646320 gcc/testsuite/gcc.target/i386/sse-19.c ! ac956409974f86cabf6c497ae158d0a3 gcc/testsuite/gcc.target/i386/sse-2.c ! 91aa245329c42910c70c7fa25185013e gcc/testsuite/gcc.target/i386/sse-20.c 6f72f5cda8d60392229a1bb4f9c2f4e1 gcc/testsuite/gcc.target/i386/sse-21.c ddc174c64ecbde7ff0766c505e7a55b6 gcc/testsuite/gcc.target/i386/sse-22.c 4f7dbaa4c91a4df47917de3aa0a1b855 gcc/testsuite/gcc.target/i386/sse-23.c ! f882978332ef8475e764867b3dffafff gcc/testsuite/gcc.target/i386/sse-3.c ! 5d81ca69ddc7b70211c056c3bdc53dfa gcc/testsuite/gcc.target/i386/sse-4.c 3d362089b85e37fffeb3bc67567552a3 gcc/testsuite/gcc.target/i386/sse-5.c ! c1862100710d9584d106fc30b28ca03d gcc/testsuite/gcc.target/i386/sse-6.c ! 828c9c37744235fdf09698e656376fd5 gcc/testsuite/gcc.target/i386/sse-7.c a25422d1196a94c7d1dd062ba3c21e5b gcc/testsuite/gcc.target/i386/sse-8.c ! 97ee4ab2460696488ad82040490f9ade gcc/testsuite/gcc.target/i386/sse-9.c ! c898fc88a989530b1d4c280f4a866d96 gcc/testsuite/gcc.target/i386/sse-addps-1.c ! 3d6a1035c037371555870938f8adb96d gcc/testsuite/gcc.target/i386/sse-addss-1.c ! b87c1a3f4b45688c9f1ea95c9734f510 gcc/testsuite/gcc.target/i386/sse-andnps-1.c ! 87aa461f8682bf277dccdc4271d35cee gcc/testsuite/gcc.target/i386/sse-andps-1.c ! 8cecc79ad516dd6504f303f72d7ccd3b gcc/testsuite/gcc.target/i386/sse-check.h ! 320dc4a0f6ebd08c92ed56bd63362209 gcc/testsuite/gcc.target/i386/sse-comiss-1.c ! 2919dec8c9d881f577575dfb458d2b76 gcc/testsuite/gcc.target/i386/sse-comiss-2.c ! 4cf4edf018960ae9de0fe65eb54f39b6 gcc/testsuite/gcc.target/i386/sse-comiss-3.c ! 7d375fb2dd02bee3c0233a2b439aa519 gcc/testsuite/gcc.target/i386/sse-comiss-4.c ! 458e99ae194cef5beff6b2a450920a7d gcc/testsuite/gcc.target/i386/sse-comiss-5.c ! 30da9a7a6d8b8d176600b6a0a2e55de7 gcc/testsuite/gcc.target/i386/sse-comiss-6.c ! bce1e4da7226803babf1b5886520307f gcc/testsuite/gcc.target/i386/sse-cvtsi2ss-1.c ! 156d67c3441bb202d53903573fa1db00 gcc/testsuite/gcc.target/i386/sse-cvtsi2ss-2.c ! 1d82852e0abc7f0e146e30c9289be3be gcc/testsuite/gcc.target/i386/sse-cvtss2si-1.c ! af5be27ecf7e1bbbc78055ec2ca52c2d gcc/testsuite/gcc.target/i386/sse-cvtss2si-2.c ! 0572d89cc387c1f0b8689bd06acca04c gcc/testsuite/gcc.target/i386/sse-cvttss2si-1.c ! 61a8fcb51b6d8fe756143efe19cb45a8 gcc/testsuite/gcc.target/i386/sse-cvttss2si-2.c ! 344c1283c56b99f6b1ae71d49a8ea080 gcc/testsuite/gcc.target/i386/sse-divps-1.c ! 0604a99bd86bb57b7bc82444f40711f8 gcc/testsuite/gcc.target/i386/sse-divss-1.c ! 2e2920382f7ca95b1bdd5b91954126be gcc/testsuite/gcc.target/i386/sse-init-v4hi-1.c ! 4494d03b8023b0a4d5be3fa7dbc4ff42 gcc/testsuite/gcc.target/i386/sse-init-v4sf-1.c ! 633088e0c3ecc009d08047c1b3897e0e gcc/testsuite/gcc.target/i386/sse-maxps-1.c ! b86df6e51804d489d4c77238496ef97e gcc/testsuite/gcc.target/i386/sse-maxss-1.c ! 4c2c8f5809a9a58f45b333fd45160214 gcc/testsuite/gcc.target/i386/sse-minps-1.c ! af31c602e518ad3f50581b19b841b810 gcc/testsuite/gcc.target/i386/sse-minss-1.c ! 71e92a75b482630814fe6eb9c3826319 gcc/testsuite/gcc.target/i386/sse-movaps-1.c ! 7a8b5c01f6a662955ab9dadc1ec2eb3a gcc/testsuite/gcc.target/i386/sse-movaps-2.c ! 338edaec3067a1db12edb1d11613c488 gcc/testsuite/gcc.target/i386/sse-movhlps-1.c ! a275fbf4e7d8d9029e801cbed5128d20 gcc/testsuite/gcc.target/i386/sse-movhps-1.c ! a5e34221ff26a9f78658d4ef74827de6 gcc/testsuite/gcc.target/i386/sse-movhps-2.c ! fde1afbda7ec12d5b9625bc00d5b7ee2 gcc/testsuite/gcc.target/i386/sse-movlhps-1.c ! c9aa37a7cd4c3627929254543b81e0db gcc/testsuite/gcc.target/i386/sse-movmskps-1.c ! 43320885287ba9b85df459c25c639f94 gcc/testsuite/gcc.target/i386/sse-movntps-1.c ! c0650c2b1a874aa61c104366e6628e1f gcc/testsuite/gcc.target/i386/sse-movss-1.c ! 02526419d68aa4bfce153298943c7d2e gcc/testsuite/gcc.target/i386/sse-movss-2.c ! bc694ba24050d23a7c6174cb3013f543 gcc/testsuite/gcc.target/i386/sse-movss-3.c ! f55eb0c82a3edf44abcacf7ab339576e gcc/testsuite/gcc.target/i386/sse-movups-1.c ! ec3bf0789200d78c2f0d32457074eb90 gcc/testsuite/gcc.target/i386/sse-movups-2.c ! cfdbe8dd4eec64451dac8650f8f65b0d gcc/testsuite/gcc.target/i386/sse-mulps-1.c ! e333dcd6863117f525120c5b991a65ad gcc/testsuite/gcc.target/i386/sse-mulss-1.c ! 2c760fbcae5fa1cea855f82d9867c270 gcc/testsuite/gcc.target/i386/sse-orps-1.c ! 97b38c04b64f7548d5a8c9e487599bfb gcc/testsuite/gcc.target/i386/sse-rcpps-1.c ! 2c6012aa8c27873033f37dfe7334ae34 gcc/testsuite/gcc.target/i386/sse-recip-vec.c ! c603044c5bd7c7539cef76b57c9db02a gcc/testsuite/gcc.target/i386/sse-recip.c ! 5942c3919db455d8c864179a27a977ff gcc/testsuite/gcc.target/i386/sse-rsqrtps-1.c ! 9f3bf6bee8e74d7565c2d91f8cd21e8f gcc/testsuite/gcc.target/i386/sse-set-ps-1.c ! be94a73ab6d40e2a46b3f105b02f8bbb gcc/testsuite/gcc.target/i386/sse-sqrtps-1.c ! 03624a90c19f5c7a43ae7a6d351f523d gcc/testsuite/gcc.target/i386/sse-subps-1.c ! 5094b075617cd809fad5a4f2aae79b3e gcc/testsuite/gcc.target/i386/sse-subss-1.c ! e4a964aacac2e504cfba4ba956ba6aad gcc/testsuite/gcc.target/i386/sse-ucomiss-1.c ! 032cf8a40d4e377eeb534b8094483b1c gcc/testsuite/gcc.target/i386/sse-ucomiss-2.c ! ed4a7a2c498fc4cf48d88965e4bce981 gcc/testsuite/gcc.target/i386/sse-ucomiss-3.c ! 94ed736f7694f828c36fecdab2ab4b9f gcc/testsuite/gcc.target/i386/sse-ucomiss-4.c ! cb152013344f60a5906c62076fa023c8 gcc/testsuite/gcc.target/i386/sse-ucomiss-5.c ! 6f7147bf21ea5012f141b872cd95bce2 gcc/testsuite/gcc.target/i386/sse-ucomiss-6.c ! 3965470763c0daded489c7c4c2d8447c gcc/testsuite/gcc.target/i386/sse-unpckhps-1.c ! d1501fc7ea16fd31ff7efdd099d8a0ac gcc/testsuite/gcc.target/i386/sse-unpcklps-1.c ! e900962f550361d9b853fcf2c77f4a7e gcc/testsuite/gcc.target/i386/sse-vect-types.c ! 5e900128d9d94dc7a11e8bd444360412 gcc/testsuite/gcc.target/i386/sse-xorps-1.c ! cc8a45cdabdb123aa0bddd3ee57caf0b gcc/testsuite/gcc.target/i386/sse2-addpd-1.c ! d6c35b53936627220eb2b8e103337e57 gcc/testsuite/gcc.target/i386/sse2-addsd-1.c ! 3ce019ecf29bdf168967ace1dc21bff1 gcc/testsuite/gcc.target/i386/sse2-andnpd-1.c ! 10cec287ccfad067ae90e25553181d26 gcc/testsuite/gcc.target/i386/sse2-andpd-1.c ! 2d871a85b66501be3635ce02759360e8 gcc/testsuite/gcc.target/i386/sse2-check.h ! 6ae49fe5a3ce9de6958c224412ae5aa4 gcc/testsuite/gcc.target/i386/sse2-comisd-1.c ! da2a48df966ea490458048fa21f55c44 gcc/testsuite/gcc.target/i386/sse2-comisd-2.c ! c6db47a123da40d6255f116b6cecf869 gcc/testsuite/gcc.target/i386/sse2-comisd-3.c ! ea294b3a2c93972b037703f69cc20b56 gcc/testsuite/gcc.target/i386/sse2-comisd-4.c ! 58c94688a6fb625fcf25ecc3773ae5db gcc/testsuite/gcc.target/i386/sse2-comisd-5.c ! ceef0e7438c9aab7e93cf65181da6870 gcc/testsuite/gcc.target/i386/sse2-comisd-6.c ! fa5de403786ddba506952c754de802cf gcc/testsuite/gcc.target/i386/sse2-cvtdq2pd-1.c ! 423acf414a6fbe960d76b68a9628135c gcc/testsuite/gcc.target/i386/sse2-cvtdq2ps-1.c ! 1a1eced310d97e5d3c6cded8113f248f gcc/testsuite/gcc.target/i386/sse2-cvtpd2dq-1.c ! b095253e01b9ca5aa5ae3dfe4d943f05 gcc/testsuite/gcc.target/i386/sse2-cvtpd2ps-1.c ! 7cf0a33c5daa7c466e8d3adbb347a4c9 gcc/testsuite/gcc.target/i386/sse2-cvtps2dq-1.c ! 1fb7af4163e1453efa6428d66ebf17e7 gcc/testsuite/gcc.target/i386/sse2-cvtps2pd-1.c ! 467bf028189a0664564aa785729c7ed9 gcc/testsuite/gcc.target/i386/sse2-cvtsd2si-1.c ! 344262edd2743b30a64b6b7559d8d471 gcc/testsuite/gcc.target/i386/sse2-cvtsd2si-2.c ! f97a415d1b7981ea889ee34ad829509d gcc/testsuite/gcc.target/i386/sse2-cvtsd2ss-1.c ! 493f26307d145ef2aeb14725e8ee0071 gcc/testsuite/gcc.target/i386/sse2-cvtsi2sd-1.c ! 2a269d756960b51499a2abc9010b40dd gcc/testsuite/gcc.target/i386/sse2-cvtsi2sd-2.c ! 10df96264d366cbdb42b45c9877b64df gcc/testsuite/gcc.target/i386/sse2-cvtss2sd-1.c ! 13d53218a330d69da1eab6f41efb5ae0 gcc/testsuite/gcc.target/i386/sse2-cvttpd2dq-1.c ! 67eaeed1f508aa180952d6f03d0a396a gcc/testsuite/gcc.target/i386/sse2-cvttps2dq-1.c ! c9cbb19855e6b8cbeb92c482c5dea4e4 gcc/testsuite/gcc.target/i386/sse2-cvttsd2si-1.c ! 4bca21fbbf828d27967386a7ebf85923 gcc/testsuite/gcc.target/i386/sse2-cvttsd2si-2.c ! 6785e8ee18dfc9ec2bf6942766dc15f6 gcc/testsuite/gcc.target/i386/sse2-divpd-1.c ! 9e14a34f157fd7ce02db60b481eb34a4 gcc/testsuite/gcc.target/i386/sse2-divsd-1.c ! 80adbdba10424793c27edd55981f1c71 gcc/testsuite/gcc.target/i386/sse2-init-v16qi-1.c ! 88efbc83c445b2b27fa1b11cb6b54f9c gcc/testsuite/gcc.target/i386/sse2-init-v2di-1.c e8e78193e5e26074646a2d69e47e46ed gcc/testsuite/gcc.target/i386/sse2-init-v2di-2.c ! 64557391c646bda47f8f6ac5195a6b3a gcc/testsuite/gcc.target/i386/sse2-init-v4si-1.c ! 902a9360ee348af9b1cc348cb653146b gcc/testsuite/gcc.target/i386/sse2-init-v8hi-1.c ! 066e8acd0d5c710792ae72e213a76984 gcc/testsuite/gcc.target/i386/sse2-lrint-vec.c ! 3e51e14891cb25e493959466907d284b gcc/testsuite/gcc.target/i386/sse2-lrintf-vec.c ! 47a3e7a263dd01150f2da537eceb8569 gcc/testsuite/gcc.target/i386/sse2-maxpd-1.c ! 5ff8c544dbb1ba41aa794d430e68775d gcc/testsuite/gcc.target/i386/sse2-maxsd-1.c ! eaf538fa0690b6d74f0614aff8737cf9 gcc/testsuite/gcc.target/i386/sse2-minpd-1.c ! 1b5918c68841b703b143e45d49032391 gcc/testsuite/gcc.target/i386/sse2-minsd-1.c ! eeeadb6404a892edf1edc165f4b9fc8e gcc/testsuite/gcc.target/i386/sse2-mmx.c ! e6db7ae5b254b885c9b28ba09ab5169f gcc/testsuite/gcc.target/i386/sse2-movapd-1.c ! ade53839bccfe1b30678e622849b4bec gcc/testsuite/gcc.target/i386/sse2-movapd-2.c ! fc2beebc8230e7d0de0ea559fb6a8be0 gcc/testsuite/gcc.target/i386/sse2-movd-1.c ! f5ed951e36e90f6a42f44ebf0f3dd8c1 gcc/testsuite/gcc.target/i386/sse2-movd-2.c ! c6870c7aae9f9e75164dca97f879b64a gcc/testsuite/gcc.target/i386/sse2-movdqa-1.c ! 58ca940fccc1f2d96c92674ad401438f gcc/testsuite/gcc.target/i386/sse2-movdqa-2.c ! 6064c674838a7b6262799fc83bce1f49 gcc/testsuite/gcc.target/i386/sse2-movdqu-1.c ! 680d0e5528b5d1a265518f6fbd7ff86b gcc/testsuite/gcc.target/i386/sse2-movdqu-2.c ! bc2323e27cdf3ae785cf1fe56e325e15 gcc/testsuite/gcc.target/i386/sse2-movhpd-1.c ! 3288f5a92a23b03c28bc477c9d1c098a gcc/testsuite/gcc.target/i386/sse2-movhpd-2.c ! c5df77c6a20e9adcb165d1ad3a0e60cf gcc/testsuite/gcc.target/i386/sse2-movlpd-1.c ! 831a306833ff4ee27a494e2694ed3c0f gcc/testsuite/gcc.target/i386/sse2-movlpd-2.c ! 4ee252b878ba2b9a6f747cd18a466a94 gcc/testsuite/gcc.target/i386/sse2-movmskpd-1.c ! 79407ca1575ead3eb789879edd5b7e7d gcc/testsuite/gcc.target/i386/sse2-movntdq-1.c ! 6cebdac547b2805d3068a9fe6f048978 gcc/testsuite/gcc.target/i386/sse2-movntpd-1.c ! 3883b5d65887381843f8fccb248b2c7e gcc/testsuite/gcc.target/i386/sse2-movq-1.c ! 479d6b7de9b2d7f88c48c368277828e9 gcc/testsuite/gcc.target/i386/sse2-movq-2.c ! bf273ae40ca971fd8c18af601ba5b969 gcc/testsuite/gcc.target/i386/sse2-movq-3.c ! 490fb9667df3494c12f0e301e380d58e gcc/testsuite/gcc.target/i386/sse2-movsd-1.c ! 5233b72f4a471ddd85020bd09f9bf575 gcc/testsuite/gcc.target/i386/sse2-movsd-2.c ! 0ae5fa2296929de9ccb899c6cc2c3a59 gcc/testsuite/gcc.target/i386/sse2-movupd-1.c ! a5588214b9c0556fed622ec21bfba7ce gcc/testsuite/gcc.target/i386/sse2-movupd-2.c ! b55116df3e6289b6d1d5fd7f5726d25a gcc/testsuite/gcc.target/i386/sse2-mulpd-1.c ! bf7686b7e705aa4ecc02707001855daf gcc/testsuite/gcc.target/i386/sse2-mulsd-1.c ! fe87216653c8bdbf7e9e6adb46295d4e gcc/testsuite/gcc.target/i386/sse2-orpd-1.c ! ca1e457d6be42ed1f11f285c5af387f2 gcc/testsuite/gcc.target/i386/sse2-packssdw-1.c ! 5c55f49afc10d5628b033bf743382cf5 gcc/testsuite/gcc.target/i386/sse2-packsswb-1.c ! 993ad18bb153d49cbeb92194ebc2de87 gcc/testsuite/gcc.target/i386/sse2-packuswb-1.c ! 7ceadc7f46ee717a464883e35afcc380 gcc/testsuite/gcc.target/i386/sse2-paddb-1.c ! 6bbc5b206ceae346252a60a7d942978b gcc/testsuite/gcc.target/i386/sse2-paddd-1.c ! e471c7d982966e5ea5110c900f6c95ef gcc/testsuite/gcc.target/i386/sse2-paddq-1.c ! 29d56f05780218d8395649f45cddc210 gcc/testsuite/gcc.target/i386/sse2-paddsb-1.c ! a6abf58ab75be9a6e438c29aee9fdb31 gcc/testsuite/gcc.target/i386/sse2-paddsw-1.c ! 886b18fd7d65c0cc5b73d0e2204b2268 gcc/testsuite/gcc.target/i386/sse2-paddusb-1.c ! d857346fea8894f0958472766f90c4c8 gcc/testsuite/gcc.target/i386/sse2-paddusw-1.c ! b3c77b6ffc02064f38ff5e5ecfac6125 gcc/testsuite/gcc.target/i386/sse2-paddw-1.c ! 2a62b9ea111ba9127443af569a2a377b gcc/testsuite/gcc.target/i386/sse2-pand-1.c ! 43f80554e69a9671abd09962351b227c gcc/testsuite/gcc.target/i386/sse2-pandn-1.c ! 66db0fa7d8ace5d8013d7fca3f8b0c4b gcc/testsuite/gcc.target/i386/sse2-pavgb-1.c ! a46093ace9ba1c9955577435a79ef0fa gcc/testsuite/gcc.target/i386/sse2-pavgw-1.c ! bc08df54101fb602c9b741d231379d9d gcc/testsuite/gcc.target/i386/sse2-pcmpeqb-1.c ! bcd54ab8d1ec06bd13f1c3f22c21327c gcc/testsuite/gcc.target/i386/sse2-pcmpeqd-1.c ! e2c5fc2004ef09f27e412ae474ce0c1d gcc/testsuite/gcc.target/i386/sse2-pcmpeqw-1.c ! 23580789543136dffada191430ac8f78 gcc/testsuite/gcc.target/i386/sse2-pcmpgtb-1.c ! 388245cf46e40b0264c3e9bc5215869c gcc/testsuite/gcc.target/i386/sse2-pcmpgtd-1.c ! 63af252c5b68d5072bb8a4b8d2796b00 gcc/testsuite/gcc.target/i386/sse2-pcmpgtw-1.c ! cf476db42b979a42e227950b6fceba85 gcc/testsuite/gcc.target/i386/sse2-pmaddwd-1.c ! 2037f4902145737ce786740e1ea151c9 gcc/testsuite/gcc.target/i386/sse2-pmaxsw-1.c ! 9ccb7f5ae3f6d4bde7acabf92d3f68db gcc/testsuite/gcc.target/i386/sse2-pmaxub-1.c ! a17691b6196c2dc5b500df2e9075d0ca gcc/testsuite/gcc.target/i386/sse2-pminsw-1.c ! c853bdcd2d7d3d964a625ea5ec08b3aa gcc/testsuite/gcc.target/i386/sse2-pminub-1.c ! 3d1cffbb29087448d9f86d5557308d2c gcc/testsuite/gcc.target/i386/sse2-pmovmskb-1.c ! a9f3a42c94ee505a69275c3976893091 gcc/testsuite/gcc.target/i386/sse2-pmulhuw-1.c ! 1f05ab2ab1194c62a3faee99b9262038 gcc/testsuite/gcc.target/i386/sse2-pmulhw-1.c ! 9c50a430712d55bd0d0663c29bc60214 gcc/testsuite/gcc.target/i386/sse2-pmullw-1.c ! b25f090485bd3c8fe14a810df970526a gcc/testsuite/gcc.target/i386/sse2-pmuludq-1.c ! 6af6d791307efd39a0c5de9c3720aaeb gcc/testsuite/gcc.target/i386/sse2-por-1.c ! 4162568bbaa2afcd89387c2a8f87908b gcc/testsuite/gcc.target/i386/sse2-psadbw-1.c ! 3489a10de26bd4475c3fc6f72a6d2755 gcc/testsuite/gcc.target/i386/sse2-pshufd-1.c ! c5898fa8de0a320401543010d4fea574 gcc/testsuite/gcc.target/i386/sse2-pshufhw-1.c ! c520dc1ccc2e1abf3e2817a094310999 gcc/testsuite/gcc.target/i386/sse2-pshuflw-1.c ! 8c3703a592e394e8e0231e6018167108 gcc/testsuite/gcc.target/i386/sse2-pslld-1.c ! c19940a885103a9dba80722cc78302dc gcc/testsuite/gcc.target/i386/sse2-pslld-2.c ! be44c23b8122f9080a9c35c6b5f40349 gcc/testsuite/gcc.target/i386/sse2-pslldq-1.c ! a44db56c2d5e20065d1dee22676b3d81 gcc/testsuite/gcc.target/i386/sse2-psllq-1.c ! d4006ec5cda41606597a210a4ca15cc7 gcc/testsuite/gcc.target/i386/sse2-psllq-2.c ! 1560e799c003687f87c5c90dd5b35d4f gcc/testsuite/gcc.target/i386/sse2-psllw-1.c ! df503b4f50d043d0b89954bd8096cdcc gcc/testsuite/gcc.target/i386/sse2-psllw-2.c ! d2e555b5f1bdb97b0e38a1b4344c8368 gcc/testsuite/gcc.target/i386/sse2-psrad-1.c ! 728e21b3cbbb73b02c8893721afaea67 gcc/testsuite/gcc.target/i386/sse2-psrad-2.c ! 9ace86e6f8d467e048c9eccc98752188 gcc/testsuite/gcc.target/i386/sse2-psraw-1.c ! 9c71b744a674d63a94950fce963d5a3a gcc/testsuite/gcc.target/i386/sse2-psraw-2.c ! 7e7e6702ab013beb5bd67ed85db1f4eb gcc/testsuite/gcc.target/i386/sse2-psrld-1.c ! 569ef0d31fd207a7ba10ee39e8feeb1e gcc/testsuite/gcc.target/i386/sse2-psrld-2.c ! 7438265591e9ae0f00a56a1b61e94ff4 gcc/testsuite/gcc.target/i386/sse2-psrldq-1.c ! ea20633b125b8d4a58801925d2f449c8 gcc/testsuite/gcc.target/i386/sse2-psrlq-1.c ! b0075e912c2605f39d289330c1bf895a gcc/testsuite/gcc.target/i386/sse2-psrlq-2.c ! 88f9d2394803526a88b3598ce439e97a gcc/testsuite/gcc.target/i386/sse2-psrlw-1.c ! 425478463e57d4bc7e3bfafef34da957 gcc/testsuite/gcc.target/i386/sse2-psrlw-2.c ! c9b028a7f40bcfa50b8bcd643fcea1b1 gcc/testsuite/gcc.target/i386/sse2-psubb-1.c ! 9de904bf9ef3c4e2c11611d99e1b972d gcc/testsuite/gcc.target/i386/sse2-psubd-1.c ! 8edb1f7da5e85523e270911dfb41bb5f gcc/testsuite/gcc.target/i386/sse2-psubq-1.c ! 203ef11f2d220e9e8319df8dc4bf7a63 gcc/testsuite/gcc.target/i386/sse2-psubsb-1.c ! 2d68a96ab2774eb97691794aa8265cea gcc/testsuite/gcc.target/i386/sse2-psubsw-1.c ! acc99034f46fe4e0e9f73359ae35b28e gcc/testsuite/gcc.target/i386/sse2-psubw-1.c ! 2f7ac3a2cd4b2e80c111880eca1465ca gcc/testsuite/gcc.target/i386/sse2-punpckhbw-1.c ! 0c0cca45a0d34bcdf53332f9befc2754 gcc/testsuite/gcc.target/i386/sse2-punpckhdq-1.c ! ac774a6d21b887b01716dc27e17c0d55 gcc/testsuite/gcc.target/i386/sse2-punpckhqdq-1.c ! 1e69f71bd3a257146d14557a27acfc4e gcc/testsuite/gcc.target/i386/sse2-punpckhwd-1.c ! 173d3c2e4d1f86dc59c5c68bf55b1e57 gcc/testsuite/gcc.target/i386/sse2-punpcklbw-1.c ! 383a2d0450654040e37531f14fcc041a gcc/testsuite/gcc.target/i386/sse2-punpckldq-1.c ! ecb64d92bdddb1f33fef0cdbda69134c gcc/testsuite/gcc.target/i386/sse2-punpcklqdq-1.c ! 221e174275598ecda041f375262171e3 gcc/testsuite/gcc.target/i386/sse2-punpcklwd-1.c ! 7530d1ea39003806e9c2789e4cda9db0 gcc/testsuite/gcc.target/i386/sse2-pxor-1.c ! 0162be716c5c1bb60e83137059c9320f gcc/testsuite/gcc.target/i386/sse2-set-epi32-1.c ! ef6dd58651cf8cfdc73004fad97cad71 gcc/testsuite/gcc.target/i386/sse2-set-epi64x-1.c ! 909efa144ba22e9df340dfcc17681baa gcc/testsuite/gcc.target/i386/sse2-set-v16qi-1.c ! 030d6ba0fb92fe690a0d91d165390b81 gcc/testsuite/gcc.target/i386/sse2-set-v16qi-2.c ! 0d438d515aca6a8c7e7b352fed37caad gcc/testsuite/gcc.target/i386/sse2-set-v16qi-3.c ! abe2c08416dee7427d4768143fa2ca49 gcc/testsuite/gcc.target/i386/sse2-set-v8hi-1.c ! 5eaacdec4d925b4967cd0c944721b48c gcc/testsuite/gcc.target/i386/sse2-set-v8hi-1a.c ! 7b3ca3df7ce043034cc7dc9670636cad gcc/testsuite/gcc.target/i386/sse2-set-v8hi-2.c ! 3b2e6e068bacbb324116d9057505307c gcc/testsuite/gcc.target/i386/sse2-set-v8hi-2a.c ! f734fafcfcfd6cf99d1c841374f1cffd gcc/testsuite/gcc.target/i386/sse2-shufpd-1.c ! 2e8a5f42fa646e7900766b159e65ec28 gcc/testsuite/gcc.target/i386/sse2-shufps-1.c ! 96133d256f68ce2351e9c0f557962fbc gcc/testsuite/gcc.target/i386/sse2-sqrtpd-1.c ! e412d272282f2652af8397a222f52b3e gcc/testsuite/gcc.target/i386/sse2-subpd-1.c ! b450f0e988bff2c63e64fa72a44982ee gcc/testsuite/gcc.target/i386/sse2-subsd-1.c ! 606021143acc1c232e4008ea03d52e45 gcc/testsuite/gcc.target/i386/sse2-ucomisd-1.c ! c787c1c63e1fed127a5fc433d016f891 gcc/testsuite/gcc.target/i386/sse2-ucomisd-2.c ! 8473d7841c77875afae003c9d4413551 gcc/testsuite/gcc.target/i386/sse2-ucomisd-3.c ! 8a6172d8cf1f915a80e09a294d6c466e gcc/testsuite/gcc.target/i386/sse2-ucomisd-4.c ! 8bf06a2dec48b4b88e9ce9408dc3a050 gcc/testsuite/gcc.target/i386/sse2-ucomisd-5.c ! 7dd1e7d394951506f92ba6feab23885b gcc/testsuite/gcc.target/i386/sse2-ucomisd-6.c ! 1b06ca6a8e7b298579d4f8b082218114 gcc/testsuite/gcc.target/i386/sse2-unpack-1.c ! ad807f617c301a24334f42c3fb844a6d gcc/testsuite/gcc.target/i386/sse2-unpckhpd-1.c ! a3d9baf6b16979a569ab204a3f9f9547 gcc/testsuite/gcc.target/i386/sse2-unpcklpd-1.c ! bcb1ca8857476d3f113aa17965a24aef gcc/testsuite/gcc.target/i386/sse2-vec-1.c ! 4b70fc3da3438b300706949b19b6c68a gcc/testsuite/gcc.target/i386/sse2-vec-2.c ! 8eb127859da55b5af7f53a6c06d73084 gcc/testsuite/gcc.target/i386/sse2-vec-3.c ! 9d3c6cfc5b7ff1305311872726be7d69 gcc/testsuite/gcc.target/i386/sse2-vec-4.c ! 719e6432a8255fdae05e0d63858e6fed gcc/testsuite/gcc.target/i386/sse2-vec-5.c ! 4e72f77ffacd0c3e211f3895d14fc60e gcc/testsuite/gcc.target/i386/sse2-vec-6.c ! 5a6351247da9ab79db1a2070def6cd3f gcc/testsuite/gcc.target/i386/sse2-xorpd-1.c ! fa6a43d00a34f270cd043e4ff5e0a51c gcc/testsuite/gcc.target/i386/sse3-addsubpd.c ! e013969098796ed5d9c89609b2fc32ca gcc/testsuite/gcc.target/i386/sse3-addsubps.c ! 7f9a35da14336e4f5ca30f3838d20283 gcc/testsuite/gcc.target/i386/sse3-check.h ! b643f2470efe1d4d1225a6c37f502ae3 gcc/testsuite/gcc.target/i386/sse3-haddpd.c ! 18dc750d1b54bee95483ba328625e0b8 gcc/testsuite/gcc.target/i386/sse3-haddps.c ! 9ba759b951541bd98d1872c50e0d3d04 gcc/testsuite/gcc.target/i386/sse3-hsubpd.c ! db02d2c86e7ca6dbd23f928c8b21ad98 gcc/testsuite/gcc.target/i386/sse3-hsubps.c ! fc6b8ef704e5ec05e1022cdc5dc17665 gcc/testsuite/gcc.target/i386/sse3-lddqu.c ! 48ef3c79efe97c16b2f5741256d52ef3 gcc/testsuite/gcc.target/i386/sse3-movddup.c ! 6cfb9e9760b50ce7b8dd2d5a7dc17d00 gcc/testsuite/gcc.target/i386/sse3-movshdup.c ! 1cc0a150f8193462e84b0761ce8bdc3f gcc/testsuite/gcc.target/i386/sse3-movsldup.c e18bbd1a575dbb964c9953896983e6c4 gcc/testsuite/gcc.target/i386/sse4_1-blendpd.c e189528eabdcee26590b3e1d63bdd0c9 gcc/testsuite/gcc.target/i386/sse4_1-blendps-2.c 250e3465396368f764f90cb412568f07 gcc/testsuite/gcc.target/i386/sse4_1-blendps.c --- 25538,25802 ---- 5284fcc983471f12858a4548278e7ba8 gcc/testsuite/gcc.target/i386/signbit-1.c c85c9e90131aec3192a00164bb0bd0c9 gcc/testsuite/gcc.target/i386/signbit-2.c e4e964c41e6d4ce52de6ff059a66864a gcc/testsuite/gcc.target/i386/signbit-3.c ! ce5abd38f9e99983c6054cff2f093f0c gcc/testsuite/gcc.target/i386/sse-1.c ! 9bad27158ce36a5ce8a320dbc944e434 gcc/testsuite/gcc.target/i386/sse-10.c ! 49bde97b271274cb2bc26697ce2b19be gcc/testsuite/gcc.target/i386/sse-11.c 564af1ee23ebd4f5364c4a80866cd116 gcc/testsuite/gcc.target/i386/sse-12.c 374a66aa7fbdae0bca3f39901dc0dca5 gcc/testsuite/gcc.target/i386/sse-13.c da4d3c4ce113068166bcb53ce60b7f80 gcc/testsuite/gcc.target/i386/sse-14.c ! da514f74e1e79e037d46d6bbab9cd401 gcc/testsuite/gcc.target/i386/sse-15.c ! 9fcbf93b1f11bd0af09b84dac5a75d97 gcc/testsuite/gcc.target/i386/sse-16.c ! f660e67b22cb44e6a6b38a247b1d78c3 gcc/testsuite/gcc.target/i386/sse-17.c ! 2e8534fec59e530e41e541308d0168ba gcc/testsuite/gcc.target/i386/sse-18.c ! 509de8d9f1134de50947d917ab668259 gcc/testsuite/gcc.target/i386/sse-19.c ! 84c82bea172793549d59b945b9c58aaf gcc/testsuite/gcc.target/i386/sse-2.c ! d7a71bae6a12771a9057e2d3a60c39f1 gcc/testsuite/gcc.target/i386/sse-20.c 6f72f5cda8d60392229a1bb4f9c2f4e1 gcc/testsuite/gcc.target/i386/sse-21.c ddc174c64ecbde7ff0766c505e7a55b6 gcc/testsuite/gcc.target/i386/sse-22.c 4f7dbaa4c91a4df47917de3aa0a1b855 gcc/testsuite/gcc.target/i386/sse-23.c ! 9dfe2cc74e998cef475e202f64ff8322 gcc/testsuite/gcc.target/i386/sse-3.c ! 5dd1036758e38b6926c980f41c9fb229 gcc/testsuite/gcc.target/i386/sse-4.c 3d362089b85e37fffeb3bc67567552a3 gcc/testsuite/gcc.target/i386/sse-5.c ! 34561bfb4872c917d97994d7de3828b5 gcc/testsuite/gcc.target/i386/sse-6.c ! f6cdb29d66458dbcca710bda033dc0ca gcc/testsuite/gcc.target/i386/sse-7.c a25422d1196a94c7d1dd062ba3c21e5b gcc/testsuite/gcc.target/i386/sse-8.c ! ee6ef4bf4e0a816c3454e31d36ab8bb6 gcc/testsuite/gcc.target/i386/sse-9.c ! 025afa1343cbfdf508febcd60f6d2c38 gcc/testsuite/gcc.target/i386/sse-addps-1.c ! 5287b15b19f501b91637e70c8c60fd2e gcc/testsuite/gcc.target/i386/sse-addss-1.c ! 773a061ce226bca557f4dfeab77ec707 gcc/testsuite/gcc.target/i386/sse-andnps-1.c ! 44bb7370d2d1d647eb070b8da049a1ee gcc/testsuite/gcc.target/i386/sse-andps-1.c ! fb1d4b622ded8c47df010df4f0e7bc21 gcc/testsuite/gcc.target/i386/sse-check.h ! ccc6c580801ffadf17dc954344e73b23 gcc/testsuite/gcc.target/i386/sse-comiss-1.c ! 3763b35cede933306e295cdd821ff1c6 gcc/testsuite/gcc.target/i386/sse-comiss-2.c ! dbf4c7b6ce3fccf7ee1941f8e1034f73 gcc/testsuite/gcc.target/i386/sse-comiss-3.c ! ed911466c07c0736e02e66d90b095100 gcc/testsuite/gcc.target/i386/sse-comiss-4.c ! d9fb3b3486eefe8b11ff61c445a11e02 gcc/testsuite/gcc.target/i386/sse-comiss-5.c ! 3ca8e7c267b407960cc458e7275698b7 gcc/testsuite/gcc.target/i386/sse-comiss-6.c ! 899fec05563e846a830eeed834029d2f gcc/testsuite/gcc.target/i386/sse-cvtsi2ss-1.c ! 4661b966698b43ceb62931f40d9e3089 gcc/testsuite/gcc.target/i386/sse-cvtsi2ss-2.c ! a17640d6e8c3fb4015b3e46eedfec394 gcc/testsuite/gcc.target/i386/sse-cvtss2si-1.c ! 4b429c002b859ce895dfccdabfa332c8 gcc/testsuite/gcc.target/i386/sse-cvtss2si-2.c ! 9f0cabbb53a77ba82473ab4aa1c66424 gcc/testsuite/gcc.target/i386/sse-cvttss2si-1.c ! eb15ffa04885107535465661dbdaedb7 gcc/testsuite/gcc.target/i386/sse-cvttss2si-2.c ! 3505e52bbc59fc59f60921d6cd5bee99 gcc/testsuite/gcc.target/i386/sse-divps-1.c ! 0c0f489b28655dbafacbf31bb309f555 gcc/testsuite/gcc.target/i386/sse-divss-1.c ! 8b85558c6ee55904994783f1aff372c8 gcc/testsuite/gcc.target/i386/sse-init-v4hi-1.c ! cfe36d3ea5b0fbc300cd5fef60e07a9a gcc/testsuite/gcc.target/i386/sse-init-v4sf-1.c ! e705960bdfcc3fab219a9646e69f574e gcc/testsuite/gcc.target/i386/sse-maxps-1.c ! 3586f28051dca7de135795e687bde3d2 gcc/testsuite/gcc.target/i386/sse-maxss-1.c ! fc357b7da15d21bced5dda082a5316e4 gcc/testsuite/gcc.target/i386/sse-minps-1.c ! 31303b723b03972aa01393df9aa1d872 gcc/testsuite/gcc.target/i386/sse-minss-1.c ! 1efee700419238ceedba6d2721323bcd gcc/testsuite/gcc.target/i386/sse-movaps-1.c ! d7085afc26cfdca6d8f4d2712f22d0d7 gcc/testsuite/gcc.target/i386/sse-movaps-2.c ! e475c079994b29c8108f9016a3b4d091 gcc/testsuite/gcc.target/i386/sse-movhlps-1.c ! 3679b62452e09e6e7de6f809b5cd1c95 gcc/testsuite/gcc.target/i386/sse-movhps-1.c ! e506da4c6de413148b5b72fc61ef0c1a gcc/testsuite/gcc.target/i386/sse-movhps-2.c ! 1a6cd46c47fb1486316562403d7c0a4c gcc/testsuite/gcc.target/i386/sse-movlhps-1.c ! 2daa613c38671c5457c55a64834b6d34 gcc/testsuite/gcc.target/i386/sse-movmskps-1.c ! 872a7372dbd17770dd167f4bbbe98f9e gcc/testsuite/gcc.target/i386/sse-movntps-1.c ! 0c20fe3e793cdf3df534a3410f87980d gcc/testsuite/gcc.target/i386/sse-movss-1.c ! caa588177b3a91e2a57fd162fd9c803f gcc/testsuite/gcc.target/i386/sse-movss-2.c ! a4eecf1c384ff0251e2c9f7dc262fcb2 gcc/testsuite/gcc.target/i386/sse-movss-3.c ! 495f0f96f3d88e2a5aa6dcf7b01cf317 gcc/testsuite/gcc.target/i386/sse-movups-1.c ! bcf0d6d51d39f674c2672181211f8783 gcc/testsuite/gcc.target/i386/sse-movups-2.c ! 0496ef0acd33a936ebe83ac1bae2c8f3 gcc/testsuite/gcc.target/i386/sse-mulps-1.c ! 51890d9a987841a9d50bcb4978419235 gcc/testsuite/gcc.target/i386/sse-mulss-1.c ! 011989a32280bb1aa821f00e7f492898 gcc/testsuite/gcc.target/i386/sse-orps-1.c ! 89552849d46cd46dba9f21d1b11c3b3b gcc/testsuite/gcc.target/i386/sse-os-support.h ! 642da3797fdc5a430e7dffdf36d5a54d gcc/testsuite/gcc.target/i386/sse-rcpps-1.c ! 1afcc510521cb40453b8b69902ef93c9 gcc/testsuite/gcc.target/i386/sse-recip-vec.c ! aea0d5b5ce50e4793a508ad8ff831cb3 gcc/testsuite/gcc.target/i386/sse-recip.c ! 5edc79770097d674d8172960a971c52b gcc/testsuite/gcc.target/i386/sse-rsqrtps-1.c ! ceca3fb0024061a35aae0907e590d0fb gcc/testsuite/gcc.target/i386/sse-set-ps-1.c ! faeba3d2d853ae3650e4e1152bbb29ca gcc/testsuite/gcc.target/i386/sse-sqrtps-1.c ! 8f0199beb6d69e73f059bb38f7949bee gcc/testsuite/gcc.target/i386/sse-subps-1.c ! 40f702f7e150860651edfe2e1d8d4c01 gcc/testsuite/gcc.target/i386/sse-subss-1.c ! 800412fd9b59a17a864c3107d3184170 gcc/testsuite/gcc.target/i386/sse-ucomiss-1.c ! 10fba460c88be7c946dae559f3fa7bf3 gcc/testsuite/gcc.target/i386/sse-ucomiss-2.c ! e732da1bea01895c7e57d68c95815451 gcc/testsuite/gcc.target/i386/sse-ucomiss-3.c ! 0468413a6454b3f6e710d0233f5ed997 gcc/testsuite/gcc.target/i386/sse-ucomiss-4.c ! 677d791ca3dcc7e877a425df590bfd01 gcc/testsuite/gcc.target/i386/sse-ucomiss-5.c ! 4a6ecdfcf542baef0610e56cf9bacdc6 gcc/testsuite/gcc.target/i386/sse-ucomiss-6.c ! e80e025b5521ce049d975cd0376dd73f gcc/testsuite/gcc.target/i386/sse-unpckhps-1.c ! 96937d4f53343afbd857a121ebb693f7 gcc/testsuite/gcc.target/i386/sse-unpcklps-1.c ! f6ff379882d9b974dfc15438c945604b gcc/testsuite/gcc.target/i386/sse-vect-types.c ! a41fe7dc0e539ceefca894e1f80e769e gcc/testsuite/gcc.target/i386/sse-xorps-1.c ! d577617bdd4e8a2de2ec9b6e4bde1eb4 gcc/testsuite/gcc.target/i386/sse2-addpd-1.c ! 45d458b0f755e9542ac936ae4fc8eb16 gcc/testsuite/gcc.target/i386/sse2-addsd-1.c ! 5b64c8e79e14ff09355a5e5875fb1376 gcc/testsuite/gcc.target/i386/sse2-andnpd-1.c ! abded689dfc189d904257a4341611ab4 gcc/testsuite/gcc.target/i386/sse2-andpd-1.c ! f6f55ff9ed793ac3c34f35cb8cdb5c65 gcc/testsuite/gcc.target/i386/sse2-check.h ! f9303cbefb35bb531ae6bf99854d6e5b gcc/testsuite/gcc.target/i386/sse2-comisd-1.c ! 5a9fd838d989116aa050564ca2091347 gcc/testsuite/gcc.target/i386/sse2-comisd-2.c ! 8383faf31d94e52f28e372574e0f5744 gcc/testsuite/gcc.target/i386/sse2-comisd-3.c ! eee6bd623599432f7832e0c7317ccdb8 gcc/testsuite/gcc.target/i386/sse2-comisd-4.c ! b4178c256301ad4dedf8beee720d4f58 gcc/testsuite/gcc.target/i386/sse2-comisd-5.c ! de64abbae5fd84b85677810337b1ac54 gcc/testsuite/gcc.target/i386/sse2-comisd-6.c ! 4e3feefde0710268f4343252bc995acd gcc/testsuite/gcc.target/i386/sse2-cvtdq2pd-1.c ! 3a9d9c69d3ba50ae9cb23e4aca8beb92 gcc/testsuite/gcc.target/i386/sse2-cvtdq2ps-1.c ! 698f29412bbb79d37233514ae4d2c040 gcc/testsuite/gcc.target/i386/sse2-cvtpd2dq-1.c ! 3544979a6a78f7bbe7a71bab05e81932 gcc/testsuite/gcc.target/i386/sse2-cvtpd2ps-1.c ! d9146caf3ad7c6c003d3d9b551eeeec7 gcc/testsuite/gcc.target/i386/sse2-cvtps2dq-1.c ! ae46e998f5faa40b54283eeadf38816e gcc/testsuite/gcc.target/i386/sse2-cvtps2pd-1.c ! 00db025d55918ffa6aa550bbed4c0fbc gcc/testsuite/gcc.target/i386/sse2-cvtsd2si-1.c ! da21ca3d3963c18f33c91330e1c82c8c gcc/testsuite/gcc.target/i386/sse2-cvtsd2si-2.c ! 315c6a163d611e9f7d412015eb737577 gcc/testsuite/gcc.target/i386/sse2-cvtsd2ss-1.c ! 6d4b056931d058581f88f9da22986ad3 gcc/testsuite/gcc.target/i386/sse2-cvtsi2sd-1.c ! 7e88a80631b79301fa99461fe5079a96 gcc/testsuite/gcc.target/i386/sse2-cvtsi2sd-2.c ! 8ad39d7b77a02f1d699ea023cd04a531 gcc/testsuite/gcc.target/i386/sse2-cvtss2sd-1.c ! 2c0f75a85db2d8e37f0f78092f2313ac gcc/testsuite/gcc.target/i386/sse2-cvttpd2dq-1.c ! b9ce5798c339f3d6a78c41c0059bb5e2 gcc/testsuite/gcc.target/i386/sse2-cvttps2dq-1.c ! 50ab3a5cdfff0a2169802c882336fac3 gcc/testsuite/gcc.target/i386/sse2-cvttsd2si-1.c ! d94e400fc08caf144d9d4f0b55a7e69c gcc/testsuite/gcc.target/i386/sse2-cvttsd2si-2.c ! fc535f253868df6d104fe59110255bbe gcc/testsuite/gcc.target/i386/sse2-divpd-1.c ! c61ecb520f8d8d7266675b405d7b2aa7 gcc/testsuite/gcc.target/i386/sse2-divsd-1.c ! 2826f31ddc998ab7f07b1235d215e39d gcc/testsuite/gcc.target/i386/sse2-init-v16qi-1.c ! 7ed343a35790aa4739272bbb5559e6fb gcc/testsuite/gcc.target/i386/sse2-init-v2di-1.c e8e78193e5e26074646a2d69e47e46ed gcc/testsuite/gcc.target/i386/sse2-init-v2di-2.c ! f53a36e4b14e3ead4c8fcaec57e63ddb gcc/testsuite/gcc.target/i386/sse2-init-v4si-1.c ! 8fbafd8cda93cc37dbbd3283557aaadc gcc/testsuite/gcc.target/i386/sse2-init-v8hi-1.c ! f4d5400e4ee3ffd7055d5bacd465fbde gcc/testsuite/gcc.target/i386/sse2-lrint-vec.c ! cc9a7f1ef05952d3fd208ec996ec2649 gcc/testsuite/gcc.target/i386/sse2-lrintf-vec.c ! 59ad2445260c9125a3a84caff66ce2ff gcc/testsuite/gcc.target/i386/sse2-maxpd-1.c ! 44a4fbaf09442e13accaef4df3afb231 gcc/testsuite/gcc.target/i386/sse2-maxsd-1.c ! aefc174798cfd957968a0915e9989648 gcc/testsuite/gcc.target/i386/sse2-minpd-1.c ! fc86a82738b060b9900f3f68205d60d9 gcc/testsuite/gcc.target/i386/sse2-minsd-1.c ! 87efe59d21cddd4ccc1f8caa2e5300d4 gcc/testsuite/gcc.target/i386/sse2-mmx.c ! 99700c0bbb9ac7119491dacab03a852e gcc/testsuite/gcc.target/i386/sse2-movapd-1.c ! 6b01c60d5cfc36bc3fb3861e7c65fafb gcc/testsuite/gcc.target/i386/sse2-movapd-2.c ! df256dc991af0bd27068e98f9914f7e9 gcc/testsuite/gcc.target/i386/sse2-movd-1.c ! f904689d8d0067d93105e377367edd5b gcc/testsuite/gcc.target/i386/sse2-movd-2.c ! a2458c99d49657dc72864ee69a151f31 gcc/testsuite/gcc.target/i386/sse2-movdqa-1.c ! ced4796ac5dfc014babbc665ff88c4cf gcc/testsuite/gcc.target/i386/sse2-movdqa-2.c ! b1aa88da3ede7c3fe5d2236e78d140dd gcc/testsuite/gcc.target/i386/sse2-movdqu-1.c ! 0c9dc8cb80943dfd68fa9a0147f7afbd gcc/testsuite/gcc.target/i386/sse2-movdqu-2.c ! b7a2d677e8ddba27857a6428fa912308 gcc/testsuite/gcc.target/i386/sse2-movhpd-1.c ! 423c2f112d85674a71fd253ad3f4dd09 gcc/testsuite/gcc.target/i386/sse2-movhpd-2.c ! f74da89ccc25550df06087c141afdd97 gcc/testsuite/gcc.target/i386/sse2-movlpd-1.c ! 86ecd6acb27017a30599ea995ccb6209 gcc/testsuite/gcc.target/i386/sse2-movlpd-2.c ! 2a3c6cb083b01fdc411e6d44dcda94d6 gcc/testsuite/gcc.target/i386/sse2-movmskpd-1.c ! 9aaffba514b100e11484b92b86c02746 gcc/testsuite/gcc.target/i386/sse2-movntdq-1.c ! 4f7bbb23f015424e2719ae09d5344dda gcc/testsuite/gcc.target/i386/sse2-movntpd-1.c ! 8d09bce376e0e8484e1cbc963aff3720 gcc/testsuite/gcc.target/i386/sse2-movq-1.c ! d75903616b50fdffa695886c0188f68d gcc/testsuite/gcc.target/i386/sse2-movq-2.c ! 7f6bdee204b30e7d7d39cb013641942b gcc/testsuite/gcc.target/i386/sse2-movq-3.c ! 70fdf1bc420ca06c4d2d3433dd3722a3 gcc/testsuite/gcc.target/i386/sse2-movsd-1.c ! a1c36049c008e71e9c8fbeb3c7516204 gcc/testsuite/gcc.target/i386/sse2-movsd-2.c ! dba017852b221b4a3d9870e2038939d9 gcc/testsuite/gcc.target/i386/sse2-movupd-1.c ! 9ad6864502f6f0070d01ce084e5e1fcb gcc/testsuite/gcc.target/i386/sse2-movupd-2.c ! d4ca566e1f3070ded6fc43a97cc113f7 gcc/testsuite/gcc.target/i386/sse2-mulpd-1.c ! f5cb6fdc99159a8d8291d2ae013cdc6e gcc/testsuite/gcc.target/i386/sse2-mulsd-1.c ! 163b2120ed0748fb20db0ee972b5a168 gcc/testsuite/gcc.target/i386/sse2-orpd-1.c ! 48567ba2801952886b52ff587344a5ba gcc/testsuite/gcc.target/i386/sse2-packssdw-1.c ! 7298245145c703059737c65a6ce41ef1 gcc/testsuite/gcc.target/i386/sse2-packsswb-1.c ! 0cb971d6f9f1ff695b42303a0ddc8f50 gcc/testsuite/gcc.target/i386/sse2-packuswb-1.c ! 5b99958ac4d152d53410a841a97b9553 gcc/testsuite/gcc.target/i386/sse2-paddb-1.c ! fff95cb638d398b811b878236f00b805 gcc/testsuite/gcc.target/i386/sse2-paddd-1.c ! b5c1d8e8dbc21da42151d14436d95365 gcc/testsuite/gcc.target/i386/sse2-paddq-1.c ! 1967140f89073cc72866c8f34e4de377 gcc/testsuite/gcc.target/i386/sse2-paddsb-1.c ! 98b2bb700e1798aa9149ab48a39bea96 gcc/testsuite/gcc.target/i386/sse2-paddsw-1.c ! 161716e2f130a7ac2d50b15517814604 gcc/testsuite/gcc.target/i386/sse2-paddusb-1.c ! b4cbdc33b07f014c0de8f010c518a0dc gcc/testsuite/gcc.target/i386/sse2-paddusw-1.c ! 88e46e5ad94a3a28d4e1e898d3a1e78a gcc/testsuite/gcc.target/i386/sse2-paddw-1.c ! 219fec283fe61b463c7d302c49392f62 gcc/testsuite/gcc.target/i386/sse2-pand-1.c ! 6dbac7d9c01b9575a45f0e353e509aaf gcc/testsuite/gcc.target/i386/sse2-pandn-1.c ! 625f4a64c917a7bbee4395cdc03b9f48 gcc/testsuite/gcc.target/i386/sse2-pavgb-1.c ! a5c67d56f12f3a50a1e77e4aee67a442 gcc/testsuite/gcc.target/i386/sse2-pavgw-1.c ! 502a8985fae88c84995dd25458072c96 gcc/testsuite/gcc.target/i386/sse2-pcmpeqb-1.c ! 9726296c15833ec442a79e43ee9c0b7f gcc/testsuite/gcc.target/i386/sse2-pcmpeqd-1.c ! 3635672617ba37292d411154bd9a4029 gcc/testsuite/gcc.target/i386/sse2-pcmpeqw-1.c ! cb27c0fe9688d0fe30106b39d32d74ec gcc/testsuite/gcc.target/i386/sse2-pcmpgtb-1.c ! e3fb25931d4bf1c146a150057a441638 gcc/testsuite/gcc.target/i386/sse2-pcmpgtd-1.c ! b15aba423805a83116bbc28ffc07595a gcc/testsuite/gcc.target/i386/sse2-pcmpgtw-1.c ! c08ec273f99091717bab88591775b9e2 gcc/testsuite/gcc.target/i386/sse2-pmaddwd-1.c ! 4601e3a801b5a07f19ce34df66ef4ca4 gcc/testsuite/gcc.target/i386/sse2-pmaxsw-1.c ! ea4e48b8ae29d3b6fa83dad43a630981 gcc/testsuite/gcc.target/i386/sse2-pmaxub-1.c ! b11a37b915c7e69cd7d6d57ec22653ca gcc/testsuite/gcc.target/i386/sse2-pminsw-1.c ! 0fd6f2b0cb447502f943872a36e7ef35 gcc/testsuite/gcc.target/i386/sse2-pminub-1.c ! 92f8ce0ad44127c6cd8a648e18062d88 gcc/testsuite/gcc.target/i386/sse2-pmovmskb-1.c ! dffaa1d87966ffde8d2842fc062b5513 gcc/testsuite/gcc.target/i386/sse2-pmulhuw-1.c ! b4038cdeb4eee7cf1074de1cead1d1b5 gcc/testsuite/gcc.target/i386/sse2-pmulhw-1.c ! d1e0ff73b10eb61ca8fa06128a453ef9 gcc/testsuite/gcc.target/i386/sse2-pmullw-1.c ! 308fe64b1fe9bf78b6b4ed03b89a6c2f gcc/testsuite/gcc.target/i386/sse2-pmuludq-1.c ! 5a4b1b55ad120b0697aa2b141f831dcc gcc/testsuite/gcc.target/i386/sse2-por-1.c ! 306e316bf36fd1022168fa5560198f41 gcc/testsuite/gcc.target/i386/sse2-psadbw-1.c ! 31949c673c69db630bfaf04449d2677f gcc/testsuite/gcc.target/i386/sse2-pshufd-1.c ! 2890c692e114956ac819984c965d389e gcc/testsuite/gcc.target/i386/sse2-pshufhw-1.c ! 1802251564599c9c391fcb383918a223 gcc/testsuite/gcc.target/i386/sse2-pshuflw-1.c ! e0b645e5fbdd8e7ef9c5c95ba4322c49 gcc/testsuite/gcc.target/i386/sse2-pslld-1.c ! ffffe0f305e6006a7b493ae3b009a98a gcc/testsuite/gcc.target/i386/sse2-pslld-2.c ! c455a583d94965892a58697e4eea9f86 gcc/testsuite/gcc.target/i386/sse2-pslldq-1.c ! 147d552e1f88b7d5bcfe59312d016871 gcc/testsuite/gcc.target/i386/sse2-psllq-1.c ! 1ecba90a8b008cf50059eb6684c5cb87 gcc/testsuite/gcc.target/i386/sse2-psllq-2.c ! f6c973b6f8c0838b106b2401d6071d02 gcc/testsuite/gcc.target/i386/sse2-psllw-1.c ! d73f31d8e47f50f11339411115430bdf gcc/testsuite/gcc.target/i386/sse2-psllw-2.c ! 2b188e95090c12512620f1a04451b564 gcc/testsuite/gcc.target/i386/sse2-psrad-1.c ! 0a0730290bd38b2c389aa3744dae77bc gcc/testsuite/gcc.target/i386/sse2-psrad-2.c ! 5caad595517ae384ce66d97312b54483 gcc/testsuite/gcc.target/i386/sse2-psraw-1.c ! d5fc16fd182f4d66aba527f552508a3c gcc/testsuite/gcc.target/i386/sse2-psraw-2.c ! bde3696085b13de5ccb15a084b3845ec gcc/testsuite/gcc.target/i386/sse2-psrld-1.c ! bef290319558e327445466dfc3c514b1 gcc/testsuite/gcc.target/i386/sse2-psrld-2.c ! e70990bdd04949e1e73bd7bf7615d869 gcc/testsuite/gcc.target/i386/sse2-psrldq-1.c ! 455fd0cb0defc7e4c5cad4344a106342 gcc/testsuite/gcc.target/i386/sse2-psrlq-1.c ! 3d81b1557032115728845806bc625b5d gcc/testsuite/gcc.target/i386/sse2-psrlq-2.c ! c14648267adc3c23d66f23e87548327b gcc/testsuite/gcc.target/i386/sse2-psrlw-1.c ! afbdbe5dcfb41909a7a1b6f27bf3773c gcc/testsuite/gcc.target/i386/sse2-psrlw-2.c ! 7320d7085ea3abc2fe30bc30de711f7d gcc/testsuite/gcc.target/i386/sse2-psubb-1.c ! 4074d7d0d7357386ad3f8d4b1a9424f2 gcc/testsuite/gcc.target/i386/sse2-psubd-1.c ! 3d11a8a252034920f7201e61f0fc2061 gcc/testsuite/gcc.target/i386/sse2-psubq-1.c ! 68f35fbee22f54d573a1b38013d713b0 gcc/testsuite/gcc.target/i386/sse2-psubsb-1.c ! 85ee5fec0e4b995d4c61ad39e3c50303 gcc/testsuite/gcc.target/i386/sse2-psubsw-1.c ! 580fb7fce8019ac6ad2f46eee70ceb56 gcc/testsuite/gcc.target/i386/sse2-psubw-1.c ! c302dd2d1f67a170695b5bbd22fee7ce gcc/testsuite/gcc.target/i386/sse2-punpckhbw-1.c ! ba412402d675f68d3cfc9e4ffaf93422 gcc/testsuite/gcc.target/i386/sse2-punpckhdq-1.c ! ee0947efe3f26b9b3c81387731fd5821 gcc/testsuite/gcc.target/i386/sse2-punpckhqdq-1.c ! fb8f297273d484e27ffa2e81ecd3b08b gcc/testsuite/gcc.target/i386/sse2-punpckhwd-1.c ! 5f3f69f4f3aa5825bb04120a66dbab2c gcc/testsuite/gcc.target/i386/sse2-punpcklbw-1.c ! bc284489629affc959c93b03096c8e25 gcc/testsuite/gcc.target/i386/sse2-punpckldq-1.c ! 8c6a36db59e9c8788b924d69c3b5a62d gcc/testsuite/gcc.target/i386/sse2-punpcklqdq-1.c ! 7426574b173eda0275eeaa174069edf5 gcc/testsuite/gcc.target/i386/sse2-punpcklwd-1.c ! 7525c192086f8e667100aa2237a8b7b5 gcc/testsuite/gcc.target/i386/sse2-pxor-1.c ! 1b52e5d56dca0f7a127b0690903b39b0 gcc/testsuite/gcc.target/i386/sse2-set-epi32-1.c ! abc5b4d607de5944b64eb304a1a6ec6f gcc/testsuite/gcc.target/i386/sse2-set-epi64x-1.c ! 589d03d33e589b13a71b9a5a01d750f2 gcc/testsuite/gcc.target/i386/sse2-set-v16qi-1.c ! 1b820e04d09f063d478cb6d35d38c0b4 gcc/testsuite/gcc.target/i386/sse2-set-v16qi-2.c ! 30138811a0947e7b0a6279288b5f5907 gcc/testsuite/gcc.target/i386/sse2-set-v16qi-3.c ! cf5ce63ad160152c8cf0c9c3d01c5b79 gcc/testsuite/gcc.target/i386/sse2-set-v8hi-1.c ! d83d0f8b342ff8ef187b5267acdf1b9a gcc/testsuite/gcc.target/i386/sse2-set-v8hi-1a.c ! 001bec980378e25765c927def02c9eae gcc/testsuite/gcc.target/i386/sse2-set-v8hi-2.c ! c86c2814d0ff9e3e7807177c93e54cdf gcc/testsuite/gcc.target/i386/sse2-set-v8hi-2a.c ! 747d389fb10946466ce7106bf9861c05 gcc/testsuite/gcc.target/i386/sse2-shufpd-1.c ! 229da27deb07940e47896f28568a9ad6 gcc/testsuite/gcc.target/i386/sse2-shufps-1.c ! e3c923013c80e125486648e3307d19ca gcc/testsuite/gcc.target/i386/sse2-sqrtpd-1.c ! 9be13acc473ad924e8c8d9361b6bb102 gcc/testsuite/gcc.target/i386/sse2-subpd-1.c ! 27c775be57a4cec6ca0c692df6b7b073 gcc/testsuite/gcc.target/i386/sse2-subsd-1.c ! 29e42097b8a8d6b6700b13e1bd99e89d gcc/testsuite/gcc.target/i386/sse2-ucomisd-1.c ! c6cc7b9cddecbd362f62ee43f93aad9a gcc/testsuite/gcc.target/i386/sse2-ucomisd-2.c ! 0d5f8eb7a2c407c8c85df483f6cc297b gcc/testsuite/gcc.target/i386/sse2-ucomisd-3.c ! 0141e98a0c825329cbb5a4ab981c7ae2 gcc/testsuite/gcc.target/i386/sse2-ucomisd-4.c ! 8c34ba2618e91e021ae0ec78981af7fe gcc/testsuite/gcc.target/i386/sse2-ucomisd-5.c ! bab76acbc7e8c59491b8644934eb6ecb gcc/testsuite/gcc.target/i386/sse2-ucomisd-6.c ! 4951822cb2e0e414636d8d000b12a967 gcc/testsuite/gcc.target/i386/sse2-unpack-1.c ! 43e8ca0937f6b7cbab38830389bf3387 gcc/testsuite/gcc.target/i386/sse2-unpckhpd-1.c ! 85905c2a21413d27a8372674c172763a gcc/testsuite/gcc.target/i386/sse2-unpcklpd-1.c ! dc9066a5a4e2651d9a9a03c5eef62f20 gcc/testsuite/gcc.target/i386/sse2-vec-1.c ! 5ef6907bdb04ea9524e19fcbc3e33d50 gcc/testsuite/gcc.target/i386/sse2-vec-2.c ! 59be8d1739dbdafc9545e07226dee15e gcc/testsuite/gcc.target/i386/sse2-vec-3.c ! 202a6731618fc7aa2c02b3f3fdeec639 gcc/testsuite/gcc.target/i386/sse2-vec-4.c ! dec1e214a725c4ef29402728ed4efddd gcc/testsuite/gcc.target/i386/sse2-vec-5.c ! 85d3058a688602cf40c9f43a08d99d78 gcc/testsuite/gcc.target/i386/sse2-vec-6.c ! dc73452d28fcbbd540b9cf6fc6180122 gcc/testsuite/gcc.target/i386/sse2-xorpd-1.c ! 342be20db8b742094128e66603c1d675 gcc/testsuite/gcc.target/i386/sse3-addsubpd.c ! cf2e3b0d340c93e5f24fdb8924b47313 gcc/testsuite/gcc.target/i386/sse3-addsubps.c ! 85ee71d61eab8f8ed14839a5a8d3d548 gcc/testsuite/gcc.target/i386/sse3-check.h ! 82e983d062836904674989a0995ca407 gcc/testsuite/gcc.target/i386/sse3-haddpd.c ! b0b2094f1f81694e655c06af411b909e gcc/testsuite/gcc.target/i386/sse3-haddps.c ! 47cdea793aee4f93abf7e67265ab702b gcc/testsuite/gcc.target/i386/sse3-hsubpd.c ! 77b9b2b569daf0152e8da3a2e1a535d1 gcc/testsuite/gcc.target/i386/sse3-hsubps.c ! 7545ab9b51dd98b62f94596e0fef11fb gcc/testsuite/gcc.target/i386/sse3-lddqu.c ! e74162d2e3d68b7ced7d0745c7adc4f2 gcc/testsuite/gcc.target/i386/sse3-movddup.c ! d82d917b914b989a4f437aca582f09a3 gcc/testsuite/gcc.target/i386/sse3-movshdup.c ! 61cb0bb6708a19006f1679b146c2f6e1 gcc/testsuite/gcc.target/i386/sse3-movsldup.c e18bbd1a575dbb964c9953896983e6c4 gcc/testsuite/gcc.target/i386/sse4_1-blendpd.c e189528eabdcee26590b3e1d63bdd0c9 gcc/testsuite/gcc.target/i386/sse4_1-blendps-2.c 250e3465396368f764f90cb412568f07 gcc/testsuite/gcc.target/i386/sse4_1-blendps.c *************** ddfa615a48108550b2bba426aac827c9 gcc/te *** 25870,25894 **** 1189bee5287f90d2e75492d85da1ff5f gcc/testsuite/gcc.target/i386/sse5-shift1-vector.c f4ff334c8c511922e34311ca14f3441c gcc/testsuite/gcc.target/i386/sse5-shift2-vector.c 5d412233a3624d84d6052caa9f5af542 gcc/testsuite/gcc.target/i386/sse5-shift3-vector.c ! bdfd2a9e53c526e862d4f6891e3f8eb2 gcc/testsuite/gcc.target/i386/ssefn-1.c ! eccdc9377b4e1d917cbe863ceefe1740 gcc/testsuite/gcc.target/i386/ssefn-2.c ! 58cc16264646273f7c134e00fa6afcef gcc/testsuite/gcc.target/i386/ssefn-3.c ! b3466ca7681fd757e171b01ec6f71cdc gcc/testsuite/gcc.target/i386/ssefn-4.c ! 9a2601b17de78d5b8d266df4e569f317 gcc/testsuite/gcc.target/i386/ssefp-1.c ! b57f4065fe7f376c41903425aa64822f gcc/testsuite/gcc.target/i386/ssefp-2.c ! 74be1fc83dabd786dff5427dcbe5896d gcc/testsuite/gcc.target/i386/sseregparm-1.c 992d8dc3ed5860394bbc1df5e546fd1c gcc/testsuite/gcc.target/i386/sseregparm-2.c ! 129cf9d00d9f7607ba8b502f63eca244 gcc/testsuite/gcc.target/i386/sseregparm-3.c ! 0a21d69e3d118cf1f7cbecccb3bac154 gcc/testsuite/gcc.target/i386/sseregparm-4.c ! b0a7b4df88996018183609ca95cee8db gcc/testsuite/gcc.target/i386/sseregparm-5.c ! 111dad5799f5719dbebcb970c49c1b91 gcc/testsuite/gcc.target/i386/sseregparm-6.c ! 6ebc9c95ca997554fe0fc2ac89424c36 gcc/testsuite/gcc.target/i386/sseregparm-7.c ce9557e886bae0b8a98a072554578e4d gcc/testsuite/gcc.target/i386/sseregparm-8.c ! 119889ee918f0834dfe461303bdd0368 gcc/testsuite/gcc.target/i386/ssetype-1.c ! e027bc347b4e707813bc5df3a292d2c9 gcc/testsuite/gcc.target/i386/ssetype-2.c ! 3c41b559d00725d65a5f5f92a6f9e617 gcc/testsuite/gcc.target/i386/ssetype-3.c ! fdf3ced9c10f6f133f5e33a8a960c3d3 gcc/testsuite/gcc.target/i386/ssetype-4.c ! 485bb732dfccc72a676d5de6204a346d gcc/testsuite/gcc.target/i386/ssetype-5.c 015307b25693d034f11bcaa95a627aae gcc/testsuite/gcc.target/i386/ssse3-check.h 4326bb9d499c1bd1b4e682f031aa0266 gcc/testsuite/gcc.target/i386/ssse3-pabsb.c d0fa6d5390a1783b475aec6aa5274798 gcc/testsuite/gcc.target/i386/ssse3-pabsd.c --- 25924,25948 ---- 1189bee5287f90d2e75492d85da1ff5f gcc/testsuite/gcc.target/i386/sse5-shift1-vector.c f4ff334c8c511922e34311ca14f3441c gcc/testsuite/gcc.target/i386/sse5-shift2-vector.c 5d412233a3624d84d6052caa9f5af542 gcc/testsuite/gcc.target/i386/sse5-shift3-vector.c ! 866284014aaa4ea36909d0335e337538 gcc/testsuite/gcc.target/i386/ssefn-1.c ! 28202227cf2c8b986697d75a5a999e29 gcc/testsuite/gcc.target/i386/ssefn-2.c ! b30af657dc02d895db811d45730e91fa gcc/testsuite/gcc.target/i386/ssefn-3.c ! 471549312362678ee4916237dc05bbc6 gcc/testsuite/gcc.target/i386/ssefn-4.c ! ad1019b768db6bd75a9c2bb69d8fa7c0 gcc/testsuite/gcc.target/i386/ssefp-1.c ! 0bbd6ce34d1e7881820ee7507536f598 gcc/testsuite/gcc.target/i386/ssefp-2.c ! 131345bfdc395d3fb8ab8cf73bca25e2 gcc/testsuite/gcc.target/i386/sseregparm-1.c 992d8dc3ed5860394bbc1df5e546fd1c gcc/testsuite/gcc.target/i386/sseregparm-2.c ! 803dcab8a5554060553545e30fcd63da gcc/testsuite/gcc.target/i386/sseregparm-3.c ! c1769dcd8f885800bacb75737c66b5b2 gcc/testsuite/gcc.target/i386/sseregparm-4.c ! 89c74702acbdee44e4bbe36db40a394e gcc/testsuite/gcc.target/i386/sseregparm-5.c ! 749c095870ce48661272e5f1653e21f2 gcc/testsuite/gcc.target/i386/sseregparm-6.c ! f55fedca60aee8d615fc5e849ea0f98f gcc/testsuite/gcc.target/i386/sseregparm-7.c ce9557e886bae0b8a98a072554578e4d gcc/testsuite/gcc.target/i386/sseregparm-8.c ! 4dea5b05dba6a19ec68dae56424c5f28 gcc/testsuite/gcc.target/i386/ssetype-1.c ! 01b982ba308ad1adff422d44a4564479 gcc/testsuite/gcc.target/i386/ssetype-2.c ! a3066c67fcb0872bd1db1628dbace6f5 gcc/testsuite/gcc.target/i386/ssetype-3.c ! c9824d78d960835ae76b66aee5f3eb21 gcc/testsuite/gcc.target/i386/ssetype-4.c ! 7ceb1f4ef01dfc4bf7c08862be39de38 gcc/testsuite/gcc.target/i386/ssetype-5.c 015307b25693d034f11bcaa95a627aae gcc/testsuite/gcc.target/i386/ssse3-check.h 4326bb9d499c1bd1b4e682f031aa0266 gcc/testsuite/gcc.target/i386/ssse3-pabsb.c d0fa6d5390a1783b475aec6aa5274798 gcc/testsuite/gcc.target/i386/ssse3-pabsd.c *************** e64a18994c4fc6457d43a16bcf766b9b gcc/te *** 25914,25957 **** fffeb41bcc3342922e554b35ff66f4bf gcc/testsuite/gcc.target/i386/stackalign/longlong-2.c e7bd87c087919f6a576f0684cab283e3 gcc/testsuite/gcc.target/i386/stackalign/return-1.c 995270449c0c992f3aaa4c3bd16316b6 gcc/testsuite/gcc.target/i386/stackalign/return-2.c ! 66a3b3c5c25140e994f600d1a483743f gcc/testsuite/gcc.target/i386/stackalign/return-3.c 01725a54daa5f0b088b3c2742ba7b377 gcc/testsuite/gcc.target/i386/stackalign/return-4.c 8276f2c9f0467299ccc2c3bc989ca9cb gcc/testsuite/gcc.target/i386/stackalign/return-5.c 67a3c24d3712370ddefd38dcbb853a48 gcc/testsuite/gcc.target/i386/stackalign/return-6.c 2a20ea600d538940cb00a2933a0c059f gcc/testsuite/gcc.target/i386/stackalign/stackalign.exp 8bb32478cf4b79f4930eb3fadafc4d58 gcc/testsuite/gcc.target/i386/strinline.c d9982306d08862356b85afb7bc7b4079 gcc/testsuite/gcc.target/i386/tailcall-1.c ! b3482aa074e044edfb2a4c72e5c1d085 gcc/testsuite/gcc.target/i386/unordcmp-1.c c228da79970ec0afef31aced9bc68236 gcc/testsuite/gcc.target/i386/unroll-1.c ! 06c0ece587b679ddbec7ada51af9b809 gcc/testsuite/gcc.target/i386/vararg-1.c 3b8acabb2f18b3fd13f3871729bac23f gcc/testsuite/gcc.target/i386/vararg-10.c ! 2da0d66312551e42866005eeb98f6e83 gcc/testsuite/gcc.target/i386/vararg-2.c ! aac770bd43ffda379690e83a942525df gcc/testsuite/gcc.target/i386/vararg-3.c ! 1864954121531ddcfbc610ccb0bc8055 gcc/testsuite/gcc.target/i386/vararg-4.c 26b495c42c74633fbe8f695a8be428c2 gcc/testsuite/gcc.target/i386/vararg-5.c 3f24ea17a6bcfc49a9c230c37950c030 gcc/testsuite/gcc.target/i386/vararg-6.c ! d0462ae397ea957a900b44342f072e1d gcc/testsuite/gcc.target/i386/vararg-7.c ! 29c876dd4fefd8ef1e9e9496ac79fe0f gcc/testsuite/gcc.target/i386/vararg-8.c 720067ba9815f8767ffbfb049d5bf847 gcc/testsuite/gcc.target/i386/vararg-9.c ! 886d57271a8c6e95627fec9e0434ac09 gcc/testsuite/gcc.target/i386/vecinit-1.c ! 31d8f7f0949cf9434d1f834c564e940e gcc/testsuite/gcc.target/i386/vecinit-2.c ! 2034dca52de7f2d991f1f4f6c3733e9d gcc/testsuite/gcc.target/i386/vecinit-3.c ! a8146407b6a48b1c6d490c788cc13f97 gcc/testsuite/gcc.target/i386/vecinit-4.c ! afcbf6b23182ac04af952eacb3b4f517 gcc/testsuite/gcc.target/i386/vecinit-5.c ! 1b31ae2cdc9802f2a8644b0a5e16d26a gcc/testsuite/gcc.target/i386/vecinit-6.c 845de8711de12ad1852cb72abde413c9 gcc/testsuite/gcc.target/i386/vect-args.c ! 6d9afbfbb815be52180d39d175296614 gcc/testsuite/gcc.target/i386/vectorize1.c ! fb2a0e97b380f20684aa6addc6383899 gcc/testsuite/gcc.target/i386/vectorize2.c ! d9337e36cb89f810827a40283d1e6db9 gcc/testsuite/gcc.target/i386/vectorize3.c ! c882d09fcdd4993f41af6e88b11e3824 gcc/testsuite/gcc.target/i386/vectorize4.c 7f8506f1b5022341fd3d6e51df540cc3 gcc/testsuite/gcc.target/i386/vectorize5.c ! bb39d01a68e0737bd37c9d22c2c1b46b gcc/testsuite/gcc.target/i386/vectorize6.c 784c987777c87b20adb70aefdd43c1ea gcc/testsuite/gcc.target/i386/volatile-1.c e45be5b5dd5f8be0a75495bb33be0404 gcc/testsuite/gcc.target/i386/xchg-1.c b6d6abcfbd5245e5750e48d0e9518639 gcc/testsuite/gcc.target/i386/xchg-2.c ! 9d85993ff88724a6ede2b74bc9d3044a gcc/testsuite/gcc.target/i386/xorps-sse.c ! cf48fa2f871a7dc750c658c38d0389a0 gcc/testsuite/gcc.target/i386/xorps-sse2.c ! 823144da31d940721b1596844506366d gcc/testsuite/gcc.target/i386/xorps.c 09fb6852403bb7a0b9b3339c49e09efb gcc/testsuite/gcc.target/ia64/20010423-1.c d42256aef37a73ae61dad2030303738b gcc/testsuite/gcc.target/ia64/20020313-1.c 80710ab442f553a1629beb106d8276a3 gcc/testsuite/gcc.target/ia64/20020326-1.c --- 25968,26011 ---- fffeb41bcc3342922e554b35ff66f4bf gcc/testsuite/gcc.target/i386/stackalign/longlong-2.c e7bd87c087919f6a576f0684cab283e3 gcc/testsuite/gcc.target/i386/stackalign/return-1.c 995270449c0c992f3aaa4c3bd16316b6 gcc/testsuite/gcc.target/i386/stackalign/return-2.c ! 7d7bcd34cccd8080a61758dee40eaa56 gcc/testsuite/gcc.target/i386/stackalign/return-3.c 01725a54daa5f0b088b3c2742ba7b377 gcc/testsuite/gcc.target/i386/stackalign/return-4.c 8276f2c9f0467299ccc2c3bc989ca9cb gcc/testsuite/gcc.target/i386/stackalign/return-5.c 67a3c24d3712370ddefd38dcbb853a48 gcc/testsuite/gcc.target/i386/stackalign/return-6.c 2a20ea600d538940cb00a2933a0c059f gcc/testsuite/gcc.target/i386/stackalign/stackalign.exp 8bb32478cf4b79f4930eb3fadafc4d58 gcc/testsuite/gcc.target/i386/strinline.c d9982306d08862356b85afb7bc7b4079 gcc/testsuite/gcc.target/i386/tailcall-1.c ! 03f531f3c4fc5f67b3e51e1640cd5d41 gcc/testsuite/gcc.target/i386/unordcmp-1.c c228da79970ec0afef31aced9bc68236 gcc/testsuite/gcc.target/i386/unroll-1.c ! ddf45d185ee9dd4a512921559bac3249 gcc/testsuite/gcc.target/i386/vararg-1.c 3b8acabb2f18b3fd13f3871729bac23f gcc/testsuite/gcc.target/i386/vararg-10.c ! 32a6239f7b9d7b25dcd7d20378291d4a gcc/testsuite/gcc.target/i386/vararg-2.c ! 43699b250c82b84cf0ed3efac0aa4516 gcc/testsuite/gcc.target/i386/vararg-3.c ! a4fe926ed930e3d04f3d214919607450 gcc/testsuite/gcc.target/i386/vararg-4.c 26b495c42c74633fbe8f695a8be428c2 gcc/testsuite/gcc.target/i386/vararg-5.c 3f24ea17a6bcfc49a9c230c37950c030 gcc/testsuite/gcc.target/i386/vararg-6.c ! 0b2e6fff851cb61d43d8eb9b6fef3fd2 gcc/testsuite/gcc.target/i386/vararg-7.c ! 4c7ae35fca28cf5aa0b6938d41627966 gcc/testsuite/gcc.target/i386/vararg-8.c 720067ba9815f8767ffbfb049d5bf847 gcc/testsuite/gcc.target/i386/vararg-9.c ! 7ba1f59ac0cb2c34230d1d79e0262f62 gcc/testsuite/gcc.target/i386/vecinit-1.c ! 0ee5279878b725ff84e0357009686534 gcc/testsuite/gcc.target/i386/vecinit-2.c ! 823e05990debcc9939bcd2f205f222a6 gcc/testsuite/gcc.target/i386/vecinit-3.c ! 9abd7a802f14e7c965a2c630f4708ac1 gcc/testsuite/gcc.target/i386/vecinit-4.c ! a93a2d6cd4fc31bc53f1fa31e2f7f5d6 gcc/testsuite/gcc.target/i386/vecinit-5.c ! 0492f77b089ce03e6105f6cb513842ae gcc/testsuite/gcc.target/i386/vecinit-6.c 845de8711de12ad1852cb72abde413c9 gcc/testsuite/gcc.target/i386/vect-args.c ! 4ee0ba353678a0d656106023128aa977 gcc/testsuite/gcc.target/i386/vectorize1.c ! f83d6172c6a16f4912c2621497065f4a gcc/testsuite/gcc.target/i386/vectorize2.c ! 49385915e2f5e0664aa9e9da31ebc40f gcc/testsuite/gcc.target/i386/vectorize3.c ! d3647ccb29137edf1774d4e755f1fd81 gcc/testsuite/gcc.target/i386/vectorize4.c 7f8506f1b5022341fd3d6e51df540cc3 gcc/testsuite/gcc.target/i386/vectorize5.c ! 137fdcffa25ae05e87d004f3686d197b gcc/testsuite/gcc.target/i386/vectorize6.c 784c987777c87b20adb70aefdd43c1ea gcc/testsuite/gcc.target/i386/volatile-1.c e45be5b5dd5f8be0a75495bb33be0404 gcc/testsuite/gcc.target/i386/xchg-1.c b6d6abcfbd5245e5750e48d0e9518639 gcc/testsuite/gcc.target/i386/xchg-2.c ! 86e9df69f60c544cfba7e32ced8c761e gcc/testsuite/gcc.target/i386/xorps-sse.c ! 750741c5dab05b35b55246f891faf4cc gcc/testsuite/gcc.target/i386/xorps-sse2.c ! f8cc76d3c6cc25eb1c763be90ac22bcb gcc/testsuite/gcc.target/i386/xorps.c 09fb6852403bb7a0b9b3339c49e09efb gcc/testsuite/gcc.target/ia64/20010423-1.c d42256aef37a73ae61dad2030303738b gcc/testsuite/gcc.target/ia64/20020313-1.c 80710ab442f553a1629beb106d8276a3 gcc/testsuite/gcc.target/ia64/20020326-1.c *************** ab85237eb97b722f7106870c72402a8f gcc/te *** 25960,25965 **** --- 26014,26020 ---- 12c2330c97195c7bf90780ebf816b9bf gcc/testsuite/gcc.target/ia64/20030811-1.c a285a7a4bba38f8493ae6f3ed39a4914 gcc/testsuite/gcc.target/ia64/20040303-1.c 68a4d356aa8cec24645a7b46b1b1125e gcc/testsuite/gcc.target/ia64/20040709-2.c + 0ecee2a0927d3cf5599c7195622d9180 gcc/testsuite/gcc.target/ia64/20071210-2.c d810d557de63b38ebd071a5348469d22 gcc/testsuite/gcc.target/ia64/20080802-1.c d8ed8bedc22a19bb981b1eae977050f2 gcc/testsuite/gcc.target/ia64/20090324-1.c decf68915fe7cbaf22ca75bf23d8f1c4 gcc/testsuite/gcc.target/ia64/asm-1.c *************** ee302d993f68621386f88c2997835050 gcc/te *** 26586,26591 **** --- 26641,26647 ---- c18e0726af4158f9f944069a676b6c7f gcc/testsuite/gcc.target/sparc/fxors.c bafb883b61e54f84d541ff234e2a48ae gcc/testsuite/gcc.target/sparc/globalreg-1.c a6501f830b7d1b9e944beb9e5db075f6 gcc/testsuite/gcc.target/sparc/mfpu.c + d5da5605cd2fa1aba47e2a0eed7dae63 gcc/testsuite/gcc.target/sparc/mnofpu.c 27bc21317eeddefa4b9cc41e1c4e363c gcc/testsuite/gcc.target/sparc/noresult.c f45aca1618e19a193435678244783c63 gcc/testsuite/gcc.target/sparc/pdist-2.c 77281e86e797be1ef8a0784c9a4db58a gcc/testsuite/gcc.target/sparc/pdist-3.c *************** e564d0032d6bd114296dbffaad36dd8b gcc/te *** 26636,26646 **** 231a29c37421f789917dfb39159e85ab gcc/testsuite/gcc.target/x86_64/abi/README.gcc a98bf7ae0b6869a087bd2400515969db gcc/testsuite/gcc.target/x86_64/abi/abi-x86_64.exp 4599244d74ba4aabbd69240d86d2fe79 gcc/testsuite/gcc.target/x86_64/abi/args.h ! 883a90fab4aeed88172f24cf6f04de38 gcc/testsuite/gcc.target/x86_64/abi/asm-support-darwin.s ! 1820f27caf1d1b1dac300d252360a2a7 gcc/testsuite/gcc.target/x86_64/abi/asm-support.S ! d91513753b8fa7f825e225f75e5c9da6 gcc/testsuite/gcc.target/x86_64/abi/avx/abi-avx.exp f559d61e72669fec3c7c3bb1345a001f gcc/testsuite/gcc.target/x86_64/abi/avx/args.h ! e41768e87869221cee5edf61e3c3839b gcc/testsuite/gcc.target/x86_64/abi/avx/asm-support.S 906d3e82c934ebb0523d4487dcd5abc7 gcc/testsuite/gcc.target/x86_64/abi/avx/avx-check.h d3c71d269c1b4265e86c5ace1089e848 gcc/testsuite/gcc.target/x86_64/abi/avx/test_m256_returning.c b43e5e8d171dcdbec5cac42b0b9a298c gcc/testsuite/gcc.target/x86_64/abi/avx/test_passing_m256.c --- 26692,26702 ---- 231a29c37421f789917dfb39159e85ab gcc/testsuite/gcc.target/x86_64/abi/README.gcc a98bf7ae0b6869a087bd2400515969db gcc/testsuite/gcc.target/x86_64/abi/abi-x86_64.exp 4599244d74ba4aabbd69240d86d2fe79 gcc/testsuite/gcc.target/x86_64/abi/args.h ! 00a7756c300412476dc7df5636d760dd gcc/testsuite/gcc.target/x86_64/abi/asm-support-darwin.s ! 3003646df75711be87357346568aa8b2 gcc/testsuite/gcc.target/x86_64/abi/asm-support.S ! 4d65830e20072867b2564e5822a3841e gcc/testsuite/gcc.target/x86_64/abi/avx/abi-avx.exp f559d61e72669fec3c7c3bb1345a001f gcc/testsuite/gcc.target/x86_64/abi/avx/args.h ! 2ab990bb306a8a9c1f146095795ed0bb gcc/testsuite/gcc.target/x86_64/abi/avx/asm-support.S 906d3e82c934ebb0523d4487dcd5abc7 gcc/testsuite/gcc.target/x86_64/abi/avx/avx-check.h d3c71d269c1b4265e86c5ace1089e848 gcc/testsuite/gcc.target/x86_64/abi/avx/test_m256_returning.c b43e5e8d171dcdbec5cac42b0b9a298c gcc/testsuite/gcc.target/x86_64/abi/avx/test_passing_m256.c *************** adc0eb00219635dd070fea1765eaea0f gcc/te *** 26959,26964 **** --- 27015,27021 ---- 87cec4a2de8161fc453c6bd9657b09fc gcc/testsuite/gfortran.dg/actual_array_constructor_2.f90 90a85866f0eaaaef7096cd50de601bd6 gcc/testsuite/gfortran.dg/actual_array_constructor_3.f90 ac3c78981b68dd7570fbf24a454c1f49 gcc/testsuite/gfortran.dg/actual_array_interface_1.f90 + aef95d16f07bbc2f2592af837c0f0108 gcc/testsuite/gfortran.dg/actual_array_interface_2.f90 7eea72d7e9641572040238e4ba15adff gcc/testsuite/gfortran.dg/actual_array_result_1.f90 34959919da3b97a43fb3f415fe8e30f7 gcc/testsuite/gfortran.dg/actual_array_substr_1.f90 7a300b081e47b640c644b904366e081e gcc/testsuite/gfortran.dg/actual_array_substr_2.f90 *************** b307041dd8a62e74a3083ce06f86ab6b gcc/te *** 26972,26981 **** --- 27029,27040 ---- 595f29ed28687fb2fb41dd5a7c87f19c gcc/testsuite/gfortran.dg/advance_5.f90 f1badcf3a75e0f6f28834bb392c274f9 gcc/testsuite/gfortran.dg/advance_6.f90 762441c3489be61276162b0dd388e187 gcc/testsuite/gfortran.dg/aint_anint_1.f90 + 2c95179738aaff4364e09cb74a3ecfb7 gcc/testsuite/gfortran.dg/aliasing_array_result_1.f90 0372a292244bd2342316a86ca38fff46 gcc/testsuite/gfortran.dg/aliasing_dummy_1.f90 8b4552e37a00ca309f85af9759908a94 gcc/testsuite/gfortran.dg/aliasing_dummy_2.f90 a083a600a2313f038c16b43b7b4401b7 gcc/testsuite/gfortran.dg/aliasing_dummy_3.f90 3e49369cb2578494e46a7a1b763e90c7 gcc/testsuite/gfortran.dg/aliasing_dummy_4.f90 + 14f6f3361e88b396acf5ccd689078295 gcc/testsuite/gfortran.dg/aliasing_dummy_5.f90 24b512d84abed6259b98219d8d44e490 gcc/testsuite/gfortran.dg/all_bounds_1.f90 188bb09f10e579808ae008c280bfaae3 gcc/testsuite/gfortran.dg/alloc_alloc_expr_1.f90 0c032a47fcd66c28edb88141b892affc gcc/testsuite/gfortran.dg/alloc_alloc_expr_2.f90 *************** c404924b69df8e1ff68ec61e74f21d6b gcc/te *** 27087,27093 **** d90a9e6babfbac5e6859c5478c86b712 gcc/testsuite/gfortran.dg/array_constructor_20.f90 abd2cc2aa1deb066bc53d489b2c60858 gcc/testsuite/gfortran.dg/array_constructor_21.f90 db03b3afc6bbb5e91379f6a0ad97c093 gcc/testsuite/gfortran.dg/array_constructor_22.f90 ! a962addcdff1135d36d653229584c235 gcc/testsuite/gfortran.dg/array_constructor_23.f 3da281b068891ab68547f22bcc2f9943 gcc/testsuite/gfortran.dg/array_constructor_24.f e1c301e198e52e75cc41d51cb75f5d30 gcc/testsuite/gfortran.dg/array_constructor_25.f03 d1b2bfd59f749feae94e708d38c091bc gcc/testsuite/gfortran.dg/array_constructor_26.f03 --- 27146,27152 ---- d90a9e6babfbac5e6859c5478c86b712 gcc/testsuite/gfortran.dg/array_constructor_20.f90 abd2cc2aa1deb066bc53d489b2c60858 gcc/testsuite/gfortran.dg/array_constructor_21.f90 db03b3afc6bbb5e91379f6a0ad97c093 gcc/testsuite/gfortran.dg/array_constructor_22.f90 ! 02d67df422b75276f6a95d5a60796b9b gcc/testsuite/gfortran.dg/array_constructor_23.f 3da281b068891ab68547f22bcc2f9943 gcc/testsuite/gfortran.dg/array_constructor_24.f e1c301e198e52e75cc41d51cb75f5d30 gcc/testsuite/gfortran.dg/array_constructor_25.f03 d1b2bfd59f749feae94e708d38c091bc gcc/testsuite/gfortran.dg/array_constructor_26.f03 *************** f4eda2a91b3f1d79985435e1a8052ace gcc/te *** 27359,27364 **** --- 27418,27424 ---- 77ce60d1b670936c7255436c32b6e175 gcc/testsuite/gfortran.dg/boz_7.f90 e5054b6498692a21bb3137280b1d78b8 gcc/testsuite/gfortran.dg/boz_8.f90 8c4874c51d29fe1676b8d15d6657bc92 gcc/testsuite/gfortran.dg/boz_9.f90 + 22e53935cf175dd2fbe59b4440950526 gcc/testsuite/gfortran.dg/btest_1.f90 dbab7052c49d479a8d2e25e0b571b1d8 gcc/testsuite/gfortran.dg/byte_1.f90 d04db9714722a890fe3f299c043d6607 gcc/testsuite/gfortran.dg/byte_2.f90 64fbd9c1485a21aef4a81ea5e8c59287 gcc/testsuite/gfortran.dg/c_assoc.f90 *************** d66c344ef783f295ed4c0c2e5523160e gcc/te *** 27739,27744 **** --- 27799,27805 ---- a237f52cf9e04e4f33058f6fcba6aac1 gcc/testsuite/gfortran.dg/elemental_optional_args_1.f90 da7ded9aff7d25bb1fb9237905ad0720 gcc/testsuite/gfortran.dg/elemental_pointer_1.f90 a65b569f2b87a13758b2ec2d80fced15 gcc/testsuite/gfortran.dg/elemental_result_1.f90 + 5e9d7b3f9884bed6e2645e411eb5ff36 gcc/testsuite/gfortran.dg/elemental_scalar_args_1.f90 52d4db70ff02a0704f4af297c8185d39 gcc/testsuite/gfortran.dg/elemental_subroutine_1.f90 7d9e12da4788e4feb39263a8b935416c gcc/testsuite/gfortran.dg/elemental_subroutine_2.f90 e95fff032a08a9fc9c4323c663de82f6 gcc/testsuite/gfortran.dg/elemental_subroutine_3.f90 *************** b4570608c9f7bf1bf83b19629ce884db gcc/te *** 28220,28231 **** f3677d31dd1f67614d77de630d5f14c3 gcc/testsuite/gfortran.dg/gomp/pr41344.f 64ec23cbb777b2296f56ac2b3b8024fa gcc/testsuite/gfortran.dg/gomp/pr43337.f90 1d6f79f130df09d550010b1d0daa490c gcc/testsuite/gfortran.dg/gomp/pr43836.f90 a0169f3f7b23f97b379a44b2968ddb97 gcc/testsuite/gfortran.dg/gomp/reduction1.f90 02484261b0434dbaf2709c34db58cd4d gcc/testsuite/gfortran.dg/gomp/reduction2.f90 cf9706c950168b12fedcd8bec1221dd2 gcc/testsuite/gfortran.dg/gomp/reduction3.f90 d3619d026ab9456f87869aa3853e4407 gcc/testsuite/gfortran.dg/gomp/sharing-1.f90 0225b461902c034537f77db022b17f11 gcc/testsuite/gfortran.dg/gomp/sharing-2.f90 ! cf0d844c3c09ea513672a529c792e9a2 gcc/testsuite/gfortran.dg/gomp/sharing-3.f90 41759f5578782a6f4ae3601bff797650 gcc/testsuite/gfortran.dg/gomp/workshare1.f90 361bf8573acec01a7db297dcb95d5da7 gcc/testsuite/gfortran.dg/goto_1.f 0785b77d4d0a60afcbae2f2c1fe1fed1 gcc/testsuite/gfortran.dg/goto_2.f90 --- 28281,28299 ---- f3677d31dd1f67614d77de630d5f14c3 gcc/testsuite/gfortran.dg/gomp/pr41344.f 64ec23cbb777b2296f56ac2b3b8024fa gcc/testsuite/gfortran.dg/gomp/pr43337.f90 1d6f79f130df09d550010b1d0daa490c gcc/testsuite/gfortran.dg/gomp/pr43836.f90 + 6367e0f6e70d3bb3ebdd47697408c214 gcc/testsuite/gfortran.dg/gomp/pr44036-1.f90 + d3025370cce4b18eae6eccec4241d4b4 gcc/testsuite/gfortran.dg/gomp/pr44036-2.f90 + 98fd69112eb3d61013fdd4bcee9ab120 gcc/testsuite/gfortran.dg/gomp/pr44036-3.f90 + 44c8c3f1fa1d9acd7338b76017c8687a gcc/testsuite/gfortran.dg/gomp/pr44085.f90 + b96022f13a3a6b11a0de8f01c35128f0 gcc/testsuite/gfortran.dg/gomp/pr44536.f90 + 598aecb4d4ea6b8ab6a2058c41b2aee7 gcc/testsuite/gfortran.dg/gomp/pr44847.f90 + 0784fa1cf4bc9ef82345c80d2f32b6f0 gcc/testsuite/gfortran.dg/gomp/pr45595.f90 a0169f3f7b23f97b379a44b2968ddb97 gcc/testsuite/gfortran.dg/gomp/reduction1.f90 02484261b0434dbaf2709c34db58cd4d gcc/testsuite/gfortran.dg/gomp/reduction2.f90 cf9706c950168b12fedcd8bec1221dd2 gcc/testsuite/gfortran.dg/gomp/reduction3.f90 d3619d026ab9456f87869aa3853e4407 gcc/testsuite/gfortran.dg/gomp/sharing-1.f90 0225b461902c034537f77db022b17f11 gcc/testsuite/gfortran.dg/gomp/sharing-2.f90 ! 338202088032a1453c1b11e7f193b475 gcc/testsuite/gfortran.dg/gomp/sharing-3.f90 41759f5578782a6f4ae3601bff797650 gcc/testsuite/gfortran.dg/gomp/workshare1.f90 361bf8573acec01a7db297dcb95d5da7 gcc/testsuite/gfortran.dg/goto_1.f 0785b77d4d0a60afcbae2f2c1fe1fed1 gcc/testsuite/gfortran.dg/goto_2.f90 *************** f1fc80bf1bccb109a59dfbe026760a25 gcc/te *** 28276,28282 **** --- 28344,28353 ---- 08287847ed10d3737eaebe2605a7dd6c gcc/testsuite/gfortran.dg/host_used_types_1.f90 1269ef018bebe4f6c1aa791cdf526512 gcc/testsuite/gfortran.dg/hypot_1.f90 7a755761cf587f0e925f0fd9d7e1d93d gcc/testsuite/gfortran.dg/iargc.f90 + 7c6d282fb7219ea8b6437744a0db709a gcc/testsuite/gfortran.dg/ibclr_1.f90 4a14f8c5fc20306209e32b99dd1eb2bf gcc/testsuite/gfortran.dg/ibits.f90 + e6c37a9def09433a6a2f8bc1d9220133 gcc/testsuite/gfortran.dg/ibits_1.f90 + 9f3ccb4943f5f4737bc99acb427e11b0 gcc/testsuite/gfortran.dg/ibset_1.f90 62a8904690ab3ce1ecb304b4131c61ed gcc/testsuite/gfortran.dg/ichar_1.f90 9f00cdde2669030be42ca86f95884598 gcc/testsuite/gfortran.dg/ichar_2.f90 d827b941652feab002a335b27a4dd9f2 gcc/testsuite/gfortran.dg/imag_1.f *************** e389abe51628b7a64b697ca8b137280e gcc/te *** 28557,28563 **** 726ec797a297adbf1b1f9bb404d5f316 gcc/testsuite/gfortran.dg/lrshift_1.f90 4d4250fed2b219548ae05cb95f2df7d4 gcc/testsuite/gfortran.dg/ltime_gmtime_1.f90 a55efddcb4e9b7dd23587122d3afde8c gcc/testsuite/gfortran.dg/ltime_gmtime_2.f90 ! f4bec06fbca13cb6184b3a7b83f57276 gcc/testsuite/gfortran.dg/ltrans-7.f90 b49070ec831f64c85f249772acd9a59f gcc/testsuite/gfortran.dg/malloc_free_1.f90 61d3b8657948afcf6f7238620aeea520 gcc/testsuite/gfortran.dg/mapping_1.f90 68d703808840d734b10889f60ed7da3c gcc/testsuite/gfortran.dg/mapping_2.f90 --- 28628,28634 ---- 726ec797a297adbf1b1f9bb404d5f316 gcc/testsuite/gfortran.dg/lrshift_1.f90 4d4250fed2b219548ae05cb95f2df7d4 gcc/testsuite/gfortran.dg/ltime_gmtime_1.f90 a55efddcb4e9b7dd23587122d3afde8c gcc/testsuite/gfortran.dg/ltime_gmtime_2.f90 ! b69f71853b12947cc96b93ce7b6535dd gcc/testsuite/gfortran.dg/ltrans-7.f90 b49070ec831f64c85f249772acd9a59f gcc/testsuite/gfortran.dg/malloc_free_1.f90 61d3b8657948afcf6f7238620aeea520 gcc/testsuite/gfortran.dg/mapping_1.f90 68d703808840d734b10889f60ed7da3c gcc/testsuite/gfortran.dg/mapping_2.f90 *************** c32ce34cb402014e9d7c5119bfe2327d gcc/te *** 28653,28658 **** --- 28724,28730 ---- c31049d80a6d5f251553cf67a645cfbc gcc/testsuite/gfortran.dg/mvbits_6.f90 77a635834f240bbf76b909c32e16841c gcc/testsuite/gfortran.dg/mvbits_7.f90 e4b88011e1ed48d9302d9d8ad22f628b gcc/testsuite/gfortran.dg/mvbits_8.f90 + cda99c4f9b1e1ca808103eba31168058 gcc/testsuite/gfortran.dg/mvbits_9.f90 7cf5dc498ef726ce761b9f199aab760b gcc/testsuite/gfortran.dg/named_interface.f90 c0974b5c5b120f3e3f3cc3f37372b506 gcc/testsuite/gfortran.dg/namelist_1.f90 f636e160e90cfda627b6d67dc01a78ac gcc/testsuite/gfortran.dg/namelist_11.f *************** f0d6527105879f6c4ca2e3ac76d32982 gcc/te *** 28710,28715 **** --- 28782,28788 ---- bab2531b6270e9d665dd73e2155c1752 gcc/testsuite/gfortran.dg/namelist_59.f90 7a932f8d1201cefbdd2545a21119e539 gcc/testsuite/gfortran.dg/namelist_60.f90 90f9e0225b27df1270a47a96b26e0900 gcc/testsuite/gfortran.dg/namelist_61.f90 + 9982ecb4ec300608d8c229fdf2f68c37 gcc/testsuite/gfortran.dg/namelist_64.f90 138069b06bed4dd2d6e20acb12f17f7c gcc/testsuite/gfortran.dg/namelist_assumed_char.f90 73de646ecd69b0bf965fecc1ccd64052 gcc/testsuite/gfortran.dg/namelist_blockdata.f 83887fdeb898325d2669dfdf819782d4 gcc/testsuite/gfortran.dg/namelist_char_only.f90 *************** f1f0a1b63c158c6d6d8e894c0aea0483 gcc/te *** 28892,28904 **** a8e2db84661b4f240f7affaf48406075 gcc/testsuite/gfortran.dg/pr26246_1.f90 402035806ec0f6b295386ada5580bcb3 gcc/testsuite/gfortran.dg/pr26246_2.f90 c5691130bd4c286f7eee40a2c5c77152 gcc/testsuite/gfortran.dg/pr26524.f ! 9f6528d064e574fc551b12a4d61c890a gcc/testsuite/gfortran.dg/pr28158.f90 a677e692ddc8db95c44027d781286bb1 gcc/testsuite/gfortran.dg/pr28971.f90 78db8c67c61bddab1d869cab206a04b0 gcc/testsuite/gfortran.dg/pr29067.f 8a8bf8cec47060178472d613091f0994 gcc/testsuite/gfortran.dg/pr29581.f90 31ec24a5dc4f881189c9731e7b807f4a gcc/testsuite/gfortran.dg/pr29713.f90 b1d2ae1f9fe6fb4add603f895862ce5f gcc/testsuite/gfortran.dg/pr30391-1.f90 ! ec5c278964987904454c249c035eb114 gcc/testsuite/gfortran.dg/pr30667.f d7afa5477feea41da7fcbefa1a4e4562 gcc/testsuite/gfortran.dg/pr31025.f90 e940dc722b5dc7829733d76ac0f77e35 gcc/testsuite/gfortran.dg/pr32136.f90 b63cf426429e85f0b46561839fb9ba39 gcc/testsuite/gfortran.dg/pr32222.f90 --- 28965,28977 ---- a8e2db84661b4f240f7affaf48406075 gcc/testsuite/gfortran.dg/pr26246_1.f90 402035806ec0f6b295386ada5580bcb3 gcc/testsuite/gfortran.dg/pr26246_2.f90 c5691130bd4c286f7eee40a2c5c77152 gcc/testsuite/gfortran.dg/pr26524.f ! 9e9dd3b1f52334d90a945169eb218cf8 gcc/testsuite/gfortran.dg/pr28158.f90 a677e692ddc8db95c44027d781286bb1 gcc/testsuite/gfortran.dg/pr28971.f90 78db8c67c61bddab1d869cab206a04b0 gcc/testsuite/gfortran.dg/pr29067.f 8a8bf8cec47060178472d613091f0994 gcc/testsuite/gfortran.dg/pr29581.f90 31ec24a5dc4f881189c9731e7b807f4a gcc/testsuite/gfortran.dg/pr29713.f90 b1d2ae1f9fe6fb4add603f895862ce5f gcc/testsuite/gfortran.dg/pr30391-1.f90 ! 7d35548cced5cb020dfcca20408cb266 gcc/testsuite/gfortran.dg/pr30667.f d7afa5477feea41da7fcbefa1a4e4562 gcc/testsuite/gfortran.dg/pr31025.f90 e940dc722b5dc7829733d76ac0f77e35 gcc/testsuite/gfortran.dg/pr32136.f90 b63cf426429e85f0b46561839fb9ba39 gcc/testsuite/gfortran.dg/pr32222.f90 *************** b9e2c750274471b80970250d22b1f7dd gcc/te *** 28948,28956 **** --- 29021,29031 ---- b0352cfde4ae60cc2b0b0f5e8074caec gcc/testsuite/gfortran.dg/pr41347.f90 7474cbf3d33d0f676c86eb8e1c5076a4 gcc/testsuite/gfortran.dg/pr41928.f90 f97bbef31f7ca1230b7b8b18d0f71473 gcc/testsuite/gfortran.dg/pr42166.f90 + 867385ced8adf73c6b6090ccc4be3174 gcc/testsuite/gfortran.dg/pr42246-2.f 1a4e070f9e54fef158848ff09b92a9d6 gcc/testsuite/gfortran.dg/pr42294.f 7f250967671ff3b657404ee17aa72a10 gcc/testsuite/gfortran.dg/pr43229.f90 0808d46b345e8db382dc37c40a89e446 gcc/testsuite/gfortran.dg/pr43475.f90 + d9a349190ca794aeb8312defcd7c755a gcc/testsuite/gfortran.dg/pr44691.f 6ff99f4b0021f30bee039a61db7cba9d gcc/testsuite/gfortran.dg/predcom-1.f 20a411a7e5a57891297c4c6a96d92009 gcc/testsuite/gfortran.dg/predcom-2.f c1ed4aee35f394f952b49fcdcfc84fba gcc/testsuite/gfortran.dg/present_1.f90 *************** cedac13505e8a5175fa43ac2c3c4834d gcc/te *** 29199,29206 **** 010cfcdec31146aa14377199603e5cca gcc/testsuite/gfortran.dg/spread_scalar_source.f90 654688402ffab04ce051df7b4f572427 gcc/testsuite/gfortran.dg/spread_shape_1.f90 660cebcc8ffff86cb4ccb16d81f894fb gcc/testsuite/gfortran.dg/spread_zerosize_1.f90 ! 2277a08552879a8d07b48d8e359ff5a4 gcc/testsuite/gfortran.dg/stat_1.f90 ! b5f5dd48a5466884986e02ca3af2ea22 gcc/testsuite/gfortran.dg/stat_2.f90 8297205d0fd462057bf77c41569c1427 gcc/testsuite/gfortran.dg/static_linking_1.c fdcc241cfe92b58fca2cd6843c525442 gcc/testsuite/gfortran.dg/static_linking_1.f bf0f78ddd69ccd4c8c96ce04c0da6db7 gcc/testsuite/gfortran.dg/stfunc_1.f90 --- 29274,29281 ---- 010cfcdec31146aa14377199603e5cca gcc/testsuite/gfortran.dg/spread_scalar_source.f90 654688402ffab04ce051df7b4f572427 gcc/testsuite/gfortran.dg/spread_shape_1.f90 660cebcc8ffff86cb4ccb16d81f894fb gcc/testsuite/gfortran.dg/spread_zerosize_1.f90 ! fd8b9c308b44bf73c604a05bf4ccd696 gcc/testsuite/gfortran.dg/stat_1.f90 ! f2ff8174c83497121679d90203802580 gcc/testsuite/gfortran.dg/stat_2.f90 8297205d0fd462057bf77c41569c1427 gcc/testsuite/gfortran.dg/static_linking_1.c fdcc241cfe92b58fca2cd6843c525442 gcc/testsuite/gfortran.dg/static_linking_1.f bf0f78ddd69ccd4c8c96ce04c0da6db7 gcc/testsuite/gfortran.dg/stfunc_1.f90 *************** b20d3850a69a3a0806b12fd2cd504afc gcc/te *** 29342,29347 **** --- 29417,29423 ---- c7e3f8f8a4fba4e7d49f3e4b94e8eab4 gcc/testsuite/gfortran.dg/use_10.f90 74e92cfd9ef9a034e1698a5c2b2bacf6 gcc/testsuite/gfortran.dg/use_11.f90 d77c09d297fb35fb62cf1d10ab085b7d gcc/testsuite/gfortran.dg/use_12.f90 + 21e0dc3e303ad0169f19dd39ecb38e46 gcc/testsuite/gfortran.dg/use_13.f90 9cec81b3eb746de856fbb5731e5448e6 gcc/testsuite/gfortran.dg/use_2.f90 995f7c2f16385889e53cf6c97a7b802e gcc/testsuite/gfortran.dg/use_3.f90 140e285848ae4cf4a8a3c02380873568 gcc/testsuite/gfortran.dg/use_4.f90 *************** d9c420ec26bc98b99cc365204daf2b72 gcc/te *** 29430,29436 **** 30ac034bafd9a5accc6ac6ede2105ddf gcc/testsuite/gfortran.dg/vect/vect-3.f90 8e2386f65118c235837ac4780e665d2c gcc/testsuite/gfortran.dg/vect/vect-4.f90 ed380377d11f379222ac64dc7ca9a4d0 gcc/testsuite/gfortran.dg/vect/vect-5.f90 ! cd4298bad9053fae81401201947fcef1 gcc/testsuite/gfortran.dg/vect/vect.exp ae79af47097b6fa393f61536baee22e0 gcc/testsuite/gfortran.dg/vector_subscript_1.f90 9206e2127fe7833b7ffdd6daf40b63ac gcc/testsuite/gfortran.dg/vector_subscript_2.f90 d519b7207c9ad543969b05a5a67e3706 gcc/testsuite/gfortran.dg/vector_subscript_3.f90 --- 29506,29512 ---- 30ac034bafd9a5accc6ac6ede2105ddf gcc/testsuite/gfortran.dg/vect/vect-3.f90 8e2386f65118c235837ac4780e665d2c gcc/testsuite/gfortran.dg/vect/vect-4.f90 ed380377d11f379222ac64dc7ca9a4d0 gcc/testsuite/gfortran.dg/vect/vect-5.f90 ! e41916359df35579b3e4997e90382118 gcc/testsuite/gfortran.dg/vect/vect.exp ae79af47097b6fa393f61536baee22e0 gcc/testsuite/gfortran.dg/vector_subscript_1.f90 9206e2127fe7833b7ffdd6daf40b63ac gcc/testsuite/gfortran.dg/vector_subscript_2.f90 d519b7207c9ad543969b05a5a67e3706 gcc/testsuite/gfortran.dg/vector_subscript_3.f90 *************** cbd160fa487335a0853797f8c2cdb5b4 gcc/te *** 29574,29579 **** --- 29650,29657 ---- 3a4564a9fbeb28a840e68ea186582402 gcc/testsuite/gfortran.fortran-torture/compile/pr36078.f90 08f6bae93db5b11cf15273ca75f49c11 gcc/testsuite/gfortran.fortran-torture/compile/pr37236.f bff697a90a03eff01ad3f51a4d72ee71 gcc/testsuite/gfortran.fortran-torture/compile/pr39937.f + d8d04dd88f8e8ffbaa7fbdb631f898a0 gcc/testsuite/gfortran.fortran-torture/compile/pr40421.f + 3c11090435f556560d4d73c61e7efab0 gcc/testsuite/gfortran.fortran-torture/compile/pr40421.f90 80e110638bde42fd313d3f9c9aeae6e7 gcc/testsuite/gfortran.fortran-torture/compile/pr42781.f90 7602f8cc2d0ebd2bf0bb974069a764e0 gcc/testsuite/gfortran.fortran-torture/compile/shape_reshape.f90 d5ee9d72b3b02f47b393934ca0c89627 gcc/testsuite/gfortran.fortran-torture/compile/stoppause.f90 *************** fd66cccd1fac713f451b7b6a07a75b57 gcc/te *** 30209,30215 **** 1a5f90c5e3353a65a20c002423b82dc9 gcc/testsuite/gnat.dg/slice5.adb 5f0bf4632c09277729d821e8413a0426 gcc/testsuite/gnat.dg/slice_enum.adb 04d0c566bcfddf32cfb214ddbc7a73bc gcc/testsuite/gnat.dg/small_alignment.adb ! 398a4262cc23899ecbde95edc766fabb gcc/testsuite/gnat.dg/socket1.adb 0caf5abcbc500a4037b4b5d2e38923f3 gcc/testsuite/gnat.dg/sort1.adb cc5d9c23cbd067bd3b5f3d7e9a5747a4 gcc/testsuite/gnat.dg/sort1.ads b8eb8b7feeea1677a72807b2c341edfb gcc/testsuite/gnat.dg/sort2.adb --- 30287,30293 ---- 1a5f90c5e3353a65a20c002423b82dc9 gcc/testsuite/gnat.dg/slice5.adb 5f0bf4632c09277729d821e8413a0426 gcc/testsuite/gnat.dg/slice_enum.adb 04d0c566bcfddf32cfb214ddbc7a73bc gcc/testsuite/gnat.dg/small_alignment.adb ! 7859d3d3ffdc14118bb275a43a367d7d gcc/testsuite/gnat.dg/socket1.adb 0caf5abcbc500a4037b4b5d2e38923f3 gcc/testsuite/gnat.dg/sort1.adb cc5d9c23cbd067bd3b5f3d7e9a5747a4 gcc/testsuite/gnat.dg/sort1.ads b8eb8b7feeea1677a72807b2c341edfb gcc/testsuite/gnat.dg/sort2.adb *************** c6ab42a1860cf3906ab6f4aaa9fb5e2f gcc/te *** 30387,30399 **** 77aaeb8d16afbdd42fa33c22011ad66f gcc/testsuite/gnat.dg/wide_pi.adb 067dba883e26668ff9d0a937d7332052 gcc/testsuite/gnat.dg/wide_test.adb b933d7929459832aace0de18ec97f6e7 gcc/testsuite/lib/c-compat.exp ! 902e9b12595f1e9a98c1cb38c3819397 gcc/testsuite/lib/c-torture.exp c25c82809ef97e977c0c559d38f44131 gcc/testsuite/lib/compat.exp 04c0b9356b5f47e9ed8cd6d274acc7a5 gcc/testsuite/lib/copy-file.exp 4bfa515dd06eebce186d22f504c9ccc0 gcc/testsuite/lib/dejapatches.exp afa14dda7f1a23deb438ef87b734b557 gcc/testsuite/lib/dg-pch.exp 580cf6165292238070c546d894c45943 gcc/testsuite/lib/file-format.exp ! 1cbb4508f847232f36f4b46e46b6388b gcc/testsuite/lib/fortran-torture.exp 50ffa346e924efe09842cf41681b0f00 gcc/testsuite/lib/g++-dg.exp 1f81a25231124bb4a13947db0132b56e gcc/testsuite/lib/g++.exp ea9850a45c038f82e07430065da162e5 gcc/testsuite/lib/gcc-defs.exp --- 30465,30477 ---- 77aaeb8d16afbdd42fa33c22011ad66f gcc/testsuite/gnat.dg/wide_pi.adb 067dba883e26668ff9d0a937d7332052 gcc/testsuite/gnat.dg/wide_test.adb b933d7929459832aace0de18ec97f6e7 gcc/testsuite/lib/c-compat.exp ! 38d139bb1ec1f3b1a4ff71ad5ace9ab8 gcc/testsuite/lib/c-torture.exp c25c82809ef97e977c0c559d38f44131 gcc/testsuite/lib/compat.exp 04c0b9356b5f47e9ed8cd6d274acc7a5 gcc/testsuite/lib/copy-file.exp 4bfa515dd06eebce186d22f504c9ccc0 gcc/testsuite/lib/dejapatches.exp afa14dda7f1a23deb438ef87b734b557 gcc/testsuite/lib/dg-pch.exp 580cf6165292238070c546d894c45943 gcc/testsuite/lib/file-format.exp ! 2ed2033db8ed7eb908ef6028dc14e7f5 gcc/testsuite/lib/fortran-torture.exp 50ffa346e924efe09842cf41681b0f00 gcc/testsuite/lib/g++-dg.exp 1f81a25231124bb4a13947db0132b56e gcc/testsuite/lib/g++.exp ea9850a45c038f82e07430065da162e5 gcc/testsuite/lib/gcc-defs.exp *************** ac08ec7aa95bbbc5e1fce85e90617833 gcc/te *** 30419,30426 **** 98d6cc3401bd49f0f2cf61a1735aec75 gcc/testsuite/lib/scanrtl.exp 9a908bb507989b82eddfeb9d23c66587 gcc/testsuite/lib/scantree.exp e491de496275e2c1eaa1010c85de53ca gcc/testsuite/lib/target-libpath.exp ! 59df3b9ec08ffe18ebdc57b93fedfc3c gcc/testsuite/lib/target-supports-dg.exp ! 9e6211bb950be9a4ad345ea5bc0096cf gcc/testsuite/lib/target-supports.exp 3247a569c87014396b4682567b02c72f gcc/testsuite/lib/timeout-dg.exp 3b7f74ee8537decb5895ed7a3c008b6e gcc/testsuite/lib/timeout.exp 79ac90a6a1627fc40f4be76ee6d3e10a gcc/testsuite/lib/torture-options.exp --- 30497,30504 ---- 98d6cc3401bd49f0f2cf61a1735aec75 gcc/testsuite/lib/scanrtl.exp 9a908bb507989b82eddfeb9d23c66587 gcc/testsuite/lib/scantree.exp e491de496275e2c1eaa1010c85de53ca gcc/testsuite/lib/target-libpath.exp ! fa6d1623fb20803440b8493cdfd7d49c gcc/testsuite/lib/target-supports-dg.exp ! b9064806e77b3fe6bc696e45b7bf9086 gcc/testsuite/lib/target-supports.exp 3247a569c87014396b4682567b02c72f gcc/testsuite/lib/timeout-dg.exp 3b7f74ee8537decb5895ed7a3c008b6e gcc/testsuite/lib/timeout.exp 79ac90a6a1627fc40f4be76ee6d3e10a gcc/testsuite/lib/torture-options.exp *************** ba285401a863e0573f80d25a4ff3cf88 gcc/te *** 30803,30809 **** ff38a68c34552514346653b9991507c6 gcc/testsuite/objc/execute/formal_protocol-6.m 0c611b99a91d28210266c408ff243879 gcc/testsuite/objc/execute/formal_protocol-7.m e35d74e9cbbcb893a957c61358508059 gcc/testsuite/objc/execute/forward-1.m ! af8f508775d885c5095860156d19d504 gcc/testsuite/objc/execute/forward-1.x c1cd0508a9c25c70c9843a0afc4acf95 gcc/testsuite/objc/execute/function-message-1.m 2e32e017fe7de84283b8c9f03661d155 gcc/testsuite/objc/execute/informal_protocol.m c5a1ab4cc050d437968f7cbed4c847ec gcc/testsuite/objc/execute/initialize.m --- 30881,30887 ---- ff38a68c34552514346653b9991507c6 gcc/testsuite/objc/execute/formal_protocol-6.m 0c611b99a91d28210266c408ff243879 gcc/testsuite/objc/execute/formal_protocol-7.m e35d74e9cbbcb893a957c61358508059 gcc/testsuite/objc/execute/forward-1.m ! e1a047c9f616f352430ed734aaaa1632 gcc/testsuite/objc/execute/forward-1.x c1cd0508a9c25c70c9843a0afc4acf95 gcc/testsuite/objc/execute/function-message-1.m 2e32e017fe7de84283b8c9f03661d155 gcc/testsuite/objc/execute/informal_protocol.m c5a1ab4cc050d437968f7cbed4c847ec gcc/testsuite/objc/execute/initialize.m *************** d7ceabafcb502a19bfb16a5edec259f6 gcc/tr *** 30853,30859 **** 95cd7c79620ee7114d993efc771f7fd8 gcc/tree-browser.def def2a52cc7c070df1022f36051a0c1c2 gcc/tree-call-cdce.c f2c6f3b30cdf59de3a664ffc6126c2a1 gcc/tree-cfg.c ! c56e5bc664dc17e25b7f4811fb953b52 gcc/tree-cfgcleanup.c 5b1197419bd4500758c335a6b756cd69 gcc/tree-chrec.c 709f9b370c5300867ea6dc891135d037 gcc/tree-chrec.h ebbda1a31c1dd3ab37b0a4ac8e446db1 gcc/tree-complex.c --- 30931,30937 ---- 95cd7c79620ee7114d993efc771f7fd8 gcc/tree-browser.def def2a52cc7c070df1022f36051a0c1c2 gcc/tree-call-cdce.c f2c6f3b30cdf59de3a664ffc6126c2a1 gcc/tree-cfg.c ! 47978e610ac855766e6e00f352eb450a gcc/tree-cfgcleanup.c 5b1197419bd4500758c335a6b756cd69 gcc/tree-chrec.c 709f9b370c5300867ea6dc891135d037 gcc/tree-chrec.h ebbda1a31c1dd3ab37b0a4ac8e446db1 gcc/tree-complex.c *************** a409ef6271e7349a7d1ba26376221b25 gcc/tr *** 30866,30872 **** 05ae630977385569c6c89c3b583627cb gcc/tree-flow-inline.h 24106014d0db14fdc62ebf4926088dc2 gcc/tree-flow.h 9c3d691478b1ee15a910bfb905b9724c gcc/tree-if-conv.c ! ea46504d31095374a021e973eedfae50 gcc/tree-inline.c e89ef9f63732856e58241270249cd88f gcc/tree-inline.h 86ec613c676367e4f7d81cd33f3d4b51 gcc/tree-into-ssa.c e61efd034a6f59b8648c99d54659b408 gcc/tree-iterator.c --- 30944,30950 ---- 05ae630977385569c6c89c3b583627cb gcc/tree-flow-inline.h 24106014d0db14fdc62ebf4926088dc2 gcc/tree-flow.h 9c3d691478b1ee15a910bfb905b9724c gcc/tree-if-conv.c ! 13aefe4147e084f479b4433224635bb7 gcc/tree-inline.c e89ef9f63732856e58241270249cd88f gcc/tree-inline.h 86ec613c676367e4f7d81cd33f3d4b51 gcc/tree-into-ssa.c e61efd034a6f59b8648c99d54659b408 gcc/tree-iterator.c *************** f4cf37a4d74bb0a896c79e7947f8b9f3 gcc/tr *** 30884,30890 **** b580443f6fcba43fe01f082f27b19518 gcc/tree-parloops.c 48fb22d24caf753038c93dba844e0f17 gcc/tree-pass.h aa2665de57f161d05be1d2b68bccff7e gcc/tree-phinodes.c ! 239d4fa6cf1ced3f2b2924a57bee44a0 gcc/tree-predcom.c db575b88a4bf8a9ad70130b4b3f30da6 gcc/tree-pretty-print.c 436994a40e27a8032599006a6ccbda72 gcc/tree-profile.c 1acac502469470176cb27083cee2bfd5 gcc/tree-scalar-evolution.c --- 30962,30968 ---- b580443f6fcba43fe01f082f27b19518 gcc/tree-parloops.c 48fb22d24caf753038c93dba844e0f17 gcc/tree-pass.h aa2665de57f161d05be1d2b68bccff7e gcc/tree-phinodes.c ! e46dcf35a30096db3965ce1410bd18fe gcc/tree-predcom.c db575b88a4bf8a9ad70130b4b3f30da6 gcc/tree-pretty-print.c 436994a40e27a8032599006a6ccbda72 gcc/tree-profile.c 1acac502469470176cb27083cee2bfd5 gcc/tree-scalar-evolution.c *************** ebd0c7a42bce4511046e5489e0d78f3b gcc/tr *** 30897,30903 **** 801c5e9973056ccefbf9257b5d19f30a gcc/tree-ssa-copy.c 2addd634736f8ade3525e6af92a78469 gcc/tree-ssa-copyrename.c 25f81be4dfeff8b6be3a5684e020aeee gcc/tree-ssa-dce.c ! 73c685432d498a7f8a860a733511e948 gcc/tree-ssa-dom.c 93fb1f957a4119cc1827e3090f597c30 gcc/tree-ssa-dse.c 38571bc8040efcb846a5ab3a8387a533 gcc/tree-ssa-forwprop.c a6562ce11cf9cdf6f140c186b991057d gcc/tree-ssa-ifcombine.c --- 30975,30981 ---- 801c5e9973056ccefbf9257b5d19f30a gcc/tree-ssa-copy.c 2addd634736f8ade3525e6af92a78469 gcc/tree-ssa-copyrename.c 25f81be4dfeff8b6be3a5684e020aeee gcc/tree-ssa-dce.c ! 56248826ed00b4841582889dfce343c2 gcc/tree-ssa-dom.c 93fb1f957a4119cc1827e3090f597c30 gcc/tree-ssa-dse.c 38571bc8040efcb846a5ab3a8387a533 gcc/tree-ssa-forwprop.c a6562ce11cf9cdf6f140c186b991057d gcc/tree-ssa-ifcombine.c *************** a6562ce11cf9cdf6f140c186b991057d gcc/tr *** 30906,30912 **** 9734f55b7518dbe2c9aec464add72076 gcc/tree-ssa-loop-ch.c b306120551927a23f6339aed8a2b5f3e gcc/tree-ssa-loop-im.c 02b5dc92a7f205b6e8b4179875fae7a8 gcc/tree-ssa-loop-ivcanon.c ! b3b5ecef1001e0bba018be4c7f60112b gcc/tree-ssa-loop-ivopts.c 28f15835a4cf86bb6cd27a2beb0e3717 gcc/tree-ssa-loop-manip.c 00bcd745587f4a6ce7c2cb9d5a0171f2 gcc/tree-ssa-loop-niter.c 219c7cef73c3e7dc974da87b3805ef50 gcc/tree-ssa-loop-prefetch.c --- 30984,30990 ---- 9734f55b7518dbe2c9aec464add72076 gcc/tree-ssa-loop-ch.c b306120551927a23f6339aed8a2b5f3e gcc/tree-ssa-loop-im.c 02b5dc92a7f205b6e8b4179875fae7a8 gcc/tree-ssa-loop-ivcanon.c ! 986fa65f8324615b069921db440cdf6f gcc/tree-ssa-loop-ivopts.c 28f15835a4cf86bb6cd27a2beb0e3717 gcc/tree-ssa-loop-manip.c 00bcd745587f4a6ce7c2cb9d5a0171f2 gcc/tree-ssa-loop-niter.c 219c7cef73c3e7dc974da87b3805ef50 gcc/tree-ssa-loop-prefetch.c *************** ceed1bfcc7386d0e82896eb7b73d0247 gcc/tr *** 30917,30930 **** 24fc49b7c726323b2e249fb01132d683 gcc/tree-ssa-operands.h 5c471c8182ac31faf8daa0cab1bad55c gcc/tree-ssa-phiopt.c 44a7827fe52e476e5aebb0ea4541c8ab gcc/tree-ssa-phiprop.c ! 06dded0bf7b24127b8411cda66b18428 gcc/tree-ssa-pre.c ! b3a5cd136577d4d9764860fbb9aa2d70 gcc/tree-ssa-propagate.c 4e03d85d1b53fca9c060b5d626da09fd gcc/tree-ssa-propagate.h e110d972b97351bca1a2e2e5b634e712 gcc/tree-ssa-reassoc.c 14a0b6bb22d8ada345cccf34a4162033 gcc/tree-ssa-sccvn.c 2f5411534286a67f7fc406d70facbe09 gcc/tree-ssa-sccvn.h d1b4126d8f53283460df31db7194b14b gcc/tree-ssa-sink.c ! cd6ad64a42ec84773b3cdaa13d9388a7 gcc/tree-ssa-structalias.c 7ba91c9a7e0f9e2e00c0feefdd350585 gcc/tree-ssa-structalias.h 82793369250dfeeb4b267a1b3964692b gcc/tree-ssa-ter.c 5a11cf241632bb90fce4bb0d92afb48e gcc/tree-ssa-threadedge.c --- 30995,31008 ---- 24fc49b7c726323b2e249fb01132d683 gcc/tree-ssa-operands.h 5c471c8182ac31faf8daa0cab1bad55c gcc/tree-ssa-phiopt.c 44a7827fe52e476e5aebb0ea4541c8ab gcc/tree-ssa-phiprop.c ! ac3f366b514564d3e14815434807bbe2 gcc/tree-ssa-pre.c ! 90262fab96fe3ec31e25aabe1b025b51 gcc/tree-ssa-propagate.c 4e03d85d1b53fca9c060b5d626da09fd gcc/tree-ssa-propagate.h e110d972b97351bca1a2e2e5b634e712 gcc/tree-ssa-reassoc.c 14a0b6bb22d8ada345cccf34a4162033 gcc/tree-ssa-sccvn.c 2f5411534286a67f7fc406d70facbe09 gcc/tree-ssa-sccvn.h d1b4126d8f53283460df31db7194b14b gcc/tree-ssa-sink.c ! f59a9c392005422eaeeb99fc2edc5464 gcc/tree-ssa-structalias.c 7ba91c9a7e0f9e2e00c0feefdd350585 gcc/tree-ssa-structalias.h 82793369250dfeeb4b267a1b3964692b gcc/tree-ssa-ter.c 5a11cf241632bb90fce4bb0d92afb48e gcc/tree-ssa-threadedge.c *************** acd8ec20ec0a9db6415f00c228c998a3 gcc/tr *** 30934,30940 **** 4f0a5ea903e5d35c291a71c8276284a0 gcc/tree-ssanames.c 6cdde0c031bd687bf601e3edff015a3a gcc/tree-stdarg.c 9dc7ea806141e247f0061ebed82e5f57 gcc/tree-stdarg.h ! d018c1f2e7e00060bd155e8d9a075a9c gcc/tree-switch-conversion.c 0b620ad94e894b3b6b01d8ad07b28cd8 gcc/tree-tailcall.c e08815ba32294df679d5edc14caa2390 gcc/tree-vect-analyze.c b6d73aea616cb17079714ba502599e66 gcc/tree-vect-generic.c --- 31012,31018 ---- 4f0a5ea903e5d35c291a71c8276284a0 gcc/tree-ssanames.c 6cdde0c031bd687bf601e3edff015a3a gcc/tree-stdarg.c 9dc7ea806141e247f0061ebed82e5f57 gcc/tree-stdarg.h ! d6e0e4801594f885b8e22f24cfcd3b56 gcc/tree-switch-conversion.c 0b620ad94e894b3b6b01d8ad07b28cd8 gcc/tree-tailcall.c e08815ba32294df679d5edc14caa2390 gcc/tree-vect-analyze.c b6d73aea616cb17079714ba502599e66 gcc/tree-vect-generic.c *************** a4c06b5d0ee8f1be4624969690fff2b9 gcc/we *** 30981,30993 **** 42adadee6c316f624c86e3ccfdeee75c gcc/xcoff.h 4bb6c12cfbacc8d214992f0f2f518c35 gcc/xcoffout.c 26455c95210e49d4944e4cb9c55be072 gcc/xcoffout.h ! 710ae6251db5221dfbb6e9bb0b7896a4 gnattools/ChangeLog 5c6e51b0ba78687e3e203baf2cb8efee gnattools/Makefile.in a0ff396cebc896665506c2e467585f33 gnattools/configure fee7c8fcbc6994c9cc4cdc0f719cc7cc gnattools/configure.ac 59530bdf33659b29e73d4adb9f9f6552 include/COPYING d32239bcb673463ab874e80d47fae504 include/COPYING3 ! a83b6788bba12372e74150a153c47ae7 include/ChangeLog 4263432a72ff47ed8bf420208ee7eea5 include/ChangeLog-9103 f7d3e7ee65516643f4847560778a30cf include/ansidecl.h 7f56ea1304d016a45770f3989736f181 include/demangle.h --- 31059,31071 ---- 42adadee6c316f624c86e3ccfdeee75c gcc/xcoff.h 4bb6c12cfbacc8d214992f0f2f518c35 gcc/xcoffout.c 26455c95210e49d4944e4cb9c55be072 gcc/xcoffout.h ! 3a3849ea88b8e68fc8723a87c2f8b853 gnattools/ChangeLog 5c6e51b0ba78687e3e203baf2cb8efee gnattools/Makefile.in a0ff396cebc896665506c2e467585f33 gnattools/configure fee7c8fcbc6994c9cc4cdc0f719cc7cc gnattools/configure.ac 59530bdf33659b29e73d4adb9f9f6552 include/COPYING d32239bcb673463ab874e80d47fae504 include/COPYING3 ! 904b27bebbd08be98bde5d3db0683aab include/ChangeLog 4263432a72ff47ed8bf420208ee7eea5 include/ChangeLog-9103 f7d3e7ee65516643f4847560778a30cf include/ansidecl.h 7f56ea1304d016a45770f3989736f181 include/demangle.h *************** c665cdb0d6c3bfb5d86841b168a2d1f9 includ *** 31012,31018 **** 0294cecbb1f66d640ccba3a5d862d05b include/xregex2.h 06cee0773295c3ade78d4605550102dc include/xtensa-config.h aded5875c5d5830de6653181e8ced19c install-sh ! c67a0f33a5a8fbfd6ac0fc0457d97d3c intl/ChangeLog afcc65eba0b481722fcfcb92bae389b2 intl/Makefile.in 6ec998bb4716c744bf8185e607f69301 intl/README 76ca170a525d5b84d90f0478fe788931 intl/VERSION --- 31090,31096 ---- 0294cecbb1f66d640ccba3a5d862d05b include/xregex2.h 06cee0773295c3ade78d4605550102dc include/xtensa-config.h aded5875c5d5830de6653181e8ced19c install-sh ! 75b30ca1741d99317047dc06e780c6a7 intl/ChangeLog afcc65eba0b481722fcfcb92bae389b2 intl/Makefile.in 6ec998bb4716c744bf8185e607f69301 intl/README 76ca170a525d5b84d90f0478fe788931 intl/VERSION *************** d50a8c6c5b41089930accbdce767d3c0 intl/p *** 31054,31064 **** b4758a0194e3e41362b939911472ce62 intl/relocatable.c bedade7bcfc3bc5eb09a2c6844f637f3 intl/relocatable.h 43f287d082528203fc85c1d2d81bf30d intl/textdomain.c ! f6ca6507369a7384c7ace9bb12632e43 libada/ChangeLog 262839d559b47e6b7e3099d78607925a libada/Makefile.in 07862146e86060f3f2fec11cdd9b0d22 libada/configure e37a058398e43aabbe1177079b0fa59f libada/configure.ac ! b6d66db6599796c935c5f0e1c415cd38 libcpp/ChangeLog e4bd42c5b05fa59f0882ee3ae5228ca8 libcpp/Makefile.in cdb0d04b305e8a1db0b518b01a50345a libcpp/aclocal.m4 0bbe704b181f2d1f34a7ff96797032f1 libcpp/charset.c --- 31132,31142 ---- b4758a0194e3e41362b939911472ce62 intl/relocatable.c bedade7bcfc3bc5eb09a2c6844f637f3 intl/relocatable.h 43f287d082528203fc85c1d2d81bf30d intl/textdomain.c ! 3032f91ff1121639d3ef2faed3f81a1e libada/ChangeLog 262839d559b47e6b7e3099d78607925a libada/Makefile.in 07862146e86060f3f2fec11cdd9b0d22 libada/configure e37a058398e43aabbe1177079b0fa59f libada/configure.ac ! b4dfc2fb58e905548d0c68e6032e1ea1 libcpp/ChangeLog e4bd42c5b05fa59f0882ee3ae5228ca8 libcpp/Makefile.in cdb0d04b305e8a1db0b518b01a50345a libcpp/aclocal.m4 0bbe704b181f2d1f34a7ff96797032f1 libcpp/charset.c *************** bd3ad232a81e8a65301172800949c9b8 libcpp *** 31085,31091 **** 2d45a726957f93e9ec053b644480b2e9 libcpp/makeucnid.c f35ae8ba1fd3553b47bcf87cc1730aeb libcpp/mkdeps.c 27f54e6a64816a2de073e04aeee5952e libcpp/pch.c ! 68fb21478de2b7e92248424be585c32a libcpp/po/ChangeLog fc5cc939e5c54692720d84af5a2a1d65 libcpp/po/be.gmo 19432f3b20d6c2f0837866cbc06f78e7 libcpp/po/be.po 54da3a45154df725cc7b7a1f2fa8cced libcpp/po/ca.gmo --- 31163,31169 ---- 2d45a726957f93e9ec053b644480b2e9 libcpp/makeucnid.c f35ae8ba1fd3553b47bcf87cc1730aeb libcpp/mkdeps.c 27f54e6a64816a2de073e04aeee5952e libcpp/pch.c ! 9030f551b9e74f5e8126038d7a3f855b libcpp/po/ChangeLog fc5cc939e5c54692720d84af5a2a1d65 libcpp/po/be.gmo 19432f3b20d6c2f0837866cbc06f78e7 libcpp/po/be.po 54da3a45154df725cc7b7a1f2fa8cced libcpp/po/ca.gmo *************** fb521a18156982ce2a50c28291c16622 libcpp *** 31124,31130 **** 67fcd3d878017060c56219962e5e062b libcpp/traditional.c 11f204ddd01b33474c3de82de9192de4 libcpp/ucnid.h 524392c32703f6022427bf6bbdb833c8 libcpp/ucnid.tab ! 535c39f98aff0bbc865556e80d843a0d libdecnumber/ChangeLog db91d69aaa5063f52bcad6e8ffb8edea libdecnumber/Makefile.in fadf2817f83f012f9f3e7dfd466a54aa libdecnumber/aclocal.m4 a0ecbc50fa8e505f88a951c3c294ecbc libdecnumber/bid/bid-dpd.h --- 31202,31208 ---- 67fcd3d878017060c56219962e5e062b libcpp/traditional.c 11f204ddd01b33474c3de82de9192de4 libcpp/ucnid.h 524392c32703f6022427bf6bbdb833c8 libcpp/ucnid.tab ! 7980b75fdbf74950bfb5c478d9e1972b libdecnumber/ChangeLog db91d69aaa5063f52bcad6e8ffb8edea libdecnumber/Makefile.in fadf2817f83f012f9f3e7dfd466a54aa libdecnumber/aclocal.m4 a0ecbc50fa8e505f88a951c3c294ecbc libdecnumber/bid/bid-dpd.h *************** a97c47969dfc92a7666dfe3c2e1e1448 libdec *** 31186,31204 **** 5659059205f642d272e5f9d4ba943919 libdecnumber/dpd/decimal64.c 245e62676fd97afc6b66736ed611da97 libdecnumber/dpd/decimal64.h 0f6db29710e7075c2fd62bc4478b3b8d libdecnumber/dpd/decimal64Symbols.h ! 093f5dc98c1e284a460a147d8107dff1 libffi/ChangeLog fbbc216bc25d759a72ea3e6d734af56b libffi/ChangeLog.libgcj d946d2b97454ad50a1dbfbf48923c5be libffi/ChangeLog.v1 085f9917800070e791f49bf4733e23fa libffi/LICENSE 424699205fcfa47e70f941461dffabda libffi/Makefile.am ! 89fe9ffe8d745da951b6f2ba41caf4b6 libffi/Makefile.in 6d88c5fa0e8184c66bf0f7fbd796c1f8 libffi/README 0ec3418e6c2e6b89c24cffd4322b6368 libffi/acinclude.m4 711c807cab08c08e4b8f9e4738aca030 libffi/aclocal.m4 ! 77bb1e78e19ac849c78939cbe6a3d4f0 libffi/configure ! 9b37258c37bb9391f123a717c410a877 libffi/configure.ac bec544523f8f7f3d5136f67598cf609a libffi/configure.host ! 0a5beab98a77c8cb20c57b9b9dce54a9 libffi/fficonfig.h.in f165b6fb33a20fdd5f1eeffbafa83d78 libffi/include/Makefile.am d19ea57b807eaf04573edfbbe1bf9771 libffi/include/Makefile.in c491662c9c285cace4271486b9684bc4 libffi/include/ffi.h.in --- 31264,31282 ---- 5659059205f642d272e5f9d4ba943919 libdecnumber/dpd/decimal64.c 245e62676fd97afc6b66736ed611da97 libdecnumber/dpd/decimal64.h 0f6db29710e7075c2fd62bc4478b3b8d libdecnumber/dpd/decimal64Symbols.h ! 1b12f8f805bcd2db834b405827241659 libffi/ChangeLog fbbc216bc25d759a72ea3e6d734af56b libffi/ChangeLog.libgcj d946d2b97454ad50a1dbfbf48923c5be libffi/ChangeLog.v1 085f9917800070e791f49bf4733e23fa libffi/LICENSE 424699205fcfa47e70f941461dffabda libffi/Makefile.am ! 9c3cd8e3f6d887b3cb436c24b7aadf50 libffi/Makefile.in 6d88c5fa0e8184c66bf0f7fbd796c1f8 libffi/README 0ec3418e6c2e6b89c24cffd4322b6368 libffi/acinclude.m4 711c807cab08c08e4b8f9e4738aca030 libffi/aclocal.m4 ! 1baeb97bf614c0c354f6edc3d9b4fb44 libffi/configure ! 6a2f4774d98c09e11625670e2e491a74 libffi/configure.ac bec544523f8f7f3d5136f67598cf609a libffi/configure.host ! c312d6e0ba9c984323f3a473633316d3 libffi/fficonfig.h.in f165b6fb33a20fdd5f1eeffbafa83d78 libffi/include/Makefile.am d19ea57b807eaf04573edfbbe1bf9771 libffi/include/Makefile.in c491662c9c285cace4271486b9684bc4 libffi/include/ffi.h.in *************** a28e94414531f2468ed70cb8cbd85e0c libffi *** 31268,31278 **** e247408326a1bebada7a0bf44d45c905 libffi/src/types.c cac05ffa118af0842ef9a81b348c10f4 libffi/src/x86/darwin.S 32cb9d9cf479a7d65f42055ba6b2ba26 libffi/src/x86/darwin64.S ! eba1dcd4d5f6ac87588cfc060682adff libffi/src/x86/ffi.c 25b3759d122419d3ef4426b6e394467c libffi/src/x86/ffi64.c 90d53a17461cd45824b4fc5914a3e438 libffi/src/x86/ffitarget.h ! c341d8da46c147a2048248e9a13c7c48 libffi/src/x86/sysv.S ! 2a075018804d54386cd070659d3bae75 libffi/src/x86/unix64.S af3e62702bd4e408e4017a4387c728b2 libffi/src/x86/win32.S 1ded054093de910d9786c62bc4fe8cc6 libffi/stamp-h.in 04e06926cecf1198af45894dc46ffd39 libffi/testsuite/Makefile.am --- 31346,31356 ---- e247408326a1bebada7a0bf44d45c905 libffi/src/types.c cac05ffa118af0842ef9a81b348c10f4 libffi/src/x86/darwin.S 32cb9d9cf479a7d65f42055ba6b2ba26 libffi/src/x86/darwin64.S ! c8ad89d4d711ff7c2aeda79f8fac5010 libffi/src/x86/ffi.c 25b3759d122419d3ef4426b6e394467c libffi/src/x86/ffi64.c 90d53a17461cd45824b4fc5914a3e438 libffi/src/x86/ffitarget.h ! 68996da72f124e60f940982b6f36bf1a libffi/src/x86/sysv.S ! 428d42e9857502a3385be547941efc6e libffi/src/x86/unix64.S af3e62702bd4e408e4017a4387c728b2 libffi/src/x86/win32.S 1ded054093de910d9786c62bc4fe8cc6 libffi/stamp-h.in 04e06926cecf1198af45894dc46ffd39 libffi/testsuite/Makefile.am *************** b84890d83f011c1b342ba72165c5337b libffi *** 31388,31399 **** 92f1548985e720c30797e9e403807475 libffi/testsuite/libffi.special/special.exp f66daec7c7f631f03fad7424a605034b libffi/testsuite/libffi.special/unwindtest.cc 185d0795017fbbe253a13db8e34085f9 libffi/testsuite/libffi.special/unwindtest_ffi_call.cc ! 300c976515961c90939b9a997d595bd9 libgcc/ChangeLog ff55ad4dde97e7076aad7016505db695 libgcc/Makefile.in f64c32aad25e9b04e007e11b2993e5f0 libgcc/config.host 4d2e967f3d00f422f15be583a4ca4881 libgcc/config/alpha/t-crtfm 42e1ccf0240e3f8b375747d001d7caff libgcc/config/avr/t-avr ! 061c07498bd2a0650fa0386da023acda libgcc/config/i386/32/sfp-machine.h 2b8bfa8a6f0b34e124ae0461882c65ef libgcc/config/i386/32/t-fprules-softfp 7d3267782d5f3311644fd10bddb44d11 libgcc/config/i386/32/tf-signs.c 8091c7a0eb80c61991ae7a3747f1413f libgcc/config/i386/64/_divtc3.c --- 31466,31477 ---- 92f1548985e720c30797e9e403807475 libffi/testsuite/libffi.special/special.exp f66daec7c7f631f03fad7424a605034b libffi/testsuite/libffi.special/unwindtest.cc 185d0795017fbbe253a13db8e34085f9 libffi/testsuite/libffi.special/unwindtest_ffi_call.cc ! 5fdc41083390155c0c872c61b0e08c6c libgcc/ChangeLog ff55ad4dde97e7076aad7016505db695 libgcc/Makefile.in f64c32aad25e9b04e007e11b2993e5f0 libgcc/config.host 4d2e967f3d00f422f15be583a4ca4881 libgcc/config/alpha/t-crtfm 42e1ccf0240e3f8b375747d001d7caff libgcc/config/avr/t-avr ! 815a53cda27ca21dfceeeb50ee289cbf libgcc/config/i386/32/sfp-machine.h 2b8bfa8a6f0b34e124ae0461882c65ef libgcc/config/i386/32/t-fprules-softfp 7d3267782d5f3311644fd10bddb44d11 libgcc/config/i386/32/tf-signs.c 8091c7a0eb80c61991ae7a3747f1413f libgcc/config/i386/64/_divtc3.c *************** e9968ccea8a0142626a966b8b4238529 libgcc *** 31419,31425 **** 721bfee787d81d97c021d28b97dc3415 libgcc/config/ia64/t-ia64 53a2b9e67710b0b8f02e3e3316cd4482 libgcc/config/ia64/t-softfp-compat 45cb97bd14177f2d809994a800675ceb libgcc/config/ia64/tf-signs.c ! 926d4445e4f48448f5dad91e9e8704a7 libgcc/config/libbid/ChangeLog 86e150f40ebcb97e568366a5cb38cbbe libgcc/config/libbid/_addsub_dd.c ded9495633ce7c1e30d900eae5f9a599 libgcc/config/libbid/_addsub_sd.c d26f72ff45dfd7210a6a33a599274515 libgcc/config/libbid/_addsub_td.c --- 31497,31503 ---- 721bfee787d81d97c021d28b97dc3415 libgcc/config/ia64/t-ia64 53a2b9e67710b0b8f02e3e3316cd4482 libgcc/config/ia64/t-softfp-compat 45cb97bd14177f2d809994a800675ceb libgcc/config/ia64/tf-signs.c ! 95ef0714d3238260a7db083d12f4a478 libgcc/config/libbid/ChangeLog 86e150f40ebcb97e568366a5cb38cbbe libgcc/config/libbid/_addsub_dd.c ded9495633ce7c1e30d900eae5f9a599 libgcc/config/libbid/_addsub_sd.c d26f72ff45dfd7210a6a33a599274515 libgcc/config/libbid/_addsub_td.c *************** c7b70dcc1f2024624fcba54a60ffcdda libgcc *** 31593,31599 **** c326222d0001569c09d987898e433cee libgcc/shared-object.mk e46c2a78dca584dfd7a4b4673666ab86 libgcc/siditi-object.mk 4f944647ef4ccaaaf9bb117b88d3cfd8 libgcc/static-object.mk ! a3c55d0ee2668cb48260ae4a41131b75 libgfortran/ChangeLog 2c771a7b083f9d4ba381a572d357758a libgfortran/ChangeLog-2002 67e64c8bcbf53773807721aeb4785c9e libgfortran/ChangeLog-2003 9d1927b41c85e097fe773c06a3229dba libgfortran/ChangeLog-2004 --- 31671,31677 ---- c326222d0001569c09d987898e433cee libgcc/shared-object.mk e46c2a78dca584dfd7a4b4673666ab86 libgcc/siditi-object.mk 4f944647ef4ccaaaf9bb117b88d3cfd8 libgcc/static-object.mk ! 8dfa79449a111d04802f988c0232c061 libgfortran/ChangeLog 2c771a7b083f9d4ba381a572d357758a libgfortran/ChangeLog-2002 67e64c8bcbf53773807721aeb4785c9e libgfortran/ChangeLog-2003 9d1927b41c85e097fe773c06a3229dba libgfortran/ChangeLog-2004 *************** a3c55d0ee2668cb48260ae4a41131b75 libgfo *** 31601,31618 **** 23d4aed9436c60cc4dd21836ddc910d2 libgfortran/ChangeLog-2006 a9e612cb5a2fff3038f786cb77a8f046 libgfortran/ChangeLog-2007 8e5a5fa51b716a55f422f8b0f93e1592 libgfortran/Makefile.am ! 65a5078edc8c5c5166f684dea1bf1e00 libgfortran/Makefile.in 7d3c64e165f72ea2234439913201d505 libgfortran/acinclude.m4 c0fb94551441f407db8e871ccac2e78d libgfortran/aclocal.m4 dcff9854c4eb2bbd443173a5aefe1895 libgfortran/c99_protos.h 80231af422b066964afaa6ac7df69e07 libgfortran/config.h.in ! 8bd3034fa76f83d204a0453ad53b68be libgfortran/config/fpu-387.h a0af124ab60478367c82365e809b1b9e libgfortran/config/fpu-aix.h ef879c1f693263fd0f162f58ace05d45 libgfortran/config/fpu-generic.h 0084c057da8647cb6423a20e7ab970b8 libgfortran/config/fpu-glibc.h 829ea59792674375febea191105c87a7 libgfortran/config/fpu-sysv.h 2b1b86f05b530f81205ef813ffe59eb7 libgfortran/configure ! 7a5dcbe05648507047333a6587901d26 libgfortran/configure.ac 5bb05782f75c25bb6f3fea77915d2d01 libgfortran/configure.host d7d54e6cede8107513e828e9ab5ab0c9 libgfortran/fmain.c 778cb94e2fa574da3953aeb514b7083c libgfortran/generated/_abs_c10.F90 --- 31679,31696 ---- 23d4aed9436c60cc4dd21836ddc910d2 libgfortran/ChangeLog-2006 a9e612cb5a2fff3038f786cb77a8f046 libgfortran/ChangeLog-2007 8e5a5fa51b716a55f422f8b0f93e1592 libgfortran/Makefile.am ! dbb75373932fad6741552fae60c8ddc6 libgfortran/Makefile.in 7d3c64e165f72ea2234439913201d505 libgfortran/acinclude.m4 c0fb94551441f407db8e871ccac2e78d libgfortran/aclocal.m4 dcff9854c4eb2bbd443173a5aefe1895 libgfortran/c99_protos.h 80231af422b066964afaa6ac7df69e07 libgfortran/config.h.in ! a14d3dcf4a4937dfe69616d20a5fea33 libgfortran/config/fpu-387.h a0af124ab60478367c82365e809b1b9e libgfortran/config/fpu-aix.h ef879c1f693263fd0f162f58ace05d45 libgfortran/config/fpu-generic.h 0084c057da8647cb6423a20e7ab970b8 libgfortran/config/fpu-glibc.h 829ea59792674375febea191105c87a7 libgfortran/config/fpu-sysv.h 2b1b86f05b530f81205ef813ffe59eb7 libgfortran/configure ! 0a30b817209bd5cc259d44c3c0796046 libgfortran/configure.ac 5bb05782f75c25bb6f3fea77915d2d01 libgfortran/configure.host d7d54e6cede8107513e828e9ab5ab0c9 libgfortran/fmain.c 778cb94e2fa574da3953aeb514b7083c libgfortran/generated/_abs_c10.F90 *************** cd4871a26dea20fc4b56b83232ae909b libgfo *** 32173,32179 **** 75c7250f8fc1fa03a8f74ec1ceea92bc libgfortran/io/inquire.c 325fb163c88f33e01e3a39b197718ae5 libgfortran/io/intrinsics.c 69a0483bbd140d342184a68bd1f0802c libgfortran/io/io.h ! 0223368f27e58becf4e4dfade8d4bb04 libgfortran/io/list_read.c e3d0222201de41d61352a9382d8d87a6 libgfortran/io/lock.c 7bc93382a79c7a6ec7499ebbdf333834 libgfortran/io/open.c c4b7291214389015063c97e6c10a2b0a libgfortran/io/read.c --- 32251,32257 ---- 75c7250f8fc1fa03a8f74ec1ceea92bc libgfortran/io/inquire.c 325fb163c88f33e01e3a39b197718ae5 libgfortran/io/intrinsics.c 69a0483bbd140d342184a68bd1f0802c libgfortran/io/io.h ! 0bb35d055e8eeec0dbd48c6977f836fd libgfortran/io/list_read.c e3d0222201de41d61352a9382d8d87a6 libgfortran/io/lock.c 7bc93382a79c7a6ec7499ebbdf333834 libgfortran/io/open.c c4b7291214389015063c97e6c10a2b0a libgfortran/io/read.c *************** c4b7291214389015063c97e6c10a2b0a libgfo *** 32182,32188 **** 2d7cab0c200f88072a76cb9db85307d1 libgfortran/io/unit.c 62290c2c48784e299256004fb8c5fe11 libgfortran/io/unix.c 76a373fbeaa5a92f45721e26a5923299 libgfortran/io/write.c ! e907f57d335878fa603cdcfeee0c88ba libgfortran/io/write_float.def 302582db6a96addac19c425768a569b7 libgfortran/libgfortran.h 25a776e70521ce48fb1bfdd7bfa1a646 libgfortran/libtool-version 0ababe761c83a69a7a94f2d1e8b4b0b8 libgfortran/m4/all.m4 --- 32260,32266 ---- 2d7cab0c200f88072a76cb9db85307d1 libgfortran/io/unit.c 62290c2c48784e299256004fb8c5fe11 libgfortran/io/unix.c 76a373fbeaa5a92f45721e26a5923299 libgfortran/io/write.c ! bc480c8f4bfb02c430c1226486a7dde0 libgfortran/io/write_float.def 302582db6a96addac19c425768a569b7 libgfortran/libgfortran.h 25a776e70521ce48fb1bfdd7bfa1a646 libgfortran/libtool-version 0ababe761c83a69a7a94f2d1e8b4b0b8 libgfortran/m4/all.m4 *************** bb7b00b09e55b42f687c4a55526d857f libgfo *** 32245,32253 **** 7abfa5ebb9488b9ae9fda8bb9aa388e9 libgfortran/runtime/select_inc.c 167f1718b833039909bb6da7cb5b0dae libgfortran/runtime/stop.c feb49d9c3840163547cc8b4824eff95d libgfortran/runtime/string.c ! d5180d9c06bcb17409ad37d9ac46db20 libgomp/ChangeLog a957fa342ad14a799be6ec12665a02f2 libgomp/Makefile.am ! 6582e01473d0fdc94fb3f0e3a602735f libgomp/Makefile.in e271ea66cfb75eb496bd2ab072faf5e2 libgomp/acinclude.m4 5679105c23a1b8cd0f6931336807c344 libgomp/aclocal.m4 483ce5945453d8141398f4fe33014658 libgomp/alloc.c --- 32323,32331 ---- 7abfa5ebb9488b9ae9fda8bb9aa388e9 libgfortran/runtime/select_inc.c 167f1718b833039909bb6da7cb5b0dae libgfortran/runtime/stop.c feb49d9c3840163547cc8b4824eff95d libgfortran/runtime/string.c ! 10d2c86ea2a7c603d621232836c113e8 libgomp/ChangeLog a957fa342ad14a799be6ec12665a02f2 libgomp/Makefile.am ! 1fd120cd12531f025c5d1e790ce28544 libgomp/Makefile.in e271ea66cfb75eb496bd2ab072faf5e2 libgomp/acinclude.m4 5679105c23a1b8cd0f6931336807c344 libgomp/aclocal.m4 483ce5945453d8141398f4fe33014658 libgomp/alloc.c *************** efc434763cbe71b67359f1858f6c9480 libgom *** 32294,32300 **** d049888a1f363f789ed2a9d80956bc66 libgomp/config/posix95/lock.c a7bd34c2bfa880ac20c3dd26741f05f4 libgomp/config/posix95/omp-lock.h dde74499bfac2f781e122aff525e756d libgomp/configure ! 30ed6212c6f71a6ff6ec763e9e745357 libgomp/configure.ac 36b3805a4e653da431521a58586162d7 libgomp/configure.tgt eeb570991118428a63a9a984a972a7a7 libgomp/critical.c dc42a04242fd6a5c3320aabf352baa6c libgomp/env.c --- 32372,32378 ---- d049888a1f363f789ed2a9d80956bc66 libgomp/config/posix95/lock.c a7bd34c2bfa880ac20c3dd26741f05f4 libgomp/config/posix95/omp-lock.h dde74499bfac2f781e122aff525e756d libgomp/configure ! a49c9df380f9928b51226ebe2b4be781 libgomp/configure.ac 36b3805a4e653da431521a58586162d7 libgomp/configure.tgt eeb570991118428a63a9a984a972a7a7 libgomp/critical.c dc42a04242fd6a5c3320aabf352baa6c libgomp/env.c *************** dc42a04242fd6a5c3320aabf352baa6c libgom *** 32303,32309 **** acc3925b8f43fb985313663c30103701 libgomp/iter.c cf8a700a297d5418b1a70e667db6d660 libgomp/iter_ull.c 58f614974a58d0fe0d3526f923dfe827 libgomp/libgomp.h ! 402b029f2bcb4f29d11d35db825228ff libgomp/libgomp.info 6d09628d0d1ec45377b20f3e3391395b libgomp/libgomp.map 591ff20dfd2b81e3c919249b5db8a967 libgomp/libgomp.spec.in c6e20f2bcf9c5b57cf8e597f1f11bbf5 libgomp/libgomp.texi --- 32381,32387 ---- acc3925b8f43fb985313663c30103701 libgomp/iter.c cf8a700a297d5418b1a70e667db6d660 libgomp/iter_ull.c 58f614974a58d0fe0d3526f923dfe827 libgomp/libgomp.h ! b9a5549022c520d677ab1c58912b33bc libgomp/libgomp.info 6d09628d0d1ec45377b20f3e3391395b libgomp/libgomp.map 591ff20dfd2b81e3c919249b5db8a967 libgomp/libgomp.spec.in c6e20f2bcf9c5b57cf8e597f1f11bbf5 libgomp/libgomp.texi *************** a41af349d54ba08799297bcd040e9521 libgom *** 32376,32381 **** --- 32454,32460 ---- f288ebef02de5e114b5c8526bad9dc19 libgomp/testsuite/libgomp.c++/pr35185.C d65773670d221b74aa6b327a1de57dff libgomp/testsuite/libgomp.c++/pr38650.C 32eed8fe7a118de6fa22a9b1ffec6c53 libgomp/testsuite/libgomp.c++/pr39573.C + 467dc8995782492f741eb1d9548a272b libgomp/testsuite/libgomp.c++/pr43893.C a594cebdf052900dd0c8792068e14d85 libgomp/testsuite/libgomp.c++/reduction-1.C 6a724210e4cb30df7ade4ef7ee0aa83e libgomp/testsuite/libgomp.c++/reduction-2.C e6be7ac480ea1328785bc17e9c2ecc9a libgomp/testsuite/libgomp.c++/reduction-3.C *************** e6be7ac480ea1328785bc17e9c2ecc9a libgom *** 32385,32396 **** 989f18f6eb61c820627dc227d206e00d libgomp/testsuite/libgomp.c++/single-1.C fa90d4613f21c2fc2203f662585b40a3 libgomp/testsuite/libgomp.c++/single-2.C 7d0f24f8edab30e9e5aa2d3f5133e9f4 libgomp/testsuite/libgomp.c++/single-3.C ! 17951aff38a82de031b40053b6c9f0b6 libgomp/testsuite/libgomp.c++/task-1.C 5532f36e28daf97021228ebf72885697 libgomp/testsuite/libgomp.c++/task-2.C 27531bc2a807e1107292fe33e894f8a0 libgomp/testsuite/libgomp.c++/task-3.C 0d8cf66e014b36ac1b99ff0ada601105 libgomp/testsuite/libgomp.c++/task-4.C 6cc1ae8058007b8afab8f6686080f1dc libgomp/testsuite/libgomp.c++/task-5.C ! b70675a5fe079a3bc3b265d7bb6f2c90 libgomp/testsuite/libgomp.c++/task-6.C e58d1f21c043b7905dfd8072efa52a05 libgomp/testsuite/libgomp.c++/task-7.C 7e532c1149924de0a21af04b07136701 libgomp/testsuite/libgomp.c/appendix-a/a.15.1.c 16dafd2aadb62eb39423e7b2deb46cc1 libgomp/testsuite/libgomp.c/appendix-a/a.16.1.c --- 32464,32475 ---- 989f18f6eb61c820627dc227d206e00d libgomp/testsuite/libgomp.c++/single-1.C fa90d4613f21c2fc2203f662585b40a3 libgomp/testsuite/libgomp.c++/single-2.C 7d0f24f8edab30e9e5aa2d3f5133e9f4 libgomp/testsuite/libgomp.c++/single-3.C ! 4755f8276f35f740d59135af4e5242f0 libgomp/testsuite/libgomp.c++/task-1.C 5532f36e28daf97021228ebf72885697 libgomp/testsuite/libgomp.c++/task-2.C 27531bc2a807e1107292fe33e894f8a0 libgomp/testsuite/libgomp.c++/task-3.C 0d8cf66e014b36ac1b99ff0ada601105 libgomp/testsuite/libgomp.c++/task-4.C 6cc1ae8058007b8afab8f6686080f1dc libgomp/testsuite/libgomp.c++/task-5.C ! f3fc31477cdff517af07a5eaed3977b4 libgomp/testsuite/libgomp.c++/task-6.C e58d1f21c043b7905dfd8072efa52a05 libgomp/testsuite/libgomp.c++/task-7.C 7e532c1149924de0a21af04b07136701 libgomp/testsuite/libgomp.c/appendix-a/a.15.1.c 16dafd2aadb62eb39423e7b2deb46cc1 libgomp/testsuite/libgomp.c/appendix-a/a.16.1.c *************** bc3be9337646882bc8533bbbc9f01dd6 libgom *** 32506,32511 **** --- 32585,32591 ---- 29fe07764851d55e5c590ddee1bdb8bb libgomp/testsuite/libgomp.c/pr39591-3.c 006c9241a06131d8b1ad87c0a7a58349 libgomp/testsuite/libgomp.c/pr42029.c 965ea816877f4bf791f4bf1a1aeef3cf libgomp/testsuite/libgomp.c/pr42942.c + 3b6d62c4c9f8e8ce4656f6342157558e libgomp/testsuite/libgomp.c/pr43893.c ea7c9e74bda402b1663a903b26400fab libgomp/testsuite/libgomp.c/private-1.c a594cebdf052900dd0c8792068e14d85 libgomp/testsuite/libgomp.c/reduction-1.c 6a724210e4cb30df7ade4ef7ee0aa83e libgomp/testsuite/libgomp.c/reduction-2.c *************** ee9b4e6286720c9e31c8afb5899375cf libgom *** 32645,32651 **** 10994954f2e9828dd2a982c245ff4a59 libgomp/testsuite/libgomp.fortran/workshare1.f90 66ffa69cccfc856bc101f397c0632b69 libgomp/work.c a916467b91076e631dd8edb7424769c7 libiberty/COPYING.LIB ! 46fa81b1e841bde09da5b2f43e6932e8 libiberty/ChangeLog 5d7d26fcf11db09a97b1dc5814d59dcd libiberty/Makefile.in 294191545dc71f5ad13229b0a5bfd7b1 libiberty/README 8797cb1a6faa84f3c7fe3d12164a4b13 libiberty/_doprnt.c --- 32725,32731 ---- 10994954f2e9828dd2a982c245ff4a59 libgomp/testsuite/libgomp.fortran/workshare1.f90 66ffa69cccfc856bc101f397c0632b69 libgomp/work.c a916467b91076e631dd8edb7424769c7 libiberty/COPYING.LIB ! 4ea224e26ced6708b6ade55f60f5bbd0 libiberty/ChangeLog 5d7d26fcf11db09a97b1dc5814d59dcd libiberty/Makefile.in 294191545dc71f5ad13229b0a5bfd7b1 libiberty/README 8797cb1a6faa84f3c7fe3d12164a4b13 libiberty/_doprnt.c *************** fdaf5fdc2a84ff34103604588aea1a3b libibe *** 32675,32681 **** e2988fc11a09ff9f65903ff8a25dc4f2 libiberty/configure.ac a8959f1d1758eb14819753023f89d199 libiberty/copying-lib.texi fe053283d3559af3ec5cac45f8ead009 libiberty/copysign.c ! fc64ad780a913e0089bdc649049031c7 libiberty/cp-demangle.c 8cea50969b39425036204cd5e6736d6f libiberty/cp-demangle.h a57edfd55211c46358188905b2dfac7d libiberty/cp-demint.c efdae98b615eb04085dd967fbe618295 libiberty/cplus-dem.c --- 32755,32761 ---- e2988fc11a09ff9f65903ff8a25dc4f2 libiberty/configure.ac a8959f1d1758eb14819753023f89d199 libiberty/copying-lib.texi fe053283d3559af3ec5cac45f8ead009 libiberty/copysign.c ! da9e1b9c3dd7b3c20779fecf04b3ddc7 libiberty/cp-demangle.c 8cea50969b39425036204cd5e6736d6f libiberty/cp-demangle.h a57edfd55211c46358188905b2dfac7d libiberty/cp-demint.c efdae98b615eb04085dd967fbe618295 libiberty/cplus-dem.c *************** f824ac0dcaa3a91b48d01cc80a7d17ef libibe *** 32761,32768 **** 26196a9a92fae743a06d65f0e081084b libiberty/strtoul.c 9e1bb6fe95ebb6415672ddf1da29ec65 libiberty/strverscmp.c 8f24f8939540ed6d58ad0dcdf1132562 libiberty/testsuite/Makefile.in ! f6f1cf5cc84a601d5fb7341320c8989f libiberty/testsuite/demangle-expected ! 260c6daa082aed2403b1a5b12d233f27 libiberty/testsuite/test-demangle.c 9c8adfe97eb319577a25393de6ee66c8 libiberty/testsuite/test-expandargv.c e9e958dbfc45a08dbbbbe48c83d3987e libiberty/testsuite/test-pexecute.c 6b513119d8c36af928821e8ec24265d7 libiberty/tmpnam.c --- 32841,32848 ---- 26196a9a92fae743a06d65f0e081084b libiberty/strtoul.c 9e1bb6fe95ebb6415672ddf1da29ec65 libiberty/strverscmp.c 8f24f8939540ed6d58ad0dcdf1132562 libiberty/testsuite/Makefile.in ! 0d759badc64340c6911e176fcd9a8fa3 libiberty/testsuite/demangle-expected ! 894f594269148278da40e15c8297c10c libiberty/testsuite/test-demangle.c 9c8adfe97eb319577a25393de6ee66c8 libiberty/testsuite/test-expandargv.c e9e958dbfc45a08dbbbbe48c83d3987e libiberty/testsuite/test-pexecute.c 6b513119d8c36af928821e8ec24265d7 libiberty/tmpnam.c *************** cdc140ce93944c5bb2ac62cd3dfd86d6 libibe *** 32783,32789 **** 6f774a92661ca4a067f1691a7925524b libiberty/xstrerror.c c6e7ef53b4ff115a136d917511222656 libiberty/xstrndup.c 94d55d512a9ba36caa9b7df079bae19f libjava/COPYING ! 118ce9c5a7fc6a69edb1dea0901edc9f libjava/ChangeLog 03e1f38b916604fdf1470238201325f3 libjava/ChangeLog-1998 691acb61fbd6a2235826ff55db5578be libjava/ChangeLog-1999 b58c6701706771a02bf00a77666941ef libjava/ChangeLog-2000 --- 32863,32869 ---- 6f774a92661ca4a067f1691a7925524b libiberty/xstrerror.c c6e7ef53b4ff115a136d917511222656 libiberty/xstrndup.c 94d55d512a9ba36caa9b7df079bae19f libjava/COPYING ! 73b21503db512341a4c15460b6c0a6b4 libjava/ChangeLog 03e1f38b916604fdf1470238201325f3 libjava/ChangeLog-1998 691acb61fbd6a2235826ff55db5578be libjava/ChangeLog-1999 b58c6701706771a02bf00a77666941ef libjava/ChangeLog-2000 *************** ae961717bc1539baf6df7fd0fe9c323e libjav *** 32798,32804 **** 1cb331bff490ae09303ec8f39f4a33a0 libjava/HACKING e6044391ca5876bd430bc51e9e144cf6 libjava/LIBGCJ_LICENSE 8a0dadc43dc62e551d72c54c2293c947 libjava/Makefile.am ! fe1da90119be3770e5afd8e93479de45 libjava/Makefile.in 9dd432872e3bbb6e7cd07279a4a71baa libjava/NEWS b8af03ff64b9879992c9382503d9910e libjava/README fcab9c26cd6f539addaab81491b62c25 libjava/THANKS --- 32878,32884 ---- 1cb331bff490ae09303ec8f39f4a33a0 libjava/HACKING e6044391ca5876bd430bc51e9e144cf6 libjava/LIBGCJ_LICENSE 8a0dadc43dc62e551d72c54c2293c947 libjava/Makefile.am ! e153deed7c580ab965c1520c91d82c1f libjava/Makefile.in 9dd432872e3bbb6e7cd07279a4a71baa libjava/NEWS b8af03ff64b9879992c9382503d9910e libjava/README fcab9c26cd6f539addaab81491b62c25 libjava/THANKS *************** de54f80484e640306e109e785e4611c8 libjav *** 32819,32825 **** 880a25226e4e4e4c241663041d24f8dd libjava/classpath/AUTHORS efd97e0bb913655e0c8b16fa78bdded4 libjava/classpath/BUGS af0004801732bc4b20d90f351cf80510 libjava/classpath/COPYING ! b722b6bb91db610f8daaf22c1aa40d87 libjava/classpath/ChangeLog 3418fae58de967afe26d915a4b18d82c libjava/classpath/ChangeLog-2003 a5b72adb94a3c362738b0f52e57a82af libjava/classpath/ChangeLog-2004 61159c6e0802d0d2a92b3051003db5c5 libjava/classpath/ChangeLog-2005 --- 32899,32905 ---- 880a25226e4e4e4c241663041d24f8dd libjava/classpath/AUTHORS efd97e0bb913655e0c8b16fa78bdded4 libjava/classpath/BUGS af0004801732bc4b20d90f351cf80510 libjava/classpath/COPYING ! 9b2adeb1ea7bdbe3f6df6bb4d7747975 libjava/classpath/ChangeLog 3418fae58de967afe26d915a4b18d82c libjava/classpath/ChangeLog-2003 a5b72adb94a3c362738b0f52e57a82af libjava/classpath/ChangeLog-2004 61159c6e0802d0d2a92b3051003db5c5 libjava/classpath/ChangeLog-2005 *************** b35964059a02f01f39b05a95b401f586 libjav *** 32835,32841 **** 60f30af7e6443cf9bf9d8c91e8678dd8 libjava/classpath/INSTALL 92acc79f1f429143f4624d07b253702a libjava/classpath/LICENSE ffe581cf85bb751dc999fa9b1d565bcf libjava/classpath/Makefile.am ! ee8167c35d6f60f314ee0f5493b604b1 libjava/classpath/Makefile.in 2df774fbc2b313bf7213a9236ce80910 libjava/classpath/NEWS ae621062c33128309ab96315647a1ee2 libjava/classpath/README 80ca2ee11f57237001b9704f871ea5a0 libjava/classpath/THANKYOU --- 32915,32921 ---- 60f30af7e6443cf9bf9d8c91e8678dd8 libjava/classpath/INSTALL 92acc79f1f429143f4624d07b253702a libjava/classpath/LICENSE ffe581cf85bb751dc999fa9b1d565bcf libjava/classpath/Makefile.am ! 22acd1ff4854c38a56b2f2fa75b90ff3 libjava/classpath/Makefile.in 2df774fbc2b313bf7213a9236ce80910 libjava/classpath/NEWS ae621062c33128309ab96315647a1ee2 libjava/classpath/README 80ca2ee11f57237001b9704f871ea5a0 libjava/classpath/THANKYOU *************** b2a35e98453194ca837c363ee9c0d379 libjav *** 32846,32852 **** 750ac5e3ea012afd503db973cb076f70 libjava/classpath/config.guess 21e1bf1c3580193cf0906851326a0d64 libjava/classpath/config.sub b9ffd088c097ce1f0542b01af7d012f3 libjava/classpath/configure ! 6a2e298d4addb6a2f6cef2a5ba83ac47 libjava/classpath/configure.ac 534084afb552747d884a45353769fa29 libjava/classpath/depcomp a6cedb4991503f803e9f0870daf59c13 libjava/classpath/doc/.cvsignore 6a196932c60abb48459517e2d6e8eedd libjava/classpath/doc/Makefile.am --- 32926,32932 ---- 750ac5e3ea012afd503db973cb076f70 libjava/classpath/config.guess 21e1bf1c3580193cf0906851326a0d64 libjava/classpath/config.sub b9ffd088c097ce1f0542b01af7d012f3 libjava/classpath/configure ! 3d8b080d6ffdf553b007d1ba3c26f802 libjava/classpath/configure.ac 534084afb552747d884a45353769fa29 libjava/classpath/depcomp a6cedb4991503f803e9f0870daf59c13 libjava/classpath/doc/.cvsignore 6a196932c60abb48459517e2d6e8eedd libjava/classpath/doc/Makefile.am *************** f5c6a4723cbe101a2c000b83875c2326 libjav *** 32856,32876 **** b343eec566430e85d1f95c21438aa4ee libjava/classpath/doc/api/Makefile.am 179ea612146ae215bc3e7790ab2369e4 libjava/classpath/doc/api/Makefile.in 063a948da1da1787e5ad8af8cd260ffe libjava/classpath/doc/cp-hacking.texinfo ! 1b5e1b1960ddbfa7413c19df53fc4b6e libjava/classpath/doc/cp-tools.info 2f9243a9d8681fb57cfc14ea3839b38e libjava/classpath/doc/cp-tools.texinfo 3155d9bd9a7bf4aff2ff0dfe4a2cb878 libjava/classpath/doc/cp-vmintegration.texinfo ! 3b1088ff8db1e19b43ce4d63effb349e libjava/classpath/doc/gappletviewer.1 ! 5984b7c60aa7487c1a4228da5554acab libjava/classpath/doc/gjar.1 ! 58c88f466d24b238b10e68ff57d07c11 libjava/classpath/doc/gjarsigner.1 ! 3194f559c842fe30858e4b4dd2587f20 libjava/classpath/doc/gjavah.1 ! e9d47a60befc101045f48fc79087e505 libjava/classpath/doc/gjdoc.1 ! 00ae19f29ab1cc486c7dea5bc9c9f5ba libjava/classpath/doc/gkeytool.1 ! 046c82d75ea8fe2bc43f23910c1c528c libjava/classpath/doc/gnative2ascii.1 ! 160b8c598e00416ed8b50f16b15a2fd8 libjava/classpath/doc/gorbd.1 ! 08b462255357232bd111a83cfe8cd78d libjava/classpath/doc/grmid.1 ! f8afb2adf1b9cb9c1277cda29138bb05 libjava/classpath/doc/grmiregistry.1 ! 1c95bf3737ed1721dd5dedb6abf578e6 libjava/classpath/doc/gserialver.1 ! 9c439fa3fc4870cfe5c90d18abe5e66f libjava/classpath/doc/gtnameserv.1 7e4e31659df1c7e815f9151958dceef2 libjava/classpath/doc/texi2pod.pl 55dea7a47b6450cdcb103c76295441bd libjava/classpath/doc/texinfo.tex b1e0c0c30547d57d7a09b04d47c70b06 libjava/classpath/examples/.cvsignore --- 32936,32956 ---- b343eec566430e85d1f95c21438aa4ee libjava/classpath/doc/api/Makefile.am 179ea612146ae215bc3e7790ab2369e4 libjava/classpath/doc/api/Makefile.in 063a948da1da1787e5ad8af8cd260ffe libjava/classpath/doc/cp-hacking.texinfo ! 516f0d65b814bc50ea4ed28d70976297 libjava/classpath/doc/cp-tools.info 2f9243a9d8681fb57cfc14ea3839b38e libjava/classpath/doc/cp-tools.texinfo 3155d9bd9a7bf4aff2ff0dfe4a2cb878 libjava/classpath/doc/cp-vmintegration.texinfo ! f0d68072c767504b2f36b80d17e8a98e libjava/classpath/doc/gappletviewer.1 ! c9985014760b6ed229508dc30eaa7936 libjava/classpath/doc/gjar.1 ! 80a853e03ee64e2462b394d945ffa39c libjava/classpath/doc/gjarsigner.1 ! d99b73fb229e8201ebf7f8054e0f7734 libjava/classpath/doc/gjavah.1 ! 8d3058684dd2b938398640139d3fc808 libjava/classpath/doc/gjdoc.1 ! c3390db3eefb7bd698e577f77e6d55f0 libjava/classpath/doc/gkeytool.1 ! ff1d0065a4a46726877079d2c2559563 libjava/classpath/doc/gnative2ascii.1 ! 1a54cdd5430dc4d0231fa9b91710d1be libjava/classpath/doc/gorbd.1 ! eee39a4250c0d4a482509f9cccbed889 libjava/classpath/doc/grmid.1 ! 577b5a0716957bb86457c50dc9b1c62a libjava/classpath/doc/grmiregistry.1 ! d04e805764de12248b2b8ca7f1537076 libjava/classpath/doc/gserialver.1 ! eb3e147bf14f72865b29661602f1687d libjava/classpath/doc/gtnameserv.1 7e4e31659df1c7e815f9151958dceef2 libjava/classpath/doc/texi2pod.pl 55dea7a47b6450cdcb103c76295441bd libjava/classpath/doc/texinfo.tex b1e0c0c30547d57d7a09b04d47c70b06 libjava/classpath/examples/.cvsignore *************** de2c5416da259527496de495ea98683d libjav *** 34853,34861 **** 65482f380a3f65305b55717c5dd5856e libjava/classpath/gnu/javax/print/ipp/IppDelimiterTag.java f52551880d67a00b20db92467a007722 libjava/classpath/gnu/javax/print/ipp/IppException.java 7b4155229e57cea8cc31440147f39147 libjava/classpath/gnu/javax/print/ipp/IppMultiDocPrintService.java ! e0d266956f919548053d033149afc89d libjava/classpath/gnu/javax/print/ipp/IppPrintService.java ! d12357d8d4fbf0a07ff9bb95d3a6b3a7 libjava/classpath/gnu/javax/print/ipp/IppRequest.java ! 78fc370f06622aed6d01eee0ade001e4 libjava/classpath/gnu/javax/print/ipp/IppResponse.java 0dc5c6d16af5a389de9b7a0a4e06fba2 libjava/classpath/gnu/javax/print/ipp/IppStatusCode.java 62f86da750e1119c4c603e80eefda7b2 libjava/classpath/gnu/javax/print/ipp/IppUtilities.java cdb77f145f97f74467e8205e607f1d51 libjava/classpath/gnu/javax/print/ipp/IppValueTag.java --- 34933,34941 ---- 65482f380a3f65305b55717c5dd5856e libjava/classpath/gnu/javax/print/ipp/IppDelimiterTag.java f52551880d67a00b20db92467a007722 libjava/classpath/gnu/javax/print/ipp/IppException.java 7b4155229e57cea8cc31440147f39147 libjava/classpath/gnu/javax/print/ipp/IppMultiDocPrintService.java ! 73818e74df2e93b45017092adb497241 libjava/classpath/gnu/javax/print/ipp/IppPrintService.java ! e3f52950b62eecaa800ece594eb026ae libjava/classpath/gnu/javax/print/ipp/IppRequest.java ! 9786b81bbe823e291872459f2e8977bc libjava/classpath/gnu/javax/print/ipp/IppResponse.java 0dc5c6d16af5a389de9b7a0a4e06fba2 libjava/classpath/gnu/javax/print/ipp/IppStatusCode.java 62f86da750e1119c4c603e80eefda7b2 libjava/classpath/gnu/javax/print/ipp/IppUtilities.java cdb77f145f97f74467e8205e607f1d51 libjava/classpath/gnu/javax/print/ipp/IppValueTag.java *************** d26ac13e76886ba97c2a685c6828a7bd libjav *** 36777,36783 **** edd6d794a4656ff2c6dec6ccd504f97b libjava/classpath/java/util/UnknownFormatFlagsException.java 2df89675426f4fbe60abb591962fe5c6 libjava/classpath/java/util/Vector.java bd6ef87fd90bdd21144aa4561c6b65bb libjava/classpath/java/util/WeakHashMap.java ! 3209d81b375c5d1a37e1c2fd2062f63a libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java e1a110459d2dae3cda68f220efdce146 libjava/classpath/java/util/jar/Attributes.java 2c0a4c76cb033866f06e61e6db4df022 libjava/classpath/java/util/jar/JarEntry.java f571c8ed79e5b08fec093d4c35cc181a libjava/classpath/java/util/jar/JarException.java --- 36857,36863 ---- edd6d794a4656ff2c6dec6ccd504f97b libjava/classpath/java/util/UnknownFormatFlagsException.java 2df89675426f4fbe60abb591962fe5c6 libjava/classpath/java/util/Vector.java bd6ef87fd90bdd21144aa4561c6b65bb libjava/classpath/java/util/WeakHashMap.java ! f2d8d3b10d046b86881b1d8fb7da20bf libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java e1a110459d2dae3cda68f220efdce146 libjava/classpath/java/util/jar/Attributes.java 2c0a4c76cb033866f06e61e6db4df022 libjava/classpath/java/util/jar/JarEntry.java f571c8ed79e5b08fec093d4c35cc181a libjava/classpath/java/util/jar/JarException.java *************** f3bbe84f7dfe877f5996ab663d95ae2b libjav *** 37314,37320 **** 2b673fe6bb23738c152494f48dcf197b libjava/classpath/javax/print/attribute/standard/JobSheets.java 6d1e131a7455999e44c0e5e47657ec50 libjava/classpath/javax/print/attribute/standard/JobState.java b4e3614ce2b2324f7d8684edb2c84007 libjava/classpath/javax/print/attribute/standard/JobStateReason.java ! 04a4c66396a10e498134883861a75502 libjava/classpath/javax/print/attribute/standard/JobStateReasons.java 9299a07edbb8fffaa3b9b26946d475f3 libjava/classpath/javax/print/attribute/standard/Media.java 52ff3061484c57c99ee8858aba965b73 libjava/classpath/javax/print/attribute/standard/MediaName.java ddf3e003706e14d0d0561acee0d01b25 libjava/classpath/javax/print/attribute/standard/MediaPrintableArea.java --- 37394,37400 ---- 2b673fe6bb23738c152494f48dcf197b libjava/classpath/javax/print/attribute/standard/JobSheets.java 6d1e131a7455999e44c0e5e47657ec50 libjava/classpath/javax/print/attribute/standard/JobState.java b4e3614ce2b2324f7d8684edb2c84007 libjava/classpath/javax/print/attribute/standard/JobStateReason.java ! 4d4ad287fb90994a9522146d36f95593 libjava/classpath/javax/print/attribute/standard/JobStateReasons.java 9299a07edbb8fffaa3b9b26946d475f3 libjava/classpath/javax/print/attribute/standard/Media.java 52ff3061484c57c99ee8858aba965b73 libjava/classpath/javax/print/attribute/standard/MediaName.java ddf3e003706e14d0d0561acee0d01b25 libjava/classpath/javax/print/attribute/standard/MediaPrintableArea.java *************** c6175e73d8a673bfdaf398d13c3a0189 libjav *** 40271,40281 **** 685ae6c26bf299daafb4a4d1c08171ec libjava/classpath/lib/gnu/javax/print/ipp/IppDelimiterTag.class 045b5c17c2c7b6f2908205dbe51f4f99 libjava/classpath/lib/gnu/javax/print/ipp/IppException.class 46554372b379ccc81291ca836d3f201f libjava/classpath/lib/gnu/javax/print/ipp/IppMultiDocPrintService.class ! bdc6a24c68b031a0502f24a219f970d0 libjava/classpath/lib/gnu/javax/print/ipp/IppPrintService.class ! 1eba408eca77d580dd48db4e9d7df33e libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class ! a0a5c18109ceed9bace891cfdac5484c libjava/classpath/lib/gnu/javax/print/ipp/IppRequest.class ! 791cb78a0ca27b16f9d62e44c786b37e libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class ! 9fd8ed54e8e0fa66151fcc9c372b8bb7 libjava/classpath/lib/gnu/javax/print/ipp/IppResponse.class 72569a20151de156869f8277eedf9b42 libjava/classpath/lib/gnu/javax/print/ipp/IppStatusCode.class e55647cc8e8924c67adb50e6ae26fe71 libjava/classpath/lib/gnu/javax/print/ipp/IppUtilities.class 868403bcda216940e2c94c8302826be0 libjava/classpath/lib/gnu/javax/print/ipp/IppValueTag.class --- 40351,40361 ---- 685ae6c26bf299daafb4a4d1c08171ec libjava/classpath/lib/gnu/javax/print/ipp/IppDelimiterTag.class 045b5c17c2c7b6f2908205dbe51f4f99 libjava/classpath/lib/gnu/javax/print/ipp/IppException.class 46554372b379ccc81291ca836d3f201f libjava/classpath/lib/gnu/javax/print/ipp/IppMultiDocPrintService.class ! 548e79cc8f7428a88a7da3751da398af libjava/classpath/lib/gnu/javax/print/ipp/IppPrintService.class ! 22be2b2f80273b6fde09a5d0eb9db32a libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class ! 3927e064517da14d8f24c73a5ed820be libjava/classpath/lib/gnu/javax/print/ipp/IppRequest.class ! 7cbd41214b78537beb1a32c39e3abe12 libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class ! afd83382f2019ea2b08ef813b61f3b42 libjava/classpath/lib/gnu/javax/print/ipp/IppResponse.class 72569a20151de156869f8277eedf9b42 libjava/classpath/lib/gnu/javax/print/ipp/IppStatusCode.class e55647cc8e8924c67adb50e6ae26fe71 libjava/classpath/lib/gnu/javax/print/ipp/IppUtilities.class 868403bcda216940e2c94c8302826be0 libjava/classpath/lib/gnu/javax/print/ipp/IppValueTag.class *************** ba574692d6f20172b15420dbd27da0bd libjav *** 42463,42474 **** c61948c7a0b7a5096a6be9d714a18502 libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$Values.class 1bc72c2b1039cca7cfdda17b9549fe2f libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap.class 2ebda9623b6575f5ef2772067efbb88d libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListSet.class ! 2e9926a2a85a650dea575493ce1c4798 libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$1.class ! 96b2473cfb82015f17e0242a0ceb4f0b libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$2.class ! 384b52b309b69135a87e4be931af2bc7 libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$3.class ! effa21668ecf99a102468b9007e18e28 libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.class ! 1b4c637a17157f3c2631c0e639bae0ff libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$SubList.class ! 12f67b35230d7eb8383c1ede3dac3e4d libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class 081b87992f28d5c142ea824b0c5459a5 libjava/classpath/lib/java/util/concurrent/CopyOnWriteArraySet.class 5049241280f9764946d8a89dacd674c7 libjava/classpath/lib/java/util/concurrent/CountDownLatch$Sync.class 633d5818893f942ee72cebc09821e33a libjava/classpath/lib/java/util/concurrent/CountDownLatch.class --- 42543,42554 ---- c61948c7a0b7a5096a6be9d714a18502 libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$Values.class 1bc72c2b1039cca7cfdda17b9549fe2f libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap.class 2ebda9623b6575f5ef2772067efbb88d libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListSet.class ! 23bdbf27d3b6e34c8ad9f0ddab07dea3 libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$1.class ! db0c1420e94f227ef8c6f72e816281c4 libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$2.class ! 099f1b34e39ea023a5a89bfcdd51268e libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$3.class ! 27157087bb6320decee7b51093f0d9c2 libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.class ! 73a5081334dab854d73e8cb2bacd8260 libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$SubList.class ! b6a99e6de88ec85e2619ca9f09fbdc38 libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class 081b87992f28d5c142ea824b0c5459a5 libjava/classpath/lib/java/util/concurrent/CopyOnWriteArraySet.class 5049241280f9764946d8a89dacd674c7 libjava/classpath/lib/java/util/concurrent/CountDownLatch$Sync.class 633d5818893f942ee72cebc09821e33a libjava/classpath/lib/java/util/concurrent/CountDownLatch.class *************** feb322faa1fd7ed4484027ffcbcc840a libjav *** 43177,43183 **** f9fc52ee4b59e0c6b0a1fc4355cb1c8a libjava/classpath/lib/javax/print/attribute/standard/JobSheets.class f0ada151b36cd1b342c0d480a0ab5b9a libjava/classpath/lib/javax/print/attribute/standard/JobState.class f2ea5d1598b94ea9b569a1a0033a5288 libjava/classpath/lib/javax/print/attribute/standard/JobStateReason.class ! 75cf04fda5889ce3c53f8e22bacb1a28 libjava/classpath/lib/javax/print/attribute/standard/JobStateReasons.class 4e4df4887be6b89e318e5f634ab39dde libjava/classpath/lib/javax/print/attribute/standard/Media.class 9feb0ba9c6d75029f7125ed574940eef libjava/classpath/lib/javax/print/attribute/standard/MediaName.class d5d66503cf87e8625606a1ac5224cef9 libjava/classpath/lib/javax/print/attribute/standard/MediaPrintableArea.class --- 43257,43263 ---- f9fc52ee4b59e0c6b0a1fc4355cb1c8a libjava/classpath/lib/javax/print/attribute/standard/JobSheets.class f0ada151b36cd1b342c0d480a0ab5b9a libjava/classpath/lib/javax/print/attribute/standard/JobState.class f2ea5d1598b94ea9b569a1a0033a5288 libjava/classpath/lib/javax/print/attribute/standard/JobStateReason.class ! 6dd9f7fef4e72f9a18a8e854019f2178 libjava/classpath/lib/javax/print/attribute/standard/JobStateReasons.class 4e4df4887be6b89e318e5f634ab39dde libjava/classpath/lib/javax/print/attribute/standard/Media.class 9feb0ba9c6d75029f7125ed574940eef libjava/classpath/lib/javax/print/attribute/standard/MediaName.class d5d66503cf87e8625606a1ac5224cef9 libjava/classpath/lib/javax/print/attribute/standard/MediaPrintableArea.class *************** ddc4fbdb92341fefa981794f8ac4d011 libjav *** 46771,46777 **** a9c684cc6f0041cdbdc181faa43e0a74 libjava/classpath/scripts/.cvsignore b6ca3ec1dce161be118a36827b445743 libjava/classpath/scripts/Makefile.am f6c57c92703cb4a1abaecf31df61c700 libjava/classpath/scripts/Makefile.in ! 3529944e5972f83787003b1257060010 libjava/classpath/scripts/check_jni_methods.sh.in 2bebc71ab67b74f7e8afe0c4ef5e3e33 libjava/classpath/scripts/classpath.spec.in 1ae0b90a8193f65e5fa94a8563b5374a libjava/classpath/scripts/generate-locale-list.sh cc8835cb1d85d7e72bd9fb2488ee779c libjava/classpath/scripts/import-cacerts.sh --- 46851,46857 ---- a9c684cc6f0041cdbdc181faa43e0a74 libjava/classpath/scripts/.cvsignore b6ca3ec1dce161be118a36827b445743 libjava/classpath/scripts/Makefile.am f6c57c92703cb4a1abaecf31df61c700 libjava/classpath/scripts/Makefile.in ! 10ad456bc61347e187329c23940d68b0 libjava/classpath/scripts/check_jni_methods.sh.in 2bebc71ab67b74f7e8afe0c4ef5e3e33 libjava/classpath/scripts/classpath.spec.in 1ae0b90a8193f65e5fa94a8563b5374a libjava/classpath/scripts/generate-locale-list.sh cc8835cb1d85d7e72bd9fb2488ee779c libjava/classpath/scripts/import-cacerts.sh *************** ac26f2f5c9382a190763aff47c60d272 libjav *** 46784,46791 **** 0c747e2f535a2a34c771b9a407711117 libjava/classpath/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java 3f08bd06ef029c45616d04bbd5983660 libjava/classpath/sun/reflect/annotation/ExceptionProxy.java aeaf6d218b77faba0f1cbff86204beff libjava/classpath/tools/.cvsignore ! a20f1613c42347b3e6e6f3c2d3df18ef libjava/classpath/tools/Makefile.am ! cce38a79776cc72f7beb9bbfc95b819f libjava/classpath/tools/Makefile.in 03025a704e81cde9a3a54eede984c97c libjava/classpath/tools/README e5d5f3a5429f17358e074bb584e8d0bc libjava/classpath/tools/appletviewer.in 823f9a2a72ec8efb7e42692c6a3d9fb3 libjava/classpath/tools/asm/org/objectweb/asm/AnnotationVisitor.class --- 46864,46871 ---- 0c747e2f535a2a34c771b9a407711117 libjava/classpath/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java 3f08bd06ef029c45616d04bbd5983660 libjava/classpath/sun/reflect/annotation/ExceptionProxy.java aeaf6d218b77faba0f1cbff86204beff libjava/classpath/tools/.cvsignore ! 46064c0e87143d150ae08cffd4dc5696 libjava/classpath/tools/Makefile.am ! 37b6473a955ad395d83a04790b1e0a85 libjava/classpath/tools/Makefile.in 03025a704e81cde9a3a54eede984c97c libjava/classpath/tools/README e5d5f3a5429f17358e074bb584e8d0bc libjava/classpath/tools/appletviewer.in 823f9a2a72ec8efb7e42692c6a3d9fb3 libjava/classpath/tools/asm/org/objectweb/asm/AnnotationVisitor.class *************** c1ce4729db55108c4a08b25266172219 libjav *** 48105,48112 **** 851fa7c60828ad1f1741ff4abdd6e4c2 libjava/classpath/vm/reference/sun/misc/Unsafe.java d8b9d62b3d4b77c2c9db9a8dd775afbf libjava/classpath/vm/reference/sun/reflect/Reflection.java df8921743087523404a2b30bdb83d3a6 libjava/classpath/vm/reference/sun/reflect/misc/ReflectUtil.java ! 02d23fe2376551ccf52480800752b570 libjava/configure ! fe670bef7fad49fb53ecd031d38522ee libjava/configure.ac c093e2cd85abcf74ae46b3ca286a40e7 libjava/configure.host 012f2a1247de717e81d230f40da5bd94 libjava/contrib/aot-compile-rpm.in 3e89d242a7180e4fcb6d15eb171cae47 libjava/contrib/aot-compile.in --- 48185,48192 ---- 851fa7c60828ad1f1741ff4abdd6e4c2 libjava/classpath/vm/reference/sun/misc/Unsafe.java d8b9d62b3d4b77c2c9db9a8dd775afbf libjava/classpath/vm/reference/sun/reflect/Reflection.java df8921743087523404a2b30bdb83d3a6 libjava/classpath/vm/reference/sun/reflect/misc/ReflectUtil.java ! d1aaa2b377b184414e848952fab0a76a libjava/configure ! c372f83f5a65b2fd99be00fb02088eaa libjava/configure.ac c093e2cd85abcf74ae46b3ca286a40e7 libjava/configure.host 012f2a1247de717e81d230f40da5bd94 libjava/contrib/aot-compile-rpm.in 3e89d242a7180e4fcb6d15eb171cae47 libjava/contrib/aot-compile.in *************** d04590c4dc6a61734d09958671cba4da libjav *** 55062,55070 **** 13fc127864a775b5feed8f9c90cef50f libjava/libgcj.ver 76464737aa7df6509d1446b5716a4c51 libjava/libgcj_bc.c e3eda01d9815f8d24aae2dbd89b68b06 libjava/libltdl/COPYING.LIB ! 7da1cda6f529091a16f387e1e92f965c libjava/libltdl/ChangeLog ! 687405b58bc7fffede3a92c2d9d39bcf libjava/libltdl/Makefile.am ! ac1431b3e2aa810ce3be72c06d06302a libjava/libltdl/Makefile.in 36da24f9facf00b349ea10dba3789d92 libjava/libltdl/README 7faa29e2f82bf6114ec1421c3f4c7b24 libjava/libltdl/acinclude.m4 6f9097b7a1a805c805e9fcefcd50545a libjava/libltdl/aclocal.m4 --- 55142,55150 ---- 13fc127864a775b5feed8f9c90cef50f libjava/libgcj.ver 76464737aa7df6509d1446b5716a4c51 libjava/libgcj_bc.c e3eda01d9815f8d24aae2dbd89b68b06 libjava/libltdl/COPYING.LIB ! 558e50ba6701a9e2677471e76a3806b9 libjava/libltdl/ChangeLog ! 349267319e3d55dcf180a20f85394144 libjava/libltdl/Makefile.am ! e8f658f33319507467cd470b61cc13eb libjava/libltdl/Makefile.in 36da24f9facf00b349ea10dba3789d92 libjava/libltdl/README 7faa29e2f82bf6114ec1421c3f4c7b24 libjava/libltdl/acinclude.m4 6f9097b7a1a805c805e9fcefcd50545a libjava/libltdl/aclocal.m4 *************** d41d8cd98f00b204e9800998ecf8427e libjav *** 56756,56776 **** 434ac04eb066f5075299583492846410 libjava/verify.cc 355440a0c2fb5e16259d7ae381b37ed5 libjava/win32-threads.cc 434d5e5e91727dec004f0d1d1fab47ec libjava/win32.cc ! bebb3254c6ed0302fdca029873560b64 libmudflap/ChangeLog 6d4defe09ae6115619c10f3496c4ab64 libmudflap/Makefile.am ! 39b46b84ef49309117e8d0d20e6571f8 libmudflap/Makefile.in 9883ed42b491d8aea83fdde90561cf2a libmudflap/acinclude.m4 084d14c2c42ad97daae2c3c99920bbb5 libmudflap/aclocal.m4 016a705d0e37d753b493d8b15a7387db libmudflap/config.h.in 56e8cf01fc0f852833ee979d1cadb0d9 libmudflap/configure ! 1e8d81b297cfb6101409ccf4382debe5 libmudflap/configure.ac 5b95ad6add3888b3ac1fd4fc7b3704ca libmudflap/libtool-version 694c90cdce97196ecbcacaf5762d0ef3 libmudflap/mf-heuristics.c ! 1de5d73467755815d091fdfe50e111be libmudflap/mf-hooks1.c 8a5b8b8aa7f00933ce106a9bc195afd8 libmudflap/mf-hooks2.c 396ef46979ed2d86d47fcb9544eb7f0d libmudflap/mf-hooks3.c f580104b7c64d5ce7b2c66d11827c45f libmudflap/mf-impl.h ! b09e2466c023d930165dc0b0ef021c4e libmudflap/mf-runtime.c 105da97de539d731d901a5e64f821c3d libmudflap/mf-runtime.h 8f93cea3023d6f4d27e295ebcc0eef13 libmudflap/testsuite/Makefile.am 3192d37e18d1fdf55d65f1cbf44a0541 libmudflap/testsuite/Makefile.in --- 56836,56856 ---- 434ac04eb066f5075299583492846410 libjava/verify.cc 355440a0c2fb5e16259d7ae381b37ed5 libjava/win32-threads.cc 434d5e5e91727dec004f0d1d1fab47ec libjava/win32.cc ! 438b336b139c49a0f88c22f97fb70f06 libmudflap/ChangeLog 6d4defe09ae6115619c10f3496c4ab64 libmudflap/Makefile.am ! dbd0b2bf416bd70ccf222d66d3d47eda libmudflap/Makefile.in 9883ed42b491d8aea83fdde90561cf2a libmudflap/acinclude.m4 084d14c2c42ad97daae2c3c99920bbb5 libmudflap/aclocal.m4 016a705d0e37d753b493d8b15a7387db libmudflap/config.h.in 56e8cf01fc0f852833ee979d1cadb0d9 libmudflap/configure ! f2795ea95aacf5356aa5bb425966c43b libmudflap/configure.ac 5b95ad6add3888b3ac1fd4fc7b3704ca libmudflap/libtool-version 694c90cdce97196ecbcacaf5762d0ef3 libmudflap/mf-heuristics.c ! d6c2c3d990d841087a64f0f1dea909f5 libmudflap/mf-hooks1.c 8a5b8b8aa7f00933ce106a9bc195afd8 libmudflap/mf-hooks2.c 396ef46979ed2d86d47fcb9544eb7f0d libmudflap/mf-hooks3.c f580104b7c64d5ce7b2c66d11827c45f libmudflap/mf-impl.h ! 9cb08d0003a20030dde0b4775e88a34e libmudflap/mf-runtime.c 105da97de539d731d901a5e64f821c3d libmudflap/mf-runtime.h 8f93cea3023d6f4d27e295ebcc0eef13 libmudflap/testsuite/Makefile.am 3192d37e18d1fdf55d65f1cbf44a0541 libmudflap/testsuite/Makefile.in *************** af2dbd515fe01a4fdcc3fb8037f815b1 libmud *** 56831,56837 **** aa7f3be8fbb9c6a0ff826c01c206365b libmudflap/testsuite/libmudflap.c/fail38-frag.c 33cf873dd7dd7eddf7bad374ef08cdef libmudflap/testsuite/libmudflap.c/fail39-frag.c 0dfd981ee2e625ca1e22d36d0108cc9a libmudflap/testsuite/libmudflap.c/fail4-frag.c ! e6c7b28b6896f9a0da785219b693b806 libmudflap/testsuite/libmudflap.c/fail40-frag.c 9e31dcfd9573de93e2b46d9f0e382376 libmudflap/testsuite/libmudflap.c/fail5-frag.c b86a1b2de633cab886f73596afbb0057 libmudflap/testsuite/libmudflap.c/fail6-frag.c 2a52c49e96c0b6cfecc1650a8fd4f934 libmudflap/testsuite/libmudflap.c/fail7-frag.c --- 56911,56917 ---- aa7f3be8fbb9c6a0ff826c01c206365b libmudflap/testsuite/libmudflap.c/fail38-frag.c 33cf873dd7dd7eddf7bad374ef08cdef libmudflap/testsuite/libmudflap.c/fail39-frag.c 0dfd981ee2e625ca1e22d36d0108cc9a libmudflap/testsuite/libmudflap.c/fail4-frag.c ! acc384ac57e4917edca343c3abe0feb0 libmudflap/testsuite/libmudflap.c/fail40-frag.c 9e31dcfd9573de93e2b46d9f0e382376 libmudflap/testsuite/libmudflap.c/fail5-frag.c b86a1b2de633cab886f73596afbb0057 libmudflap/testsuite/libmudflap.c/fail6-frag.c 2a52c49e96c0b6cfecc1650a8fd4f934 libmudflap/testsuite/libmudflap.c/fail7-frag.c *************** ea6553f0aeedb175208b59b4aaa8e4de libmud *** 56880,56886 **** 4c8b3d3792aa0707c47d0f92500ad3ab libmudflap/testsuite/libmudflap.c/pass49-frag.c 9c44851c5fba91b55b24260e67dccf4e libmudflap/testsuite/libmudflap.c/pass5-frag.c c502e330a2452b0db330811b47612f98 libmudflap/testsuite/libmudflap.c/pass50-frag.c ! 34f8f23d8ea931c121a3081e487f2498 libmudflap/testsuite/libmudflap.c/pass51-frag.c a051a4c55bb7af739947f5202bd4ddff libmudflap/testsuite/libmudflap.c/pass52-frag.c 68b3516885a8c2fcfdba7df5322933ed libmudflap/testsuite/libmudflap.c/pass53-frag.c 41390c98013c5e45819ea44dd1ae77e8 libmudflap/testsuite/libmudflap.c/pass54-frag.c --- 56960,56966 ---- 4c8b3d3792aa0707c47d0f92500ad3ab libmudflap/testsuite/libmudflap.c/pass49-frag.c 9c44851c5fba91b55b24260e67dccf4e libmudflap/testsuite/libmudflap.c/pass5-frag.c c502e330a2452b0db330811b47612f98 libmudflap/testsuite/libmudflap.c/pass50-frag.c ! 151f92828e84b32f2681d9d171cdda49 libmudflap/testsuite/libmudflap.c/pass51-frag.c a051a4c55bb7af739947f5202bd4ddff libmudflap/testsuite/libmudflap.c/pass52-frag.c 68b3516885a8c2fcfdba7df5322933ed libmudflap/testsuite/libmudflap.c/pass53-frag.c 41390c98013c5e45819ea44dd1ae77e8 libmudflap/testsuite/libmudflap.c/pass54-frag.c *************** c5335252518805ab1392c05df57648dd libmud *** 56899,56905 **** 9c6e0ee7556df21372ba89fcb2612d17 libmudflap/testsuite/libmudflap.cth/pass40-frag.c 725a94441658e42a6adf2add0a0a419d libmudflap/testsuite/libmudflap.cth/pass59-frag.c 60168171460c9277504005955b1ea1b8 libmudflap/testsuite/mfconfig.exp.in ! bf0b3b6b3e493b43812ecb51abb49c4e libobjc/ChangeLog 41023a63330b3f3df8d84a9f53f51144 libobjc/Makefile.in c29f84b3cc952e29b58505493f5a83d2 libobjc/NXConstStr.m 989107befe0f3cbd2cdcf09c37efd3f1 libobjc/Object.m --- 56979,56985 ---- 9c6e0ee7556df21372ba89fcb2612d17 libmudflap/testsuite/libmudflap.cth/pass40-frag.c 725a94441658e42a6adf2add0a0a419d libmudflap/testsuite/libmudflap.cth/pass59-frag.c 60168171460c9277504005955b1ea1b8 libmudflap/testsuite/mfconfig.exp.in ! 075f2c4b2afef7154011e9e92c5d9bde libobjc/ChangeLog 41023a63330b3f3df8d84a9f53f51144 libobjc/Makefile.in c29f84b3cc952e29b58505493f5a83d2 libobjc/NXConstStr.m 989107befe0f3cbd2cdcf09c37efd3f1 libobjc/Object.m *************** c90ce33066aad1708a9e1982519b72e6 libobj *** 56957,56969 **** c90ce33066aad1708a9e1982519b72e6 libobjc/thr-vxworks.c 6236bc1c75de340fddb7f419e3b7ec36 libobjc/thr-win32.c fde3505ce0d880daddfed519e0f248a8 libobjc/thr.c ! 1b110a97e1965c73b9988bd0fe34f72f libssp/ChangeLog 8ba45911491ce4f2901104def2a4910b libssp/Makefile.am ! 10621bd0b0e1fc57827c748dc30af8fd libssp/Makefile.in f7d347e8ca11532917d54d715bb150f7 libssp/aclocal.m4 c2c2db45e1d7949f2a534f7301fa0cd5 libssp/config.h.in 1043fdd2a036264aaa58e6f77ab6ec26 libssp/configure ! 860b3199e940b3d49ceacb698c6f3c0f libssp/configure.ac 8068f3e391d39bf2201dfa1ed2a2efc6 libssp/gets-chk.c 0ac32b60459d1fdec670990324d7bdc6 libssp/libtool-version 12fd466620cc9404510b266d5d61eccf libssp/memcpy-chk.c --- 57037,57049 ---- c90ce33066aad1708a9e1982519b72e6 libobjc/thr-vxworks.c 6236bc1c75de340fddb7f419e3b7ec36 libobjc/thr-win32.c fde3505ce0d880daddfed519e0f248a8 libobjc/thr.c ! 9d2dd74a4f15a7a59369580365a73a86 libssp/ChangeLog 8ba45911491ce4f2901104def2a4910b libssp/Makefile.am ! 90d09aef7c998456b5ce1d82b25a88c2 libssp/Makefile.in f7d347e8ca11532917d54d715bb150f7 libssp/aclocal.m4 c2c2db45e1d7949f2a534f7301fa0cd5 libssp/config.h.in 1043fdd2a036264aaa58e6f77ab6ec26 libssp/configure ! 759a306b66987d8524c9c86e5a642feb libssp/configure.ac 8068f3e391d39bf2201dfa1ed2a2efc6 libssp/gets-chk.c 0ac32b60459d1fdec670990324d7bdc6 libssp/libtool-version 12fd466620cc9404510b266d5d61eccf libssp/memcpy-chk.c *************** aeb2f84c5e8ba3215469d507bd2efe57 libssp *** 56986,56992 **** e9ab923d2562bf5f5be6883dfb9f0184 libssp/strncpy-chk.c 5e0d8b8a766c31b12354baec1b7a159c libssp/vsnprintf-chk.c f56ab1f8922a16f7e9e4f5270ae1e34e libssp/vsprintf-chk.c ! e47f71589d25e65b95a1c35cf6c09942 libstdc++-v3/ChangeLog 0cda0576312959181333fb6113d11fca libstdc++-v3/ChangeLog-1998 2ae7a1f1cc67620a3493cac4ec7a49d4 libstdc++-v3/ChangeLog-1999 7b42e2258fc86c55d4a1196c3073f514 libstdc++-v3/ChangeLog-2000 --- 57066,57072 ---- e9ab923d2562bf5f5be6883dfb9f0184 libssp/strncpy-chk.c 5e0d8b8a766c31b12354baec1b7a159c libssp/vsnprintf-chk.c f56ab1f8922a16f7e9e4f5270ae1e34e libssp/vsprintf-chk.c ! 1490dc5b8f0b70ed8061bc5747bbaf13 libstdc++-v3/ChangeLog 0cda0576312959181333fb6113d11fca libstdc++-v3/ChangeLog-1998 2ae7a1f1cc67620a3493cac4ec7a49d4 libstdc++-v3/ChangeLog-1999 7b42e2258fc86c55d4a1196c3073f514 libstdc++-v3/ChangeLog-2000 *************** ebb260ade6f2a919fdecda5202c7bfd9 libstd *** 56998,57004 **** aa0be98f91e3a56f174839361f40a92b libstdc++-v3/ChangeLog-2006 7d4fc72eb88dea51ba950fa5d346ecdd libstdc++-v3/ChangeLog-2007 c0bbdc0878f506a7a0919ef8d161c948 libstdc++-v3/Makefile.am ! 75e6959a246eb54f331c6603702f1662 libstdc++-v3/Makefile.in f372af73db4ac0ad88e43199e1f29e08 libstdc++-v3/README f1c4a6a2ec13e3bf0fedebed3734735e libstdc++-v3/acinclude.m4 b2c1d7985943a346d924a42052e3b2cb libstdc++-v3/aclocal.m4 --- 57078,57084 ---- aa0be98f91e3a56f174839361f40a92b libstdc++-v3/ChangeLog-2006 7d4fc72eb88dea51ba950fa5d346ecdd libstdc++-v3/ChangeLog-2007 c0bbdc0878f506a7a0919ef8d161c948 libstdc++-v3/Makefile.am ! e00c0fb514c194e3f888078b9d8861d5 libstdc++-v3/Makefile.in f372af73db4ac0ad88e43199e1f29e08 libstdc++-v3/README f1c4a6a2ec13e3bf0fedebed3734735e libstdc++-v3/acinclude.m4 b2c1d7985943a346d924a42052e3b2cb libstdc++-v3/aclocal.m4 *************** d140d59e20427babe403cd07e7963631 libstd *** 57157,57163 **** 9b42fb577e461d069aaea8260e5587ef libstdc++-v3/config/os/vxworks/ctype_noninline.h 08de420b5c703e7c50e2ab596ec76d0f libstdc++-v3/config/os/vxworks/os_defines.h 004efc26fbe081e063bb83b6f4d8cc95 libstdc++-v3/configure ! efc59b79b73d7572aefcf379b5639547 libstdc++-v3/configure.ac b9a1a9c7a51a31b739f3defb9bdd777c libstdc++-v3/configure.host 093c37d9a83ba910da5768905e6cead6 libstdc++-v3/crossconfig.m4 97b3ae21efbaf93b2d019522df84c415 libstdc++-v3/doc/Makefile.am --- 57237,57243 ---- 9b42fb577e461d069aaea8260e5587ef libstdc++-v3/config/os/vxworks/ctype_noninline.h 08de420b5c703e7c50e2ab596ec76d0f libstdc++-v3/config/os/vxworks/os_defines.h 004efc26fbe081e063bb83b6f4d8cc95 libstdc++-v3/configure ! a95d38555e4e9612a6c38aa4f4180d03 libstdc++-v3/configure.ac b9a1a9c7a51a31b739f3defb9bdd777c libstdc++-v3/configure.host 093c37d9a83ba910da5768905e6cead6 libstdc++-v3/crossconfig.m4 97b3ae21efbaf93b2d019522df84c415 libstdc++-v3/doc/Makefile.am *************** ed02861948b08578eaabcfb6b0173f67 libstd *** 58398,58404 **** a8fec32706bc04f4e4dcfe9ab9df588c libstdc++-v3/src/chrono.cc 02fae1a430575de8df0f6fc038f0d32b libstdc++-v3/src/codecvt.cc dcc643ebc6077eb47d49c1266ef8e281 libstdc++-v3/src/compatibility-ldbl.cc ! b12670b75e785e2ec58373d951fddce7 libstdc++-v3/src/compatibility.cc 0e5c266a7d3739e22bca82d9328b66e4 libstdc++-v3/src/complex_io.cc 028537b63ff8ad673d98b5fabc6153fc libstdc++-v3/src/concept-inst.cc 67a7d8bc8d9edb370996604e657c020e libstdc++-v3/src/condition_variable.cc --- 58478,58484 ---- a8fec32706bc04f4e4dcfe9ab9df588c libstdc++-v3/src/chrono.cc 02fae1a430575de8df0f6fc038f0d32b libstdc++-v3/src/codecvt.cc dcc643ebc6077eb47d49c1266ef8e281 libstdc++-v3/src/compatibility-ldbl.cc ! a897c57c800676796e6563966bb26110 libstdc++-v3/src/compatibility.cc 0e5c266a7d3739e22bca82d9328b66e4 libstdc++-v3/src/complex_io.cc 028537b63ff8ad673d98b5fabc6153fc libstdc++-v3/src/concept-inst.cc 67a7d8bc8d9edb370996604e657c020e libstdc++-v3/src/condition_variable.cc *************** b328cd1b7c0da5f7e5c62de9e0d0ce30 libstd *** 59335,59341 **** 2c9720f8128e108f8f5890521b2875ca libstdc++-v3/testsuite/22_locale/num_put/put/char/10.cc 6dc392a3190781e8c72c0e2cd75be625 libstdc++-v3/testsuite/22_locale/num_put/put/char/11.cc 8f494d90777ffe7cc3fa027b86b60dd6 libstdc++-v3/testsuite/22_locale/num_put/put/char/12.cc ! 91b9661b6ef8884c6538c6dbdbc9cc47 libstdc++-v3/testsuite/22_locale/num_put/put/char/14220.cc d291b423c9a402ec03a7bb0b9cffa6c8 libstdc++-v3/testsuite/22_locale/num_put/put/char/15565.cc b8d507640f171af94cde5a1a035b9b75 libstdc++-v3/testsuite/22_locale/num_put/put/char/2.cc dfc49ace73d8875cd98dbdef30674616 libstdc++-v3/testsuite/22_locale/num_put/put/char/20909.cc --- 59415,59421 ---- 2c9720f8128e108f8f5890521b2875ca libstdc++-v3/testsuite/22_locale/num_put/put/char/10.cc 6dc392a3190781e8c72c0e2cd75be625 libstdc++-v3/testsuite/22_locale/num_put/put/char/11.cc 8f494d90777ffe7cc3fa027b86b60dd6 libstdc++-v3/testsuite/22_locale/num_put/put/char/12.cc ! 3accbe1bcf8b42bf2d98c91f1d86b97b libstdc++-v3/testsuite/22_locale/num_put/put/char/14220.cc d291b423c9a402ec03a7bb0b9cffa6c8 libstdc++-v3/testsuite/22_locale/num_put/put/char/15565.cc b8d507640f171af94cde5a1a035b9b75 libstdc++-v3/testsuite/22_locale/num_put/put/char/2.cc dfc49ace73d8875cd98dbdef30674616 libstdc++-v3/testsuite/22_locale/num_put/put/char/20909.cc *************** bd7394ca1aa451b3affa46208ca013c0 libstd *** 59357,59363 **** 59f1af852fec60ae8b3598d7f800dc8c libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/10.cc 07080e0e8f2a2f5153b17685c9b2be63 libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/11.cc 184378b53eac6c39846451d8406da5d1 libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/12.cc ! 8b2f8e5b87e430cfd2642842653e5018 libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/14220.cc e40432d663fa0eff3de9b8c1b8cac0a2 libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/15565.cc 0d901bf8d82dc8a4ecb6d65f6677424a libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/2.cc fbff05782d3ed571aca89b986e46c04f libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20909.cc --- 59437,59443 ---- 59f1af852fec60ae8b3598d7f800dc8c libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/10.cc 07080e0e8f2a2f5153b17685c9b2be63 libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/11.cc 184378b53eac6c39846451d8406da5d1 libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/12.cc ! cb69ba2dfec9b126a44ccb9d66341ebc libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/14220.cc e40432d663fa0eff3de9b8c1b8cac0a2 libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/15565.cc 0d901bf8d82dc8a4ecb6d65f6677424a libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/2.cc fbff05782d3ed571aca89b986e46c04f libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20909.cc *************** a4f98d09646f9ed328ac61a6b3954812 libstd *** 60623,60629 **** e153ebfcab16b9dd12e66e6cb46d0166 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/09.cc 6004cfaaf5b90a81bb3a868040bbacbf libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/10.cc 97b290ad1f89e74e6a22134e858cbd68 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/11.cc ! 3cec8af298fb6b0bcd3e749cf65f67e8 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc 7350407d5fa0abb7ba33dec9d2fdbb0d libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc 80b1dcc74ee78a637bb89c0d4299e9a8 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/9555-ia.cc 660d905ec2730df003094b111f69763a libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_badbit_throw.cc --- 60703,60709 ---- e153ebfcab16b9dd12e66e6cb46d0166 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/09.cc 6004cfaaf5b90a81bb3a868040bbacbf libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/10.cc 97b290ad1f89e74e6a22134e858cbd68 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/11.cc ! 0c2b4a5061c25dab9af26407e35a506c libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc 7350407d5fa0abb7ba33dec9d2fdbb0d libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc 80b1dcc74ee78a637bb89c0d4299e9a8 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/9555-ia.cc 660d905ec2730df003094b111f69763a libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_badbit_throw.cc *************** ae1c8ff64f4865ca3f57334f14b6dbe0 libstd *** 60639,60645 **** aa0f5f9664e8f5728bd5c6a424243138 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/09.cc f6635cf2e9069f812008d535c2a464aa libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/10.cc 492b0e88f95cf4e22c808e09abff6fce libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/11.cc ! 77e6c621e875f8ca56bace28b2b587a3 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc 7298f0a4a0af23092c8f13b3c609e0a6 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/13.cc fb7c66dc6929089e11bc183f87aedd48 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/9555-ia.cc b70d94c22d397769bc6a92aff1dc7bd9 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_badbit_throw.cc --- 60719,60725 ---- aa0f5f9664e8f5728bd5c6a424243138 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/09.cc f6635cf2e9069f812008d535c2a464aa libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/10.cc 492b0e88f95cf4e22c808e09abff6fce libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/11.cc ! 4301a93b1a544fd548d5f9bc318fa0c1 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc 7298f0a4a0af23092c8f13b3c609e0a6 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/13.cc fb7c66dc6929089e11bc183f87aedd48 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/9555-ia.cc b70d94c22d397769bc6a92aff1dc7bd9 libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_badbit_throw.cc *************** c550b844ea3ef193e152a1f755b37ded libstd *** 61397,61404 **** 7e5c5f7c55c2123bbfd67112eea25ad0 libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/2.cc 21a9715a13af44f1081de381917562a4 libstdc++-v3/testsuite/30_threads/unique_lock/requirements/explicit_instantiation.cc 60ce61cd1da6f10fecccb306dc296523 libstdc++-v3/testsuite/30_threads/unique_lock/requirements/typedefs.cc ! e1c4bb25fa98dd4d577b226722bcbbd4 libstdc++-v3/testsuite/Makefile.am ! 510b90c33cb3f9adf0b857c667c3f53d libstdc++-v3/testsuite/Makefile.in df2f4f01f10ff329bdc130014310ce5a libstdc++-v3/testsuite/abi/30586.cc 25a3d840a0ef2a18becbbfaa9cb65589 libstdc++-v3/testsuite/abi/cxx_runtime_only_linkage.cc 7cef5cd27bb8855db75202338678f7f8 libstdc++-v3/testsuite/abi/demangle/abi_examples/01.cc --- 61477,61484 ---- 7e5c5f7c55c2123bbfd67112eea25ad0 libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/2.cc 21a9715a13af44f1081de381917562a4 libstdc++-v3/testsuite/30_threads/unique_lock/requirements/explicit_instantiation.cc 60ce61cd1da6f10fecccb306dc296523 libstdc++-v3/testsuite/30_threads/unique_lock/requirements/typedefs.cc ! 118156c34758d56015a72bcc6cfd93a3 libstdc++-v3/testsuite/Makefile.am ! 1ba7e075bda70195dcb43aab745f5fc8 libstdc++-v3/testsuite/Makefile.in df2f4f01f10ff329bdc130014310ce5a libstdc++-v3/testsuite/abi/30586.cc 25a3d840a0ef2a18becbbfaa9cb65589 libstdc++-v3/testsuite/abi/cxx_runtime_only_linkage.cc 7cef5cd27bb8855db75202338678f7f8 libstdc++-v3/testsuite/abi/demangle/abi_examples/01.cc *************** ad2602196cd0f9d7c3b5a0d4265ccbc8 libstd *** 61565,61571 **** 94cbe455b1f07e1fb02b36da0c0027cc libstdc++-v3/testsuite/ext/debug_allocator/check_new.cc 9fef494653fffa48d8301b7d978dfab8 libstdc++-v3/testsuite/ext/debug_allocator/explicit_instantiation.cc 15402fe5ec674a08af2c600f66d5edeb libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc ! 71d48a13689137e5c09377a3cb144f18 libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc 1020776fe84f834c4ce3f9da7043ff49 libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc 0d54ade5c58b55d5266ca1c94aeb6a1e libstdc++-v3/testsuite/ext/ext_pointer/1.cc a2e47f85cdbee0ed19d763c29bf50da8 libstdc++-v3/testsuite/ext/ext_pointer/1_neg.cc --- 61645,61651 ---- 94cbe455b1f07e1fb02b36da0c0027cc libstdc++-v3/testsuite/ext/debug_allocator/check_new.cc 9fef494653fffa48d8301b7d978dfab8 libstdc++-v3/testsuite/ext/debug_allocator/explicit_instantiation.cc 15402fe5ec674a08af2c600f66d5edeb libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc ! c1bbb2bf677cf7a87eec03791afd2de3 libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc 1020776fe84f834c4ce3f9da7043ff49 libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc 0d54ade5c58b55d5266ca1c94aeb6a1e libstdc++-v3/testsuite/ext/ext_pointer/1.cc a2e47f85cdbee0ed19d763c29bf50da8 libstdc++-v3/testsuite/ext/ext_pointer/1_neg.cc *************** f340af3f7bbe4ce6b512960a33dca8ce libstd *** 61611,61617 **** a78517b0010d8a511b6ce45d68100019 libstdc++-v3/testsuite/ext/new_allocator/check_deallocate_null.cc 5ae0edf2913e9ec22c3ff03f2bc4c6bc libstdc++-v3/testsuite/ext/new_allocator/check_delete.cc 02ddadc447a2da66a397950663c71453 libstdc++-v3/testsuite/ext/new_allocator/check_new.cc ! 36cbd489c6f9bfa2cad1ad9567f6ae4d libstdc++-v3/testsuite/ext/new_allocator/deallocate_global.cc eb9376abe7b22a345f611c1fe6a08b18 libstdc++-v3/testsuite/ext/new_allocator/deallocate_local.cc fb7ec4eca7d18b3bd60b5e5da679eeca libstdc++-v3/testsuite/ext/new_allocator/instantiate.cc b9e32da07c32d78f92fb30199284261f libstdc++-v3/testsuite/ext/new_allocator/variadic_construct.cc --- 61691,61697 ---- a78517b0010d8a511b6ce45d68100019 libstdc++-v3/testsuite/ext/new_allocator/check_deallocate_null.cc 5ae0edf2913e9ec22c3ff03f2bc4c6bc libstdc++-v3/testsuite/ext/new_allocator/check_delete.cc 02ddadc447a2da66a397950663c71453 libstdc++-v3/testsuite/ext/new_allocator/check_new.cc ! 40e29aee1f7aac57d1617905621f9c19 libstdc++-v3/testsuite/ext/new_allocator/deallocate_global.cc eb9376abe7b22a345f611c1fe6a08b18 libstdc++-v3/testsuite/ext/new_allocator/deallocate_local.cc fb7ec4eca7d18b3bd60b5e5da679eeca libstdc++-v3/testsuite/ext/new_allocator/instantiate.cc b9e32da07c32d78f92fb30199284261f libstdc++-v3/testsuite/ext/new_allocator/variadic_construct.cc *************** e169569012bfc087685765e0837b7a90 libstd *** 61696,61702 **** 1858b512e82612725e74d14ffe995c47 libstdc++-v3/testsuite/ext/throw_allocator/check_deallocate_null.cc 2a8517f2bf01054f9fa00ffebbc95aff libstdc++-v3/testsuite/ext/throw_allocator/check_delete.cc f0c073cb1cb9e352eb1b59404f1dfd5f libstdc++-v3/testsuite/ext/throw_allocator/check_new.cc ! fe4141f10e4125b46f5225a54abe1599 libstdc++-v3/testsuite/ext/throw_allocator/deallocate_global.cc e8073185de4789acb5c35e4a62ba77fd libstdc++-v3/testsuite/ext/throw_allocator/deallocate_local.cc d5b1e675aabe1da3cb30637d6a82a55b libstdc++-v3/testsuite/ext/throw_allocator/explicit_instantiation.cc 7176ceb4016055249dccdcdd7c1d1430 libstdc++-v3/testsuite/ext/throw_allocator/variadic_construct.cc --- 61776,61782 ---- 1858b512e82612725e74d14ffe995c47 libstdc++-v3/testsuite/ext/throw_allocator/check_deallocate_null.cc 2a8517f2bf01054f9fa00ffebbc95aff libstdc++-v3/testsuite/ext/throw_allocator/check_delete.cc f0c073cb1cb9e352eb1b59404f1dfd5f libstdc++-v3/testsuite/ext/throw_allocator/check_new.cc ! d846bb4d0d4a076a4fa97754da383f64 libstdc++-v3/testsuite/ext/throw_allocator/deallocate_global.cc e8073185de4789acb5c35e4a62ba77fd libstdc++-v3/testsuite/ext/throw_allocator/deallocate_local.cc d5b1e675aabe1da3cb30637d6a82a55b libstdc++-v3/testsuite/ext/throw_allocator/explicit_instantiation.cc 7176ceb4016055249dccdcdd7c1d1430 libstdc++-v3/testsuite/ext/throw_allocator/variadic_construct.cc *************** c42d2565a53a629b57bf6e79a5ae0697 ltmain *** 62470,62476 **** bc2f6032c98896249eadb56177c7d357 ltsugar.m4 8ad9271cd6f868874ffff4223e2ff0ee ltversion.m4 13eeb5a2026d18ffe6428827fc7ab406 lt~obsolete.m4 ! a839986159399a01ee152b89cca69d60 maintainer-scripts/ChangeLog 9bf52719995189b7572953a25ad202ed maintainer-scripts/README 907b1fc4a36a43358b745c52de228fc7 maintainer-scripts/crontab fcff2666949e8b4b296d1bfc260d53e3 maintainer-scripts/gcc_release --- 62550,62556 ---- bc2f6032c98896249eadb56177c7d357 ltsugar.m4 8ad9271cd6f868874ffff4223e2ff0ee ltversion.m4 13eeb5a2026d18ffe6428827fc7ab406 lt~obsolete.m4 ! 940c63c68d7274187f3b8f83bb9bbe05 maintainer-scripts/ChangeLog 9bf52719995189b7572953a25ad202ed maintainer-scripts/README 907b1fc4a36a43358b745c52de228fc7 maintainer-scripts/crontab fcff2666949e8b4b296d1bfc260d53e3 maintainer-scripts/gcc_release *************** fbe2467afef81c41c166173adeb0ee20 mkdep *** 62484,62490 **** a20215c156b06261d944ae7f30a3b75c move-if-change cf2baa0854f564a7785307e79f155efc symlink-tree e0a5f7e59d19edfd4b4d26479a141f02 ylwrap ! 85c2c175be91a0c89f7e9ceb942f4865 zlib/ChangeLog 85fcf93ac4aa5b30b63f2f4bb3f654a3 zlib/ChangeLog.gcj 2f46720fda5ab68a1e495009895d874c zlib/FAQ 8851ace55681b1664d97c045d71e339b zlib/INDEX --- 62564,62570 ---- a20215c156b06261d944ae7f30a3b75c move-if-change cf2baa0854f564a7785307e79f155efc symlink-tree e0a5f7e59d19edfd4b4d26479a141f02 ylwrap ! dc342bd1d3a05eaebb1138dd11bba503 zlib/ChangeLog 85fcf93ac4aa5b30b63f2f4bb3f654a3 zlib/ChangeLog.gcj 2f46720fda5ab68a1e495009895d874c zlib/FAQ 8851ace55681b1664d97c045d71e339b zlib/INDEX diff -Nrcpad gcc-4.4.4/NEWS gcc-4.4.5/NEWS *** gcc-4.4.4/NEWS Thu Apr 29 08:27:18 2010 --- gcc-4.4.5/NEWS Fri Oct 1 08:26:42 2010 *************** References and Acknowledgements *** 55,76 **** Please send FSF & GNU inquiries & questions to [13]gnu@gnu.org. There are also [14]other ways to contact the FSF. ! These pages are maintained by [15]the GCC team. For questions related to the use of GCC, please consult these web pages and the [16]GCC manuals. If that fails, the [17]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [18]gcc@gnu.org or [19]gcc@gcc.gnu.org. ! All of our lists have [20]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-04-29 [21]Valid XHTML 1.0 References --- 55,76 ---- Please send FSF & GNU inquiries & questions to [13]gnu@gnu.org. There are also [14]other ways to contact the FSF. ! These pages are [15]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [16]GCC manuals. If that fails, the [17]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [18]gcc@gcc.gnu.org. All of our lists have ! [19]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [20]Valid XHTML 1.0 References *************** References *** 91,100 **** 15. http://gcc.gnu.org/about.html 16. http://gcc.gnu.org/onlinedocs/ 17. mailto:gcc-help@gcc.gnu.org ! 18. mailto:gcc@gnu.org ! 19. mailto:gcc@gcc.gnu.org ! 20. http://gcc.gnu.org/lists.html ! 21. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-4.4/changes.html GCC 4.4 Release Series --- 91,99 ---- 15. http://gcc.gnu.org/about.html 16. http://gcc.gnu.org/onlinedocs/ 17. mailto:gcc-help@gcc.gnu.org ! 18. mailto:gcc@gcc.gnu.org ! 19. http://gcc.gnu.org/lists.html ! 20. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-4.4/changes.html GCC 4.4 Release Series *************** GCC 4.4.4 *** 668,689 **** Please send FSF & GNU inquiries & questions to [17]gnu@gnu.org. There are also [18]other ways to contact the FSF. ! These pages are maintained by [19]the GCC team. For questions related to the use of GCC, please consult these web pages and the [20]GCC manuals. If that fails, the [21]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [22]gcc@gnu.org or [23]gcc@gcc.gnu.org. ! All of our lists have [24]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-04-29 [25]Valid XHTML 1.0 References --- 667,688 ---- Please send FSF & GNU inquiries & questions to [17]gnu@gnu.org. There are also [18]other ways to contact the FSF. ! These pages are [19]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [20]GCC manuals. If that fails, the [21]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [22]gcc@gcc.gnu.org. All of our lists have ! [23]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [24]Valid XHTML 1.0 References *************** References *** 708,745 **** 19. http://gcc.gnu.org/about.html 20. http://gcc.gnu.org/onlinedocs/ 21. mailto:gcc-help@gcc.gnu.org ! 22. mailto:gcc@gnu.org ! 23. mailto:gcc@gcc.gnu.org ! 24. http://gcc.gnu.org/lists.html ! 25. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-4.3/index.html GCC 4.3 Release Series ! January 24, 2009 The [1]GNU project and the GCC developers are pleased to announce the ! release of GCC 4.3.4. This release is a bug-fix release, containing fixes for regressions in ! GCC 4.3.3 relative to previous releases of GCC. Release History GCC 4.3.4 ! August 4, 2009 ([2]changes) GCC 4.3.3 ! January 24, 2009 ([3]changes) GCC 4.3.2 ! August 27, 2008 ([4]changes) GCC 4.3.1 ! June 6, 2008 ([5]changes) GCC 4.3.0 ! March 5, 2008 ([6]changes) References and Acknowledgements --- 707,746 ---- 19. http://gcc.gnu.org/about.html 20. http://gcc.gnu.org/onlinedocs/ 21. mailto:gcc-help@gcc.gnu.org ! 22. mailto:gcc@gcc.gnu.org ! 23. http://gcc.gnu.org/lists.html ! 24. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-4.3/index.html GCC 4.3 Release Series ! May 22, 2010 The [1]GNU project and the GCC developers are pleased to announce the ! release of GCC 4.3.5. This release is a bug-fix release, containing fixes for regressions in ! GCC 4.3.4 relative to previous releases of GCC. Release History + GCC 4.3.5 + May 22, 2010 ([2]changes) + GCC 4.3.4 ! August 4, 2009 ([3]changes) GCC 4.3.3 ! January 24, 2009 ([4]changes) GCC 4.3.2 ! August 27, 2008 ([5]changes) GCC 4.3.1 ! June 6, 2008 ([6]changes) GCC 4.3.0 ! March 5, 2008 ([7]changes) References and Acknowledgements *************** References and Acknowledgements *** 747,784 **** supports several other languages aside from C, it now stands for the GNU Compiler Collection. ! A list of [7]successful builds is updated as new information becomes available. The GCC developers would like to thank the numerous people that have contributed new features, improvements, bug fixes, and other changes as ! well as test results to GCC. This [8]amazing group of volunteers is what makes GCC successful. ! For additional information about GCC please refer to the [9]GCC project ! web site or contact the [10]GCC development mailing list. ! To obtain GCC please use [11]our mirror sites or [12]our SVN server. ! Please send FSF & GNU inquiries & questions to [13]gnu@gnu.org. There ! are also [14]other ways to contact the FSF. ! These pages are maintained by [15]the GCC team. For questions related to the use of GCC, please consult these web ! pages and the [16]GCC manuals. If that fails, the ! [17]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [18]gcc@gnu.org or [19]gcc@gcc.gnu.org. ! All of our lists have [20]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2009-10-15 [21]Valid XHTML 1.0 References --- 748,785 ---- supports several other languages aside from C, it now stands for the GNU Compiler Collection. ! A list of [8]successful builds is updated as new information becomes available. The GCC developers would like to thank the numerous people that have contributed new features, improvements, bug fixes, and other changes as ! well as test results to GCC. This [9]amazing group of volunteers is what makes GCC successful. ! For additional information about GCC please refer to the [10]GCC ! project web site or contact the [11]GCC development mailing list. ! To obtain GCC please use [12]our mirror sites or [13]our SVN server. ! Please send FSF & GNU inquiries & questions to [14]gnu@gnu.org. There ! are also [15]other ways to contact the FSF. ! These pages are [16]maintained by the GCC team. For questions related to the use of GCC, please consult these web ! pages and the [17]GCC manuals. If that fails, the ! [18]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [19]gcc@gcc.gnu.org. All of our lists have ! [20]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [21]Valid XHTML 1.0 References *************** References *** 788,805 **** 4. http://gcc.gnu.org/gcc-4.3/changes.html 5. http://gcc.gnu.org/gcc-4.3/changes.html 6. http://gcc.gnu.org/gcc-4.3/changes.html ! 7. http://gcc.gnu.org/gcc-4.3/buildstat.html ! 8. http://gcc.gnu.org/onlinedocs/gcc/Contributors.html ! 9. http://gcc.gnu.org/index.html ! 10. mailto:gcc@gcc.gnu.org ! 11. http://gcc.gnu.org/mirrors.html ! 12. http://gcc.gnu.org/svn.html ! 13. mailto:gnu@gnu.org ! 14. http://www.gnu.org/home.html#ContactInfo ! 15. http://gcc.gnu.org/about.html ! 16. http://gcc.gnu.org/onlinedocs/ ! 17. mailto:gcc-help@gcc.gnu.org ! 18. mailto:gcc@gnu.org 19. mailto:gcc@gcc.gnu.org 20. http://gcc.gnu.org/lists.html 21. http://validator.w3.org/check/referer --- 789,806 ---- 4. http://gcc.gnu.org/gcc-4.3/changes.html 5. http://gcc.gnu.org/gcc-4.3/changes.html 6. http://gcc.gnu.org/gcc-4.3/changes.html ! 7. http://gcc.gnu.org/gcc-4.3/changes.html ! 8. http://gcc.gnu.org/gcc-4.3/buildstat.html ! 9. http://gcc.gnu.org/onlinedocs/gcc/Contributors.html ! 10. http://gcc.gnu.org/index.html ! 11. mailto:gcc@gcc.gnu.org ! 12. http://gcc.gnu.org/mirrors.html ! 13. http://gcc.gnu.org/svn.html ! 14. mailto:gnu@gnu.org ! 15. http://www.gnu.org/home.html#ContactInfo ! 16. http://gcc.gnu.org/about.html ! 17. http://gcc.gnu.org/onlinedocs/ ! 18. mailto:gcc-help@gcc.gnu.org 19. mailto:gcc@gcc.gnu.org 20. http://gcc.gnu.org/lists.html 21. http://validator.w3.org/check/referer *************** http://gcc.gnu.org/gcc-4.3/changes.html *** 808,814 **** GCC 4.3 Release Series Changes, New Features, and Fixes ! The latest release in the 4.3 release series is [1]GCC 4.3.4. Caveats --- 809,815 ---- GCC 4.3 Release Series Changes, New Features, and Fixes ! The latest release in the 4.3 release series is [1]GCC 4.3.5. Caveats *************** New Languages and Language specific impr *** 1128,1134 **** Java (GCJ) ! * gcj now uses the Eclipse Java compiler for its Java parsing needs. This enables the use of all 1.5 language features, and fixes most existing front end bugs. * libgcj now supports all 1.5 language features which require runtime --- 1129,1135 ---- Java (GCJ) ! * GCJ now uses the Eclipse Java compiler for its Java parsing needs. This enables the use of all 1.5 language features, and fixes most existing front end bugs. * libgcj now supports all 1.5 language features which require runtime *************** GCC 4.3.4 *** 1551,1579 **** not be complete (that is, it is possible that some PRs that have been fixed are not listed here). ! Please send FSF & GNU inquiries & questions to [29]gnu@gnu.org. There ! are also [30]other ways to contact the FSF. ! These pages are maintained by [31]the GCC team. For questions related to the use of GCC, please consult these web ! pages and the [32]GCC manuals. If that fails, the ! [33]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [34]gcc@gnu.org or [35]gcc@gcc.gnu.org. ! All of our lists have [36]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2009-08-13 [37]Valid XHTML 1.0 References ! 1. http://gcc.gnu.org/gcc-4.3/changes.html#4.3.4 2. http://gmplib.org/ 3. http://www.mpfr.org/ 4. http://gcc.gnu.org/install/prerequisites.html --- 1552,1587 ---- not be complete (that is, it is possible that some PRs that have been fixed are not listed here). ! GCC 4.3.5 ! This is the [29]list of problem reports (PRs) from GCC's bug tracking ! system that are known to be fixed in the 4.3.5 release. This list might ! not be complete (that is, it is possible that some PRs that have been ! fixed are not listed here). ! ! Please send FSF & GNU inquiries & questions to [30]gnu@gnu.org. There ! are also [31]other ways to contact the FSF. ! ! These pages are [32]maintained by the GCC team. For questions related to the use of GCC, please consult these web ! pages and the [33]GCC manuals. If that fails, the ! [34]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [35]gcc@gcc.gnu.org. All of our lists have ! [36]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [37]Valid XHTML 1.0 References ! 1. http://gcc.gnu.org/gcc-4.3/changes.html#4.3.5 2. http://gmplib.org/ 3. http://www.mpfr.org/ 4. http://gcc.gnu.org/install/prerequisites.html *************** References *** 1601,1612 **** 26. http://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=4.3.2 27. http://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=4.3.3 28. http://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=4.3.4 ! 29. mailto:gnu@gnu.org ! 30. http://www.gnu.org/home.html#ContactInfo ! 31. http://gcc.gnu.org/about.html ! 32. http://gcc.gnu.org/onlinedocs/ ! 33. mailto:gcc-help@gcc.gnu.org ! 34. mailto:gcc@gnu.org 35. mailto:gcc@gcc.gnu.org 36. http://gcc.gnu.org/lists.html 37. http://validator.w3.org/check/referer --- 1609,1620 ---- 26. http://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=4.3.2 27. http://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=4.3.3 28. http://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=4.3.4 ! 29. http://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=4.3.5 ! 30. mailto:gnu@gnu.org ! 31. http://www.gnu.org/home.html#ContactInfo ! 32. http://gcc.gnu.org/about.html ! 33. http://gcc.gnu.org/onlinedocs/ ! 34. mailto:gcc-help@gcc.gnu.org 35. mailto:gcc@gcc.gnu.org 36. http://gcc.gnu.org/lists.html 37. http://validator.w3.org/check/referer *************** References and Acknowledgements *** 1661,1682 **** Please send FSF & GNU inquiries & questions to [13]gnu@gnu.org. There are also [14]other ways to contact the FSF. ! These pages are maintained by [15]the GCC team. For questions related to the use of GCC, please consult these web pages and the [16]GCC manuals. If that fails, the [17]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [18]gcc@gnu.org or [19]gcc@gcc.gnu.org. ! All of our lists have [20]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2008-10-04 [21]Valid XHTML 1.0 References --- 1669,1690 ---- Please send FSF & GNU inquiries & questions to [13]gnu@gnu.org. There are also [14]other ways to contact the FSF. ! These pages are [15]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [16]GCC manuals. If that fails, the [17]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [18]gcc@gcc.gnu.org. All of our lists have ! [19]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [20]Valid XHTML 1.0 References *************** References *** 1697,1706 **** 15. http://gcc.gnu.org/about.html 16. http://gcc.gnu.org/onlinedocs/ 17. mailto:gcc-help@gcc.gnu.org ! 18. mailto:gcc@gnu.org ! 19. mailto:gcc@gcc.gnu.org ! 20. http://gcc.gnu.org/lists.html ! 21. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-4.2/changes.html GCC 4.2 Release Series --- 1705,1713 ---- 15. http://gcc.gnu.org/about.html 16. http://gcc.gnu.org/onlinedocs/ 17. mailto:gcc-help@gcc.gnu.org ! 18. mailto:gcc@gcc.gnu.org ! 19. http://gcc.gnu.org/lists.html ! 20. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-4.2/changes.html GCC 4.2 Release Series *************** Other significant improvements *** 1997,2018 **** Please send FSF & GNU inquiries & questions to [7]gnu@gnu.org. There are also [8]other ways to contact the FSF. ! These pages are maintained by [9]the GCC team. For questions related to the use of GCC, please consult these web pages and the [10]GCC manuals. If that fails, the [11]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [12]gcc@gnu.org or [13]gcc@gcc.gnu.org. ! All of our lists have [14]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2009-11-08 [15]Valid XHTML 1.0 References --- 2004,2025 ---- Please send FSF & GNU inquiries & questions to [7]gnu@gnu.org. There are also [8]other ways to contact the FSF. ! These pages are [9]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [10]GCC manuals. If that fails, the [11]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [12]gcc@gcc.gnu.org. All of our lists have ! [13]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [14]Valid XHTML 1.0 References *************** References *** 2027,2036 **** 9. http://gcc.gnu.org/about.html 10. http://gcc.gnu.org/onlinedocs/ 11. mailto:gcc-help@gcc.gnu.org ! 12. mailto:gcc@gnu.org ! 13. mailto:gcc@gcc.gnu.org ! 14. http://gcc.gnu.org/lists.html ! 15. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-4.1/index.html GCC 4.1 Release Series --- 2034,2042 ---- 9. http://gcc.gnu.org/about.html 10. http://gcc.gnu.org/onlinedocs/ 11. mailto:gcc-help@gcc.gnu.org ! 12. mailto:gcc@gcc.gnu.org ! 13. http://gcc.gnu.org/lists.html ! 14. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-4.1/index.html GCC 4.1 Release Series *************** References and Acknowledgements *** 2076,2097 **** Please send FSF & GNU inquiries & questions to [11]gnu@gnu.org. There are also [12]other ways to contact the FSF. ! These pages are maintained by [13]the GCC team. For questions related to the use of GCC, please consult these web pages and the [14]GCC manuals. If that fails, the [15]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [16]gcc@gnu.org or [17]gcc@gcc.gnu.org. ! All of our lists have [18]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2008-10-04 [19]Valid XHTML 1.0 References --- 2082,2103 ---- Please send FSF & GNU inquiries & questions to [11]gnu@gnu.org. There are also [12]other ways to contact the FSF. ! These pages are [13]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [14]GCC manuals. If that fails, the [15]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [16]gcc@gcc.gnu.org. All of our lists have ! [17]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [18]Valid XHTML 1.0 References *************** References *** 2110,2119 **** 13. http://gcc.gnu.org/about.html 14. http://gcc.gnu.org/onlinedocs/ 15. mailto:gcc-help@gcc.gnu.org ! 16. mailto:gcc@gnu.org ! 17. mailto:gcc@gcc.gnu.org ! 18. http://gcc.gnu.org/lists.html ! 19. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-4.1/changes.html GCC 4.1 Release Series --- 2116,2124 ---- 13. http://gcc.gnu.org/about.html 14. http://gcc.gnu.org/onlinedocs/ 15. mailto:gcc-help@gcc.gnu.org ! 16. mailto:gcc@gcc.gnu.org ! 17. http://gcc.gnu.org/lists.html ! 18. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-4.1/changes.html GCC 4.1 Release Series *************** GCC 4.1.2 *** 2646,2667 **** Please send FSF & GNU inquiries & questions to [7]gnu@gnu.org. There are also [8]other ways to contact the FSF. ! These pages are maintained by [9]the GCC team. For questions related to the use of GCC, please consult these web pages and the [10]GCC manuals. If that fails, the [11]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [12]gcc@gnu.org or [13]gcc@gcc.gnu.org. ! All of our lists have [14]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2009-01-25 [15]Valid XHTML 1.0 References --- 2651,2672 ---- Please send FSF & GNU inquiries & questions to [7]gnu@gnu.org. There are also [8]other ways to contact the FSF. ! These pages are [9]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [10]GCC manuals. If that fails, the [11]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [12]gcc@gcc.gnu.org. All of our lists have ! [13]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [14]Valid XHTML 1.0 References *************** References *** 2676,2685 **** 9. http://gcc.gnu.org/about.html 10. http://gcc.gnu.org/onlinedocs/ 11. mailto:gcc-help@gcc.gnu.org ! 12. mailto:gcc@gnu.org ! 13. mailto:gcc@gcc.gnu.org ! 14. http://gcc.gnu.org/lists.html ! 15. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-4.0/index.html GCC 4.0 Release Series --- 2681,2689 ---- 9. http://gcc.gnu.org/about.html 10. http://gcc.gnu.org/onlinedocs/ 11. mailto:gcc-help@gcc.gnu.org ! 12. mailto:gcc@gcc.gnu.org ! 13. http://gcc.gnu.org/lists.html ! 14. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-4.0/index.html GCC 4.0 Release Series *************** References and Acknowledgements *** 2731,2752 **** Please send FSF & GNU inquiries & questions to [13]gnu@gnu.org. There are also [14]other ways to contact the FSF. ! These pages are maintained by [15]the GCC team. For questions related to the use of GCC, please consult these web pages and the [16]GCC manuals. If that fails, the [17]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [18]gcc@gnu.org or [19]gcc@gcc.gnu.org. ! All of our lists have [20]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2008-07-26 [21]Valid XHTML 1.0 References --- 2735,2756 ---- Please send FSF & GNU inquiries & questions to [13]gnu@gnu.org. There are also [14]other ways to contact the FSF. ! These pages are [15]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [16]GCC manuals. If that fails, the [17]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [18]gcc@gcc.gnu.org. All of our lists have ! [19]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [20]Valid XHTML 1.0 References *************** References *** 2767,2776 **** 15. http://gcc.gnu.org/about.html 16. http://gcc.gnu.org/onlinedocs/ 17. mailto:gcc-help@gcc.gnu.org ! 18. mailto:gcc@gnu.org ! 19. mailto:gcc@gcc.gnu.org ! 20. http://gcc.gnu.org/lists.html ! 21. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-4.0/changes.html GCC 4.0 Release Series --- 2771,2779 ---- 15. http://gcc.gnu.org/about.html 16. http://gcc.gnu.org/onlinedocs/ 17. mailto:gcc-help@gcc.gnu.org ! 18. mailto:gcc@gcc.gnu.org ! 19. http://gcc.gnu.org/lists.html ! 20. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-4.0/changes.html GCC 4.0 Release Series *************** GCC 4.0.4 *** 3264,3285 **** Please send FSF & GNU inquiries & questions to [16]gnu@gnu.org. There are also [17]other ways to contact the FSF. ! These pages are maintained by [18]the GCC team. For questions related to the use of GCC, please consult these web pages and the [19]GCC manuals. If that fails, the [20]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [21]gcc@gnu.org or [22]gcc@gcc.gnu.org. ! All of our lists have [23]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2009-01-25 [24]Valid XHTML 1.0 References --- 3267,3288 ---- Please send FSF & GNU inquiries & questions to [16]gnu@gnu.org. There are also [17]other ways to contact the FSF. ! These pages are [18]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [19]GCC manuals. If that fails, the [20]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [21]gcc@gcc.gnu.org. All of our lists have ! [22]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [23]Valid XHTML 1.0 References *************** References *** 3303,3312 **** 18. http://gcc.gnu.org/about.html 19. http://gcc.gnu.org/onlinedocs/ 20. mailto:gcc-help@gcc.gnu.org ! 21. mailto:gcc@gnu.org ! 22. mailto:gcc@gcc.gnu.org ! 23. http://gcc.gnu.org/lists.html ! 24. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.4/index.html GCC 3.4 Release Series --- 3306,3314 ---- 18. http://gcc.gnu.org/about.html 19. http://gcc.gnu.org/onlinedocs/ 20. mailto:gcc-help@gcc.gnu.org ! 21. mailto:gcc@gcc.gnu.org ! 22. http://gcc.gnu.org/lists.html ! 23. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.4/index.html GCC 3.4 Release Series *************** References and Acknowledgements *** 3369,3390 **** Please send FSF & GNU inquiries & questions to [17]gnu@gnu.org. There are also [18]other ways to contact the FSF. ! These pages are maintained by [19]the GCC team. For questions related to the use of GCC, please consult these web pages and the [20]GCC manuals. If that fails, the [21]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [22]gcc@gnu.org or [23]gcc@gcc.gnu.org. ! All of our lists have [24]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2008-07-26 [25]Valid XHTML 1.0 References --- 3371,3392 ---- Please send FSF & GNU inquiries & questions to [17]gnu@gnu.org. There are also [18]other ways to contact the FSF. ! These pages are [19]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [20]GCC manuals. If that fails, the [21]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [22]gcc@gcc.gnu.org. All of our lists have ! [23]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [24]Valid XHTML 1.0 References *************** References *** 3409,3418 **** 19. http://gcc.gnu.org/about.html 20. http://gcc.gnu.org/onlinedocs/ 21. mailto:gcc-help@gcc.gnu.org ! 22. mailto:gcc@gnu.org ! 23. mailto:gcc@gcc.gnu.org ! 24. http://gcc.gnu.org/lists.html ! 25. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.4/changes.html GCC 3.4 Release Series --- 3411,3419 ---- 19. http://gcc.gnu.org/about.html 20. http://gcc.gnu.org/onlinedocs/ 21. mailto:gcc-help@gcc.gnu.org ! 22. mailto:gcc@gcc.gnu.org ! 23. http://gcc.gnu.org/lists.html ! 24. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.4/changes.html GCC 3.4 Release Series *************** GCC 3.4.6 *** 5164,5185 **** Please send FSF & GNU inquiries & questions to [412]gnu@gnu.org. There are also [413]other ways to contact the FSF. ! These pages are maintained by [414]the GCC team. For questions related to the use of GCC, please consult these web pages and the [415]GCC manuals. If that fails, the [416]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [417]gcc@gnu.org or ! [418]gcc@gcc.gnu.org. All of our lists have [419]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2009-11-08 [420]Valid XHTML 1.0 References --- 5165,5186 ---- Please send FSF & GNU inquiries & questions to [412]gnu@gnu.org. There are also [413]other ways to contact the FSF. ! These pages are [414]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [415]GCC manuals. If that fails, the [416]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [417]gcc@gcc.gnu.org. All of our lists have ! [418]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [419]Valid XHTML 1.0 References *************** References *** 5599,5608 **** 414. http://gcc.gnu.org/about.html 415. http://gcc.gnu.org/onlinedocs/ 416. mailto:gcc-help@gcc.gnu.org ! 417. mailto:gcc@gnu.org ! 418. mailto:gcc@gcc.gnu.org ! 419. http://gcc.gnu.org/lists.html ! 420. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.3/index.html GCC 3.3 Release Series --- 5600,5608 ---- 414. http://gcc.gnu.org/about.html 415. http://gcc.gnu.org/onlinedocs/ 416. mailto:gcc-help@gcc.gnu.org ! 417. mailto:gcc@gcc.gnu.org ! 418. http://gcc.gnu.org/lists.html ! 419. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.3/index.html GCC 3.3 Release Series *************** References and Acknowledgements *** 5666,5687 **** Please send FSF & GNU inquiries & questions to [16]gnu@gnu.org. There are also [17]other ways to contact the FSF. ! These pages are maintained by [18]the GCC team. For questions related to the use of GCC, please consult these web pages and the [19]GCC manuals. If that fails, the [20]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [21]gcc@gnu.org or [22]gcc@gcc.gnu.org. ! All of our lists have [23]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2008-07-26 [24]Valid XHTML 1.0 References --- 5666,5687 ---- Please send FSF & GNU inquiries & questions to [16]gnu@gnu.org. There are also [17]other ways to contact the FSF. ! These pages are [18]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [19]GCC manuals. If that fails, the [20]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [21]gcc@gcc.gnu.org. All of our lists have ! [22]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [23]Valid XHTML 1.0 References *************** References *** 5705,5714 **** 18. http://gcc.gnu.org/about.html 19. http://gcc.gnu.org/onlinedocs/ 20. mailto:gcc-help@gcc.gnu.org ! 21. mailto:gcc@gnu.org ! 22. mailto:gcc@gcc.gnu.org ! 23. http://gcc.gnu.org/lists.html ! 24. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.3/changes.html GCC 3.3 Release Series --- 5705,5713 ---- 18. http://gcc.gnu.org/about.html 19. http://gcc.gnu.org/onlinedocs/ 20. mailto:gcc-help@gcc.gnu.org ! 21. mailto:gcc@gcc.gnu.org ! 22. http://gcc.gnu.org/lists.html ! 23. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.3/changes.html GCC 3.3 Release Series *************** GCC 3.3.6 *** 7048,7069 **** Please send FSF & GNU inquiries & questions to [553]gnu@gnu.org. There are also [554]other ways to contact the FSF. ! These pages are maintained by [555]the GCC team. For questions related to the use of GCC, please consult these web pages and the [556]GCC manuals. If that fails, the [557]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [558]gcc@gnu.org or ! [559]gcc@gcc.gnu.org. All of our lists have [560]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2007-08-20 [561]Valid XHTML 1.0 References --- 7047,7068 ---- Please send FSF & GNU inquiries & questions to [553]gnu@gnu.org. There are also [554]other ways to contact the FSF. ! These pages are [555]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [556]GCC manuals. If that fails, the [557]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [558]gcc@gcc.gnu.org. All of our lists have ! [559]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [560]Valid XHTML 1.0 References *************** References *** 7624,7633 **** 555. http://gcc.gnu.org/about.html 556. http://gcc.gnu.org/onlinedocs/ 557. mailto:gcc-help@gcc.gnu.org ! 558. mailto:gcc@gnu.org ! 559. mailto:gcc@gcc.gnu.org ! 560. http://gcc.gnu.org/lists.html ! 561. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.2/index.html GCC 3.2 Release Series --- 7623,7631 ---- 555. http://gcc.gnu.org/about.html 556. http://gcc.gnu.org/onlinedocs/ 557. mailto:gcc-help@gcc.gnu.org ! 558. mailto:gcc@gcc.gnu.org ! 559. http://gcc.gnu.org/lists.html ! 560. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.2/index.html GCC 3.2 Release Series *************** References and Acknowledgements *** 7685,7706 **** Please send FSF & GNU inquiries & questions to [12]gnu@gnu.org. There are also [13]other ways to contact the FSF. ! These pages are maintained by [14]the GCC team. For questions related to the use of GCC, please consult these web pages and the [15]GCC manuals. If that fails, the [16]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [17]gcc@gnu.org or [18]gcc@gcc.gnu.org. ! All of our lists have [19]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2008-07-26 [20]Valid XHTML 1.0 References --- 7683,7704 ---- Please send FSF & GNU inquiries & questions to [12]gnu@gnu.org. There are also [13]other ways to contact the FSF. ! These pages are [14]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [15]GCC manuals. If that fails, the [16]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [17]gcc@gcc.gnu.org. All of our lists have ! [18]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [19]Valid XHTML 1.0 References *************** References *** 7720,7729 **** 14. http://gcc.gnu.org/about.html 15. http://gcc.gnu.org/onlinedocs/ 16. mailto:gcc-help@gcc.gnu.org ! 17. mailto:gcc@gnu.org ! 18. mailto:gcc@gcc.gnu.org ! 19. http://gcc.gnu.org/lists.html ! 20. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.2/changes.html GCC 3.2 Release Series --- 7718,7726 ---- 14. http://gcc.gnu.org/about.html 15. http://gcc.gnu.org/onlinedocs/ 16. mailto:gcc-help@gcc.gnu.org ! 17. mailto:gcc@gcc.gnu.org ! 18. http://gcc.gnu.org/lists.html ! 19. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.2/changes.html GCC 3.2 Release Series *************** GCC 3.2 *** 8315,8336 **** Please send FSF & GNU inquiries & questions to [246]gnu@gnu.org. There are also [247]other ways to contact the FSF. ! These pages are maintained by [248]the GCC team. For questions related to the use of GCC, please consult these web pages and the [249]GCC manuals. If that fails, the [250]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [251]gcc@gnu.org or ! [252]gcc@gcc.gnu.org. All of our lists have [253]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2007-07-25 [254]Valid XHTML 1.0 References --- 8312,8333 ---- Please send FSF & GNU inquiries & questions to [246]gnu@gnu.org. There are also [247]other ways to contact the FSF. ! These pages are [248]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [249]GCC manuals. If that fails, the [250]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [251]gcc@gcc.gnu.org. All of our lists have ! [252]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [253]Valid XHTML 1.0 References *************** References *** 8584,8593 **** 248. http://gcc.gnu.org/about.html 249. http://gcc.gnu.org/onlinedocs/ 250. mailto:gcc-help@gcc.gnu.org ! 251. mailto:gcc@gnu.org ! 252. mailto:gcc@gcc.gnu.org ! 253. http://gcc.gnu.org/lists.html ! 254. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.1/index.html GCC 3.1 --- 8581,8589 ---- 248. http://gcc.gnu.org/about.html 249. http://gcc.gnu.org/onlinedocs/ 250. mailto:gcc-help@gcc.gnu.org ! 251. mailto:gcc@gcc.gnu.org ! 252. http://gcc.gnu.org/lists.html ! 253. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.1/index.html GCC 3.1 *************** http://gcc.gnu.org/gcc-3.1/index.html *** 8625,8646 **** Please send FSF & GNU inquiries & questions to [9]gnu@gnu.org. There are also [10]other ways to contact the FSF. ! These pages are maintained by [11]the GCC team. For questions related to the use of GCC, please consult these web pages and the [12]GCC manuals. If that fails, the [13]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [14]gcc@gnu.org or [15]gcc@gcc.gnu.org. ! All of our lists have [16]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2008-07-26 [17]Valid XHTML 1.0 References --- 8621,8642 ---- Please send FSF & GNU inquiries & questions to [9]gnu@gnu.org. There are also [10]other ways to contact the FSF. ! These pages are [11]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [12]GCC manuals. If that fails, the [13]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [14]gcc@gcc.gnu.org. All of our lists have ! [15]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [16]Valid XHTML 1.0 References *************** References *** 8657,8666 **** 11. http://gcc.gnu.org/about.html 12. http://gcc.gnu.org/onlinedocs/ 13. mailto:gcc-help@gcc.gnu.org ! 14. mailto:gcc@gnu.org ! 15. mailto:gcc@gcc.gnu.org ! 16. http://gcc.gnu.org/lists.html ! 17. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.1/changes.html GCC 3.1 Release Series --- 8653,8661 ---- 11. http://gcc.gnu.org/about.html 12. http://gcc.gnu.org/onlinedocs/ 13. mailto:gcc-help@gcc.gnu.org ! 14. mailto:gcc@gcc.gnu.org ! 15. http://gcc.gnu.org/lists.html ! 16. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.1/changes.html GCC 3.1 Release Series *************** Documentation improvements *** 8987,9008 **** Please send FSF & GNU inquiries & questions to [13]gnu@gnu.org. There are also [14]other ways to contact the FSF. ! These pages are maintained by [15]the GCC team. For questions related to the use of GCC, please consult these web pages and the [16]GCC manuals. If that fails, the [17]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [18]gcc@gnu.org or [19]gcc@gcc.gnu.org. ! All of our lists have [20]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2008-05-03 [21]Valid XHTML 1.0 References --- 8982,9003 ---- Please send FSF & GNU inquiries & questions to [13]gnu@gnu.org. There are also [14]other ways to contact the FSF. ! These pages are [15]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [16]GCC manuals. If that fails, the [17]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [18]gcc@gcc.gnu.org. All of our lists have ! [19]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [20]Valid XHTML 1.0 References *************** References *** 9023,9032 **** 15. http://gcc.gnu.org/about.html 16. http://gcc.gnu.org/onlinedocs/ 17. mailto:gcc-help@gcc.gnu.org ! 18. mailto:gcc@gnu.org ! 19. mailto:gcc@gcc.gnu.org ! 20. http://gcc.gnu.org/lists.html ! 21. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.0/gcc-3.0.html GCC 3.0.4 --- 9018,9026 ---- 15. http://gcc.gnu.org/about.html 16. http://gcc.gnu.org/onlinedocs/ 17. mailto:gcc-help@gcc.gnu.org ! 18. mailto:gcc@gcc.gnu.org ! 19. http://gcc.gnu.org/lists.html ! 20. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.0/gcc-3.0.html GCC 3.0.4 *************** Previous 3.0.x Releases *** 9071,9092 **** Please send FSF & GNU inquiries & questions to [9]gnu@gnu.org. There are also [10]other ways to contact the FSF. ! These pages are maintained by [11]the GCC team. For questions related to the use of GCC, please consult these web pages and the [12]GCC manuals. If that fails, the [13]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [14]gcc@gnu.org or [15]gcc@gcc.gnu.org. ! All of our lists have [16]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2008-07-26 [17]Valid XHTML 1.0 References --- 9065,9086 ---- Please send FSF & GNU inquiries & questions to [9]gnu@gnu.org. There are also [10]other ways to contact the FSF. ! These pages are [11]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [12]GCC manuals. If that fails, the [13]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [14]gcc@gcc.gnu.org. All of our lists have ! [15]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [16]Valid XHTML 1.0 References *************** References *** 9103,9112 **** 11. http://gcc.gnu.org/about.html 12. http://gcc.gnu.org/onlinedocs/ 13. mailto:gcc-help@gcc.gnu.org ! 14. mailto:gcc@gnu.org ! 15. mailto:gcc@gcc.gnu.org ! 16. http://gcc.gnu.org/lists.html ! 17. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.0/features.html GCC 3.0 New Features --- 9097,9105 ---- 11. http://gcc.gnu.org/about.html 12. http://gcc.gnu.org/onlinedocs/ 13. mailto:gcc-help@gcc.gnu.org ! 14. mailto:gcc@gcc.gnu.org ! 15. http://gcc.gnu.org/lists.html ! 16. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.0/features.html GCC 3.0 New Features *************** Other significant improvements *** 9269,9290 **** Please send FSF & GNU inquiries & questions to [14]gnu@gnu.org. There are also [15]other ways to contact the FSF. ! These pages are maintained by [16]the GCC team. For questions related to the use of GCC, please consult these web pages and the [17]GCC manuals. If that fails, the [18]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [19]gcc@gnu.org or [20]gcc@gcc.gnu.org. ! All of our lists have [21]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2007-07-25 [22]Valid XHTML 1.0 References --- 9262,9283 ---- Please send FSF & GNU inquiries & questions to [14]gnu@gnu.org. There are also [15]other ways to contact the FSF. ! These pages are [16]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [17]GCC manuals. If that fails, the [18]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [19]gcc@gcc.gnu.org. All of our lists have ! [20]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [21]Valid XHTML 1.0 References *************** References *** 9306,9315 **** 16. http://gcc.gnu.org/about.html 17. http://gcc.gnu.org/onlinedocs/ 18. mailto:gcc-help@gcc.gnu.org ! 19. mailto:gcc@gnu.org ! 20. mailto:gcc@gcc.gnu.org ! 21. http://gcc.gnu.org/lists.html ! 22. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.0/caveats.html GCC 3.0 Caveats --- 9299,9307 ---- 16. http://gcc.gnu.org/about.html 17. http://gcc.gnu.org/onlinedocs/ 18. mailto:gcc-help@gcc.gnu.org ! 19. mailto:gcc@gcc.gnu.org ! 20. http://gcc.gnu.org/lists.html ! 21. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-3.0/caveats.html GCC 3.0 Caveats *************** http://gcc.gnu.org/gcc-3.0/caveats.html *** 9349,9370 **** Please send FSF & GNU inquiries & questions to [2]gnu@gnu.org. There are also [3]other ways to contact the FSF. ! These pages are maintained by [4]the GCC team. For questions related to the use of GCC, please consult these web pages and the [5]GCC manuals. If that fails, the [6]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [7]gcc@gnu.org or [8]gcc@gcc.gnu.org. ! All of our lists have [9]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2008-05-07 [10]Valid XHTML 1.0 References --- 9341,9362 ---- Please send FSF & GNU inquiries & questions to [2]gnu@gnu.org. There are also [3]other ways to contact the FSF. ! These pages are [4]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [5]GCC manuals. If that fails, the [6]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [7]gcc@gcc.gnu.org. All of our lists have ! [8]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [9]Valid XHTML 1.0 References *************** References *** 9374,9383 **** 4. http://gcc.gnu.org/about.html 5. http://gcc.gnu.org/onlinedocs/ 6. mailto:gcc-help@gcc.gnu.org ! 7. mailto:gcc@gnu.org ! 8. mailto:gcc@gcc.gnu.org ! 9. http://gcc.gnu.org/lists.html ! 10. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-2.95/index.html GCC 2.95 --- 9366,9374 ---- 4. http://gcc.gnu.org/about.html 5. http://gcc.gnu.org/onlinedocs/ 6. mailto:gcc-help@gcc.gnu.org ! 7. mailto:gcc@gcc.gnu.org ! 8. http://gcc.gnu.org/lists.html ! 9. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-2.95/index.html GCC 2.95 *************** References and Acknowledgements *** 9436,9457 **** Please send FSF & GNU inquiries & questions to [11]gnu@gnu.org. There are also [12]other ways to contact the FSF. ! These pages are maintained by [13]the GCC team. For questions related to the use of GCC, please consult these web pages and the [14]GCC manuals. If that fails, the [15]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [16]gcc@gnu.org or [17]gcc@gcc.gnu.org. ! All of our lists have [18]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2008-07-26 [19]Valid XHTML 1.0 References --- 9427,9448 ---- Please send FSF & GNU inquiries & questions to [11]gnu@gnu.org. There are also [12]other ways to contact the FSF. ! These pages are [13]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [14]GCC manuals. If that fails, the [15]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [16]gcc@gcc.gnu.org. All of our lists have ! [17]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [18]Valid XHTML 1.0 References *************** References *** 9470,9479 **** 13. http://gcc.gnu.org/about.html 14. http://gcc.gnu.org/onlinedocs/ 15. mailto:gcc-help@gcc.gnu.org ! 16. mailto:gcc@gnu.org ! 17. mailto:gcc@gcc.gnu.org ! 18. http://gcc.gnu.org/lists.html ! 19. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-2.95/features.html GCC 2.95 New Features --- 9461,9469 ---- 13. http://gcc.gnu.org/about.html 14. http://gcc.gnu.org/onlinedocs/ 15. mailto:gcc-help@gcc.gnu.org ! 16. mailto:gcc@gcc.gnu.org ! 17. http://gcc.gnu.org/lists.html ! 18. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-2.95/features.html GCC 2.95 New Features *************** Additional Changes in GCC 2.95.3 *** 9709,9730 **** Please send FSF & GNU inquiries & questions to [17]gnu@gnu.org. There are also [18]other ways to contact the FSF. ! These pages are maintained by [19]the GCC team. For questions related to the use of GCC, please consult these web pages and the [20]GCC manuals. If that fails, the [21]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [22]gcc@gnu.org or [23]gcc@gcc.gnu.org. ! All of our lists have [24]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2008-06-15 [25]Valid XHTML 1.0 References --- 9699,9720 ---- Please send FSF & GNU inquiries & questions to [17]gnu@gnu.org. There are also [18]other ways to contact the FSF. ! These pages are [19]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [20]GCC manuals. If that fails, the [21]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [22]gcc@gcc.gnu.org. All of our lists have ! [23]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [24]Valid XHTML 1.0 References *************** References *** 9749,9758 **** 19. http://gcc.gnu.org/about.html 20. http://gcc.gnu.org/onlinedocs/ 21. mailto:gcc-help@gcc.gnu.org ! 22. mailto:gcc@gnu.org ! 23. mailto:gcc@gcc.gnu.org ! 24. http://gcc.gnu.org/lists.html ! 25. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-2.95/caveats.html GCC 2.95 Caveats --- 9739,9747 ---- 19. http://gcc.gnu.org/about.html 20. http://gcc.gnu.org/onlinedocs/ 21. mailto:gcc-help@gcc.gnu.org ! 22. mailto:gcc@gcc.gnu.org ! 23. http://gcc.gnu.org/lists.html ! 24. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/gcc-2.95/caveats.html GCC 2.95 Caveats *************** http://gcc.gnu.org/gcc-2.95/caveats.html *** 9800,9821 **** Please send FSF & GNU inquiries & questions to [2]gnu@gnu.org. There are also [3]other ways to contact the FSF. ! These pages are maintained by [4]the GCC team. For questions related to the use of GCC, please consult these web pages and the [5]GCC manuals. If that fails, the [6]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [7]gcc@gnu.org or [8]gcc@gcc.gnu.org. ! All of our lists have [9]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2007-07-25 [10]Valid XHTML 1.0 References --- 9789,9810 ---- Please send FSF & GNU inquiries & questions to [2]gnu@gnu.org. There are also [3]other ways to contact the FSF. ! These pages are [4]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [5]GCC manuals. If that fails, the [6]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [7]gcc@gcc.gnu.org. All of our lists have ! [8]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [9]Valid XHTML 1.0 References *************** References *** 9825,9834 **** 4. http://gcc.gnu.org/about.html 5. http://gcc.gnu.org/onlinedocs/ 6. mailto:gcc-help@gcc.gnu.org ! 7. mailto:gcc@gnu.org ! 8. mailto:gcc@gcc.gnu.org ! 9. http://gcc.gnu.org/lists.html ! 10. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/egcs-1.1/index.html EGCS 1.1 --- 9814,9822 ---- 4. http://gcc.gnu.org/about.html 5. http://gcc.gnu.org/onlinedocs/ 6. mailto:gcc-help@gcc.gnu.org ! 7. mailto:gcc@gcc.gnu.org ! 8. http://gcc.gnu.org/lists.html ! 9. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/egcs-1.1/index.html EGCS 1.1 *************** http://gcc.gnu.org/egcs-1.1/index.html *** 10028,10049 **** Please send FSF & GNU inquiries & questions to [11]gnu@gnu.org. There are also [12]other ways to contact the FSF. ! These pages are maintained by [13]the GCC team. For questions related to the use of GCC, please consult these web pages and the [14]GCC manuals. If that fails, the [15]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [16]gcc@gnu.org or [17]gcc@gcc.gnu.org. ! All of our lists have [18]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2007-07-25 [19]Valid XHTML 1.0 References --- 10016,10037 ---- Please send FSF & GNU inquiries & questions to [11]gnu@gnu.org. There are also [12]other ways to contact the FSF. ! These pages are [13]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [14]GCC manuals. If that fails, the [15]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [16]gcc@gcc.gnu.org. All of our lists have ! [17]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [18]Valid XHTML 1.0 References *************** References *** 10062,10071 **** 13. http://gcc.gnu.org/about.html 14. http://gcc.gnu.org/onlinedocs/ 15. mailto:gcc-help@gcc.gnu.org ! 16. mailto:gcc@gnu.org ! 17. mailto:gcc@gcc.gnu.org ! 18. http://gcc.gnu.org/lists.html ! 19. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/egcs-1.1/features.html EGCS 1.1 new features --- 10050,10058 ---- 13. http://gcc.gnu.org/about.html 14. http://gcc.gnu.org/onlinedocs/ 15. mailto:gcc-help@gcc.gnu.org ! 16. mailto:gcc@gcc.gnu.org ! 17. http://gcc.gnu.org/lists.html ! 18. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/egcs-1.1/features.html EGCS 1.1 new features *************** http://gcc.gnu.org/egcs-1.1/features.htm *** 10136,10157 **** Please send FSF & GNU inquiries & questions to [5]gnu@gnu.org. There are also [6]other ways to contact the FSF. ! These pages are maintained by [7]the GCC team. For questions related to the use of GCC, please consult these web pages and the [8]GCC manuals. If that fails, the [9]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [10]gcc@gnu.org or [11]gcc@gcc.gnu.org. ! All of our lists have [12]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2008-07-26 [13]Valid XHTML 1.0 References --- 10123,10144 ---- Please send FSF & GNU inquiries & questions to [5]gnu@gnu.org. There are also [6]other ways to contact the FSF. ! These pages are [7]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [8]GCC manuals. If that fails, the [9]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [10]gcc@gcc.gnu.org. All of our lists have ! [11]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [12]Valid XHTML 1.0 References *************** References *** 10164,10173 **** 7. http://gcc.gnu.org/about.html 8. http://gcc.gnu.org/onlinedocs/ 9. mailto:gcc-help@gcc.gnu.org ! 10. mailto:gcc@gnu.org ! 11. mailto:gcc@gcc.gnu.org ! 12. http://gcc.gnu.org/lists.html ! 13. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/egcs-1.1/caveats.html EGCS 1.1 Caveats --- 10151,10159 ---- 7. http://gcc.gnu.org/about.html 8. http://gcc.gnu.org/onlinedocs/ 9. mailto:gcc-help@gcc.gnu.org ! 10. mailto:gcc@gcc.gnu.org ! 11. http://gcc.gnu.org/lists.html ! 12. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/egcs-1.1/caveats.html EGCS 1.1 Caveats *************** http://gcc.gnu.org/egcs-1.1/caveats.html *** 10198,10219 **** Please send FSF & GNU inquiries & questions to [1]gnu@gnu.org. There are also [2]other ways to contact the FSF. ! These pages are maintained by [3]the GCC team. For questions related to the use of GCC, please consult these web pages and the [4]GCC manuals. If that fails, the [5]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [6]gcc@gnu.org or [7]gcc@gcc.gnu.org. ! All of our lists have [8]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2007-07-25 [9]Valid XHTML 1.0 References --- 10184,10205 ---- Please send FSF & GNU inquiries & questions to [1]gnu@gnu.org. There are also [2]other ways to contact the FSF. ! These pages are [3]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [4]GCC manuals. If that fails, the [5]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [6]gcc@gcc.gnu.org. All of our lists have ! [7]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [8]Valid XHTML 1.0 References *************** References *** 10222,10231 **** 3. http://gcc.gnu.org/about.html 4. http://gcc.gnu.org/onlinedocs/ 5. mailto:gcc-help@gcc.gnu.org ! 6. mailto:gcc@gnu.org ! 7. mailto:gcc@gcc.gnu.org ! 8. http://gcc.gnu.org/lists.html ! 9. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/egcs-1.0/index.html EGCS 1.0 --- 10208,10216 ---- 3. http://gcc.gnu.org/about.html 4. http://gcc.gnu.org/onlinedocs/ 5. mailto:gcc-help@gcc.gnu.org ! 6. mailto:gcc@gcc.gnu.org ! 7. http://gcc.gnu.org/lists.html ! 8. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/egcs-1.0/index.html EGCS 1.0 *************** http://gcc.gnu.org/egcs-1.0/index.html *** 10402,10423 **** Please send FSF & GNU inquiries & questions to [6]gnu@gnu.org. There are also [7]other ways to contact the FSF. ! These pages are maintained by [8]the GCC team. For questions related to the use of GCC, please consult these web pages and the [9]GCC manuals. If that fails, the [10]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [11]gcc@gnu.org or [12]gcc@gcc.gnu.org. ! All of our lists have [13]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2007-07-25 [14]Valid XHTML 1.0 References --- 10387,10408 ---- Please send FSF & GNU inquiries & questions to [6]gnu@gnu.org. There are also [7]other ways to contact the FSF. ! These pages are [8]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [9]GCC manuals. If that fails, the [10]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [11]gcc@gcc.gnu.org. All of our lists have ! [12]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [13]Valid XHTML 1.0 References *************** References *** 10431,10440 **** 8. http://gcc.gnu.org/about.html 9. http://gcc.gnu.org/onlinedocs/ 10. mailto:gcc-help@gcc.gnu.org ! 11. mailto:gcc@gnu.org ! 12. mailto:gcc@gcc.gnu.org ! 13. http://gcc.gnu.org/lists.html ! 14. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/egcs-1.0/features.html EGCS 1.0 features --- 10416,10424 ---- 8. http://gcc.gnu.org/about.html 9. http://gcc.gnu.org/onlinedocs/ 10. mailto:gcc-help@gcc.gnu.org ! 11. mailto:gcc@gcc.gnu.org ! 12. http://gcc.gnu.org/lists.html ! 13. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/egcs-1.0/features.html EGCS 1.0 features *************** http://gcc.gnu.org/egcs-1.0/features.htm *** 10477,10498 **** Please send FSF & GNU inquiries & questions to [3]gnu@gnu.org. There are also [4]other ways to contact the FSF. ! These pages are maintained by [5]the GCC team. For questions related to the use of GCC, please consult these web pages and the [6]GCC manuals. If that fails, the [7]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [8]gcc@gnu.org or [9]gcc@gcc.gnu.org. ! All of our lists have [10]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2007-07-25 [11]Valid XHTML 1.0 References --- 10461,10482 ---- Please send FSF & GNU inquiries & questions to [3]gnu@gnu.org. There are also [4]other ways to contact the FSF. ! These pages are [5]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [6]GCC manuals. If that fails, the [7]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [8]gcc@gcc.gnu.org. All of our lists have ! [9]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [10]Valid XHTML 1.0 References *************** References *** 10503,10512 **** 5. http://gcc.gnu.org/about.html 6. http://gcc.gnu.org/onlinedocs/ 7. mailto:gcc-help@gcc.gnu.org ! 8. mailto:gcc@gnu.org ! 9. mailto:gcc@gcc.gnu.org ! 10. http://gcc.gnu.org/lists.html ! 11. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/egcs-1.0/caveats.html EGCS 1.0 Caveats --- 10487,10495 ---- 5. http://gcc.gnu.org/about.html 6. http://gcc.gnu.org/onlinedocs/ 7. mailto:gcc-help@gcc.gnu.org ! 8. mailto:gcc@gcc.gnu.org ! 9. http://gcc.gnu.org/lists.html ! 10. http://validator.w3.org/check/referer ====================================================================== http://gcc.gnu.org/egcs-1.0/caveats.html EGCS 1.0 Caveats *************** http://gcc.gnu.org/egcs-1.0/caveats.html *** 10538,10559 **** Please send FSF & GNU inquiries & questions to [1]gnu@gnu.org. There are also [2]other ways to contact the FSF. ! These pages are maintained by [3]the GCC team. For questions related to the use of GCC, please consult these web pages and the [4]GCC manuals. If that fails, the [5]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer mailing list at [6]gcc@gnu.org or [7]gcc@gcc.gnu.org. ! All of our lists have [8]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2007-07-25 [9]Valid XHTML 1.0 References --- 10521,10542 ---- Please send FSF & GNU inquiries & questions to [1]gnu@gnu.org. There are also [2]other ways to contact the FSF. ! These pages are [3]maintained by the GCC team. For questions related to the use of GCC, please consult these web pages and the [4]GCC manuals. If that fails, the [5]gcc-help@gcc.gnu.org mailing list might help. Please send comments on these web pages and the development of GCC to ! our developer list at [6]gcc@gcc.gnu.org. All of our lists have ! [7]public archives. Copyright (C) Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ! Last modified 2010-08-15 [8]Valid XHTML 1.0 References *************** References *** 10562,10569 **** 3. http://gcc.gnu.org/about.html 4. http://gcc.gnu.org/onlinedocs/ 5. mailto:gcc-help@gcc.gnu.org ! 6. mailto:gcc@gnu.org ! 7. mailto:gcc@gcc.gnu.org ! 8. http://gcc.gnu.org/lists.html ! 9. http://validator.w3.org/check/referer ====================================================================== --- 10545,10551 ---- 3. http://gcc.gnu.org/about.html 4. http://gcc.gnu.org/onlinedocs/ 5. mailto:gcc-help@gcc.gnu.org ! 6. mailto:gcc@gcc.gnu.org ! 7. http://gcc.gnu.org/lists.html ! 8. http://validator.w3.org/check/referer ====================================================================== diff -Nrcpad gcc-4.4.4/config/ChangeLog gcc-4.4.5/config/ChangeLog *** gcc-4.4.4/config/ChangeLog Thu Apr 29 07:50:54 2010 --- gcc-4.4.5/config/ChangeLog Fri Oct 1 08:03:53 2010 *************** *** 1,3 **** --- 1,11 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + + 2010-06-11 Rainer Orth + + * override.m4 (AC_LANG_WERROR): Redefine to autoconf 2.62 version. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/config/override.m4 gcc-4.4.5/config/override.m4 *** gcc-4.4.4/config/override.m4 Tue Jun 17 23:13:35 2008 --- gcc-4.4.5/config/override.m4 Fri Jun 11 11:49:16 2010 *************** m4_define([m4_wrap], [m4_ifdef([_$0_text *** 249,251 **** --- 249,261 ---- [m4_define([_$0_text], [$1])m4_builtin([m4wrap], [m4_default(m4_defn([_$0_text])m4_undefine([_$0_text]))])])]) ]) + + # AC_LANG_WERROR + # ------------------ + # This is the same code as in 2.59, but sets the werror_flag to default to + # empty as expected by the rest of the code. + m4_version_prereq([2.62],, [ + AC_DEFUN([AC_LANG_WERROR], + [m4_divert_text([DEFAULTS], [ac_[]_AC_LANG_ABBREV[]_werror_flag=]) + ac_[]_AC_LANG_ABBREV[]_werror_flag=yes])# AC_LANG_WERROR + ]) diff -Nrcpad gcc-4.4.4/configure gcc-4.4.5/configure *** gcc-4.4.4/configure Sat Apr 25 04:10:29 2009 --- gcc-4.4.5/configure Mon Jun 7 20:10:41 2010 *************** fi *** 7719,7725 **** done if test -z "$ac_cv_prog_RANLIB" ; then ! RANLIB=":" fi --- 7719,7725 ---- done if test -z "$ac_cv_prog_RANLIB" ; then ! RANLIB="true" fi *************** fi *** 7849,7855 **** done if test -z "$ac_cv_prog_STRIP" ; then ! STRIP=":" fi --- 7849,7855 ---- done if test -z "$ac_cv_prog_STRIP" ; then ! STRIP="true" fi diff -Nrcpad gcc-4.4.4/configure.ac gcc-4.4.5/configure.ac *** gcc-4.4.4/configure.ac Sat Apr 25 04:10:29 2009 --- gcc-4.4.5/configure.ac Mon Jun 7 20:10:41 2010 *************** *** 1,6 **** # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ! # 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ! # Inc. # # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by --- 1,6 ---- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ! # 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ! # Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by *************** NCN_STRICT_CHECK_TOOLS(DLLTOOL, dlltool) *** 2764,2771 **** NCN_STRICT_CHECK_TOOLS(LD, ld) NCN_STRICT_CHECK_TOOLS(LIPO, lipo) NCN_STRICT_CHECK_TOOLS(NM, nm) ! NCN_STRICT_CHECK_TOOLS(RANLIB, ranlib, :) ! NCN_STRICT_CHECK_TOOLS(STRIP, strip, :) NCN_STRICT_CHECK_TOOLS(WINDRES, windres) NCN_STRICT_CHECK_TOOLS(WINDMC, windmc) NCN_STRICT_CHECK_TOOLS(OBJCOPY, objcopy) --- 2764,2771 ---- NCN_STRICT_CHECK_TOOLS(LD, ld) NCN_STRICT_CHECK_TOOLS(LIPO, lipo) NCN_STRICT_CHECK_TOOLS(NM, nm) ! NCN_STRICT_CHECK_TOOLS(RANLIB, ranlib, true) ! NCN_STRICT_CHECK_TOOLS(STRIP, strip, true) NCN_STRICT_CHECK_TOOLS(WINDRES, windres) NCN_STRICT_CHECK_TOOLS(WINDMC, windmc) NCN_STRICT_CHECK_TOOLS(OBJCOPY, objcopy) *************** ACX_CHECK_INSTALLED_TARGET_TOOL(LD_FOR_T *** 2801,2807 **** ACX_CHECK_INSTALLED_TARGET_TOOL(LIPO_FOR_TARGET, lipo) ACX_CHECK_INSTALLED_TARGET_TOOL(NM_FOR_TARGET, nm) ACX_CHECK_INSTALLED_TARGET_TOOL(OBJDUMP_FOR_TARGET, objdump) ! ACX_CHECK_INSTALLED_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib, :) ACX_CHECK_INSTALLED_TARGET_TOOL(STRIP_FOR_TARGET, strip) ACX_CHECK_INSTALLED_TARGET_TOOL(WINDRES_FOR_TARGET, windres) ACX_CHECK_INSTALLED_TARGET_TOOL(WINDMC_FOR_TARGET, windmc) --- 2801,2807 ---- ACX_CHECK_INSTALLED_TARGET_TOOL(LIPO_FOR_TARGET, lipo) ACX_CHECK_INSTALLED_TARGET_TOOL(NM_FOR_TARGET, nm) ACX_CHECK_INSTALLED_TARGET_TOOL(OBJDUMP_FOR_TARGET, objdump) ! ACX_CHECK_INSTALLED_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib) ACX_CHECK_INSTALLED_TARGET_TOOL(STRIP_FOR_TARGET, strip) ACX_CHECK_INSTALLED_TARGET_TOOL(WINDRES_FOR_TARGET, windres) ACX_CHECK_INSTALLED_TARGET_TOOL(WINDMC_FOR_TARGET, windmc) diff -Nrcpad gcc-4.4.4/contrib/ChangeLog gcc-4.4.5/contrib/ChangeLog *** gcc-4.4.4/contrib/ChangeLog Thu Apr 29 07:52:39 2010 --- gcc-4.4.5/contrib/ChangeLog Fri Oct 1 08:05:15 2010 *************** *** 1,3 **** --- 1,29 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + + 2010-06-10 Rainer Orth + + Backport from mainline: + 2010-03-02 Rainer Orth + + * dg-extract-results.sh: Fix result order to match sequential case. + + 2010-06-04 Rainer Orth + + * test_summary: Don't use diff -u. + Adapt egrep regex. + + 2010-05-25 Rainer Orth + + * dg-extract-results.sh: Redirect grep output to /dev/null instead + of grep -q. + + Backport from mainline: + 2010-01-05 Rainer Orth + + * dg-extract-results.sh: Don't use tail -n. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/contrib/dg-extract-results.sh gcc-4.4.5/contrib/dg-extract-results.sh *** gcc-4.4.4/contrib/dg-extract-results.sh Mon Apr 27 19:13:16 2009 --- gcc-4.4.5/contrib/dg-extract-results.sh Thu Jun 10 12:27:08 2010 *************** else *** 224,230 **** VARIANTS="" for VAR in $VARS do ! grep -q "Running target $VAR" $SUM_FILES && VARIANTS="$VARIANTS $VAR" done fi --- 224,230 ---- VARIANTS="" for VAR in $VARS do ! grep "Running target $VAR" $SUM_FILES > /dev/null && VARIANTS="$VARIANTS $VAR" done fi *************** BEGIN { *** 365,372 **** END { printf ("\t\t=== %s Summary for %s ===\n\n", tool, variant) if (passcnt != 0) printf ("# of expected passes\t\t%d\n", passcnt) - if (xpasscnt != 0) printf ("# of unexpected successes\t%d\n", xpasscnt) if (failcnt != 0) printf ("# of unexpected failures\t%d\n", failcnt) if (xfailcnt != 0) printf ("# of expected failures\t\t%d\n", xfailcnt) if (untstcnt != 0) printf ("# of untested testcases\t\t%d\n", untstcnt) if (unrescnt != 0) printf ("# of unresolved testcases\t%d\n", unrescnt) --- 365,372 ---- END { printf ("\t\t=== %s Summary for %s ===\n\n", tool, variant) if (passcnt != 0) printf ("# of expected passes\t\t%d\n", passcnt) if (failcnt != 0) printf ("# of unexpected failures\t%d\n", failcnt) + if (xpasscnt != 0) printf ("# of unexpected successes\t%d\n", xpasscnt) if (xfailcnt != 0) printf ("# of expected failures\t\t%d\n", xfailcnt) if (untstcnt != 0) printf ("# of untested testcases\t\t%d\n", untstcnt) if (unrescnt != 0) printf ("# of unresolved testcases\t%d\n", unrescnt) *************** cat ${TMP}/var-* | $AWK -f $TOTAL_AWK *** 418,423 **** # This is ugly, but if there's version output from the compiler under test # at the end of the file, we want it. The other thing that might be there # is the final summary counts. ! tail -n 2 $FIRST_SUM | grep -q '^#' || tail -n 2 $FIRST_SUM exit 0 --- 418,423 ---- # This is ugly, but if there's version output from the compiler under test # at the end of the file, we want it. The other thing that might be there # is the final summary counts. ! tail -2 $FIRST_SUM | grep '^#' > /dev/null || tail -2 $FIRST_SUM exit 0 diff -Nrcpad gcc-4.4.4/contrib/reghunt/ChangeLog gcc-4.4.5/contrib/reghunt/ChangeLog *** gcc-4.4.4/contrib/reghunt/ChangeLog Thu Apr 29 07:52:33 2010 --- gcc-4.4.5/contrib/reghunt/ChangeLog Fri Oct 1 08:05:10 2010 *************** *** 1,3 **** --- 1,7 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/contrib/regression/ChangeLog gcc-4.4.5/contrib/regression/ChangeLog *** gcc-4.4.4/contrib/regression/ChangeLog Thu Apr 29 07:52:27 2010 --- gcc-4.4.5/contrib/regression/ChangeLog Fri Oct 1 08:05:04 2010 *************** *** 1,3 **** --- 1,7 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/contrib/test_summary gcc-4.4.5/contrib/test_summary *** gcc-4.4.4/contrib/test_summary Sat Jun 20 17:03:06 2009 --- gcc-4.4.5/contrib/test_summary Fri Jun 4 14:06:27 2010 *************** *** 1,6 **** #! /bin/sh ! # (C) 1998, 1999, 2000, 2002, 2003, 2004, 2007, 2009 # Free Software Foundation # Originally by Alexandre Oliva --- 1,6 ---- #! /bin/sh ! # (C) 1998, 1999, 2000, 2002, 2003, 2004, 2007, 2009, 2010 # Free Software Foundation # Originally by Alexandre Oliva *************** for file in $files; do *** 75,83 **** [ -f $file ] && anyfile=true && { $anychange || ! anychange=`diff -u $file.sent $file 2>/dev/null | if test ! -f $file.sent || ! egrep '^[-+](XPASS|FAIL)' >/dev/null; then echo true else echo false --- 75,83 ---- [ -f $file ] && anyfile=true && { $anychange || ! anychange=`diff $file.sent $file 2>/dev/null | if test ! -f $file.sent || ! egrep '^[<>] (XPASS|FAIL)' >/dev/null; then echo true else echo false diff -Nrcpad gcc-4.4.4/fixincludes/ChangeLog gcc-4.4.5/fixincludes/ChangeLog *** gcc-4.4.4/fixincludes/ChangeLog Thu Apr 29 07:48:38 2010 --- gcc-4.4.5/fixincludes/ChangeLog Fri Oct 1 08:02:15 2010 *************** *** 1,3 **** --- 1,43 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + + 2010-07-15 Rainer Orth + + Backport from mainline: + 2010-07-12 Rainer Orth + + * inclhack.def (solaris_cond_init): New fix. + * fixincl.x: Regenerate. + * tests/base/pthread.h [SOLARIS_COND_INIT_CHECK]: New test. + [SOLARIS_MUTEX_INIT_2_CHECK]: Adapt. + + 2010-06-02 Rainer Orth + + Backport from mainline: + 2010-03-31 Rainer Orth + + * inclhack.def (alpha_assert): Allow for more whitespace in + select. + * fixincl.x: Regenerate. + + 2010-06-02 Rainer Orth + + Backport from mainline: + 2009-09-02 Rainer Orth + + PR libfortran/41169 + * inclhack.def (irix_complex): New fix. + (solaris_complex): Likewise. + * fixincl.x: Regenerate. + * tests/base/complex.h [IRIX_COMPLEX_CHECK, SOLARIS_COMPLEX_CHECK]: + New tests. + + 2009-09-08 Ralf Wildenhues + + * inclhack.def (solaris_complex): Remove superfluous backslashes from + replacement string. Replace \+ operator with \{1,\}. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/fixincludes/fixincl.x gcc-4.4.5/fixincludes/fixincl.x *** gcc-4.4.4/fixincludes/fixincl.x Sat Feb 28 18:13:31 2009 --- gcc-4.4.5/fixincludes/fixincl.x Thu Jul 15 10:04:48 2010 *************** *** 2,12 **** * * DO NOT EDIT THIS FILE (fixincl.x) * ! * It has been AutoGen-ed Saturday February 28, 2009 at 10:11:41 AM PST * From the definitions inclhack.def * and the template file fixincl */ ! /* DO NOT SVN-MERGE THIS FILE, EITHER Sat Feb 28 10:11:41 PST 2009 * * You must regenerate it. Use the ./genfixes script. * --- 2,12 ---- * * DO NOT EDIT THIS FILE (fixincl.x) * ! * It has been AutoGen-ed Wednesday July 14, 2010 at 11:12:51 AM MEST * From the definitions inclhack.def * and the template file fixincl */ ! /* DO NOT SVN-MERGE THIS FILE, EITHER Wed Jul 14 11:12:52 MEST 2010 * * You must regenerate it. Use the ./genfixes script. * *************** *** 15,21 **** * certain ANSI-incompatible system header files which are fixed to work * correctly with ANSI C and placed in a directory that GNU C will search. * ! * This file contains 180 fixup descriptions. * * See README for more information. * --- 15,21 ---- * certain ANSI-incompatible system header files which are fixed to work * correctly with ANSI C and placed in a directory that GNU C will search. * ! * This file contains 183 fixup descriptions. * * See README for more information. * *************** tSCC zAlpha_AssertList[] = *** 832,838 **** * content selection pattern - do fix if pattern found */ tSCC zAlpha_AssertSelect0[] = ! "(#define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)"; #define ALPHA_ASSERT_TEST_CT 1 static tTestDesc aAlpha_AssertTests[] = { --- 832,838 ---- * content selection pattern - do fix if pattern found */ tSCC zAlpha_AssertSelect0[] = ! "(#[ \t]*define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)"; #define ALPHA_ASSERT_TEST_CT 1 static tTestDesc aAlpha_AssertTests[] = { *************** static const char* apzIrix_Asm_Apostroph *** 3788,3793 **** --- 3788,3832 ---- /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Irix_Complex fix + */ + tSCC zIrix_ComplexName[] = + "irix_complex"; + + /* + * File name selection pattern + */ + tSCC zIrix_ComplexList[] = + "complex.h\0"; + /* + * Machine/OS name selection pattern + */ + tSCC* apzIrix_ComplexMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; + + /* + * content selection pattern - do fix if pattern found + */ + tSCC zIrix_ComplexSelect0[] = + "#define[ \t]_Complex_I[ \t]\\(\\(float[ \t]_Complex\\)[ \t]\\(__I__\\)\\)"; + + #define IRIX_COMPLEX_TEST_CT 1 + static tTestDesc aIrix_ComplexTests[] = { + { TT_EGREP, zIrix_ComplexSelect0, (regex_t*)NULL }, }; + + /* + * Fix Command Arguments for Irix_Complex + */ + static const char* apzIrix_ComplexPatch[] = { sed_cmd_z, + "-e", "s/#define[ \t]_Complex_I[ \t]((float[ \t]_Complex)[ \t](__I__))/#define _Complex_I (__extension__ 1.0iF)/", + "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d", + "-e", "/#define[ \t]_Imaginary_I/d", + "-e", "s/#define[ \t]I[ \t]_Imaginary_I/#define I _Complex_I/", + (char*)NULL }; + + /* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Irix_Limits_Const fix */ tSCC zIrix_Limits_ConstName[] = *************** static const char* apzSco_MathPatch[] = *** 5301,5306 **** --- 5340,5422 ---- /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Solaris_Complex fix + */ + tSCC zSolaris_ComplexName[] = + "solaris_complex"; + + /* + * File name selection pattern + */ + tSCC zSolaris_ComplexList[] = + "complex.h\0"; + /* + * Machine/OS name selection pattern + */ + tSCC* apzSolaris_ComplexMachs[] = { + "*-*-solaris2.*", + (const char*)NULL }; + + /* + * content selection pattern - do fix if pattern found + */ + tSCC zSolaris_ComplexSelect0[] = + "#define[ \t]_Complex_I[ \t]_Complex_I"; + + #define SOLARIS_COMPLEX_TEST_CT 1 + static tTestDesc aSolaris_ComplexTests[] = { + { TT_EGREP, zSolaris_ComplexSelect0, (regex_t*)NULL }, }; + + /* + * Fix Command Arguments for Solaris_Complex + */ + static const char* apzSolaris_ComplexPatch[] = { sed_cmd_z, + "-e", "s/#define[ \t]_Complex_I[ \t]_Complex_I/#define\t_Complex_I\t(__extension__ 1.0iF)/", + "-e", "/#define[ \t]_Imaginary_I[ \t]_Imaginary_I/d", + "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d", + "-e", "s/#define[ \t]I[ \t]\\{1,\\}_Imaginary_I/#define\tI\t\t_Complex_I/", + (char*)NULL }; + + /* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Cond_Init fix + */ + tSCC zSolaris_Cond_InitName[] = + "solaris_cond_init"; + + /* + * File name selection pattern + */ + tSCC zSolaris_Cond_InitList[] = + "pthread.h\0"; + /* + * Machine/OS name selection pattern + */ + tSCC* apzSolaris_Cond_InitMachs[] = { + "*-*-solaris2.8", + (const char*)NULL }; + + /* + * content selection pattern - do fix if pattern found + */ + tSCC zSolaris_Cond_InitSelect0[] = + "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + + #define SOLARIS_COND_INIT_TEST_CT 1 + static tTestDesc aSolaris_Cond_InitTests[] = { + { TT_EGREP, zSolaris_Cond_InitSelect0, (regex_t*)NULL }, }; + + /* + * Fix Command Arguments for Solaris_Cond_Init + */ + static const char* apzSolaris_Cond_InitPatch[] = { + "format", + "%1, 0x4356%2", + "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+\\{.*0)(\\},[ \t]*0\\}.*)$", + (char*)NULL }; + + /* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Solaris_Math_1 fix */ tSCC zSolaris_Math_1Name[] = *************** static const char* apzX11_SprintfPatch[] *** 7308,7316 **** * * List of all fixes */ ! #define REGEX_COUNT 226 #define MACH_LIST_SIZE_LIMIT 181 ! #define FIX_COUNT 180 /* * Enumerate the fixes --- 7424,7432 ---- * * List of all fixes */ ! #define REGEX_COUNT 229 #define MACH_LIST_SIZE_LIMIT 181 ! #define FIX_COUNT 183 /* * Enumerate the fixes *************** typedef enum { *** 7408,7413 **** --- 7524,7530 ---- IRIX___GENERIC1_FIXIDX, IRIX___GENERIC2_FIXIDX, IRIX_ASM_APOSTROPHE_FIXIDX, + IRIX_COMPLEX_FIXIDX, IRIX_LIMITS_CONST_FIXIDX, IRIX_SOCKLEN_T_FIXIDX, IRIX_STDINT_C99_FIXIDX, *************** typedef enum { *** 7447,7452 **** --- 7564,7571 ---- RS6000_FCHMOD_FIXIDX, RS6000_PARAM_FIXIDX, SCO_MATH_FIXIDX, + SOLARIS_COMPLEX_FIXIDX, + SOLARIS_COND_INIT_FIXIDX, SOLARIS_MATH_1_FIXIDX, SOLARIS_MATH_2_FIXIDX, SOLARIS_MATH_3_FIXIDX, *************** tFixDesc fixDescList[ FIX_COUNT ] = { *** 7959,7964 **** --- 8078,8088 ---- IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aIrix_Asm_ApostropheTests, apzIrix_Asm_ApostrophePatch, 0 }, + { zIrix_ComplexName, zIrix_ComplexList, + apzIrix_ComplexMachs, + IRIX_COMPLEX_TEST_CT, FD_MACH_ONLY, + aIrix_ComplexTests, apzIrix_ComplexPatch, 0 }, + { zIrix_Limits_ConstName, zIrix_Limits_ConstList, apzIrix_Limits_ConstMachs, IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, *************** tFixDesc fixDescList[ FIX_COUNT ] = { *** 8154,8159 **** --- 8278,8293 ---- SCO_MATH_TEST_CT, FD_MACH_ONLY, aSco_MathTests, apzSco_MathPatch, 0 }, + { zSolaris_ComplexName, zSolaris_ComplexList, + apzSolaris_ComplexMachs, + SOLARIS_COMPLEX_TEST_CT, FD_MACH_ONLY, + aSolaris_ComplexTests, apzSolaris_ComplexPatch, 0 }, + + { zSolaris_Cond_InitName, zSolaris_Cond_InitList, + apzSolaris_Cond_InitMachs, + SOLARIS_COND_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Cond_InitTests, apzSolaris_Cond_InitPatch, 0 }, + { zSolaris_Math_1Name, zSolaris_Math_1List, apzSolaris_Math_1Machs, SOLARIS_MATH_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, diff -Nrcpad gcc-4.4.4/fixincludes/inclhack.def gcc-4.4.5/fixincludes/inclhack.def *** gcc-4.4.4/fixincludes/inclhack.def Sat Feb 28 18:13:31 2009 --- gcc-4.4.5/fixincludes/inclhack.def Thu Jul 15 10:04:48 2010 *************** fix = { *** 509,515 **** fix = { hackname = alpha_assert; files = "assert.h"; ! select = '(#define assert\(EX\).*)\(\(int\) \(EX\)\)'; c_fix = format; c_fix_arg = "%1(EX)"; test_text = '#define assert(EX) (((int) (EX)) ? (void)0 ' --- 509,515 ---- fix = { hackname = alpha_assert; files = "assert.h"; ! select = "(#[ \t]*" 'define assert\(EX\).*)\(\(int\) \(EX\)\)'; c_fix = format; c_fix_arg = "%1(EX)"; test_text = '#define assert(EX) (((int) (EX)) ? (void)0 ' *************** fix = { *** 2066,2071 **** --- 2066,2094 ---- /* + * IRIX 6.5 complex.h defines _Complex_I and _Imaginary_I in terms of __I__, + * which is a MIPSpro compiler builtin. Remove _Imaginary_I and imaginary + * definitions which are not supported by GCC. + */ + fix = { + hackname = irix_complex; + mach = "mips-sgi-irix6.5"; + files = complex.h; + select = "#define[ \t]_Complex_I[ \t]\\(\\(float[ \t]_Complex\\)[ \t]\\(__I__\\)\\)"; + sed = "s/#define[ \t]_Complex_I[ \t]((float[ \t]_Complex)[ \t](__I__))/" + "#define _Complex_I (__extension__ 1.0iF)/"; + sed = "/#define[ \t]imaginary[ \t]_Imaginary/d"; + sed = "/#define[ \t]_Imaginary_I/d"; + sed = "s/#define[ \t]I[ \t]_Imaginary_I/#define I _Complex_I/"; + test_text = "#define _Complex_I ((float _Complex) (__I__))\n" + "#define imaginary _Imaginary\n" + "// #define _Imaginary_I ((float _Imaginary) 1)\n" + "#define _Imaginary_I __I__\n" + "#define I _Imaginary_I"; + }; + + + /* * Non-traditional "const" declaration in Irix's limits.h. */ fix = { *************** fix = { *** 2807,2812 **** --- 2830,2879 ---- /* + * Solaris 10+ complex.h defines _Complex_I and _Imaginary_I in terms of + * themselves, which are Sun Studio compiler intrinsics. Remove _Imaginary_I + * and imaginary definitions which are not supported by GCC. + */ + fix = { + hackname = solaris_complex; + mach = "*-*-solaris2.*"; + files = complex.h; + select = "#define[ \t]_Complex_I[ \t]_Complex_I"; + sed = "s/#define[ \t]_Complex_I[ \t]_Complex_I/" + "#define\t_Complex_I\t(__extension__ 1.0iF)/"; + sed = "/#define[ \t]_Imaginary_I[ \t]_Imaginary_I/d"; + sed = "/#define[ \t]imaginary[ \t]_Imaginary/d"; + sed = "s/#define[ \t]I[ \t]\\{1,\\}_Imaginary_I/#define\tI\t\t_Complex_I/"; + test_text = "#define _Complex_I _Complex_I\n" + "#define complex _Complex\n" + "#define _Imaginary_I _Imaginary_I\n" + "#define imaginary _Imaginary\n" + "#undef I\n" + "#define I _Imaginary_I"; + }; + + + /* + * Solaris 8 PTHREAD_COND_INITIALIZER lacks the __pthread_cond_magic field. + * COND_MAGIC is only defined in and pollutes the namespace, so + * use the value literally instead. + */ + fix = { + hackname = solaris_cond_init; + select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + files = pthread.h; + mach = '*-*-solaris2.8'; + c_fix = format; + c_fix_arg = "%1, 0x4356%2"; + c_fix_arg = "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+" + "\\{.*0)(\\},[ \t]*0\\}.*)$"; + test_text = + '#pragma ident "@(#)pthread.h 1.29 01/07/07 SMI"'"\n" + '#define PTHREAD_COND_INITIALIZER {{{0}, 0}, 0} /* = DEFAULTCV */'; + }; + + + /* * Sun Solaris 10 defines several C99 math macros in terms of * builtins specific to the Studio compiler, in particular not * compatible with the GNU compiler. diff -Nrcpad gcc-4.4.4/fixincludes/tests/base/complex.h gcc-4.4.5/fixincludes/tests/base/complex.h *** gcc-4.4.4/fixincludes/tests/base/complex.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/fixincludes/tests/base/complex.h Wed Jun 2 16:49:39 2010 *************** *** 0 **** --- 1,23 ---- + /* DO NOT EDIT THIS FILE. + + It has been auto-edited by fixincludes from: + + "fixinc/tests/inc/complex.h" + + This had to be done to correct non-standard usages in the + original, manufacturer supplied header file. */ + + + + #if defined( IRIX_COMPLEX_CHECK ) + #define _Complex_I (__extension__ 1.0iF) + #define I _Complex_I + #endif /* IRIX_COMPLEX_CHECK */ + + + #if defined( SOLARIS_COMPLEX_CHECK ) + #define _Complex_I (__extension__ 1.0iF) + #define complex _Complex + #undef I + #define I _Complex_I + #endif /* SOLARIS_COMPLEX_CHECK */ diff -Nrcpad gcc-4.4.4/fixincludes/tests/base/pthread.h gcc-4.4.5/fixincludes/tests/base/pthread.h *** gcc-4.4.4/fixincludes/tests/base/pthread.h Sat Sep 6 19:57:26 2008 --- gcc-4.4.5/fixincludes/tests/base/pthread.h Thu Jul 15 10:04:48 2010 *************** extern int __sigsetjmp (struct __jmp_buf *** 106,111 **** --- 106,121 ---- #endif /* PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_CHECK */ + #if defined( SOLARIS_COND_INIT_CHECK ) + #pragma ident "@(#)pthread.h 1.29 01/07/07 SMI" + #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG) + #define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, 0} /* = DEFAULTCV */ + #else + #define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, {0}} /* = DEFAULTCV */ + #endif + #endif /* SOLARIS_COND_INIT_CHECK */ + + #if defined( SOLARIS_MUTEX_INIT_2_CHECK ) #ident "@(#)pthread.h 1.26 98/04/12 SMI" #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG) *************** extern int __sigsetjmp (struct __jmp_buf *** 114,122 **** #define PTHREAD_MUTEX_INITIALIZER {{{0},0}, {{{0}}}, {0}} #endif #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG) ! #define PTHREAD_COND_INITIALIZER {{{0}, 0}, 0} /* DEFAULTCV */ #else ! #define PTHREAD_COND_INITIALIZER {{{0}, 0}, {0}} /* DEFAULTCV */ #endif #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG) #define PTHREAD_MUTEX_INITIALIZER /* = DEFAULTMUTEX */ \ --- 124,132 ---- #define PTHREAD_MUTEX_INITIALIZER {{{0},0}, {{{0}}}, {0}} #endif #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG) ! #define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, 0} /* DEFAULTCV */ #else ! #define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, {0}} /* DEFAULTCV */ #endif #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG) #define PTHREAD_MUTEX_INITIALIZER /* = DEFAULTMUTEX */ \ diff -Nrcpad gcc-4.4.4/gcc/BASE-VER gcc-4.4.5/gcc/BASE-VER *** gcc-4.4.4/gcc/BASE-VER Thu Jan 21 12:55:56 2010 --- gcc-4.4.5/gcc/BASE-VER Thu Apr 29 11:48:41 2010 *************** *** 1 **** ! 4.4.4 --- 1 ---- ! 4.4.5 diff -Nrcpad gcc-4.4.4/gcc/ChangeLog gcc-4.4.5/gcc/ChangeLog *** gcc-4.4.4/gcc/ChangeLog Thu Apr 29 07:50:17 2010 --- gcc-4.4.5/gcc/ChangeLog Fri Oct 1 08:03:26 2010 *************** *** 1,3 **** --- 1,1032 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + + 2010-09-24 Jakub Jelinek + + Revert: + 2010-09-17 H.J. Lu + + PR middle-end/45234 + * calls.c (expand_call): Make sure that all variable sized + adjustments are multiple of preferred stack boundary after + stack alignment. + + 2010-09-23 Eric Botcazou + + Backport from mainline + 2010-09-02 Olivier Hainque + + PR middle-end/44763 + * ira-color.c (SORTGT): New macro, helper for qsort callbacks. + (allocno_priority_compare_func): Use it instead of a straight + difference computation over priorities. + + 2010-09-23 Jakub Jelinek + + PR rtl-optimization/45728 + * expr.c (expand_expr_real_1): If op0 isn't REG or MEM, try + gen_lowpart_common first and if that fails, force_reg first + before calling gen_lowpart. + + 2010-09-22 Eric Botcazou + + PR target/35664 + * config/sparc/constraints.md ('e'): Return NO_REGS if !TARGET_FPU. + ('f'): Likewise. + + 2010-09-21 Jakub Jelinek + + PR middle-end/45678 + * expr.c (expand_expr_real_1) : If + op0 isn't sufficiently aligned and there is movmisalignM + insn for mode, use it to load op0 into a temporary register. + + Backport from mainline + 2010-09-20 Jakub Jelinek + + PR middle-end/45678 + * cfgexpand.c (expand_one_stack_var_at): Limit alignment to + crtl->max_used_stack_slot_alignment. + + 2010-09-20 Eric Botcazou + + PR rtl-optimization/42775 + * cfgrtl.c (rest_of_pass_free_cfg): Recompute notes if delay slot + scheduling is enabled. + + 2010-09-20 H.J. Lu + + Backport from mainline + 2010-09-17 H.J. Lu + + PR middle-end/45234 + * calls.c (expand_call): Make sure that all variable sized + adjustments are multiple of preferred stack boundary after + stack alignment. + + 2010-09-18 Richard Guenther + + PR tree-optimization/45709 + * tree-inline.c (copy_phis_for_bb): Delay commit of edge + insertions until after all PHI nodes of the block are processed. + + 2010-09-12 Alexander Monakov + + Backport from mainline + 2010-09-06 Andrey Belevantsev + + PR rtl-optimization/44919 + * sel-sched.c (move_cond_jump): Remove assert, check that + the several blocks case can only happen with mutually exclusive + insns instead. Rewrite the movement code to support moving through + several basic blocks. + + 2010-09-09 Vladimir Makarov + + PR middle-end/45312 + * reload1.c (merge_assigned_reloads): Remove. + (reload_as_needed): Don't call it. + + 2010-09-09 Vladimir Makarov + + PR middle-end/44554 + * ira.c (ira): Switch off sharing spill slots if setjmp is called. + + 2010-09-08 Vladimir Makarov + + PR middle-end/40386 + * ira.c (pseudo_for_reload_consideration_p): Don't use + flag_ira_share_spill_slots. + + 2010-09-08 Martin Jambor + + PR other/45443 + * doc/invoke.texi: Add -fipa-cp-clone to list of switches turned on + at -O3. + + 2010-09-07 Ian Bolton + + Backport from mainline + 2010-09-01 Ian Bolton + + * Makefile.in (tree-switch-conversion.o): Update dependencies. + + 2010-08-19 Ian Bolton + + PR target/45070 + * config/arm/arm.c (arm_output_epilogue): Ensure that return + value of size 1-3 is handled correctly. + + 2010-08-19 Ian Bolton + + * tree-switch-conversion.c (gen_inbound_check): Ensure that the + type for the conditional has wide enough range. + + 2010-08-07 Marcus Shawcroft + + * config/arm/linux-atomic.c (SUBWORD_VAL_CAS): Instantiate with + 'unsigned short' and 'unsigned char' instead of 'short' and 'char'. + (SUBWORD_BOOL_CAS): Likewise. + (SUBWORD_SYNC_OP): Likewise. + (SUBWORD_TEST_AND_SET): Likewise. + (FETCH_AND_OP_WORD): Parenthesise INF_OP + (SUBWORD_SYNC_OP): Likewise. + (OP_AND_FETCH_WORD): Likewise. + + 2010-09-02 Jakub Jelinek + + Backport from mainline + 2010-08-30 Jakub Jelinek + + PR middle-end/45423 + * gimplify.c (goa_stabilize_expr): Handle TRUTH_NOT_EXPR + and TRUTH_{AND,OR,XOR}_EXPR. + * c-parser.c (c_parser_omp_atomic): Handle boolean + {PRE,POST}_{INC,DEC}REMENT. + + 2010-09-01 Eric Botcazou + + Backport from mainline + 2010-08-20 Jakub Jelinek + + PR rtl-optimization/45353 + * sel-sched-ir.c (sel_bb_head): Return NULL even if next_nonnote_insn + after bb_note is a BARRIER. + + 2010-09-01 Eric Botcazou + + * gimplify.c (gimplify_init_constructor): Do not create a temporary for + a volatile LHS if the constructor has only one element. + + 2010-08-28 Uros Bizjak + + PR target/41484 + * config/i386/sse.md (sse4_1_extendv8qiv8hi2): Also accept memory + operands for operand 1. + (sse4_1_extendv4qiv4si2): Ditto. + (sse4_1_extendv2qiv2di2): Ditto. + (sse4_1_extendv4hiv4si2): Ditto. + (sse4_1_extendv2hiv2di2): Ditto. + (sse4_1_extendv2siv2di2): Ditto. + (sse4_1_zero_extendv8qiv8hi2): Ditto. + (sse4_1_zero_extendv4qiv4si2): Ditto. + (sse4_1_zero_extendv2qiv2di2): Ditto. + (sse4_1_zero_extendv4hiv4si2): Ditto. + (sse4_1_zero_extendv2hiv2di2): Ditto. + (sse4_1_zero_extendv2siv2di2): Ditto. + (*sse4_1_extendv8qiv8hi2): Remove insn pattern. + (*sse4_1_extendv4qiv4si2): Ditto. + (*sse4_1_extendv2qiv2di2): Ditto. + (*sse4_1_extendv4hiv4si2): Ditto. + (*sse4_1_extendv2hiv2di2): Ditto. + (*sse4_1_extendv2siv2di2): Ditto. + (*sse4_1_zero_extendv8qiv8hi2): Ditto. + (*sse4_1_zero_extendv4qiv4si2): Ditto. + (*sse4_1_zero_extendv2qiv2di2): Ditto. + (*sse4_1_zero_extendv4hiv4si2): Ditto. + (*sse4_1_zero_extendv2hiv2di2): Ditto. + (*sse4_1_zero_extendv2siv2di2): Ditto. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2010-08-19 Andrey Belevantsev + + PR rtl-optimization/44691 + * sel-sched.c (count_occurrences_1): Also punt when SUBREG_REG + is not a register. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2010-01-14 Alexander Monakov + + * sel-sched.c: Add 2010 to copyright years. + * sel-sched-ir.c: Likewise. + * sel-sched-ir.h: Likewise. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2010-01-14 Alexander Monakov + + * sel-sched-ir.c (sel_restore_other_notes): Rename to + sel_restore_notes. Update all callers. Call reemit_notes for + all insns. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2010-01-14 Andrey Belevantsev + + PR rtl-optimization/42246 + * sel-sched-ir.h (get_all_loop_exits): Include exits from inner + loops. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2010-01-14 Andrey Belevantsev + + * sel-sched.c (compute_av_set_at_bb_end): Do not test that number of + all successors is the same as number of successors in current region. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2010-01-14 Alexander Monakov + + * sel-sched.c (maybe_emit_renaming_copy): Exit early when expression + to rename is not separable. Otherwise check that its LHS is not NULL. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2010-01-14 Alexander Monakov + + * sel-sched.c (choose_best_reg_1): Loop over all regs for mode. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2010-01-14 Alexander Monakov + + * sel-sched.c (mark_unavailable_hard_regs): Do not try to search + available registers when failed to discover LHS register class. + Fix indentation. Update comment. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2010-01-14 Andrey Belevantsev + Alexander Monakov + + PR rtl-optimization/42389 + * sel-sched.c (advance_one_cycle): Set FENCE_ISSUE_MORE + to can_issue_more. + (advance_state_on_fence): Likewise. + (sel_target_adjust_priority): Print debug output only when + sched_verbose >= 4, not 2. + (get_expr_cost): Do not issue all unique insns on the next cycle. + (fill_insns): Initialize can_issue_more from the value saved + with the fence. + * sel-sched-ir.c (flist_add): New parameter issue_more. + Init FENCE_ISSUE_MORE with it. + (merge_fences): Likewise. + (init_fences): Update call to flist_add. + (add_to_fences, add_clean_fence_to_fences) + (add_dirty_fence_to_fences): Likewise. + (move_fence_to_fences): Update call to merge_fences. + (invoke_reorder_hooks): Do not reset can_issue_more on insns from + sched groups. + * sel-sched-ir.h (struct _fence): New field issue_more. + (FENCE_ISSUE_MORE): New accessor macro. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2010-01-14 Andrey Belevantsev + + PR rtl-optimization/42388 + * sel-sched-ir.c (maybe_tidy_empty_bb): Do not delete empty blocks + that have no predecessors nor successors. Do not call move_bb_info + for empty blocks outside of current region. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2010-01-14 Alexander Monakov + + PR rtl-optimization/42294 + * sel-sched-ir.h (struct _sel_insn_data): Update comment. + * sel-sched.c (move_exprs_to_boundary): Transitively add all + originators' originators. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2010-01-14 Alexander Monakov + + PR rtl-optimization/39453 + PR rtl-optimization/42246 + * sel-sched-ir.c (considered_for_pipelining_p): Do not test + for pipelining_p. + (sel_add_loop_preheaders): Add preheader to last_added_blocks. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2010-01-14 Andrey Belevantsev + Alexander Monakov + + PR middle-end/42245 + * sel-sched-ir.c (sel_recompute_toporder): New. Use it... + (maybe_tidy_empty_bb): ... here. Make static. Add new + argument. Update all callers. + (tidy_control_flow): ... and here. Recompute topological order + of basic blocks in region if necessary. + (sel_redirect_edge_and_branch): Change return type. Return true + if topological order might have been invalidated. + (purge_empty_blocks): Export and move from... + * sel-sched.c (purge_empty_blocks): ... here. + * sel-sched-ir.h (sel_redirect_edge_and_branch): Update prototype. + (maybe_tidy_empty_bb): Delete prototype. + (purge_empty_blocks): Declare. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2010-01-14 Andrey Belevantsev + + PR rtl-optimization/42249 + * sel-sched.c (try_replace_dest_reg): When chosen register + and original register is the same, do not bail out early, but + still check all original insns for validity of replacing destination + register. Set EXPR_TARGET_AVAILABLE to 1 before leaving function + in this case. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2009-11-13 Andrey Belevantsev + + PR rtl-optimization/41697 + * sel-sched-ir.c (fallthru_bb_of_jump): Bail out when a block with + a conditional jump has a single successor. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2009-11-13 Andrey Belevantsev + + * sched-deps.c (init_deps): New parameter lazy_reg_last. Don't + allocate reg_last when in case lazy_reg_last is true. + (init_deps_reg_last): New. + (free_deps): When max_reg is 0, this context is already freed. + * sched-int.h (init_deps_reg_last): Export. + (init_deps): Update prototype. + * sched-ebb.c (schedule_ebb): Update the call to init_deps. + * sched-rgn.c (sched_rgn_compute_dependencies): Likewise. + * ddg.c (build_intra_loop_deps): Likewise. + * sel-sched-ir.c (copy_deps_context, create_deps_context, + reset_deps_context, deps_init_id): Likewise. + (init_first_time_insn_data): Lazy allocate INSN_DEPS_CONTEXT. + (free_data_for_scheduled_insn): New, break down from ... + (free_first_time_insn_data): ... here. + (has_dependence_p): Allocate reg_last now, when it is needed. + (extend_insn_data): When maximal LUID is big enough, allocate + per-insn data in smaller chunks. + * sel-sched-ir.h (free_data_for_scheduled_insn): Export. + * sel-sched.c (update_seqnos_and_stage): Free INSN_DEPS_CONTEXT + in scheduled insn. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2009-10-15 Steve Ellcey + + PR rtl-optimization/41697 + * sel-sched-ir.h (_eligible_successor_edge_p): Check successor count. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2009-05-29 Andrey Belevantsev + + PR rtl-optimization/40101 + * sel-sched-ir.c (get_seqno_by_preds): Allow returning negative + seqno. Adjust comment. + * sel-sched.c (find_seqno_for_bookkeeping): Assert that when + inserting bookkeeping before a jump, the jump is not scheduled. + When no positive seqno found, provide a value. Add comment. + + 2010-08-24 Andrey Belevantsev + + Backport from mainline: + 2009-04-28 Alexander Monakov + + * sel-sched-ir.c (maybe_tidy_empty_bb): Do not attempt to delete a + block if there are complex incoming edges. + (sel_merge_blocks): Remove useless assert. + (sel_redirect_edge_and_branch): Check that edge was redirected. + * sel-sched-ir.h (_eligible_successor_edge_p): Remove assert. + (sel_find_rgns): Delete declaration. + * sel-sched.c (purge_empty_blocks): Attempt to remove first block of + the region when it is not a preheader. + + 2010-08-17 Uros Bizjak + + PR target/45296 + * reginfo.c (globalize_reg): Reject stack registers. + + 2010-08-16 John David Anglin + + Backport from mainline: + 2010-08-09 Richard Guenther + + PR middle-end/44632 + * function.c (gimplify_parameters): Do not clear addressable + bit of the original parameter. + + 2010-08-14 John David Anglin + + Revert: + 2010-08-08 John David Anglin + + PR boehm-gc/34544 + * gthr-posix.h (__gthread_start): Delete. + (__gthread_active_init): Use pthread_default_stacksize_np instead of + pthread_create to determine if hpux pthreads are active. + * gthr-posix95.h (__gthread_start): Delete. + (__gthread_active_init): Likewise use pthread_default_stacksize_np. + + 2010-08-12 Jakub Jelinek + + PR middle-end/45262 + * fold-const.c (make_range) : Punt if + -a overflows. Normalize the range. + + 2010-08-10 Steve Ellcey + Jakub Jelinek + + Backport from mainline: + PR middle-end/41551 + * function.c (instantiate_virtual_regs_in_insn): Copy to new reg + before forcing mode. + + 2010-08-08 John David Anglin + + Backport from mainline. + 2010-07-17 John David Anglin + + PR target/44805 + * config/pa/pa.h (CONSTANT_ALIGNMENT): Align strings to BITS_PER_WORD + on all targets. + + 2010-08-08 Richard Guenther + + PR tree-optimization/45109 + * tree-ssa-structalias.c (get_constraint_for_component_ref): + Explicitly strip handled components and indirect references. + + 2010-08-08 John David Anglin + + PR boehm-gc/34544 + * gthr-posix.h (__gthread_start): Delete. + (__gthread_active_init): Use pthread_default_stacksize_np instead of + pthread_create to determine if hpux pthreads are active. + * gthr-posix95.h (__gthread_start): Delete. + (__gthread_active_init): Likewise use pthread_default_stacksize_np. + + 2010-08-06 Eric Botcazou + + PR target/44942 + * config/sparc/sparc.c (function_arg_advance): Always take into account + the padding, if any. + + 2010-08-06 Uros Bizjak + + * expmed.c (expand_mult_const) : Expand shift into + temporary. Emit move from temporary to accum, so REG_EQUAL note will + be attached to this insn in correct mode. + + 2010-08-06 Uros Bizjak + + * config/i386/i386.c (ix86_decompose_address): Check for SI_REG + using REGNO of base_reg directly. + + 2010-08-04 Ulrich Weigand + + * config/spu/spu.c (spu_emit_branch_hint): Do not access NOTE_KIND of + non-NOTE insns. + + 2010-07-28 Ulrich Weigand + + Backport from mainline: + 2010-04-03 Richard Guenther + + PR middle-end/42509 + * alias.c (nonoverlapping_memrefs_p): For spill-slot accesses + require a non-NULL MEM_OFFSET. + + 2010-07-27 Richard Guenther + + PR c/44555 + * c-common.c (c_common_truthvalue_conversion): Remove + premature and wrong optimization concering ADDR_EXPRs. + + 2010-07-27 Richard Guenther + + PR tree-optimization/44977 + * tree-ssa-dom.c (propagate_rhs_into_lhs): Do not create invalid + SSA form. + + 2010-07-22 Jakub Jelinek + + Backport from mainline + 2010-07-16 Jakub Jelinek + + PR target/44942 + * config/i386/i386-protos.h (ix86_function_arg_boundary): Change second + argument to const_tree. + * config/i386/i386.c (function_arg_advance): If padding needs to be + inserted before argument, increment cum->words by number of padding + words as well. + (contains_aligned_value_p): Change argument to const_tree. + (ix86_function_arg_boundary): Change second argument to const_tree. + + 2010-07-21 Steve Ellcey + + Backport from mainline: + PR target/42869 + * config/ia64/sync.md (sync_compare_and_swap): Move memory fence. + + 2010-07-15 Rainer Orth + + Backport from mainline: + 2010-07-12 Rainer Orth + + * config/i386/i386.c (ix86_sol10_return_in_memory): Rename to + ix86_solaris_return_in_memory. + * config/i386-protos.h: Reflect this. + * config/i386/vx-common.h (SUBTARGET_RETURN_IN_MEMORY): Likewise. + * config/i386/sol2-10.h (SUBTARGET_RETURN_IN_MEMORY): Likewise. + Move ... + * config/i386/sol2.h (SUBTARGET_RETURN_IN_MEMORY): ... here. + + 2010-07-15 Rainer Orth + + Backport from mainline: + 2010-07-12 Rainer Orth + + * doc/install.texi (Specific, i?86-*-solaris2.[89]): Recommend GNU as. + Document SSE/SSE2 support. + + 2010-07-13 Rainer Orth + + * config/i386/sol2-unwind.h (x86_64_fallback_frame_state): Correct + explanation. + Find ucontext_t * on Solaris 11. + (x86_fallback_frame_state): Handle Solaris 9 multi-threaded pattern. + Handle new Solaris 11 __sighndlr patterns. + + Backport from mainline: + 2009-10-11 Olivier Hainque + Eric Botcazou + + PR target/33743 + * config/i386/sol2.h (MD_UNWIND_SUPPORT): Define. + * config/i386/sol2-unwind.h: New file. + + 2010-07-13 Rainer Orth + + Backport from mainline: + 2010-07-12 Rainer Orth + + PR pch/14940 + * config/host-solaris.c (mmap_fixed): New function. + (sol_gt_pch_get_address): Use it. + (sol_gt_pch_use_address): Likewise. + + 2010-07-03 John David Anglin + + PR target/44597 + * config/pa/predicates.md (prefetch_cc_operand): Remove. + (prefetch_nocc_operand): Likewise. + * config/pa/pa.md (prefetch): Revise expander to use prefetch_20. + (prefetch_20): New insn. + (prefetch_cc): Remove. + (prefetch_nocc): Likewise. + + PR target/44705 + * config/pa/pa.h (GO_IF_LEGITIMATE_ADDRESS): Reject LABEL_REF. + + 2010-07-01 Jakub Jelinek + + Backport from mainline + 2009-06-13 Richard Guenther + + PR tree-optimization/40421 + * tree-predcom.c (should_unroll_loop_p): Remove. + (tree_predictive_commoning_loop): Use can_unroll_loop_p. + + 2010-06-27 Richard Guenther + + PR tree-optimization/44683 + * tree-ssa-dom.c (record_edge_info): Record equivalences for the + false edge from the inverted condition. + + 2010-06-21 John David Anglin + + PR target/39690 + * config/pa/pa.c (override_options): Disable + -freorder-blocks-and-partition. + + 2010-06-21 Jakub Jelinek + + PR bootstrap/44426 + * sel-sched-dump.h (sel_prepare_string_for_dot_label): Remove + prototype. + (sel_print_to_dot): Remove macro. + (sel_print): Likewise. New prototype. + * sel-sched-dump.c (sel_prepare_string_for_dot_label): Make static. + (sel_print): New function. + + 2010-06-20 Gerald Pfeifer + + Backport from mainline: + 2009-09-11 Loren J. Rittle + + * configure.ac (*-*-freebsd*): Enable check for __stack_chk_fail. + * configure: Regenerate. + + 2010-06-19 John David Anglin + + Backport from mainline + 2010-05-29 John David Anglin + + PR target/44261 + config/pa/pa.md (negdf2_slow, negsf2_slow): New patterns. + (negdf2): Adjust expander pattern and use negdf2_slow. + (negsf2): Likewise. + + 2010-06-17 John David Anglin + + PR target/43740 + config/pa/pa.c (emit_move_sequence): Don't infer REG_POINTER flag for + SET source operand from SET destination operand. + + 2010-06-15 Jakub Jelinek + + PR bootstrap/44544 + Backport from mainline + 2009-09-13 Richard Guenther + Rafael Avila de Espindola + + * langhooks-def.h (lhd_pass_through_t): Declare. + * langhooks.c (lhd_pass_through_t): New function. + + 2010-06-15 Jakub Jelinek + + PR fortran/44536 + * langhooks.h (struct lang_hooks_for_decls): Add omp_report_decl. + * langhooks-def.h (LANG_HOOKS_OMP_REPORT_DECL): Define. + (LANG_HOOKS_DECLS): Add it. + * gimplify.c (omp_notice_variable): Call + lang_hooks.decls.omp_report_decl. + + 2010-06-14 H.J. Lu + + Backport from mainline + 2010-06-14 H.J. Lu + + PR target/44534 + * config/i386/sse.md (vec_extract_lo_): Replace 0x1 with + 0x0. + (vec_extract_lo_v16hi): Likewise. + (vec_extract_lo_v32qi): Likewise. + + 2010-06-14 Jakub Jelinek + + PR tree-optimization/44508 + * tree-ssa-propagate.c (substitute_and_fold): Don't do DCE + when called from tree-vrp.c. + + 2010-06-13 Gerald Pfeifer + + Backport from mainline: + 2009-09-11 Loren J. Rittle + + * config.gcc (*-*-freebsd*): Enable default_use_cxa_atexit + to match the system compiler's configuration at inflection point. + + 2010-06-12 Uros Bizjak + + PR target/44481 + * config/i386/i386.md (UNSPEC_PARITY): New unspec. + (paritydi2_cmp): Use UNSPEC_PARITY unspec insted of parity RTX. + (partiysi2_cmp): Ditto. + (*partiyhi2_cmp): Ditto. + (*parityqi2_cmp): Remove. + + 2010-06-08 Uros Bizjak + + * config/i386/i386.md (*movsi_1) : Use %a modifier + to output operand 1. + (ashift_zext lea splitter): Use DImode for multiplication. + + * config/i386/i386.c (ix86_expand_epilogue): Do not use ix86_gen_add + to generate addition. + + 2010-06-07 Rainer Orth + + Backport from mainline: + 2010-06-02 Rainer Orth + + * configure.ac (gcc_cv_ld_sol2_emulation): Test for GNU ld *_sol2 + linker emulations. + * configure: Regenerate. + * config.in: Regenerate. + + * config/i386/sol2-10.h [TARGET_GNU_LD] (I386_EMULATION): Define. + (X86_64_EMULATION): Define. + (TARGET_LD_EMULATION): Use them. + + * config/sparc/sol2-gld-bi.h (SPARC32_EMULATION): Define. + (SPARC64_EMULATION): Define. + (LINK_ARCH_SPEC): Use them. + + 2010-06-04 Uros Bizjak + + * config/i386/i386.md (*addqi_4): Check for incdec_operand in QImode. + + 2010-06-04 Alan Modra + + PR target/44075 + * gcc/config/rs6000/rs6000.c (struct machine_function): Reorder + fields for better packing. Add lr_save_state. + (rs6000_ra_ever_killed): Return lr_save_state if set. + (rs6000_emit_eh_reg_restore): Set lr_save_state. + + 2010-06-03 Alan Modra + + PR target/44169 + * config/rs6000/rs6000.md (load_toc_v4_PIC_1b): Add label operand. + * config/rs6000/rs6000.c (rs6000_legitimize_tls_address): Pass label + rtx to gen_load_toc_v4_PIC_1b. Tidy. + (rs6000_emit_load_toc_table): Likewise. + + 2010-06-02 Rainer Orth + + Backport from mainline: + 2010-03-31 Rainer Orth + + * config/sparc/sysv4.h (PUSHSECTION_FORMAT): Remove undef. + (PUSHSECTION_ASM_OP): Remove. + (POPSECTION_ASM_OP): Remove. + (PUSHSECTION_FORMAT): Remove. + * config/sol2.h (PUSHSECTION_FORMAT): Define. + * config/sparc/sol2.h [!USE_GAS] (PUSHSECTION_FORMAT): Redefine. + * config/sol2.c (solaris_output_init_fini): Use it. + + 2010-03-24 Rainer Orth + + * config.gcc (sparc*-*-solaris2*) [$gas=yes]: Add usegas.h to tm_file. + + 2010-06-02 Rainer Orth + + Backport from mainline: + 2010-04-09 Rainer Orth + + * config/sparc/sol2-gld.h: Remove SPARC reference. Rename ... + * config/sol2-gld.h: ... here. + * config.gcc (sparc*-*-solaris2*): Reflect this. + (i[34567]86-*-solaris2*): Use it. + + 2010-06-02 Rainer Orth + + Backport from mainline: + 2010-03-01 Rainer Orth + + PR pch/14940 + * config/host-solaris.c (HOST_HOOKS_GT_PCH_GET_ADDRESS): Redefine + to sol_gt_pch_get_address. + (TRY_EMPTY_VM_SPACE): Define for all combinations of 32 and + 64-bit, SPARC and x86. + (sol_gt_pch_get_address): New function. + + 2010-06-02 Rainer Orth + + Backport from mainline: + 2010-02-24 Rainer Orth + + * config/i386/sol2.h (NO_DBX_BNSYM_ENSYM): Define. + * config/i386/sol2-gas.h: New file. + * config.gcc (i[34567]86-*-solaris2*): Use it. + + 2010-06-02 Rainer Orth + + Backport from mainline: + 2010-03-01 Rainer Orth + + * configure.ac (gcc_cv_as_cfi_directive) [i?86-*-solaris*]: + Disable cfi directives unless GCC and gas agree on using read-only + .eh_frame sections for 64-bit. + * configure: Regenerate. + + 2010-06-02 Andreas Krebbel + + * config/s390/2097.md (z10_fhex): Remove insn reservation. + * config/s390/s390.md (UNSPEC_COPYSIGN): Remove unused constant. + (*mov_64 TD_TF, *mov_31 TD_TF, *mov_64dfp DD_DF, + *mov_64 DD_DF, *mov_31, mov): Remove load zero + instruction. + * config/s390/s390.c: Don't accept fp zeros as valid constants + anymore. + + 2010-05-28 Andreas Krebbel + + * config/s390/s390.md (movqi): Fix typo ('*' -> '#'). + + 2010-05-27 Matthias Klose + + Backport from mainline: + 2009-04-22 Andrey Belevantsev + + PR rtl-optimization/39580 + * sel-sched-ir.c (insert_in_history_vect): Remove incorrect gcc_assert. + + 2010-05-26 Jakub Jelinek + + PR target/44199 + * config/rs6000/rs6000.c (rs6000_emit_epilogue): If cfun->calls_alloca + or total_size is larger than red zone size for non-V4 ABI, emit a + stack_tie resp. frame_tie insn before stack pointer restore. + * config/rs6000/rs6000.md (frame_tie): New insn. + + 2010-05-24 Uros Bizjak + + Backport from mainline: + 2010-05-20 Uros Bizjak + + PR target/43733 + * configure.ac (gcc_cv_as_ix86_sahf): Switch to 64bit mode. + * configure: Regenerate. + * config.in: Regenerate. + * config/i386/i386.md (x86_sahf_1): Conditionally output 0x9e + instead of sahf only for 64bit targets. + + 2010-05-23 H.J. Lu + + Backport from mainline + 2010-05-23 H.J. Lu + + PR target/44245 + * config/i386/i386.c (def_builtin): Properly check + OPTION_MASK_ISA_64BIT. + + 2010-05-21 Andreas Krebbel + + * config/s390/s390.c (override_options): Increase the default + of max-completely-peel-times. + + 2010-05-21 Richard Guenther + + PR tree-optimization/43845 + * tree-ssa-pre.c (create_component_ref_by_pieces_1): Properly + lookup the CALL_EXPR function and arguments. + + 2010-05-21 Jakub Jelinek + + PR debug/44205 + * tree-cfgcleanup.c (tree_forwarder_block_p): Return false if + at -O0 goto_locus of any of the incoming edges differs from + goto_locus of outgoing edge, or gimple_location of any of the + labels differs. + + 2010-05-19 Kenneth Zadeck + + PR bootstrap/43870 + * df-scan.c (df_ref_compare): Stabilize sort. + + 2010-05-20 Jakub Jelinek + + PR target/44074 + * configure: Regenerate. + + 2010-05-20 Hans-Peter Nilsson + + PR target/44202 + * config/cris/cris.md ("*addsi3_v32"): Correct "cc" + settings for 16-bit-constant "addo" alternative. + + 2010-05-19 Rainer Orth + + Backport from mainline: + 2010-05-17 Rainer Orth + + PR target/44074 + * configure.ac (HAVE_AS_IX86_REP_LOCK_PREFIX): New test. + * configure: Regenerate. + * config.in: Regenerate. + * config/i386/i386.c (print_operand) : Also print ; if + !HAVE_AS_IX86_REP_LOCK_PREFIX. + Don't emit whitespace. + * config/i386/i386.md (*rep_movdi_rex64): Use {%;} after rep. + (*rep_movsi): Likewise. + (*rep_movsi_rex64): Likewise. + (*rep_movqi): Likewise. + (*rep_movqi_rex64): Likewise. + (*rep_stosdi_rex64): Likewise. + (*rep_stossi): Likewise. + (*rep_stossi_rex64): Likewise. + (*rep_stosqi): Likewise. + (*rep_stosqi_rex64): Likewise. + (*cmpstrnqi_nz_1): Use {%;} after repz. + (*cmpstrnqi_nz_rex_1): Likewise. + (*cmpstrnqi_1): Likewise. + (*cmpstrnqi_rex_1): Likewise. + (*strlenqi_1): Use {%;} after repnz. + (*strlenqi_rex_1): Likewise. + * config/i386/sync.md (memory_barrier_nosse): Replace {%;| } by {%;} . + (*sync_compare_and_swap): Likewise. + (sync_double_compare_and_swap): Likewise. + (*sync_double_compare_and_swapdi_pic): Likewise. + (sync_old_add): Likewise. + (sync_add): Likewise. + (sync_sub): Likewise. + (sync_): Likewise. + + 2010-05-19 Rainer Orth + + * doc/sourcebuild.texi (Directives): Document optional + dg-require-effective-target selector. + + 2010-05-19 Rainer Orth + + * configure.ac (gcc_cv_as_hidden): Check for Solaris 9/x86 as + hidden alias bug. + (gcc_cv_as_ix86_quad): Check for .quad directive. + * configure: Regenerate. + * config.in: Regenerate. + * config/i386/sol2.h (ASM_QUAD): Change guard to !HAVE_AS_IX86_QUAD. + + 2010-05-17 Alan Modra + + * config/rs6000/rs6000.c (rs6000_emit_allocate_stack): Delete + unnecessary prototype. Replace copy_r12 and copy_r11 flag params + with copy_reg rtx param. + (rs6000_emit_prologue): Update rs6000_emit_allocate_stack calls. + Correct cases where code for ABI_V4 did not initialise the reg + used to access frame. Also leave frame_reg_rtx as sp for large + frames that save no regs. + + 2010-05-12 Jakub Jelinek + + PR middle-end/44085 + * gimplify.c (enum omp_region_type): Add ORT_UNTIED_TASK, + change value of ORT_TASK. + (new_omp_context): Handle ORT_UNTIED_TASK like ORT_TASK. + (omp_notice_threadprivate_variable): New function. + (omp_notice_variable): Call it for threadprivate variables. + If enclosing ctx is a task, print enclosing task rather than + enclosing parallel. Handle ORT_UNTIED_TASK like ORT_TASK. + (gimplify_omp_task): Pass ORT_UNTIED_TASK instead of ORT_TASK + if task has untied clause. + + 2010-05-07 Ralf Wildenhues + + PR documentation/44016 + * doc/standards.texi (Standards): Link to unversioned + cxx0x_status.html page. + + 2010-05-05 Kaz Kojima + + Backport from mainline: + 2010-04-22 Kaz Kojima + + PR target/43744 + * config/sh/sh.c (find_barrier): Don't emit a constant pool + in the middle of insns for casesi_worker_2. + + 2010-05-05 Jason Merrill + + PR debug/43370 + * c-common.c (handle_aligned_attribute): Respect + ATTR_FLAG_TYPE_IN_PLACE. + + 2010-05-04 H.J. Lu + + Backport from mainline + 2010-05-04 H.J. Lu + + PR middle-end/43671 + * alias.c (true_dependence): Handle the same VALUE in x and mem. + (canon_true_dependence): Likewise. + (write_dependence_p): Likewise. + + 2010-05-02 Uros Bizjak + + * config/i386/i386.c (ix86_target_string): Output 'flags', not 'isa', + when processing flag options. + + 2010-04-30 Eric Botcazou + + * tree-ssa-loop-ivopts.c (may_be_unaligned_p): Check the alignment of + the variable part of the offset as well. Use highest_pow2_factor for + all alignment checks. + + 2010-04-30 Jakub Jelinek + + PR c/43893 + * c-omp.c (c_finish_omp_for): Handle also EQ_EXPR. + + 2010-04-29 Jakub Jelinek + + * BASE-VER: Set to 4.4.5. + * DEV-PHASE: Set to prerelease. + 2010-04-29 Release Manager * GCC 4.4.4 released. *************** *** 72,79 **** 2010-04-08 Wolfgang Gellerich * config/s390/s390.c (override_options): Adjust the z10 ! defaults for max-unroll-times, max-completely-peeled-insns ! and max-completely-peel-times. 2010-04-08 Wolfgang Gellerich --- 1101,1108 ---- 2010-04-08 Wolfgang Gellerich * config/s390/s390.c (override_options): Adjust the z10 ! defaults for max-unroll-times, max-completely-peeled-insns ! and max-completely-peel-times. 2010-04-08 Wolfgang Gellerich diff -Nrcpad gcc-4.4.4/gcc/DATESTAMP gcc-4.4.5/gcc/DATESTAMP *** gcc-4.4.4/gcc/DATESTAMP Thu Apr 29 00:16:42 2010 --- gcc-4.4.5/gcc/DATESTAMP Fri Oct 1 00:18:22 2010 *************** *** 1 **** ! 20100429 --- 1 ---- ! 20101001 diff -Nrcpad gcc-4.4.4/gcc/Makefile.in gcc-4.4.5/gcc/Makefile.in *** gcc-4.4.4/gcc/Makefile.in Mon Mar 8 11:46:28 2010 --- gcc-4.4.5/gcc/Makefile.in Tue Sep 7 11:07:31 2010 *************** tree-switch-conversion.o : tree-switch-c *** 2718,2724 **** $(TREE_H) $(TM_P_H) $(TREE_FLOW_H) $(DIAGNOSTIC_H) $(TREE_INLINE_H) \ $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) $(GIMPLE_H) \ tree-pass.h $(FLAGS_H) $(EXPR_H) $(BASIC_BLOCK_H) output.h \ ! $(GGC_H) $(OBSTACK_H) $(PARAMS_H) $(CPPLIB_H) $(PARAMS_H) tree-complex.o : tree-complex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \ $(TM_H) $(RTL_H) $(REAL_H) $(FLAGS_H) $(TREE_FLOW_H) $(GIMPLE_H) \ tree-iterator.h tree-pass.h tree-ssa-propagate.h $(DIAGNOSTIC_H) --- 2718,2724 ---- $(TREE_H) $(TM_P_H) $(TREE_FLOW_H) $(DIAGNOSTIC_H) $(TREE_INLINE_H) \ $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) $(GIMPLE_H) \ tree-pass.h $(FLAGS_H) $(EXPR_H) $(BASIC_BLOCK_H) output.h \ ! $(GGC_H) $(OBSTACK_H) $(PARAMS_H) $(CPPLIB_H) $(PARAMS_H) langhooks.h tree-complex.o : tree-complex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \ $(TM_H) $(RTL_H) $(REAL_H) $(FLAGS_H) $(TREE_FLOW_H) $(GIMPLE_H) \ tree-iterator.h tree-pass.h tree-ssa-propagate.h $(DIAGNOSTIC_H) diff -Nrcpad gcc-4.4.4/gcc/alias.c gcc-4.4.5/gcc/alias.c *** gcc-4.4.4/gcc/alias.c Thu Aug 13 06:28:28 2009 --- gcc-4.4.5/gcc/alias.c Wed Jul 28 18:00:08 2010 *************** nonoverlapping_memrefs_p (const_rtx x, c *** 2043,2048 **** --- 2043,2055 ---- if (exprx == 0 || expry == 0) return 0; + /* For spill-slot accesses make sure we have valid offsets. */ + if ((exprx == get_spill_slot_decl (false) + && ! MEM_OFFSET (x)) + || (expry == get_spill_slot_decl (false) + && ! MEM_OFFSET (y))) + return 0; + /* If both are field references, we may be able to determine something. */ if (TREE_CODE (exprx) == COMPONENT_REF && TREE_CODE (expry) == COMPONENT_REF *************** true_dependence (const_rtx mem, enum mac *** 2214,2221 **** if (mem_mode == VOIDmode) mem_mode = GET_MODE (mem); ! x_addr = get_addr (XEXP (x, 0)); ! mem_addr = get_addr (XEXP (mem, 0)); base = find_base_term (x_addr); if (base && (GET_CODE (base) == LABEL_REF --- 2221,2238 ---- if (mem_mode == VOIDmode) mem_mode = GET_MODE (mem); ! x_addr = XEXP (x, 0); ! mem_addr = XEXP (mem, 0); ! if (!((GET_CODE (x_addr) == VALUE ! && GET_CODE (mem_addr) != VALUE ! && reg_mentioned_p (x_addr, mem_addr)) ! || (GET_CODE (x_addr) != VALUE ! && GET_CODE (mem_addr) == VALUE ! && reg_mentioned_p (mem_addr, x_addr)))) ! { ! x_addr = get_addr (x_addr); ! mem_addr = get_addr (mem_addr); ! } base = find_base_term (x_addr); if (base && (GET_CODE (base) == LABEL_REF *************** canon_true_dependence (const_rtx mem, en *** 2287,2293 **** return 0; if (! x_addr) ! x_addr = get_addr (XEXP (x, 0)); if (! base_alias_check (x_addr, mem_addr, GET_MODE (x), mem_mode)) return 0; --- 2304,2319 ---- return 0; if (! x_addr) ! { ! x_addr = XEXP (x, 0); ! if (!((GET_CODE (x_addr) == VALUE ! && GET_CODE (mem_addr) != VALUE ! && reg_mentioned_p (x_addr, mem_addr)) ! || (GET_CODE (x_addr) != VALUE ! && GET_CODE (mem_addr) == VALUE ! && reg_mentioned_p (mem_addr, x_addr)))) ! x_addr = get_addr (x_addr); ! } if (! base_alias_check (x_addr, mem_addr, GET_MODE (x), mem_mode)) return 0; *************** write_dependence_p (const_rtx mem, const *** 2347,2354 **** if (nonoverlapping_memrefs_p (x, mem)) return 0; ! x_addr = get_addr (XEXP (x, 0)); ! mem_addr = get_addr (XEXP (mem, 0)); if (! writep) { --- 2373,2390 ---- if (nonoverlapping_memrefs_p (x, mem)) return 0; ! x_addr = XEXP (x, 0); ! mem_addr = XEXP (mem, 0); ! if (!((GET_CODE (x_addr) == VALUE ! && GET_CODE (mem_addr) != VALUE ! && reg_mentioned_p (x_addr, mem_addr)) ! || (GET_CODE (x_addr) != VALUE ! && GET_CODE (mem_addr) == VALUE ! && reg_mentioned_p (mem_addr, x_addr)))) ! { ! x_addr = get_addr (x_addr); ! mem_addr = get_addr (mem_addr); ! } if (! writep) { diff -Nrcpad gcc-4.4.4/gcc/c-common.c gcc-4.4.5/gcc/c-common.c *** gcc-4.4.4/gcc/c-common.c Thu Nov 5 14:57:57 2009 --- gcc-4.4.5/gcc/c-common.c Tue Jul 27 13:07:28 2010 *************** c_common_truthvalue_conversion (location *** 3397,3416 **** inner); return truthvalue_true_node; } ! ! /* If we still have a decl, it is possible for its address to ! be NULL, so we cannot optimize. */ ! if (DECL_P (inner)) ! { ! gcc_assert (DECL_WEAK (inner)); ! break; ! } ! ! if (TREE_SIDE_EFFECTS (inner)) ! return build2 (COMPOUND_EXPR, truthvalue_type_node, ! inner, truthvalue_true_node); ! else ! return truthvalue_true_node; } case COMPLEX_EXPR: --- 3397,3403 ---- inner); return truthvalue_true_node; } ! break; } case COMPLEX_EXPR: *************** handle_aligned_attribute (tree *node, tr *** 5957,5966 **** } else if (is_type) { /* If we have a TYPE_DECL, then copy the type, so that we don't accidentally modify a builtin type. See pushdecl. */ ! if (decl && TREE_TYPE (decl) != error_mark_node ! && DECL_ORIGINAL_TYPE (decl) == NULL_TREE) { tree tt = TREE_TYPE (decl); *type = build_variant_type_copy (*type); --- 5944,5955 ---- } else if (is_type) { + if ((flags & (int) ATTR_FLAG_TYPE_IN_PLACE)) + /* OK, modify the type in place. */; /* If we have a TYPE_DECL, then copy the type, so that we don't accidentally modify a builtin type. See pushdecl. */ ! else if (decl && TREE_TYPE (decl) != error_mark_node ! && DECL_ORIGINAL_TYPE (decl) == NULL_TREE) { tree tt = TREE_TYPE (decl); *type = build_variant_type_copy (*type); *************** handle_aligned_attribute (tree *node, tr *** 5969,5975 **** TREE_USED (*type) = TREE_USED (decl); TREE_TYPE (decl) = *type; } ! else if (!(flags & (int) ATTR_FLAG_TYPE_IN_PLACE)) *type = build_variant_type_copy (*type); TYPE_ALIGN (*type) = (1 << i) * BITS_PER_UNIT; --- 5958,5964 ---- TREE_USED (*type) = TREE_USED (decl); TREE_TYPE (decl) = *type; } ! else *type = build_variant_type_copy (*type); TYPE_ALIGN (*type) = (1 << i) * BITS_PER_UNIT; diff -Nrcpad gcc-4.4.4/gcc/c-omp.c gcc-4.4.5/gcc/c-omp.c *** gcc-4.4.4/gcc/c-omp.c Thu Mar 19 15:34:00 2009 --- gcc-4.4.5/gcc/c-omp.c Fri Apr 30 18:41:42 2010 *************** *** 1,7 **** /* This file contains routines to construct GNU OpenMP constructs, called from parsing in the C and C++ front ends. ! Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation, Inc. Contributed by Richard Henderson , Diego Novillo . --- 1,7 ---- /* This file contains routines to construct GNU OpenMP constructs, called from parsing in the C and C++ front ends. ! Copyright (C) 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Richard Henderson , Diego Novillo . *************** c_finish_omp_for (location_t locus, tree *** 281,287 **** || TREE_CODE (cond) == LE_EXPR || TREE_CODE (cond) == GT_EXPR || TREE_CODE (cond) == GE_EXPR ! || TREE_CODE (cond) == NE_EXPR) { tree op0 = TREE_OPERAND (cond, 0); tree op1 = TREE_OPERAND (cond, 1); --- 281,288 ---- || TREE_CODE (cond) == LE_EXPR || TREE_CODE (cond) == GT_EXPR || TREE_CODE (cond) == GE_EXPR ! || TREE_CODE (cond) == NE_EXPR ! || TREE_CODE (cond) == EQ_EXPR) { tree op0 = TREE_OPERAND (cond, 0); tree op1 = TREE_OPERAND (cond, 1); *************** c_finish_omp_for (location_t locus, tree *** 326,343 **** cond_ok = true; } ! if (TREE_CODE (cond) == NE_EXPR) { if (!INTEGRAL_TYPE_P (TREE_TYPE (decl))) cond_ok = false; else if (operand_equal_p (TREE_OPERAND (cond, 1), TYPE_MIN_VALUE (TREE_TYPE (decl)), 0)) ! TREE_SET_CODE (cond, GT_EXPR); else if (operand_equal_p (TREE_OPERAND (cond, 1), TYPE_MAX_VALUE (TREE_TYPE (decl)), 0)) ! TREE_SET_CODE (cond, LT_EXPR); else cond_ok = false; } --- 327,347 ---- cond_ok = true; } ! if (TREE_CODE (cond) == NE_EXPR ! || TREE_CODE (cond) == EQ_EXPR) { if (!INTEGRAL_TYPE_P (TREE_TYPE (decl))) cond_ok = false; else if (operand_equal_p (TREE_OPERAND (cond, 1), TYPE_MIN_VALUE (TREE_TYPE (decl)), 0)) ! TREE_SET_CODE (cond, TREE_CODE (cond) == NE_EXPR ! ? GT_EXPR : LE_EXPR); else if (operand_equal_p (TREE_OPERAND (cond, 1), TYPE_MAX_VALUE (TREE_TYPE (decl)), 0)) ! TREE_SET_CODE (cond, TREE_CODE (cond) == NE_EXPR ! ? LT_EXPR : GE_EXPR); else cond_ok = false; } diff -Nrcpad gcc-4.4.4/gcc/c-parser.c gcc-4.4.5/gcc/c-parser.c *** gcc-4.4.4/gcc/c-parser.c Mon Jun 22 22:25:38 2009 --- gcc-4.4.5/gcc/c-parser.c Thu Sep 2 08:00:55 2010 *************** c_parser_omp_atomic (c_parser *parser) *** 7457,7462 **** --- 7457,7498 ---- rhs = integer_one_node; break; + case COMPOUND_EXPR: + if (TREE_CODE (TREE_OPERAND (lhs, 0)) == SAVE_EXPR + && TREE_CODE (TREE_OPERAND (lhs, 1)) == COMPOUND_EXPR + && TREE_CODE (TREE_OPERAND (TREE_OPERAND (lhs, 1), 0)) == MODIFY_EXPR + && TREE_OPERAND (TREE_OPERAND (lhs, 1), 1) == TREE_OPERAND (lhs, 0) + && TREE_CODE (TREE_TYPE (TREE_OPERAND (TREE_OPERAND + (TREE_OPERAND (lhs, 1), 0), 0))) + == BOOLEAN_TYPE) + /* Undo effects of boolean_increment for post {in,de}crement. */ + lhs = TREE_OPERAND (TREE_OPERAND (lhs, 1), 0); + /* FALLTHRU */ + case MODIFY_EXPR: + if (TREE_CODE (lhs) == MODIFY_EXPR + && TREE_CODE (TREE_TYPE (TREE_OPERAND (lhs, 0))) == BOOLEAN_TYPE) + { + /* Undo effects of boolean_increment. */ + if (integer_onep (TREE_OPERAND (lhs, 1))) + { + /* This is pre or post increment. */ + rhs = TREE_OPERAND (lhs, 1); + lhs = TREE_OPERAND (lhs, 0); + code = NOP_EXPR; + break; + } + if (TREE_CODE (TREE_OPERAND (lhs, 1)) == TRUTH_NOT_EXPR + && TREE_OPERAND (lhs, 0) + == TREE_OPERAND (TREE_OPERAND (lhs, 1), 0)) + { + /* This is pre or post decrement. */ + rhs = TREE_OPERAND (lhs, 1); + lhs = TREE_OPERAND (lhs, 0); + code = NOP_EXPR; + break; + } + } + /* FALLTHRU */ default: switch (c_parser_peek_token (parser)->type) { diff -Nrcpad gcc-4.4.4/gcc/cfgexpand.c gcc-4.4.5/gcc/cfgexpand.c *** gcc-4.4.4/gcc/cfgexpand.c Mon Mar 8 11:46:28 2010 --- gcc-4.4.5/gcc/cfgexpand.c Tue Sep 21 16:30:21 2010 *************** dump_stack_var_partition (void) *** 826,832 **** static void expand_one_stack_var_at (tree decl, HOST_WIDE_INT offset) { ! HOST_WIDE_INT align; rtx x; /* If this fails, we've overflowed the stack frame. Error nicely? */ --- 826,832 ---- static void expand_one_stack_var_at (tree decl, HOST_WIDE_INT offset) { ! HOST_WIDE_INT align, max_align; rtx x; /* If this fails, we've overflowed the stack frame. Error nicely? */ *************** expand_one_stack_var_at (tree decl, HOST *** 839,846 **** offset -= frame_phase; align = offset & -offset; align *= BITS_PER_UNIT; ! if (align > STACK_BOUNDARY || align == 0) ! align = STACK_BOUNDARY; DECL_ALIGN (decl) = align; DECL_USER_ALIGN (decl) = 0; --- 839,847 ---- offset -= frame_phase; align = offset & -offset; align *= BITS_PER_UNIT; ! max_align = crtl->max_used_stack_slot_alignment; ! if (align == 0 || align > max_align) ! align = max_align; DECL_ALIGN (decl) = align; DECL_USER_ALIGN (decl) = 0; diff -Nrcpad gcc-4.4.4/gcc/cfgrtl.c gcc-4.4.5/gcc/cfgrtl.c *** gcc-4.4.4/gcc/cfgrtl.c Mon Mar 8 11:46:28 2010 --- gcc-4.4.5/gcc/cfgrtl.c Mon Sep 20 21:31:14 2010 *************** rest_of_pass_free_cfg (void) *** 435,441 **** /* The resource.c machinery uses DF but the CFG isn't guaranteed to be valid at that point so it would be too late to call df_analyze. */ if (optimize > 0 && flag_delayed_branch) ! df_analyze (); #endif free_bb_for_insn (); --- 435,444 ---- /* The resource.c machinery uses DF but the CFG isn't guaranteed to be valid at that point so it would be too late to call df_analyze. */ if (optimize > 0 && flag_delayed_branch) ! { ! df_note_add_problem (); ! df_analyze (); ! } #endif free_bb_for_insn (); diff -Nrcpad gcc-4.4.4/gcc/config/arm/arm.c gcc-4.4.5/gcc/config/arm/arm.c *** gcc-4.4.4/gcc/config/arm/arm.c Thu Feb 18 13:13:03 2010 --- gcc-4.4.5/gcc/config/arm/arm.c Tue Sep 7 11:07:31 2010 *************** arm_output_epilogue (rtx sibling) *** 12150,12156 **** && !crtl->tail_call_emit) { unsigned long mask; ! mask = (1 << (arm_size_return_regs() / 4)) - 1; mask ^= 0xf; mask &= ~saved_regs_mask; reg = 0; --- 12150,12157 ---- && !crtl->tail_call_emit) { unsigned long mask; ! /* Preserve return values, of any size. */ ! mask = (1 << ((arm_size_return_regs() + 3) / 4)) - 1; mask ^= 0xf; mask &= ~saved_regs_mask; reg = 0; diff -Nrcpad gcc-4.4.4/gcc/config/arm/linux-atomic.c gcc-4.4.5/gcc/config/arm/linux-atomic.c *** gcc-4.4.4/gcc/config/arm/linux-atomic.c Fri Dec 11 17:45:32 2009 --- gcc-4.4.5/gcc/config/arm/linux-atomic.c Tue Sep 7 11:07:31 2010 *************** typedef void (__kernel_dmb_t) (void); *** 56,62 **** \ do { \ tmp = *ptr; \ ! failure = __kernel_cmpxchg (tmp, PFX_OP tmp INF_OP val, ptr); \ } while (failure != 0); \ \ return tmp; \ --- 56,62 ---- \ do { \ tmp = *ptr; \ ! failure = __kernel_cmpxchg (tmp, PFX_OP (tmp INF_OP val), ptr); \ } while (failure != 0); \ \ return tmp; \ *************** FETCH_AND_OP_WORD (nand, ~, &) *** 88,95 **** \ do { \ oldval = *wordptr; \ ! newval = ((PFX_OP ((oldval & mask) >> shift) \ ! INF_OP (unsigned int) val) << shift) & mask; \ newval |= oldval & ~mask; \ failure = __kernel_cmpxchg (oldval, newval, wordptr); \ } while (failure != 0); \ --- 88,95 ---- \ do { \ oldval = *wordptr; \ ! newval = ((PFX_OP (((oldval & mask) >> shift) \ ! INF_OP (unsigned int) val)) << shift) & mask; \ newval |= oldval & ~mask; \ failure = __kernel_cmpxchg (oldval, newval, wordptr); \ } while (failure != 0); \ *************** FETCH_AND_OP_WORD (nand, ~, &) *** 97,115 **** return (RETURN & mask) >> shift; \ } ! SUBWORD_SYNC_OP (add, , +, short, 2, oldval) ! SUBWORD_SYNC_OP (sub, , -, short, 2, oldval) ! SUBWORD_SYNC_OP (or, , |, short, 2, oldval) ! SUBWORD_SYNC_OP (and, , &, short, 2, oldval) ! SUBWORD_SYNC_OP (xor, , ^, short, 2, oldval) ! SUBWORD_SYNC_OP (nand, ~, &, short, 2, oldval) ! SUBWORD_SYNC_OP (add, , +, char, 1, oldval) ! SUBWORD_SYNC_OP (sub, , -, char, 1, oldval) ! SUBWORD_SYNC_OP (or, , |, char, 1, oldval) ! SUBWORD_SYNC_OP (and, , &, char, 1, oldval) ! SUBWORD_SYNC_OP (xor, , ^, char, 1, oldval) ! SUBWORD_SYNC_OP (nand, ~, &, char, 1, oldval) #define OP_AND_FETCH_WORD(OP, PFX_OP, INF_OP) \ int HIDDEN \ --- 97,115 ---- return (RETURN & mask) >> shift; \ } ! SUBWORD_SYNC_OP (add, , +, unsigned short, 2, oldval) ! SUBWORD_SYNC_OP (sub, , -, unsigned short, 2, oldval) ! SUBWORD_SYNC_OP (or, , |, unsigned short, 2, oldval) ! SUBWORD_SYNC_OP (and, , &, unsigned short, 2, oldval) ! SUBWORD_SYNC_OP (xor, , ^, unsigned short, 2, oldval) ! SUBWORD_SYNC_OP (nand, ~, &, unsigned short, 2, oldval) ! SUBWORD_SYNC_OP (add, , +, unsigned char, 1, oldval) ! SUBWORD_SYNC_OP (sub, , -, unsigned char, 1, oldval) ! SUBWORD_SYNC_OP (or, , |, unsigned char, 1, oldval) ! SUBWORD_SYNC_OP (and, , &, unsigned char, 1, oldval) ! SUBWORD_SYNC_OP (xor, , ^, unsigned char, 1, oldval) ! SUBWORD_SYNC_OP (nand, ~, &, unsigned char, 1, oldval) #define OP_AND_FETCH_WORD(OP, PFX_OP, INF_OP) \ int HIDDEN \ *************** SUBWORD_SYNC_OP (nand, ~, &, char, 1, ol *** 119,128 **** \ do { \ tmp = *ptr; \ ! failure = __kernel_cmpxchg (tmp, PFX_OP tmp INF_OP val, ptr); \ } while (failure != 0); \ \ ! return PFX_OP tmp INF_OP val; \ } OP_AND_FETCH_WORD (add, , +) --- 119,128 ---- \ do { \ tmp = *ptr; \ ! failure = __kernel_cmpxchg (tmp, PFX_OP (tmp INF_OP val), ptr); \ } while (failure != 0); \ \ ! return PFX_OP (tmp INF_OP val); \ } OP_AND_FETCH_WORD (add, , +) *************** OP_AND_FETCH_WORD (and, , &) *** 132,150 **** OP_AND_FETCH_WORD (xor, , ^) OP_AND_FETCH_WORD (nand, ~, &) ! SUBWORD_SYNC_OP (add, , +, short, 2, newval) ! SUBWORD_SYNC_OP (sub, , -, short, 2, newval) ! SUBWORD_SYNC_OP (or, , |, short, 2, newval) ! SUBWORD_SYNC_OP (and, , &, short, 2, newval) ! SUBWORD_SYNC_OP (xor, , ^, short, 2, newval) ! SUBWORD_SYNC_OP (nand, ~, &, short, 2, newval) ! SUBWORD_SYNC_OP (add, , +, char, 1, newval) ! SUBWORD_SYNC_OP (sub, , -, char, 1, newval) ! SUBWORD_SYNC_OP (or, , |, char, 1, newval) ! SUBWORD_SYNC_OP (and, , &, char, 1, newval) ! SUBWORD_SYNC_OP (xor, , ^, char, 1, newval) ! SUBWORD_SYNC_OP (nand, ~, &, char, 1, newval) int HIDDEN __sync_val_compare_and_swap_4 (int *ptr, int oldval, int newval) --- 132,150 ---- OP_AND_FETCH_WORD (xor, , ^) OP_AND_FETCH_WORD (nand, ~, &) ! SUBWORD_SYNC_OP (add, , +, unsigned short, 2, newval) ! SUBWORD_SYNC_OP (sub, , -, unsigned short, 2, newval) ! SUBWORD_SYNC_OP (or, , |, unsigned short, 2, newval) ! SUBWORD_SYNC_OP (and, , &, unsigned short, 2, newval) ! SUBWORD_SYNC_OP (xor, , ^, unsigned short, 2, newval) ! SUBWORD_SYNC_OP (nand, ~, &, unsigned short, 2, newval) ! SUBWORD_SYNC_OP (add, , +, unsigned char, 1, newval) ! SUBWORD_SYNC_OP (sub, , -, unsigned char, 1, newval) ! SUBWORD_SYNC_OP (or, , |, unsigned char, 1, newval) ! SUBWORD_SYNC_OP (and, , &, unsigned char, 1, newval) ! SUBWORD_SYNC_OP (xor, , ^, unsigned char, 1, newval) ! SUBWORD_SYNC_OP (nand, ~, &, unsigned char, 1, newval) int HIDDEN __sync_val_compare_and_swap_4 (int *ptr, int oldval, int newval) *************** __sync_val_compare_and_swap_4 (int *ptr, *** 194,201 **** } \ } ! SUBWORD_VAL_CAS (short, 2) ! SUBWORD_VAL_CAS (char, 1) typedef unsigned char bool; --- 194,201 ---- } \ } ! SUBWORD_VAL_CAS (unsigned short, 2) ! SUBWORD_VAL_CAS (unsigned char, 1) typedef unsigned char bool; *************** __sync_bool_compare_and_swap_4 (int *ptr *** 216,223 **** return (oldval == actual_oldval); \ } ! SUBWORD_BOOL_CAS (short, 2) ! SUBWORD_BOOL_CAS (char, 1) void HIDDEN __sync_synchronize (void) --- 216,223 ---- return (oldval == actual_oldval); \ } ! SUBWORD_BOOL_CAS (unsigned short, 2) ! SUBWORD_BOOL_CAS (unsigned char, 1) void HIDDEN __sync_synchronize (void) *************** __sync_lock_test_and_set_4 (int *ptr, in *** 259,266 **** return (oldval & mask) >> shift; \ } ! SUBWORD_TEST_AND_SET (short, 2) ! SUBWORD_TEST_AND_SET (char, 1) #define SYNC_LOCK_RELEASE(TYPE, WIDTH) \ void HIDDEN \ --- 259,266 ---- return (oldval & mask) >> shift; \ } ! SUBWORD_TEST_AND_SET (unsigned short, 2) ! SUBWORD_TEST_AND_SET (unsigned char, 1) #define SYNC_LOCK_RELEASE(TYPE, WIDTH) \ void HIDDEN \ diff -Nrcpad gcc-4.4.4/gcc/config/cris/cris.md gcc-4.4.5/gcc/config/cris/cris.md *** gcc-4.4.4/gcc/config/cris/cris.md Mon Oct 12 17:59:16 2009 --- gcc-4.4.5/gcc/config/cris/cris.md Thu May 20 06:51:05 2010 *************** *** 1868,1874 **** add%u2 %2,%0 addo.%Z2 %2,%1,%0" [(set_attr "slottable" "yes,yes,yes,yes,yes,yes,yes,no,no,no,no,no,no") ! (set_attr "cc" "*,none,*,none,*,*,none,*,*,*,*,*,none")]) (define_insn "*addhi3_non_v32" [(set (match_operand:HI 0 "register_operand" "=r,r, r,r,r,r") --- 1868,1874 ---- add%u2 %2,%0 addo.%Z2 %2,%1,%0" [(set_attr "slottable" "yes,yes,yes,yes,yes,yes,yes,no,no,no,no,no,no") ! (set_attr "cc" "*,none,*,none,*,*,none,*,none,*,*,*,none")]) (define_insn "*addhi3_non_v32" [(set (match_operand:HI 0 "register_operand" "=r,r, r,r,r,r") diff -Nrcpad gcc-4.4.4/gcc/config/host-solaris.c gcc-4.4.5/gcc/config/host-solaris.c *** gcc-4.4.4/gcc/config/host-solaris.c Fri Feb 20 15:20:38 2009 --- gcc-4.4.5/gcc/config/host-solaris.c Tue Jul 13 09:07:18 2010 *************** *** 1,5 **** /* Solaris host-specific hook definitions. ! Copyright (C) 2004, 2007, 2008 Free Software Foundation, Inc. This file is part of GCC. --- 1,5 ---- /* Solaris host-specific hook definitions. ! Copyright (C) 2004, 2007, 2008, 2010 Free Software Foundation, Inc. This file is part of GCC. *************** *** 25,76 **** #include "hosthooks-def.h" #undef HOST_HOOKS_GT_PCH_USE_ADDRESS #define HOST_HOOKS_GT_PCH_USE_ADDRESS sol_gt_pch_use_address ! /* Map SIZE bytes of FD+OFFSET at BASE. Return 1 if we succeeded at ! mapping the data at BASE, -1 if we couldn't. */ ! static int ! sol_gt_pch_use_address (void *base, size_t size, int fd, size_t offset) { ! void *addr; ! ! /* We're called with size == 0 if we're not planning to load a PCH ! file at all. This allows the hook to free any static space that ! we might have allocated at link time. */ ! if (size == 0) ! return -1; ! ! addr = mmap ((caddr_t) base, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, ! fd, offset); ! /* Solaris isn't good about honoring the mmap START parameter ! without MAP_FIXED set. Before we give up, search the desired ! address space with mincore to see if the space is really free. */ ! if (addr != base) { size_t page_size = getpagesize(); char one_byte; size_t i; ! if (addr != (void *) MAP_FAILED) ! munmap ((caddr_t) addr, size); errno = 0; ! for (i = 0; i < size; i += page_size) ! if (mincore ((char *)base + i, page_size, (char *) &one_byte) == -1 && errno == ENOMEM) continue; /* The page is not mapped. */ else break; ! if (i >= size) ! addr = mmap ((caddr_t) base, size, ! PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED, ! fd, offset); } return addr == base ? 1 : -1; } --- 25,124 ---- #include "hosthooks-def.h" + #undef HOST_HOOKS_GT_PCH_GET_ADDRESS + #define HOST_HOOKS_GT_PCH_GET_ADDRESS sol_gt_pch_get_address #undef HOST_HOOKS_GT_PCH_USE_ADDRESS #define HOST_HOOKS_GT_PCH_USE_ADDRESS sol_gt_pch_use_address ! /* Before Solaris 11, the mmap ADDR parameter is mostly ignored without ! MAP_FIXED set. Before we give up, search the desired address space with ! mincore to see if the space is really free. */ ! static void * ! mmap_fixed (void *addr, size_t len, int prot, int flags, int fd, off_t off) { ! void *base; ! base = mmap ((caddr_t) addr, len, prot, flags, fd, off); ! ! if (base != addr) { size_t page_size = getpagesize(); char one_byte; size_t i; ! if (base != (void *) MAP_FAILED) ! munmap ((caddr_t) base, len); errno = 0; ! for (i = 0; i < len; i += page_size) ! if (mincore ((char *)addr + i, page_size, (char *) &one_byte) == -1 && errno == ENOMEM) continue; /* The page is not mapped. */ else break; ! if (i >= len) ! base = mmap ((caddr_t) addr, len, prot, flags | MAP_FIXED, fd, off); } + return base; + } + + /* For various ports, try to guess a fixed spot in the vm space + that's probably free. Based on McDougall, Mauro, Solaris Internals, 2nd + ed., p.460-461, fig. 9-3, 9-4, 9-5. */ + #if defined(__sparcv9__) + /* This low to avoid VA hole on UltraSPARC I/II. */ + # define TRY_EMPTY_VM_SPACE 0x70000000000 + #elif defined(__sparc__) + # define TRY_EMPTY_VM_SPACE 0x80000000 + #elif defined(__x86_64__) + # define TRY_EMPTY_VM_SPACE 0x8000000000000000 + #elif defined(__i386__) + # define TRY_EMPTY_VM_SPACE 0xB0000000 + #else + # define TRY_EMPTY_VM_SPACE 0 + #endif + + /* Determine a location where we might be able to reliably allocate + SIZE bytes. FD is the PCH file, though we should return with the + file unmapped. */ + + static void * + sol_gt_pch_get_address (size_t size, int fd) + { + void *addr; + + addr = mmap_fixed ((caddr_t) TRY_EMPTY_VM_SPACE, size, + PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + + /* If we failed the map, that means there's *no* free space. */ + if (addr == (void *) MAP_FAILED) + return NULL; + /* Unmap the area before returning. */ + munmap ((caddr_t) addr, size); + + return addr; + } + + /* Map SIZE bytes of FD+OFFSET at BASE. Return 1 if we succeeded at + mapping the data at BASE, -1 if we couldn't. */ + + static int + sol_gt_pch_use_address (void *base, size_t size, int fd, size_t offset) + { + void *addr; + + /* We're called with size == 0 if we're not planning to load a PCH + file at all. This allows the hook to free any static space that + we might have allocated at link time. */ + if (size == 0) + return -1; + + addr = mmap_fixed ((caddr_t) base, size, + PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, offset); + return addr == base ? 1 : -1; } diff -Nrcpad gcc-4.4.4/gcc/config/i386/i386-protos.h gcc-4.4.5/gcc/config/i386/i386-protos.h *** gcc-4.4.4/gcc/config/i386/i386-protos.h Sat Jul 11 19:06:26 2009 --- gcc-4.4.5/gcc/config/i386/i386-protos.h Thu Jul 22 06:46:28 2010 *************** extern enum machine_mode ix86_fp_compare *** 136,143 **** extern rtx ix86_libcall_value (enum machine_mode); extern bool ix86_function_value_regno_p (int); extern bool ix86_function_arg_regno_p (int); ! extern int ix86_function_arg_boundary (enum machine_mode, tree); ! extern bool ix86_sol10_return_in_memory (const_tree,const_tree); extern rtx ix86_force_to_memory (enum machine_mode, rtx); extern void ix86_free_from_memory (enum machine_mode); extern int ix86_cfun_abi (void); --- 136,143 ---- extern rtx ix86_libcall_value (enum machine_mode); extern bool ix86_function_value_regno_p (int); extern bool ix86_function_arg_regno_p (int); ! extern int ix86_function_arg_boundary (enum machine_mode, const_tree); ! extern bool ix86_solaris_return_in_memory (const_tree, const_tree); extern rtx ix86_force_to_memory (enum machine_mode, rtx); extern void ix86_free_from_memory (enum machine_mode); extern int ix86_cfun_abi (void); diff -Nrcpad gcc-4.4.4/gcc/config/i386/i386.c gcc-4.4.5/gcc/config/i386/i386.c *** gcc-4.4.4/gcc/config/i386/i386.c Thu Apr 8 15:09:17 2010 --- gcc-4.4.5/gcc/config/i386/i386.c Fri Aug 6 07:52:04 2010 *************** ix86_target_string (int isa, int flags, *** 2358,2364 **** if (flags && add_nl_p) { opts[num++][0] = target_other; ! sprintf (target_other, "(other flags: 0x%x)", isa); } /* Add -fpmath= option. */ --- 2358,2364 ---- if (flags && add_nl_p) { opts[num++][0] = target_other; ! sprintf (target_other, "(other flags: 0x%x)", flags); } /* Add -fpmath= option. */ *************** function_arg_advance_64 (CUMULATIVE_ARGS *** 5657,5665 **** if (!named && VALID_AVX256_REG_MODE (mode)) return; ! if (!examine_argument (mode, type, 0, &int_nregs, &sse_nregs)) ! cum->words += words; ! else if (sse_nregs <= cum->sse_nregs && int_nregs <= cum->nregs) { cum->nregs -= int_nregs; cum->sse_nregs -= sse_nregs; --- 5657,5664 ---- if (!named && VALID_AVX256_REG_MODE (mode)) return; ! if (examine_argument (mode, type, 0, &int_nregs, &sse_nregs) ! && sse_nregs <= cum->sse_nregs && int_nregs <= cum->nregs) { cum->nregs -= int_nregs; cum->sse_nregs -= sse_nregs; *************** function_arg_advance_64 (CUMULATIVE_ARGS *** 5667,5673 **** cum->sse_regno += sse_nregs; } else ! cum->words += words; } static void --- 5666,5676 ---- cum->sse_regno += sse_nregs; } else ! { ! int align = ix86_function_arg_boundary (mode, type) / BITS_PER_WORD; ! cum->words = (cum->words + align - 1) & ~(align - 1); ! cum->words += words; ! } } static void *************** ix86_pass_by_reference (CUMULATIVE_ARGS *** 5996,6002 **** /* Return true when TYPE should be 128bit aligned for 32bit argument passing ABI. */ static bool ! contains_aligned_value_p (tree type) { enum machine_mode mode = TYPE_MODE (type); if (((TARGET_SSE && SSE_REG_MODE_P (mode)) --- 5999,6005 ---- /* Return true when TYPE should be 128bit aligned for 32bit argument passing ABI. */ static bool ! contains_aligned_value_p (const_tree type) { enum machine_mode mode = TYPE_MODE (type); if (((TARGET_SSE && SSE_REG_MODE_P (mode)) *************** contains_aligned_value_p (tree type) *** 6046,6052 **** specified mode and type. */ int ! ix86_function_arg_boundary (enum machine_mode mode, tree type) { int align; if (type) --- 6049,6055 ---- specified mode and type. */ int ! ix86_function_arg_boundary (enum machine_mode mode, const_tree type) { int align; if (type) *************** ix86_return_in_memory (const_tree type, *** 6362,6373 **** } /* Return false iff TYPE is returned in memory. This version is used ! on Solaris 10. It is similar to the generic ix86_return_in_memory, but differs notably in that when MMX is available, 8-byte vectors are returned in memory, rather than in MMX registers. */ bool ! ix86_sol10_return_in_memory (const_tree type, const_tree fntype ATTRIBUTE_UNUSED) { int size; enum machine_mode mode = type_natural_mode (type, NULL); --- 6365,6376 ---- } /* Return false iff TYPE is returned in memory. This version is used ! on Solaris 2. It is similar to the generic ix86_return_in_memory, but differs notably in that when MMX is available, 8-byte vectors are returned in memory, rather than in MMX registers. */ bool ! ix86_solaris_return_in_memory (const_tree type, const_tree fntype ATTRIBUTE_UNUSED) { int size; enum machine_mode mode = type_natural_mode (type, NULL); *************** ix86_expand_epilogue (int style) *** 8676,8685 **** int param_ptr_offset = (call_used_regs[REGNO (crtl->drap_reg)] ? 0 : UNITS_PER_WORD); gcc_assert (stack_realign_drap); ! emit_insn ((*ix86_gen_add3) (stack_pointer_rtx, ! crtl->drap_reg, ! GEN_INT (-(UNITS_PER_WORD ! + param_ptr_offset)))); if (!call_used_regs[REGNO (crtl->drap_reg)]) emit_insn ((*ix86_gen_pop1) (crtl->drap_reg)); --- 8679,8690 ---- int param_ptr_offset = (call_used_regs[REGNO (crtl->drap_reg)] ? 0 : UNITS_PER_WORD); gcc_assert (stack_realign_drap); ! emit_insn (gen_rtx_SET ! (VOIDmode, stack_pointer_rtx, ! gen_rtx_PLUS (Pmode, ! crtl->drap_reg, ! GEN_INT (-(UNITS_PER_WORD ! + param_ptr_offset))))); if (!call_used_regs[REGNO (crtl->drap_reg)]) emit_insn ((*ix86_gen_pop1) (crtl->drap_reg)); *************** ix86_decompose_address (rtx addr, struct *** 8879,8886 **** to test cfun for being non-NULL. */ if (TARGET_K6 && cfun && optimize_function_for_speed_p (cfun) && base_reg && !index_reg && !disp ! && REG_P (base_reg) ! && REGNO_REG_CLASS (REGNO (base_reg)) == SIREG) disp = const0_rtx; /* Special case: encode reg+reg instead of reg*2. */ --- 8884,8890 ---- to test cfun for being non-NULL. */ if (TARGET_K6 && cfun && optimize_function_for_speed_p (cfun) && base_reg && !index_reg && !disp ! && REG_P (base_reg) && REGNO (base_reg) == SI_REG) disp = const0_rtx; /* Special case: encode reg+reg instead of reg*2. */ *************** print_operand (FILE *file, rtx x, int co *** 11277,11286 **** return; case ';': ! #if TARGET_MACHO ! fputs (" ; ", file); ! #else ! fputc (' ', file); #endif return; --- 11281,11288 ---- return; case ';': ! #if TARGET_MACHO || !HAVE_AS_IX86_REP_LOCK_PREFIX ! fputs (";", file); #endif return; *************** def_builtin (int mask, const char *name, *** 20618,20623 **** --- 20620,20626 ---- { ix86_builtins_isa[(int) code].isa = mask; + mask &= ~OPTION_MASK_ISA_64BIT; if ((mask & ix86_isa_flags) != 0 || (lang_hooks.builtin_function == lang_hooks.builtin_function_ext_scope)) diff -Nrcpad gcc-4.4.4/gcc/config/i386/i386.md gcc-4.4.5/gcc/config/i386/i386.md *** gcc-4.4.4/gcc/config/i386/i386.md Mon Dec 7 14:44:18 2009 --- gcc-4.4.5/gcc/config/i386/i386.md Sat Jun 12 07:43:40 2010 *************** *** 77,90 **** (UNSPEC_TLSDESC 23) ; Other random patterns (UNSPEC_SCAS 30) (UNSPEC_FNSTSW 31) (UNSPEC_SAHF 32) ! (UNSPEC_FSTCW 33) ! (UNSPEC_ADD_CARRY 34) ! (UNSPEC_FLDCW 35) ! (UNSPEC_REP 36) ! (UNSPEC_EH_RETURN 37) (UNSPEC_LD_MPIC 38) ; load_macho_picbase (UNSPEC_TRUNC_NOOP 39) --- 77,91 ---- (UNSPEC_TLSDESC 23) ; Other random patterns + (UNSPEC_EH_RETURN 29) (UNSPEC_SCAS 30) (UNSPEC_FNSTSW 31) (UNSPEC_SAHF 32) ! (UNSPEC_PARITY 33) ! (UNSPEC_FSTCW 34) ! (UNSPEC_ADD_CARRY 35) ! (UNSPEC_FLDCW 36) ! (UNSPEC_REP 37) (UNSPEC_LD_MPIC 38) ; load_macho_picbase (UNSPEC_TRUNC_NOOP 39) *************** *** 1314,1324 **** UNSPEC_SAHF))] "TARGET_SAHF" { ! #ifdef HAVE_AS_IX86_SAHF ! return "sahf"; ! #else ! return ".byte\t0x9e"; #endif } [(set_attr "length" "1") (set_attr "athlon_decode" "vector") --- 1315,1326 ---- UNSPEC_SAHF))] "TARGET_SAHF" { ! #ifndef HAVE_AS_IX86_SAHF ! if (TARGET_64BIT) ! return ".byte\t0x9e"; ! else #endif + return "sahf"; } [(set_attr "length" "1") (set_attr "athlon_decode" "vector") *************** *** 1563,1569 **** return "movd\t{%1, %0|%0, %1}"; case TYPE_LEA: ! return "lea{l}\t{%1, %0|%0, %1}"; default: gcc_assert (!flag_pic || LEGITIMATE_PIC_OPERAND_P (operands[1])); --- 1565,1571 ---- return "movd\t{%1, %0|%0, %1}"; case TYPE_LEA: ! return "lea{l}\t{%a1, %0|%0, %a1}"; default: gcc_assert (!flag_pic || LEGITIMATE_PIC_OPERAND_P (operands[1])); *************** *** 7324,7330 **** } } [(set (attr "type") ! (if_then_else (match_operand:HI 2 "incdec_operand" "") (const_string "incdec") (const_string "alu"))) (set_attr "mode" "QI")]) --- 7326,7332 ---- } } [(set (attr "type") ! (if_then_else (match_operand:QI 2 "incdec_operand" "") (const_string "incdec") (const_string "alu"))) (set_attr "mode" "QI")]) *************** *** 11585,11591 **** "TARGET_64BIT && reload_completed && true_regnum (operands[0]) != true_regnum (operands[1])" [(set (match_dup 0) (zero_extend:DI ! (subreg:SI (mult:SI (match_dup 1) (match_dup 2)) 0)))] { operands[1] = gen_lowpart (Pmode, operands[1]); --- 11587,11593 ---- "TARGET_64BIT && reload_completed && true_regnum (operands[0]) != true_regnum (operands[1])" [(set (match_dup 0) (zero_extend:DI ! (subreg:SI (mult:DI (match_dup 1) (match_dup 2)) 0)))] { operands[1] = gen_lowpart (Pmode, operands[1]); *************** *** 15772,15778 **** (define_insn_and_split "paritydi2_cmp" [(set (reg:CC FLAGS_REG) ! (parity:CC (match_operand:DI 3 "register_operand" "0"))) (clobber (match_scratch:DI 0 "=r")) (clobber (match_scratch:SI 1 "=&r")) (clobber (match_scratch:HI 2 "=Q"))] --- 15774,15781 ---- (define_insn_and_split "paritydi2_cmp" [(set (reg:CC FLAGS_REG) ! (unspec:CC [(match_operand:DI 3 "register_operand" "0")] ! UNSPEC_PARITY)) (clobber (match_scratch:DI 0 "=r")) (clobber (match_scratch:SI 1 "=&r")) (clobber (match_scratch:HI 2 "=Q"))] *************** *** 15785,15791 **** (clobber (reg:CC FLAGS_REG))]) (parallel [(set (reg:CC FLAGS_REG) ! (parity:CC (match_dup 1))) (clobber (match_dup 1)) (clobber (match_dup 2))])] { --- 15788,15794 ---- (clobber (reg:CC FLAGS_REG))]) (parallel [(set (reg:CC FLAGS_REG) ! (unspec:CC [(match_dup 1)] UNSPEC_PARITY)) (clobber (match_dup 1)) (clobber (match_dup 2))])] { *************** *** 15821,15827 **** (define_insn_and_split "paritysi2_cmp" [(set (reg:CC FLAGS_REG) ! (parity:CC (match_operand:SI 2 "register_operand" "0"))) (clobber (match_scratch:SI 0 "=r")) (clobber (match_scratch:HI 1 "=&Q"))] "! TARGET_POPCNT" --- 15824,15831 ---- (define_insn_and_split "paritysi2_cmp" [(set (reg:CC FLAGS_REG) ! (unspec:CC [(match_operand:SI 2 "register_operand" "0")] ! UNSPEC_PARITY)) (clobber (match_scratch:SI 0 "=r")) (clobber (match_scratch:HI 1 "=&Q"))] "! TARGET_POPCNT" *************** *** 15833,15839 **** (clobber (reg:CC FLAGS_REG))]) (parallel [(set (reg:CC FLAGS_REG) ! (parity:CC (match_dup 1))) (clobber (match_dup 1))])] { operands[3] = gen_lowpart (HImode, operands[2]); --- 15837,15843 ---- (clobber (reg:CC FLAGS_REG))]) (parallel [(set (reg:CC FLAGS_REG) ! (unspec:CC [(match_dup 1)] UNSPEC_PARITY)) (clobber (match_dup 1))])] { operands[3] = gen_lowpart (HImode, operands[2]); *************** *** 15844,15863 **** (define_insn "*parityhi2_cmp" [(set (reg:CC FLAGS_REG) ! (parity:CC (match_operand:HI 1 "register_operand" "0"))) (clobber (match_scratch:HI 0 "=Q"))] "! TARGET_POPCNT" "xor{b}\t{%h0, %b0|%b0, %h0}" [(set_attr "length" "2") (set_attr "mode" "HI")]) - - (define_insn "*parityqi2_cmp" - [(set (reg:CC FLAGS_REG) - (parity:CC (match_operand:QI 0 "register_operand" "q")))] - "! TARGET_POPCNT" - "test{b}\t%0, %0" - [(set_attr "length" "2") - (set_attr "mode" "QI")]) ;; Thread-local storage patterns for ELF. ;; --- 15848,15860 ---- (define_insn "*parityhi2_cmp" [(set (reg:CC FLAGS_REG) ! (unspec:CC [(match_operand:HI 1 "register_operand" "0")] ! UNSPEC_PARITY)) (clobber (match_scratch:HI 0 "=Q"))] "! TARGET_POPCNT" "xor{b}\t{%h0, %b0|%b0, %h0}" [(set_attr "length" "2") (set_attr "mode" "HI")]) ;; Thread-local storage patterns for ELF. ;; *************** *** 19144,19150 **** (mem:BLK (match_dup 4))) (use (match_dup 5))] "TARGET_64BIT" ! "rep movsq" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "both") --- 19141,19147 ---- (mem:BLK (match_dup 4))) (use (match_dup 5))] "TARGET_64BIT" ! "rep{%;} movsq" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "both") *************** *** 19163,19169 **** (mem:BLK (match_dup 4))) (use (match_dup 5))] "!TARGET_64BIT" ! "rep movs{l|d}" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "both") --- 19160,19166 ---- (mem:BLK (match_dup 4))) (use (match_dup 5))] "!TARGET_64BIT" ! "rep{%;} movs{l|d}" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "both") *************** *** 19182,19188 **** (mem:BLK (match_dup 4))) (use (match_dup 5))] "TARGET_64BIT" ! "rep movs{l|d}" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "both") --- 19179,19185 ---- (mem:BLK (match_dup 4))) (use (match_dup 5))] "TARGET_64BIT" ! "rep{%;} movs{l|d}" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "both") *************** *** 19199,19205 **** (mem:BLK (match_dup 4))) (use (match_dup 5))] "!TARGET_64BIT" ! "rep movsb" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "both") --- 19196,19202 ---- (mem:BLK (match_dup 4))) (use (match_dup 5))] "!TARGET_64BIT" ! "rep{%;} movsb" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "both") *************** *** 19216,19222 **** (mem:BLK (match_dup 4))) (use (match_dup 5))] "TARGET_64BIT" ! "rep movsb" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "both") --- 19213,19219 ---- (mem:BLK (match_dup 4))) (use (match_dup 5))] "TARGET_64BIT" ! "rep{%;} movsb" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "both") *************** *** 19396,19402 **** (use (match_operand:DI 2 "register_operand" "a")) (use (match_dup 4))] "TARGET_64BIT" ! "rep stosq" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "store") --- 19393,19399 ---- (use (match_operand:DI 2 "register_operand" "a")) (use (match_dup 4))] "TARGET_64BIT" ! "rep{%;} stosq" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "store") *************** *** 19413,19419 **** (use (match_operand:SI 2 "register_operand" "a")) (use (match_dup 4))] "!TARGET_64BIT" ! "rep stos{l|d}" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "store") --- 19410,19416 ---- (use (match_operand:SI 2 "register_operand" "a")) (use (match_dup 4))] "!TARGET_64BIT" ! "rep{%;} stos{l|d}" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "store") *************** *** 19430,19436 **** (use (match_operand:SI 2 "register_operand" "a")) (use (match_dup 4))] "TARGET_64BIT" ! "rep stos{l|d}" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "store") --- 19427,19433 ---- (use (match_operand:SI 2 "register_operand" "a")) (use (match_dup 4))] "TARGET_64BIT" ! "rep{%;} stos{l|d}" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "store") *************** *** 19446,19452 **** (use (match_operand:QI 2 "register_operand" "a")) (use (match_dup 4))] "!TARGET_64BIT" ! "rep stosb" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "store") --- 19443,19449 ---- (use (match_operand:QI 2 "register_operand" "a")) (use (match_dup 4))] "!TARGET_64BIT" ! "rep{%;} stosb" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "store") *************** *** 19462,19468 **** (use (match_operand:QI 2 "register_operand" "a")) (use (match_dup 4))] "TARGET_64BIT" ! "rep stosb" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "store") --- 19459,19465 ---- (use (match_operand:QI 2 "register_operand" "a")) (use (match_dup 4))] "TARGET_64BIT" ! "rep{%;} stosb" [(set_attr "type" "str") (set_attr "prefix_rep" "1") (set_attr "memory" "store") *************** *** 19574,19580 **** (clobber (match_operand:SI 1 "register_operand" "=D")) (clobber (match_operand:SI 2 "register_operand" "=c"))] "!TARGET_64BIT" ! "repz cmpsb" [(set_attr "type" "str") (set_attr "mode" "QI") (set_attr "prefix_rep" "1")]) --- 19571,19577 ---- (clobber (match_operand:SI 1 "register_operand" "=D")) (clobber (match_operand:SI 2 "register_operand" "=c"))] "!TARGET_64BIT" ! "repz{%;} cmpsb" [(set_attr "type" "str") (set_attr "mode" "QI") (set_attr "prefix_rep" "1")]) *************** *** 19589,19595 **** (clobber (match_operand:DI 1 "register_operand" "=D")) (clobber (match_operand:DI 2 "register_operand" "=c"))] "TARGET_64BIT" ! "repz cmpsb" [(set_attr "type" "str") (set_attr "mode" "QI") (set_attr "prefix_rep" "1")]) --- 19586,19592 ---- (clobber (match_operand:DI 1 "register_operand" "=D")) (clobber (match_operand:DI 2 "register_operand" "=c"))] "TARGET_64BIT" ! "repz{%;} cmpsb" [(set_attr "type" "str") (set_attr "mode" "QI") (set_attr "prefix_rep" "1")]) *************** *** 19624,19630 **** (clobber (match_operand:SI 1 "register_operand" "=D")) (clobber (match_operand:SI 2 "register_operand" "=c"))] "!TARGET_64BIT" ! "repz cmpsb" [(set_attr "type" "str") (set_attr "mode" "QI") (set_attr "prefix_rep" "1")]) --- 19621,19627 ---- (clobber (match_operand:SI 1 "register_operand" "=D")) (clobber (match_operand:SI 2 "register_operand" "=c"))] "!TARGET_64BIT" ! "repz{%;} cmpsb" [(set_attr "type" "str") (set_attr "mode" "QI") (set_attr "prefix_rep" "1")]) *************** *** 19642,19648 **** (clobber (match_operand:DI 1 "register_operand" "=D")) (clobber (match_operand:DI 2 "register_operand" "=c"))] "TARGET_64BIT" ! "repz cmpsb" [(set_attr "type" "str") (set_attr "mode" "QI") (set_attr "prefix_rep" "1")]) --- 19639,19645 ---- (clobber (match_operand:DI 1 "register_operand" "=D")) (clobber (match_operand:DI 2 "register_operand" "=c"))] "TARGET_64BIT" ! "repz{%;} cmpsb" [(set_attr "type" "str") (set_attr "mode" "QI") (set_attr "prefix_rep" "1")]) *************** *** 19689,19695 **** (clobber (match_operand:SI 1 "register_operand" "=D")) (clobber (reg:CC FLAGS_REG))] "!TARGET_64BIT" ! "repnz scasb" [(set_attr "type" "str") (set_attr "mode" "QI") (set_attr "prefix_rep" "1")]) --- 19686,19692 ---- (clobber (match_operand:SI 1 "register_operand" "=D")) (clobber (reg:CC FLAGS_REG))] "!TARGET_64BIT" ! "repnz{%;} scasb" [(set_attr "type" "str") (set_attr "mode" "QI") (set_attr "prefix_rep" "1")]) *************** *** 19703,19709 **** (clobber (match_operand:DI 1 "register_operand" "=D")) (clobber (reg:CC FLAGS_REG))] "TARGET_64BIT" ! "repnz scasb" [(set_attr "type" "str") (set_attr "mode" "QI") (set_attr "prefix_rep" "1")]) --- 19700,19706 ---- (clobber (match_operand:DI 1 "register_operand" "=D")) (clobber (reg:CC FLAGS_REG))] "TARGET_64BIT" ! "repnz{%;} scasb" [(set_attr "type" "str") (set_attr "mode" "QI") (set_attr "prefix_rep" "1")]) diff -Nrcpad gcc-4.4.4/gcc/config/i386/sol2-10.h gcc-4.4.5/gcc/config/i386/sol2-10.h *** gcc-4.4.4/gcc/config/i386/sol2-10.h Thu Jan 29 16:06:53 2009 --- gcc-4.4.5/gcc/config/i386/sol2-10.h Thu Jul 15 10:08:56 2010 *************** along with GCC; see the file COPYING3. *** 104,110 **** #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE #ifdef TARGET_GNU_LD ! #define TARGET_LD_EMULATION "%{m64:-m elf_x86_64}%{!m64:-m elf_i386} " #else #define TARGET_LD_EMULATION "" #endif --- 104,121 ---- #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE #ifdef TARGET_GNU_LD ! /* Since binutils 2.21, GNU ld supports new *_sol2 emulations to strictly ! follow the Solaris 2 ABI. Prefer them if present. */ ! #ifdef HAVE_LD_SOL2_EMULATION ! #define I386_EMULATION "elf_i386_sol2" ! #define X86_64_EMULATION "elf_x86_64_sol2" ! #else ! #define I386_EMULATION "elf_i386" ! #define X86_64_EMULATION "elf_x86_64" ! #endif ! ! #define TARGET_LD_EMULATION "%{m64:-m " X86_64_EMULATION "}" \ ! "%{!m64:-m " I386_EMULATION "} " #else #define TARGET_LD_EMULATION "" #endif *************** along with GCC; see the file COPYING3. *** 118,124 **** #undef TARGET_ASM_NAMED_SECTION #define TARGET_ASM_NAMED_SECTION i386_solaris_elf_named_section - - #undef SUBTARGET_RETURN_IN_MEMORY - #define SUBTARGET_RETURN_IN_MEMORY(TYPE, FNTYPE) \ - ix86_sol10_return_in_memory (TYPE, FNTYPE) --- 129,131 ---- diff -Nrcpad gcc-4.4.4/gcc/config/i386/sol2-gas.h gcc-4.4.5/gcc/config/i386/sol2-gas.h *** gcc-4.4.4/gcc/config/i386/sol2-gas.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/gcc/config/i386/sol2-gas.h Wed Jun 2 17:25:42 2010 *************** *** 0 **** --- 1,28 ---- + /* Definitions of target machine for GCC, for x86 running Solaris 2 + using the GNU assembler. + + Copyright (C) 2010 Free Software Foundation, Inc. + + This file is part of GCC. + + GCC 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 3, or (at your option) any later + version. + + GCC 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. + + Under Section 7 of GPL version 3, you are granted additional + permissions described in the GCC Runtime Library Exception, version + 3.1, as published by the Free Software Foundation. + + You should have received a copy of the GNU General Public License and + a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + + /* Undefine this so that BNSYM/ENSYM pairs are emitted by STABS+. */ + #undef NO_DBX_BNSYM_ENSYM diff -Nrcpad gcc-4.4.4/gcc/config/i386/sol2-unwind.h gcc-4.4.5/gcc/config/i386/sol2-unwind.h *** gcc-4.4.4/gcc/config/i386/sol2-unwind.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/gcc/config/i386/sol2-unwind.h Tue Jul 13 09:14:59 2010 *************** *** 0 **** --- 1,289 ---- + /* DWARF2 EH unwinding support for AMD x86-64 and x86. + Copyright (C) 2009, 2010 Free Software Foundation, Inc. + + This file is part of GCC. + + GCC 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 3, or (at your option) + any later version. + + GCC 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. + + Under Section 7 of GPL version 3, you are granted additional + permissions described in the GCC Runtime Library Exception, version + 3.1, as published by the Free Software Foundation. + + You should have received a copy of the GNU General Public License and + a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + + /* Do code reading to identify a signal frame, and set the frame + state data appropriately. See unwind-dw2.c for the structs. */ + + #include + #include + + #ifdef __x86_64__ + + #define MD_FALLBACK_FRAME_STATE_FOR x86_64_fallback_frame_state + + static _Unwind_Reason_Code + x86_64_fallback_frame_state (struct _Unwind_Context *context, + _Unwind_FrameState *fs) + { + unsigned char *pc = context->ra; + mcontext_t *mctx; + long new_cfa; + + if (/* Solaris 10+ + ------------ + <__sighndlr+0>: push %rbp + <__sighndlr+1>: mov %rsp,%rbp + <__sighndlr+4>: callq *%rcx + <__sighndlr+6>: leaveq <--- PC + <__sighndlr+7>: retq */ + *(unsigned long *)(pc - 6) == 0xc3c9d1ffe5894855) + + /* We need to move up three frames: + + <-- context->cfa + __sighndlr + call_user_handler + sigacthandler + + + context->cfa points into the frame after the saved frame pointer and + saved pc (struct frame). + + The ucontext_t structure is in the kernel frame after the signal + number and a siginfo_t *. Since the frame sizes vary even within + Solaris 10 updates, we need to walk the stack to get there. */ + { + struct frame *fp = (struct frame *) context->cfa - 1; + struct handler_args { + int signo; + siginfo_t *sip; + ucontext_t ucontext; + } *handler_args; + ucontext_t *ucp; + + /* Next frame: __sighndlr frame pointer. */ + fp = (struct frame *) fp->fr_savfp; + /* call_user_handler frame pointer. */ + fp = (struct frame *) fp->fr_savfp; + /* sigacthandler frame pointer. */ + fp = (struct frame *) fp->fr_savfp; + + /* The argument area precedes the struct frame. */ + handler_args = (struct handler_args *) (fp + 1); + ucp = &handler_args->ucontext; + mctx = &ucp->uc_mcontext; + } + else + return _URC_END_OF_STACK; + + new_cfa = mctx->gregs[REG_RSP]; + + fs->regs.cfa_how = CFA_REG_OFFSET; + fs->regs.cfa_reg = 7; + fs->regs.cfa_offset = new_cfa - (long) context->cfa; + + /* The SVR4 register numbering macros aren't usable in libgcc. */ + fs->regs.reg[0].how = REG_SAVED_OFFSET; + fs->regs.reg[0].loc.offset = (long)&mctx->gregs[REG_RAX] - new_cfa; + fs->regs.reg[1].how = REG_SAVED_OFFSET; + fs->regs.reg[1].loc.offset = (long)&mctx->gregs[REG_RDX] - new_cfa; + fs->regs.reg[2].how = REG_SAVED_OFFSET; + fs->regs.reg[2].loc.offset = (long)&mctx->gregs[REG_RCX] - new_cfa; + fs->regs.reg[3].how = REG_SAVED_OFFSET; + fs->regs.reg[3].loc.offset = (long)&mctx->gregs[REG_RBX] - new_cfa; + fs->regs.reg[4].how = REG_SAVED_OFFSET; + fs->regs.reg[4].loc.offset = (long)&mctx->gregs[REG_RSI] - new_cfa; + fs->regs.reg[5].how = REG_SAVED_OFFSET; + fs->regs.reg[5].loc.offset = (long)&mctx->gregs[REG_RDI] - new_cfa; + fs->regs.reg[6].how = REG_SAVED_OFFSET; + fs->regs.reg[6].loc.offset = (long)&mctx->gregs[REG_RBP] - new_cfa; + fs->regs.reg[8].how = REG_SAVED_OFFSET; + fs->regs.reg[8].loc.offset = (long)&mctx->gregs[REG_R8] - new_cfa; + fs->regs.reg[9].how = REG_SAVED_OFFSET; + fs->regs.reg[9].loc.offset = (long)&mctx->gregs[REG_R9] - new_cfa; + fs->regs.reg[10].how = REG_SAVED_OFFSET; + fs->regs.reg[10].loc.offset = (long)&mctx->gregs[REG_R10] - new_cfa; + fs->regs.reg[11].how = REG_SAVED_OFFSET; + fs->regs.reg[11].loc.offset = (long)&mctx->gregs[REG_R11] - new_cfa; + fs->regs.reg[12].how = REG_SAVED_OFFSET; + fs->regs.reg[12].loc.offset = (long)&mctx->gregs[REG_R12] - new_cfa; + fs->regs.reg[13].how = REG_SAVED_OFFSET; + fs->regs.reg[13].loc.offset = (long)&mctx->gregs[REG_R13] - new_cfa; + fs->regs.reg[14].how = REG_SAVED_OFFSET; + fs->regs.reg[14].loc.offset = (long)&mctx->gregs[REG_R14] - new_cfa; + fs->regs.reg[15].how = REG_SAVED_OFFSET; + fs->regs.reg[15].loc.offset = (long)&mctx->gregs[REG_R15] - new_cfa; + fs->regs.reg[16].how = REG_SAVED_OFFSET; + fs->regs.reg[16].loc.offset = (long)&mctx->gregs[REG_RIP] - new_cfa; + fs->retaddr_column = 16; + fs->signal_frame = 1; + + return _URC_NO_REASON; + } + + #else + + #define MD_FALLBACK_FRAME_STATE_FOR x86_fallback_frame_state + + static _Unwind_Reason_Code + x86_fallback_frame_state (struct _Unwind_Context *context, + _Unwind_FrameState *fs) + { + unsigned char *pc = context->ra; + mcontext_t *mctx; + long new_cfa; + + if (/* Solaris 8 - single-threaded + ---------------------------- + : mov 0x10(%ebp),%esi + : push %esi + : pushl 0xc(%ebp) + : mov 0x8(%ebp),%ecx + : push %ecx + : mov offset(%ebx),%eax + : call *(%eax,%ecx,4) + : add $0xc,%esp <--- PC + : push %esi ... */ + (*(unsigned long *)(pc - 20) == 0x5610758b + && *(unsigned long *)(pc - 16) == 0x8b0c75ff + && *(unsigned long *)(pc - 12) == 0x8b51084d + && *(unsigned char *)(pc - 8) == 0x83 + && *(unsigned long *)(pc - 4) == 0x8814ff00 + && *(unsigned long *)(pc - 0) == 0x560cc483) + + || /* Solaris 8 - multi-threaded + --------------------------- + <__sighndlr+0>: push %ebp + <__sighndlr+1>: mov %esp,%ebp + <__sighndlr+3>: pushl 0x10(%ebp) + <__sighndlr+6>: pushl 0xc(%ebp) + <__sighndlr+9>: pushl 0x8(%ebp) + <__sighndlr+12>: call *0x14(%ebp) + <__sighndlr+15>: leave <--- PC */ + (*(unsigned long *)(pc - 15) == 0xffec8b55 + && *(unsigned long *)(pc - 11) == 0x75ff1075 + && *(unsigned long *)(pc - 7) == 0x0875ff0c + && *(unsigned long *)(pc - 3) == 0xc91455ff) + + || /* Solaris 9 - single-threaded + ---------------------------- + : mov 0x244(%ebx),%ecx + : mov 0x8(%ebp),%eax + : mov (%ecx,%eax,4),%ecx + : pushl 0x10(%ebp) + : pushl 0xc(%ebp) + : push %eax + : call *%ecx + : add $0xc,%esp <--- PC + : pushl 0x10(%ebp) */ + (*(unsigned long *)(pc - 21) == 0x2448b8b + && *(unsigned long *)(pc - 17) == 0x458b0000 + && *(unsigned long *)(pc - 13) == 0x810c8b08 + && *(unsigned long *)(pc - 9) == 0xff1075ff + && *(unsigned long *)(pc - 5) == 0xff500c75 + && *(unsigned long *)(pc - 1) == 0xcc483d1) + + || /* Solaris 9 - multi-threaded, Solaris 10 + --------------------------------------- + <__sighndlr+0>: push %ebp + <__sighndlr+1>: mov %esp,%ebp + <__sighndlr+3>: pushl 0x10(%ebp) + <__sighndlr+6>: pushl 0xc(%ebp) + <__sighndlr+9>: pushl 0x8(%ebp) + <__sighndlr+12>: call *0x14(%ebp) + <__sighndlr+15>: add $0xc,%esp <--- PC + <__sighndlr+18>: leave + <__sighndlr+19>: ret */ + (*(unsigned long *)(pc - 15) == 0xffec8b55 + && *(unsigned long *)(pc - 11) == 0x75ff1075 + && *(unsigned long *)(pc - 7) == 0x0875ff0c + && *(unsigned long *)(pc - 3) == 0x831455ff + && *(unsigned long *)(pc + 1) == 0xc3c90cc4) + + || /* Solaris 11 before snv_125 + -------------------------- + <__sighndlr+0> push %ebp + <__sighndlr+1> mov %esp,%ebp + <__sighndlr+4> pushl 0x10(%ebp) + <__sighndlr+6> pushl 0xc(%ebp) + <__sighndlr+9> pushl 0x8(%ebp) + <__sighndlr+12> call *0x14(%ebp) + <__sighndlr+15> add $0xc,%esp + <__sighndlr+18> leave <--- PC + <__sighndlr+19> ret */ + (*(unsigned long *)(pc - 18) == 0xffec8b55 + && *(unsigned long *)(pc - 14) == 0x7fff107f + && *(unsigned long *)(pc - 10) == 0x0875ff0c + && *(unsigned long *)(pc - 6) == 0x83145fff + && *(unsigned long *)(pc - 1) == 0xc3c90cc4) + + || /* Solaris 11 since snv_125 + ------------------------- + <__sighndlr+0> push %ebp + <__sighndlr+1> mov %esp,%ebp + <__sighndlr+3> and $0xfffffff0,%esp + <__sighndlr+6> sub $0x4,%esp + <__sighndlr+9> pushl 0x10(%ebp) + <__sighndlr+12> pushl 0xc(%ebp) + <__sighndlr+15> pushl 0x8(%ebp) + <__sighndlr+18> call *0x14(%ebp) + <__sighndlr+21> leave <--- PC + <__sighndlr+22> ret */ + (*(unsigned long *)(pc - 21) == 0x83ec8b55 + && *(unsigned long *)(pc - 17) == 0xec83f0e4 + && *(unsigned long *)(pc - 13) == 0x1075ff04 + && *(unsigned long *)(pc - 9) == 0xff0c75ff + && *(unsigned long *)(pc - 5) == 0x55ff0875 + && (*(unsigned long *)(pc - 1) & 0x00ffffff) == 0x00c3c914)) + { + struct handler_args { + int signo; + siginfo_t *sip; + ucontext_t *ucontext; + } *handler_args = context->cfa; + mctx = &handler_args->ucontext->uc_mcontext; + } + else + return _URC_END_OF_STACK; + + new_cfa = mctx->gregs[UESP]; + + fs->regs.cfa_how = CFA_REG_OFFSET; + fs->regs.cfa_reg = 4; + fs->regs.cfa_offset = new_cfa - (long) context->cfa; + + /* The SVR4 register numbering macros aren't usable in libgcc. */ + fs->regs.reg[0].how = REG_SAVED_OFFSET; + fs->regs.reg[0].loc.offset = (long)&mctx->gregs[EAX] - new_cfa; + fs->regs.reg[3].how = REG_SAVED_OFFSET; + fs->regs.reg[3].loc.offset = (long)&mctx->gregs[EBX] - new_cfa; + fs->regs.reg[1].how = REG_SAVED_OFFSET; + fs->regs.reg[1].loc.offset = (long)&mctx->gregs[ECX] - new_cfa; + fs->regs.reg[2].how = REG_SAVED_OFFSET; + fs->regs.reg[2].loc.offset = (long)&mctx->gregs[EDX] - new_cfa; + fs->regs.reg[6].how = REG_SAVED_OFFSET; + fs->regs.reg[6].loc.offset = (long)&mctx->gregs[ESI] - new_cfa; + fs->regs.reg[7].how = REG_SAVED_OFFSET; + fs->regs.reg[7].loc.offset = (long)&mctx->gregs[EDI] - new_cfa; + fs->regs.reg[5].how = REG_SAVED_OFFSET; + fs->regs.reg[5].loc.offset = (long)&mctx->gregs[EBP] - new_cfa; + fs->regs.reg[8].how = REG_SAVED_OFFSET; + fs->regs.reg[8].loc.offset = (long)&mctx->gregs[EIP] - new_cfa; + fs->retaddr_column = 8; + fs->signal_frame = 1; + + return _URC_NO_REASON; + } + + #endif diff -Nrcpad gcc-4.4.4/gcc/config/i386/sol2.h gcc-4.4.5/gcc/config/i386/sol2.h *** gcc-4.4.4/gcc/config/i386/sol2.h Mon May 25 12:13:38 2009 --- gcc-4.4.5/gcc/config/i386/sol2.h Thu Jul 15 10:08:56 2010 *************** *** 1,6 **** /* Target definitions for GCC for Intel 80386 running Solaris 2 Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, ! 2004, 2007, 2008, 2009 Free Software Foundation, Inc. Contributed by Fred Fish (fnf@cygnus.com). This file is part of GCC. --- 1,6 ---- /* Target definitions for GCC for Intel 80386 running Solaris 2 Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, ! 2004, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Fred Fish (fnf@cygnus.com). This file is part of GCC. *************** along with GCC; see the file COPYING3. *** 72,78 **** #define LOCAL_LABEL_PREFIX "." /* The 32-bit Solaris assembler does not support .quad. Do not use it. */ ! #ifndef TARGET_BI_ARCH #undef ASM_QUAD #endif --- 72,78 ---- #define LOCAL_LABEL_PREFIX "." /* The 32-bit Solaris assembler does not support .quad. Do not use it. */ ! #ifndef HAVE_AS_IX86_QUAD #undef ASM_QUAD #endif *************** along with GCC; see the file COPYING3. *** 91,96 **** --- 91,100 ---- } \ } while (0) + /* The Solaris assembler cannot grok .stabd directives. */ + #undef NO_DBX_BNSYM_ENSYM + #define NO_DBX_BNSYM_ENSYM 1 + /* Solaris-specific #pragmas are implemented on top of attributes. Hook in the bits from config/sol2.c. */ #define SUBTARGET_INSERT_ATTRIBUTES solaris_insert_attributes *************** along with GCC; see the file COPYING3. *** 99,104 **** --- 103,112 ---- /* Register the Solaris-specific #pragma directives. */ #define REGISTER_SUBTARGET_PRAGMAS() solaris_register_pragmas () + #undef SUBTARGET_RETURN_IN_MEMORY + #define SUBTARGET_RETURN_IN_MEMORY(TYPE, FNTYPE) \ + ix86_solaris_return_in_memory (TYPE, FNTYPE) + /* Output a simple call for .init/.fini. */ #define ASM_OUTPUT_CALL(FILE, FN) \ do \ *************** along with GCC; see the file COPYING3. *** 118,120 **** --- 126,130 ---- #ifndef TARGET_GNU_LD #define USE_HIDDEN_LINKONCE 0 #endif + + #define MD_UNWIND_SUPPORT "config/i386/sol2-unwind.h" diff -Nrcpad gcc-4.4.4/gcc/config/i386/sse.md gcc-4.4.5/gcc/config/i386/sse.md *** gcc-4.4.4/gcc/config/i386/sse.md Wed Nov 25 20:54:12 2009 --- gcc-4.4.5/gcc/config/i386/sse.md Sat Aug 28 14:27:33 2010 *************** *** 3767,3773 **** (parallel [(const_int 0) (const_int 1) (const_int 2) (const_int 3)])))] "TARGET_AVX" ! "vextractf128\t{$0x1, %1, %0|%0, %1, 0x1}" [(set_attr "type" "sselog") (set_attr "memory" "none,store") (set_attr "prefix" "vex") --- 3767,3773 ---- (parallel [(const_int 0) (const_int 1) (const_int 2) (const_int 3)])))] "TARGET_AVX" ! "vextractf128\t{$0x0, %1, %0|%0, %1, 0x0}" [(set_attr "type" "sselog") (set_attr "memory" "none,store") (set_attr "prefix" "vex") *************** *** 3795,3801 **** (const_int 4) (const_int 5) (const_int 6) (const_int 7)])))] "TARGET_AVX" ! "vextractf128\t{$0x1, %1, %0|%0, %1, 0x1}" [(set_attr "type" "sselog") (set_attr "memory" "none,store") (set_attr "prefix" "vex") --- 3795,3801 ---- (const_int 4) (const_int 5) (const_int 6) (const_int 7)])))] "TARGET_AVX" ! "vextractf128\t{$0x0, %1, %0|%0, %1, 0x0}" [(set_attr "type" "sselog") (set_attr "memory" "none,store") (set_attr "prefix" "vex") *************** *** 3829,3835 **** (const_int 12) (const_int 13) (const_int 14) (const_int 15)])))] "TARGET_AVX" ! "vextractf128\t{$0x1, %1, %0|%0, %1, 0x1}" [(set_attr "type" "sselog") (set_attr "memory" "none,store") (set_attr "prefix" "vex") --- 3829,3835 ---- (const_int 12) (const_int 13) (const_int 14) (const_int 15)])))] "TARGET_AVX" ! "vextractf128\t{$0x0, %1, %0|%0, %1, 0x0}" [(set_attr "type" "sselog") (set_attr "memory" "none,store") (set_attr "prefix" "vex") *************** *** 9084,9111 **** [(set (match_operand:V8HI 0 "register_operand" "=x") (sign_extend:V8HI (vec_select:V8QI ! (match_operand:V16QI 1 "register_operand" "x") ! (parallel [(const_int 0) ! (const_int 1) ! (const_int 2) ! (const_int 3) ! (const_int 4) ! (const_int 5) ! (const_int 6) ! (const_int 7)]))))] ! "TARGET_SSE4_1" ! "%vpmovsxbw\t{%1, %0|%0, %1}" ! [(set_attr "type" "ssemov") ! (set_attr "prefix_extra" "1") ! (set_attr "prefix" "maybe_vex") ! (set_attr "mode" "TI")]) ! ! (define_insn "*sse4_1_extendv8qiv8hi2" ! [(set (match_operand:V8HI 0 "register_operand" "=x") ! (sign_extend:V8HI ! (vec_select:V8QI ! (vec_duplicate:V16QI ! (match_operand:V8QI 1 "nonimmediate_operand" "xm")) (parallel [(const_int 0) (const_int 1) (const_int 2) --- 9084,9090 ---- [(set (match_operand:V8HI 0 "register_operand" "=x") (sign_extend:V8HI (vec_select:V8QI ! (match_operand:V16QI 1 "nonimmediate_operand" "xm") (parallel [(const_int 0) (const_int 1) (const_int 2) *************** *** 9125,9148 **** [(set (match_operand:V4SI 0 "register_operand" "=x") (sign_extend:V4SI (vec_select:V4QI ! (match_operand:V16QI 1 "register_operand" "x") ! (parallel [(const_int 0) ! (const_int 1) ! (const_int 2) ! (const_int 3)]))))] ! "TARGET_SSE4_1" ! "%vpmovsxbd\t{%1, %0|%0, %1}" ! [(set_attr "type" "ssemov") ! (set_attr "prefix_extra" "1") ! (set_attr "prefix" "maybe_vex") ! (set_attr "mode" "TI")]) ! ! (define_insn "*sse4_1_extendv4qiv4si2" ! [(set (match_operand:V4SI 0 "register_operand" "=x") ! (sign_extend:V4SI ! (vec_select:V4QI ! (vec_duplicate:V16QI ! (match_operand:V4QI 1 "nonimmediate_operand" "xm")) (parallel [(const_int 0) (const_int 1) (const_int 2) --- 9104,9110 ---- [(set (match_operand:V4SI 0 "register_operand" "=x") (sign_extend:V4SI (vec_select:V4QI ! (match_operand:V16QI 1 "nonimmediate_operand" "xm") (parallel [(const_int 0) (const_int 1) (const_int 2) *************** *** 9158,9179 **** [(set (match_operand:V2DI 0 "register_operand" "=x") (sign_extend:V2DI (vec_select:V2QI ! (match_operand:V16QI 1 "register_operand" "x") ! (parallel [(const_int 0) ! (const_int 1)]))))] ! "TARGET_SSE4_1" ! "%vpmovsxbq\t{%1, %0|%0, %1}" ! [(set_attr "type" "ssemov") ! (set_attr "prefix_extra" "1") ! (set_attr "prefix" "maybe_vex") ! (set_attr "mode" "TI")]) ! ! (define_insn "*sse4_1_extendv2qiv2di2" ! [(set (match_operand:V2DI 0 "register_operand" "=x") ! (sign_extend:V2DI ! (vec_select:V2QI ! (vec_duplicate:V16QI ! (match_operand:V2QI 1 "nonimmediate_operand" "xm")) (parallel [(const_int 0) (const_int 1)]))))] "TARGET_SSE4_1" --- 9120,9126 ---- [(set (match_operand:V2DI 0 "register_operand" "=x") (sign_extend:V2DI (vec_select:V2QI ! (match_operand:V16QI 1 "nonimmediate_operand" "xm") (parallel [(const_int 0) (const_int 1)]))))] "TARGET_SSE4_1" *************** *** 9187,9210 **** [(set (match_operand:V4SI 0 "register_operand" "=x") (sign_extend:V4SI (vec_select:V4HI ! (match_operand:V8HI 1 "register_operand" "x") ! (parallel [(const_int 0) ! (const_int 1) ! (const_int 2) ! (const_int 3)]))))] ! "TARGET_SSE4_1" ! "%vpmovsxwd\t{%1, %0|%0, %1}" ! [(set_attr "type" "ssemov") ! (set_attr "prefix_extra" "1") ! (set_attr "prefix" "maybe_vex") ! (set_attr "mode" "TI")]) ! ! (define_insn "*sse4_1_extendv4hiv4si2" ! [(set (match_operand:V4SI 0 "register_operand" "=x") ! (sign_extend:V4SI ! (vec_select:V4HI ! (vec_duplicate:V8HI ! (match_operand:V2HI 1 "nonimmediate_operand" "xm")) (parallel [(const_int 0) (const_int 1) (const_int 2) --- 9134,9140 ---- [(set (match_operand:V4SI 0 "register_operand" "=x") (sign_extend:V4SI (vec_select:V4HI ! (match_operand:V8HI 1 "nonimmediate_operand" "xm") (parallel [(const_int 0) (const_int 1) (const_int 2) *************** *** 9220,9241 **** [(set (match_operand:V2DI 0 "register_operand" "=x") (sign_extend:V2DI (vec_select:V2HI ! (match_operand:V8HI 1 "register_operand" "x") ! (parallel [(const_int 0) ! (const_int 1)]))))] ! "TARGET_SSE4_1" ! "%vpmovsxwq\t{%1, %0|%0, %1}" ! [(set_attr "type" "ssemov") ! (set_attr "prefix_extra" "1") ! (set_attr "prefix" "maybe_vex") ! (set_attr "mode" "TI")]) ! ! (define_insn "*sse4_1_extendv2hiv2di2" ! [(set (match_operand:V2DI 0 "register_operand" "=x") ! (sign_extend:V2DI ! (vec_select:V2HI ! (vec_duplicate:V8HI ! (match_operand:V8HI 1 "nonimmediate_operand" "xm")) (parallel [(const_int 0) (const_int 1)]))))] "TARGET_SSE4_1" --- 9150,9156 ---- [(set (match_operand:V2DI 0 "register_operand" "=x") (sign_extend:V2DI (vec_select:V2HI ! (match_operand:V8HI 1 "nonimmediate_operand" "xm") (parallel [(const_int 0) (const_int 1)]))))] "TARGET_SSE4_1" *************** *** 9249,9270 **** [(set (match_operand:V2DI 0 "register_operand" "=x") (sign_extend:V2DI (vec_select:V2SI ! (match_operand:V4SI 1 "register_operand" "x") ! (parallel [(const_int 0) ! (const_int 1)]))))] ! "TARGET_SSE4_1" ! "%vpmovsxdq\t{%1, %0|%0, %1}" ! [(set_attr "type" "ssemov") ! (set_attr "prefix_extra" "1") ! (set_attr "prefix" "maybe_vex") ! (set_attr "mode" "TI")]) ! ! (define_insn "*sse4_1_extendv2siv2di2" ! [(set (match_operand:V2DI 0 "register_operand" "=x") ! (sign_extend:V2DI ! (vec_select:V2SI ! (vec_duplicate:V4SI ! (match_operand:V2SI 1 "nonimmediate_operand" "xm")) (parallel [(const_int 0) (const_int 1)]))))] "TARGET_SSE4_1" --- 9164,9170 ---- [(set (match_operand:V2DI 0 "register_operand" "=x") (sign_extend:V2DI (vec_select:V2SI ! (match_operand:V4SI 1 "nonimmediate_operand" "xm") (parallel [(const_int 0) (const_int 1)]))))] "TARGET_SSE4_1" *************** *** 9278,9305 **** [(set (match_operand:V8HI 0 "register_operand" "=x") (zero_extend:V8HI (vec_select:V8QI ! (match_operand:V16QI 1 "register_operand" "x") ! (parallel [(const_int 0) ! (const_int 1) ! (const_int 2) ! (const_int 3) ! (const_int 4) ! (const_int 5) ! (const_int 6) ! (const_int 7)]))))] ! "TARGET_SSE4_1" ! "%vpmovzxbw\t{%1, %0|%0, %1}" ! [(set_attr "type" "ssemov") ! (set_attr "prefix_extra" "1") ! (set_attr "prefix" "maybe_vex") ! (set_attr "mode" "TI")]) ! ! (define_insn "*sse4_1_zero_extendv8qiv8hi2" ! [(set (match_operand:V8HI 0 "register_operand" "=x") ! (zero_extend:V8HI ! (vec_select:V8QI ! (vec_duplicate:V16QI ! (match_operand:V8QI 1 "nonimmediate_operand" "xm")) (parallel [(const_int 0) (const_int 1) (const_int 2) --- 9178,9184 ---- [(set (match_operand:V8HI 0 "register_operand" "=x") (zero_extend:V8HI (vec_select:V8QI ! (match_operand:V16QI 1 "nonimmediate_operand" "xm") (parallel [(const_int 0) (const_int 1) (const_int 2) *************** *** 9319,9342 **** [(set (match_operand:V4SI 0 "register_operand" "=x") (zero_extend:V4SI (vec_select:V4QI ! (match_operand:V16QI 1 "register_operand" "x") ! (parallel [(const_int 0) ! (const_int 1) ! (const_int 2) ! (const_int 3)]))))] ! "TARGET_SSE4_1" ! "%vpmovzxbd\t{%1, %0|%0, %1}" ! [(set_attr "type" "ssemov") ! (set_attr "prefix_extra" "1") ! (set_attr "prefix" "maybe_vex") ! (set_attr "mode" "TI")]) ! ! (define_insn "*sse4_1_zero_extendv4qiv4si2" ! [(set (match_operand:V4SI 0 "register_operand" "=x") ! (zero_extend:V4SI ! (vec_select:V4QI ! (vec_duplicate:V16QI ! (match_operand:V4QI 1 "nonimmediate_operand" "xm")) (parallel [(const_int 0) (const_int 1) (const_int 2) --- 9198,9204 ---- [(set (match_operand:V4SI 0 "register_operand" "=x") (zero_extend:V4SI (vec_select:V4QI ! (match_operand:V16QI 1 "nonimmediate_operand" "xm") (parallel [(const_int 0) (const_int 1) (const_int 2) *************** *** 9352,9373 **** [(set (match_operand:V2DI 0 "register_operand" "=x") (zero_extend:V2DI (vec_select:V2QI ! (match_operand:V16QI 1 "register_operand" "x") ! (parallel [(const_int 0) ! (const_int 1)]))))] ! "TARGET_SSE4_1" ! "%vpmovzxbq\t{%1, %0|%0, %1}" ! [(set_attr "type" "ssemov") ! (set_attr "prefix_extra" "1") ! (set_attr "prefix" "maybe_vex") ! (set_attr "mode" "TI")]) ! ! (define_insn "*sse4_1_zero_extendv2qiv2di2" ! [(set (match_operand:V2DI 0 "register_operand" "=x") ! (zero_extend:V2DI ! (vec_select:V2QI ! (vec_duplicate:V16QI ! (match_operand:V2QI 1 "nonimmediate_operand" "xm")) (parallel [(const_int 0) (const_int 1)]))))] "TARGET_SSE4_1" --- 9214,9220 ---- [(set (match_operand:V2DI 0 "register_operand" "=x") (zero_extend:V2DI (vec_select:V2QI ! (match_operand:V16QI 1 "nonimmediate_operand" "xm") (parallel [(const_int 0) (const_int 1)]))))] "TARGET_SSE4_1" *************** *** 9381,9404 **** [(set (match_operand:V4SI 0 "register_operand" "=x") (zero_extend:V4SI (vec_select:V4HI ! (match_operand:V8HI 1 "register_operand" "x") ! (parallel [(const_int 0) ! (const_int 1) ! (const_int 2) ! (const_int 3)]))))] ! "TARGET_SSE4_1" ! "%vpmovzxwd\t{%1, %0|%0, %1}" ! [(set_attr "type" "ssemov") ! (set_attr "prefix_extra" "1") ! (set_attr "prefix" "maybe_vex") ! (set_attr "mode" "TI")]) ! ! (define_insn "*sse4_1_zero_extendv4hiv4si2" ! [(set (match_operand:V4SI 0 "register_operand" "=x") ! (zero_extend:V4SI ! (vec_select:V4HI ! (vec_duplicate:V8HI ! (match_operand:V4HI 1 "nonimmediate_operand" "xm")) (parallel [(const_int 0) (const_int 1) (const_int 2) --- 9228,9234 ---- [(set (match_operand:V4SI 0 "register_operand" "=x") (zero_extend:V4SI (vec_select:V4HI ! (match_operand:V8HI 1 "nonimmediate_operand" "xm") (parallel [(const_int 0) (const_int 1) (const_int 2) *************** *** 9414,9435 **** [(set (match_operand:V2DI 0 "register_operand" "=x") (zero_extend:V2DI (vec_select:V2HI ! (match_operand:V8HI 1 "register_operand" "x") ! (parallel [(const_int 0) ! (const_int 1)]))))] ! "TARGET_SSE4_1" ! "%vpmovzxwq\t{%1, %0|%0, %1}" ! [(set_attr "type" "ssemov") ! (set_attr "prefix_extra" "1") ! (set_attr "prefix" "maybe_vex") ! (set_attr "mode" "TI")]) ! ! (define_insn "*sse4_1_zero_extendv2hiv2di2" ! [(set (match_operand:V2DI 0 "register_operand" "=x") ! (zero_extend:V2DI ! (vec_select:V2HI ! (vec_duplicate:V8HI ! (match_operand:V2HI 1 "nonimmediate_operand" "xm")) (parallel [(const_int 0) (const_int 1)]))))] "TARGET_SSE4_1" --- 9244,9250 ---- [(set (match_operand:V2DI 0 "register_operand" "=x") (zero_extend:V2DI (vec_select:V2HI ! (match_operand:V8HI 1 "nonimmediate_operand" "xm") (parallel [(const_int 0) (const_int 1)]))))] "TARGET_SSE4_1" *************** *** 9443,9464 **** [(set (match_operand:V2DI 0 "register_operand" "=x") (zero_extend:V2DI (vec_select:V2SI ! (match_operand:V4SI 1 "register_operand" "x") ! (parallel [(const_int 0) ! (const_int 1)]))))] ! "TARGET_SSE4_1" ! "%vpmovzxdq\t{%1, %0|%0, %1}" ! [(set_attr "type" "ssemov") ! (set_attr "prefix_extra" "1") ! (set_attr "prefix" "maybe_vex") ! (set_attr "mode" "TI")]) ! ! (define_insn "*sse4_1_zero_extendv2siv2di2" ! [(set (match_operand:V2DI 0 "register_operand" "=x") ! (zero_extend:V2DI ! (vec_select:V2SI ! (vec_duplicate:V4SI ! (match_operand:V2SI 1 "nonimmediate_operand" "xm")) (parallel [(const_int 0) (const_int 1)]))))] "TARGET_SSE4_1" --- 9258,9264 ---- [(set (match_operand:V2DI 0 "register_operand" "=x") (zero_extend:V2DI (vec_select:V2SI ! (match_operand:V4SI 1 "nonimmediate_operand" "xm") (parallel [(const_int 0) (const_int 1)]))))] "TARGET_SSE4_1" diff -Nrcpad gcc-4.4.4/gcc/config/i386/sync.md gcc-4.4.5/gcc/config/i386/sync.md *** gcc-4.4.4/gcc/config/i386/sync.md Thu Mar 12 20:45:39 2009 --- gcc-4.4.5/gcc/config/i386/sync.md Wed May 19 17:42:00 2010 *************** *** 1,5 **** ;; GCC machine description for i386 synchronization instructions. ! ;; Copyright (C) 2005, 2006, 2007, 2008, 2009 ;; Free Software Foundation, Inc. ;; ;; This file is part of GCC. --- 1,5 ---- ;; GCC machine description for i386 synchronization instructions. ! ;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 ;; Free Software Foundation, Inc. ;; ;; This file is part of GCC. *************** *** 51,57 **** (unspec:BLK [(match_dup 0)] UNSPEC_MFENCE)) (clobber (reg:CC FLAGS_REG))] "!(TARGET_64BIT || TARGET_SSE2)" ! "lock{%;| }or{l}\t{$0, (%%esp)|DWORD PTR [esp], 0}" [(set_attr "memory" "unknown")]) ;; ??? It would be possible to use cmpxchg8b on pentium for DImode --- 51,57 ---- (unspec:BLK [(match_dup 0)] UNSPEC_MFENCE)) (clobber (reg:CC FLAGS_REG))] "!(TARGET_64BIT || TARGET_SSE2)" ! "lock{%;} or{l}\t{$0, (%%esp)|DWORD PTR [esp], 0}" [(set_attr "memory" "unknown")]) ;; ??? It would be possible to use cmpxchg8b on pentium for DImode *************** *** 111,117 **** UNSPECV_CMPXCHG)) (clobber (reg:CC FLAGS_REG))] "TARGET_CMPXCHG" ! "lock{%;| }cmpxchg{}\t{%3, %1|%1, %3}") (define_insn "sync_double_compare_and_swap" [(set (match_operand:DCASMODE 0 "register_operand" "=A") --- 111,117 ---- UNSPECV_CMPXCHG)) (clobber (reg:CC FLAGS_REG))] "TARGET_CMPXCHG" ! "lock{%;} cmpxchg{}\t{%3, %1|%1, %3}") (define_insn "sync_double_compare_and_swap" [(set (match_operand:DCASMODE 0 "register_operand" "=A") *************** *** 125,131 **** UNSPECV_CMPXCHG)) (clobber (reg:CC FLAGS_REG))] "" ! "lock{%;| }cmpxchgb\t%1") ;; Theoretically we'd like to use constraint "r" (any reg) for operand ;; 3, but that includes ecx. If operand 3 and 4 are the same (like when --- 125,131 ---- UNSPECV_CMPXCHG)) (clobber (reg:CC FLAGS_REG))] "" ! "lock{%;} cmpxchgb\t%1") ;; Theoretically we'd like to use constraint "r" (any reg) for operand ;; 3, but that includes ecx. If operand 3 and 4 are the same (like when *************** *** 148,154 **** UNSPECV_CMPXCHG)) (clobber (reg:CC FLAGS_REG))] "!TARGET_64BIT && TARGET_CMPXCHG8B && flag_pic" ! "xchg{l}\t%%ebx, %3\;lock{%;| }cmpxchg8b\t%1\;xchg{l}\t%%ebx, %3") (define_expand "sync_compare_and_swap_cc" [(parallel --- 148,154 ---- UNSPECV_CMPXCHG)) (clobber (reg:CC FLAGS_REG))] "!TARGET_64BIT && TARGET_CMPXCHG8B && flag_pic" ! "xchg{l}\t%%ebx, %3\;lock{%;} cmpxchg8b\t%1\;xchg{l}\t%%ebx, %3") (define_expand "sync_compare_and_swap_cc" [(parallel *************** *** 213,219 **** [(match_dup 1) (match_dup 2) (match_dup 3)] UNSPECV_CMPXCHG) (match_dup 2)))] "TARGET_CMPXCHG" ! "lock{%;| }cmpxchg{}\t{%3, %1|%1, %3}") (define_insn "sync_double_compare_and_swap_cc" [(set (match_operand:DCASMODE 0 "register_operand" "=A") --- 213,219 ---- [(match_dup 1) (match_dup 2) (match_dup 3)] UNSPECV_CMPXCHG) (match_dup 2)))] "TARGET_CMPXCHG" ! "lock{%;} cmpxchg{}\t{%3, %1|%1, %3}") (define_insn "sync_double_compare_and_swap_cc" [(set (match_operand:DCASMODE 0 "register_operand" "=A") *************** *** 232,238 **** UNSPECV_CMPXCHG) (match_dup 2)))] "" ! "lock{%;| }cmpxchgb\t%1") ;; See above for the explanation of using the constraint "SD" for ;; operand 3. --- 232,238 ---- UNSPECV_CMPXCHG) (match_dup 2)))] "" ! "lock{%;} cmpxchgb\t%1") ;; See above for the explanation of using the constraint "SD" for ;; operand 3. *************** *** 253,259 **** UNSPECV_CMPXCHG) (match_dup 2)))] "!TARGET_64BIT && TARGET_CMPXCHG8B && flag_pic" ! "xchg{l}\t%%ebx, %3\;lock{%;| }cmpxchg8b\t%1\;xchg{l}\t%%ebx, %3") (define_insn "sync_old_add" [(set (match_operand:IMODE 0 "register_operand" "=") --- 253,259 ---- UNSPECV_CMPXCHG) (match_dup 2)))] "!TARGET_64BIT && TARGET_CMPXCHG8B && flag_pic" ! "xchg{l}\t%%ebx, %3\;lock{%;} cmpxchg8b\t%1\;xchg{l}\t%%ebx, %3") (define_insn "sync_old_add" [(set (match_operand:IMODE 0 "register_operand" "=") *************** *** 264,270 **** (match_operand:IMODE 2 "register_operand" "0"))) (clobber (reg:CC FLAGS_REG))] "TARGET_XADD" ! "lock{%;| }xadd{}\t{%0, %1|%1, %0}") ;; Recall that xchg implicitly sets LOCK#, so adding it again wastes space. (define_insn "sync_lock_test_and_set" --- 264,270 ---- (match_operand:IMODE 2 "register_operand" "0"))) (clobber (reg:CC FLAGS_REG))] "TARGET_XADD" ! "lock{%;} xadd{}\t{%0, %1|%1, %0}") ;; Recall that xchg implicitly sets LOCK#, so adding it again wastes space. (define_insn "sync_lock_test_and_set" *************** *** 288,299 **** if (TARGET_USE_INCDEC) { if (operands[1] == const1_rtx) ! return "lock{%;| }inc{}\t%0"; if (operands[1] == constm1_rtx) ! return "lock{%;| }dec{}\t%0"; } ! return "lock{%;| }add{}\t{%1, %0|%0, %1}"; }) (define_insn "sync_sub" --- 288,299 ---- if (TARGET_USE_INCDEC) { if (operands[1] == const1_rtx) ! return "lock{%;} inc{}\t%0"; if (operands[1] == constm1_rtx) ! return "lock{%;} dec{}\t%0"; } ! return "lock{%;} add{}\t{%1, %0|%0, %1}"; }) (define_insn "sync_sub" *************** *** 308,319 **** if (TARGET_USE_INCDEC) { if (operands[1] == const1_rtx) ! return "lock{%;| }dec{}\t%0"; if (operands[1] == constm1_rtx) ! return "lock{%;| }inc{}\t%0"; } ! return "lock{%;| }sub{}\t{%1, %0|%0, %1}"; }) (define_insn "sync_ior" --- 308,319 ---- if (TARGET_USE_INCDEC) { if (operands[1] == const1_rtx) ! return "lock{%;} dec{}\t%0"; if (operands[1] == constm1_rtx) ! return "lock{%;} inc{}\t%0"; } ! return "lock{%;} sub{}\t{%1, %0|%0, %1}"; }) (define_insn "sync_ior" *************** *** 324,330 **** UNSPECV_LOCK)) (clobber (reg:CC FLAGS_REG))] "" ! "lock{%;| }or{}\t{%1, %0|%0, %1}") (define_insn "sync_and" [(set (match_operand:IMODE 0 "memory_operand" "+m") --- 324,330 ---- UNSPECV_LOCK)) (clobber (reg:CC FLAGS_REG))] "" ! "lock{%;} or{}\t{%1, %0|%0, %1}") (define_insn "sync_and" [(set (match_operand:IMODE 0 "memory_operand" "+m") *************** *** 334,340 **** UNSPECV_LOCK)) (clobber (reg:CC FLAGS_REG))] "" ! "lock{%;| }and{}\t{%1, %0|%0, %1}") (define_insn "sync_xor" [(set (match_operand:IMODE 0 "memory_operand" "+m") --- 334,340 ---- UNSPECV_LOCK)) (clobber (reg:CC FLAGS_REG))] "" ! "lock{%;} and{}\t{%1, %0|%0, %1}") (define_insn "sync_xor" [(set (match_operand:IMODE 0 "memory_operand" "+m") *************** *** 344,347 **** UNSPECV_LOCK)) (clobber (reg:CC FLAGS_REG))] "" ! "lock{%;| }xor{}\t{%1, %0|%0, %1}") --- 344,347 ---- UNSPECV_LOCK)) (clobber (reg:CC FLAGS_REG))] "" ! "lock{%;} xor{}\t{%1, %0|%0, %1}") diff -Nrcpad gcc-4.4.4/gcc/config/i386/vx-common.h gcc-4.4.5/gcc/config/i386/vx-common.h *** gcc-4.4.4/gcc/config/i386/vx-common.h Fri Feb 20 15:20:38 2009 --- gcc-4.4.5/gcc/config/i386/vx-common.h Thu Jul 15 10:08:56 2010 *************** *** 1,5 **** /* IA32 VxWorks and VxWorks AE target definitions. ! Copyright (C) 2007, 2008 Free Software Foundation, Inc. This file is part of GCC. --- 1,5 ---- /* IA32 VxWorks and VxWorks AE target definitions. ! Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc. This file is part of GCC. *************** along with GCC; see the file COPYING3. *** 20,26 **** #define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \ asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN) ! /* VxWorks uses the same ABI as Solaris 10. */ #define SUBTARGET_RETURN_IN_MEMORY(TYPE, FNTYPE) \ ! ix86_sol10_return_in_memory (TYPE, FNTYPE) --- 20,26 ---- #define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \ asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN) ! /* VxWorks uses the same ABI as Solaris 2. */ #define SUBTARGET_RETURN_IN_MEMORY(TYPE, FNTYPE) \ ! ix86_solaris_return_in_memory (TYPE, FNTYPE) diff -Nrcpad gcc-4.4.4/gcc/config/ia64/sync.md gcc-4.4.5/gcc/config/ia64/sync.md *** gcc-4.4.4/gcc/config/ia64/sync.md Fri Feb 20 15:20:38 2009 --- gcc-4.4.5/gcc/config/ia64/sync.md Wed Jul 21 22:37:53 2010 *************** *** 135,142 **** if (GET_MODE (dst) != DImode) dst = gen_reg_rtx (DImode); - emit_insn (gen_memory_barrier ()); emit_insn (gen_cmpxchg_rel_ (dst, operands[1], ccv, operands[3])); if (dst != operands[0]) emit_move_insn (operands[0], gen_lowpart (mode, dst)); --- 135,142 ---- if (GET_MODE (dst) != DImode) dst = gen_reg_rtx (DImode); emit_insn (gen_cmpxchg_rel_ (dst, operands[1], ccv, operands[3])); + emit_insn (gen_memory_barrier ()); if (dst != operands[0]) emit_move_insn (operands[0], gen_lowpart (mode, dst)); diff -Nrcpad gcc-4.4.4/gcc/config/pa/pa.c gcc-4.4.5/gcc/config/pa/pa.c *** gcc-4.4.4/gcc/config/pa/pa.c Wed Nov 25 00:35:16 2009 --- gcc-4.4.5/gcc/config/pa/pa.c Mon Jun 21 23:51:10 2010 *************** override_options (void) *** 500,505 **** --- 500,516 ---- if (flag_pic == 1 || TARGET_64BIT) flag_pic = 2; + /* Disable -freorder-blocks-and-partition as we don't support hot and + cold partitioning. */ + if (flag_reorder_blocks_and_partition) + { + inform (input_location, + "-freorder-blocks-and-partition does not work " + "on this architecture"); + flag_reorder_blocks_and_partition = 0; + flag_reorder_blocks = 1; + } + /* We can't guarantee that .dword is available for 32-bit targets. */ if (UNITS_PER_WORD == 4) targetm.asm_out.aligned_op.di = NULL; *************** emit_move_sequence (rtx *operands, enum *** 1682,1691 **** && !REG_POINTER (operand0) && !HARD_REGISTER_P (operand0)) copy_reg_pointer (operand0, operand1); - else if (REG_POINTER (operand0) - && !REG_POINTER (operand1) - && !HARD_REGISTER_P (operand1)) - copy_reg_pointer (operand1, operand0); } /* When MEMs are broken out, the REG_POINTER flag doesn't --- 1693,1698 ---- diff -Nrcpad gcc-4.4.4/gcc/config/pa/pa.h gcc-4.4.5/gcc/config/pa/pa.h *** gcc-4.4.4/gcc/config/pa/pa.h Mon Sep 1 09:27:39 2008 --- gcc-4.4.5/gcc/config/pa/pa.h Sun Aug 8 19:57:46 2010 *************** typedef struct machine_function GTY(()) *** 332,339 **** #define BIGGEST_ALIGNMENT (2 * BITS_PER_WORD) /* Get around hp-ux assembler bug, and make strcpy of constants fast. */ ! #define CONSTANT_ALIGNMENT(CODE, TYPEALIGN) \ ! ((TYPEALIGN) < 32 ? 32 : (TYPEALIGN)) /* Make arrays of chars word-aligned for the same reasons. */ #define DATA_ALIGNMENT(TYPE, ALIGN) \ --- 332,340 ---- #define BIGGEST_ALIGNMENT (2 * BITS_PER_WORD) /* Get around hp-ux assembler bug, and make strcpy of constants fast. */ ! #define CONSTANT_ALIGNMENT(EXP, ALIGN) \ ! (TREE_CODE (EXP) == STRING_CST \ ! && (ALIGN) < BITS_PER_WORD ? BITS_PER_WORD : (ALIGN)) /* Make arrays of chars word-aligned for the same reasons. */ #define DATA_ALIGNMENT(TYPE, ALIGN) \ *************** extern int may_call_alloca; *** 1338,1346 **** || ((MODE) != SFmode \ && (MODE) != DFmode))) \ goto ADDR; \ ! else if (GET_CODE (X) == LABEL_REF \ ! || (GET_CODE (X) == CONST_INT \ ! && INT_5_BITS (X))) \ goto ADDR; \ /* Needed for -fPIC */ \ else if (GET_CODE (X) == LO_SUM \ --- 1339,1345 ---- || ((MODE) != SFmode \ && (MODE) != DFmode))) \ goto ADDR; \ ! else if (GET_CODE (X) == CONST_INT && INT_5_BITS (X)) \ goto ADDR; \ /* Needed for -fPIC */ \ else if (GET_CODE (X) == LO_SUM \ diff -Nrcpad gcc-4.4.4/gcc/config/pa/pa.md gcc-4.4.5/gcc/config/pa/pa.md *** gcc-4.4.4/gcc/config/pa/pa.md Mon Mar 22 01:02:42 2010 --- gcc-4.4.5/gcc/config/pa/pa.md Sat Jul 3 22:50:37 2010 *************** *** 6426,6452 **** ;; Processors prior to PA 2.0 don't have a fneg instruction. Fast ;; negation can be done by subtracting from plus zero. However, this ;; violates the IEEE standard when negating plus and minus zero. (define_expand "negdf2" ! [(parallel [(set (match_operand:DF 0 "register_operand" "") ! (neg:DF (match_operand:DF 1 "register_operand" ""))) ! (use (match_dup 2))])] ! "! TARGET_SOFT_FLOAT" { if (TARGET_PA_20 || flag_unsafe_math_optimizations) emit_insn (gen_negdf2_fast (operands[0], operands[1])); else ! { ! operands[2] = force_reg (DFmode, ! CONST_DOUBLE_FROM_REAL_VALUE (dconstm1, DFmode)); ! emit_insn (gen_muldf3 (operands[0], operands[1], operands[2])); ! } DONE; }) (define_insn "negdf2_fast" [(set (match_operand:DF 0 "register_operand" "=f") (neg:DF (match_operand:DF 1 "register_operand" "f")))] ! "! TARGET_SOFT_FLOAT && (TARGET_PA_20 || flag_unsafe_math_optimizations)" "* { if (TARGET_PA_20) --- 6426,6466 ---- ;; Processors prior to PA 2.0 don't have a fneg instruction. Fast ;; negation can be done by subtracting from plus zero. However, this ;; violates the IEEE standard when negating plus and minus zero. + ;; The slow path toggles the sign bit in the general registers. (define_expand "negdf2" ! [(set (match_operand:DF 0 "register_operand" "") ! (neg:DF (match_operand:DF 1 "register_operand" "")))] ! "!TARGET_SOFT_FLOAT" { if (TARGET_PA_20 || flag_unsafe_math_optimizations) emit_insn (gen_negdf2_fast (operands[0], operands[1])); else ! emit_insn (gen_negdf2_slow (operands[0], operands[1])); DONE; }) + (define_insn "negdf2_slow" + [(set (match_operand:DF 0 "register_operand" "=r") + (neg:DF (match_operand:DF 1 "register_operand" "r")))] + "!TARGET_SOFT_FLOAT && !TARGET_PA_20" + "* + { + if (rtx_equal_p (operands[0], operands[1])) + return \"and,< %1,%1,%0\;depi,tr 1,0,1,%0\;depi 0,0,1,%0\"; + else + return \"and,< %1,%1,%0\;depi,tr 1,0,1,%0\;depi 0,0,1,%0\;copy %R1,%R0\"; + }" + [(set_attr "type" "multi") + (set (attr "length") + (if_then_else (ne (symbol_ref "rtx_equal_p (operands[0], operands[1])") + (const_int 0)) + (const_int 12) + (const_int 16)))]) + (define_insn "negdf2_fast" [(set (match_operand:DF 0 "register_operand" "=f") (neg:DF (match_operand:DF 1 "register_operand" "f")))] ! "!TARGET_SOFT_FLOAT" "* { if (TARGET_PA_20) *************** *** 6458,6483 **** (set_attr "length" "4")]) (define_expand "negsf2" ! [(parallel [(set (match_operand:SF 0 "register_operand" "") ! (neg:SF (match_operand:SF 1 "register_operand" ""))) ! (use (match_dup 2))])] ! "! TARGET_SOFT_FLOAT" { if (TARGET_PA_20 || flag_unsafe_math_optimizations) emit_insn (gen_negsf2_fast (operands[0], operands[1])); else ! { ! operands[2] = force_reg (SFmode, ! CONST_DOUBLE_FROM_REAL_VALUE (dconstm1, SFmode)); ! emit_insn (gen_mulsf3 (operands[0], operands[1], operands[2])); ! } DONE; }) (define_insn "negsf2_fast" [(set (match_operand:SF 0 "register_operand" "=f") (neg:SF (match_operand:SF 1 "register_operand" "f")))] ! "! TARGET_SOFT_FLOAT && (TARGET_PA_20 || flag_unsafe_math_optimizations)" "* { if (TARGET_PA_20) --- 6472,6500 ---- (set_attr "length" "4")]) (define_expand "negsf2" ! [(set (match_operand:SF 0 "register_operand" "") ! (neg:SF (match_operand:SF 1 "register_operand" "")))] ! "!TARGET_SOFT_FLOAT" { if (TARGET_PA_20 || flag_unsafe_math_optimizations) emit_insn (gen_negsf2_fast (operands[0], operands[1])); else ! emit_insn (gen_negsf2_slow (operands[0], operands[1])); DONE; }) + (define_insn "negsf2_slow" + [(set (match_operand:SF 0 "register_operand" "=r") + (neg:SF (match_operand:SF 1 "register_operand" "r")))] + "!TARGET_SOFT_FLOAT && !TARGET_PA_20" + "and,< %1,%1,%0\;depi,tr 1,0,1,%0\;depi 0,0,1,%0" + [(set_attr "type" "multi") + (set_attr "length" "12")]) + (define_insn "negsf2_fast" [(set (match_operand:SF 0 "register_operand" "=f") (neg:SF (match_operand:SF 1 "register_operand" "f")))] ! "!TARGET_SOFT_FLOAT" "* { if (TARGET_PA_20) *************** add,l %2,%3,%3\;bv,n %%r0(%3)" *** 9978,10067 **** (match_operand 2 "const_int_operand" "")] "TARGET_PA_20" { ! int locality = INTVAL (operands[2]); ! ! gcc_assert (locality >= 0 && locality <= 3); ! ! /* Change operand[0] to a MEM as we don't have the infrastructure ! to output all the supported address modes for ldw/ldd when we use ! the address directly. However, we do have it for MEMs. */ ! operands[0] = gen_rtx_MEM (QImode, operands[0]); ! ! /* If the address isn't valid for the prefetch, replace it. */ ! if (locality) ! { ! if (!prefetch_nocc_operand (operands[0], QImode)) ! operands[0] ! = replace_equiv_address (operands[0], ! copy_to_mode_reg (Pmode, ! XEXP (operands[0], 0))); ! emit_insn (gen_prefetch_nocc (operands[0], operands[1], operands[2])); ! } ! else ! { ! if (!prefetch_cc_operand (operands[0], QImode)) ! operands[0] ! = replace_equiv_address (operands[0], ! copy_to_mode_reg (Pmode, ! XEXP (operands[0], 0))); ! emit_insn (gen_prefetch_cc (operands[0], operands[1], operands[2])); ! } DONE; }) ! (define_insn "prefetch_cc" ! [(prefetch (match_operand:QI 0 "prefetch_cc_operand" "RW") (match_operand:SI 1 "const_int_operand" "n") (match_operand:SI 2 "const_int_operand" "n"))] ! "TARGET_PA_20 && operands[2] == const0_rtx" { ! /* The SL cache-control completor indicates good spatial locality but poor temporal locality. The ldw instruction with a target of general register 0 prefetches a cache line for a read. The ldd instruction prefetches a cache line for a write. */ - static const char * const instr[2] = { - "ldw%M0,sl %0,%%r0", - "ldd%M0,sl %0,%%r0" - }; - int read_or_write = INTVAL (operands[1]); - - gcc_assert (read_or_write >= 0 && read_or_write <= 1); - - return instr [read_or_write]; - } - [(set_attr "type" "load") - (set_attr "length" "4")]) - - (define_insn "prefetch_nocc" - [(prefetch (match_operand:QI 0 "prefetch_nocc_operand" "A,RQ") - (match_operand:SI 1 "const_int_operand" "n,n") - (match_operand:SI 2 "const_int_operand" "n,n"))] - "TARGET_PA_20 && operands[2] != const0_rtx" - { - /* The ldw instruction with a target of general register 0 prefetches - a cache line for a read. The ldd instruction prefetches a cache line - for a write. */ static const char * const instr[2][2] = { { ! "ldw RT'%A0,%%r0", ! "ldd RT'%A0,%%r0", }, { ! "ldw%M0 %0,%%r0", ! "ldd%M0 %0,%%r0", } }; ! int read_or_write = INTVAL (operands[1]); ! ! gcc_assert (which_alternative == 0 || which_alternative == 1); ! gcc_assert (read_or_write >= 0 && read_or_write <= 1); ! return instr [which_alternative][read_or_write]; } [(set_attr "type" "load") (set_attr "length" "4")]) - ;; TLS Support (define_insn "tgd_load" [(set (match_operand:SI 0 "register_operand" "=r") --- 9995,10033 ---- (match_operand 2 "const_int_operand" "")] "TARGET_PA_20" { ! operands[0] = copy_addr_to_reg (operands[0]); ! emit_insn (gen_prefetch_20 (operands[0], operands[1], operands[2])); DONE; }) ! (define_insn "prefetch_20" ! [(prefetch (match_operand 0 "pmode_register_operand" "r") (match_operand:SI 1 "const_int_operand" "n") (match_operand:SI 2 "const_int_operand" "n"))] ! "TARGET_PA_20" { ! /* The SL cache-control completer indicates good spatial locality but poor temporal locality. The ldw instruction with a target of general register 0 prefetches a cache line for a read. The ldd instruction prefetches a cache line for a write. */ static const char * const instr[2][2] = { { ! "ldw,sl 0(%0),%%r0", ! "ldd,sl 0(%0),%%r0" }, { ! "ldw 0(%0),%%r0", ! "ldd 0(%0),%%r0" } }; ! int read_or_write = INTVAL (operands[1]) == 0 ? 0 : 1; ! int locality = INTVAL (operands[2]) == 0 ? 0 : 1; ! return instr [locality][read_or_write]; } [(set_attr "type" "load") (set_attr "length" "4")]) ;; TLS Support (define_insn "tgd_load" [(set (match_operand:SI 0 "register_operand" "=r") diff -Nrcpad gcc-4.4.4/gcc/config/pa/predicates.md gcc-4.4.5/gcc/config/pa/predicates.md *** gcc-4.4.4/gcc/config/pa/predicates.md Thu Aug 2 10:49:31 2007 --- gcc-4.4.5/gcc/config/pa/predicates.md Sat Jul 3 22:50:37 2010 *************** *** 239,302 **** return memory_address_p (mode, XEXP (op, 0)); }) - ;; Accept anything that can be used as the source operand for a - ;; prefetch instruction with a cache-control completer. - - (define_predicate "prefetch_cc_operand" - (match_code "mem") - { - if (GET_CODE (op) != MEM) - return 0; - - op = XEXP (op, 0); - - /* We must reject virtual registers as we don't allow REG+D. */ - if (op == virtual_incoming_args_rtx - || op == virtual_stack_vars_rtx - || op == virtual_stack_dynamic_rtx - || op == virtual_outgoing_args_rtx - || op == virtual_cfa_rtx) - return 0; - - if (!REG_P (op) && !IS_INDEX_ADDR_P (op)) - return 0; - - /* Until problems with management of the REG_POINTER flag are resolved, - we need to delay creating prefetch insns with unscaled indexed addresses - until CSE is not expected. */ - if (!TARGET_NO_SPACE_REGS - && !cse_not_expected - && GET_CODE (op) == PLUS - && REG_P (XEXP (op, 0))) - return 0; - - return memory_address_p (mode, op); - }) - - ;; Accept anything that can be used as the source operand for a - ;; prefetch instruction with no cache-control completer. - - (define_predicate "prefetch_nocc_operand" - (match_code "mem") - { - if (GET_CODE (op) != MEM) - return 0; - - op = XEXP (op, 0); - - /* Until problems with management of the REG_POINTER flag are resolved, - we need to delay creating prefetch insns with unscaled indexed addresses - until CSE is not expected. */ - if (!TARGET_NO_SPACE_REGS - && !cse_not_expected - && GET_CODE (op) == PLUS - && REG_P (XEXP (op, 0)) - && REG_P (XEXP (op, 1))) - return 0; - - return memory_address_p (mode, op); - }) - ;; Accept REG and any CONST_INT that can be moved in one instruction ;; into a general register. --- 239,244 ---- diff -Nrcpad gcc-4.4.4/gcc/config/rs6000/rs6000.c gcc-4.4.5/gcc/config/rs6000/rs6000.c *** gcc-4.4.4/gcc/config/rs6000/rs6000.c Sat Mar 27 18:56:08 2010 --- gcc-4.4.5/gcc/config/rs6000/rs6000.c Fri Jun 4 04:57:21 2010 *************** typedef struct rs6000_stack { *** 115,128 **** This is added to the cfun structure. */ typedef struct machine_function GTY(()) { - /* Flags if __builtin_return_address (n) with n >= 1 was used. */ - int ra_needs_full_frame; /* Some local-dynamic symbol. */ const char *some_ld_name; /* Whether the instruction chain has been scanned already. */ int insn_chain_scanned_p; /* Flags if __builtin_return_address (0) was used. */ int ra_need_lr; /* Offset from virtual_stack_vars_rtx to the start of the ABI_V4 varargs save area. */ HOST_WIDE_INT varargs_save_offset; --- 115,130 ---- This is added to the cfun structure. */ typedef struct machine_function GTY(()) { /* Some local-dynamic symbol. */ const char *some_ld_name; /* Whether the instruction chain has been scanned already. */ int insn_chain_scanned_p; + /* Flags if __builtin_return_address (n) with n >= 1 was used. */ + int ra_needs_full_frame; /* Flags if __builtin_return_address (0) was used. */ int ra_need_lr; + /* Cache lr_save_p after expansion of builtin_eh_return. */ + int lr_save_state; /* Offset from virtual_stack_vars_rtx to the start of the ABI_V4 varargs save area. */ HOST_WIDE_INT varargs_save_offset; *************** static bool spe_func_has_64bit_regs_p (v *** 759,765 **** static void emit_frame_save (rtx, rtx, enum machine_mode, unsigned int, int, HOST_WIDE_INT); static rtx gen_frame_mem_offset (enum machine_mode, rtx, int); - static void rs6000_emit_allocate_stack (HOST_WIDE_INT, int, int); static unsigned rs6000_hash_constant (rtx); static unsigned toc_hash_function (const void *); static int toc_hash_eq (const void *, const void *); --- 761,766 ---- *************** rs6000_legitimize_tls_address (rtx addr, *** 4091,4110 **** rs6000_emit_move (got, gsym, Pmode); else { ! rtx tmp3, mem; ! rtx first, last; tmp1 = gen_reg_rtx (Pmode); tmp2 = gen_reg_rtx (Pmode); - tmp3 = gen_reg_rtx (Pmode); mem = gen_const_mem (Pmode, tmp1); ! ! first = emit_insn (gen_load_toc_v4_PIC_1b (gsym)); ! emit_move_insn (tmp1, ! gen_rtx_REG (Pmode, LR_REGNO)); emit_move_insn (tmp2, mem); ! emit_insn (gen_addsi3 (tmp3, tmp1, tmp2)); ! last = emit_move_insn (got, tmp3); set_unique_reg_note (last, REG_EQUAL, gsym); } } --- 4092,4107 ---- rs6000_emit_move (got, gsym, Pmode); else { ! rtx mem, lab, last; tmp1 = gen_reg_rtx (Pmode); tmp2 = gen_reg_rtx (Pmode); mem = gen_const_mem (Pmode, tmp1); ! lab = gen_label_rtx (); ! emit_insn (gen_load_toc_v4_PIC_1b (gsym, lab)); ! emit_move_insn (tmp1, gen_rtx_REG (Pmode, LR_REGNO)); emit_move_insn (tmp2, mem); ! last = emit_insn (gen_addsi3 (got, tmp1, tmp2)); set_unique_reg_note (last, REG_EQUAL, gsym); } } *************** rs6000_ra_ever_killed (void) *** 15275,15280 **** --- 15272,15280 ---- if (cfun->is_thunk) return 0; + if (cfun->machine->lr_save_state) + return cfun->machine->lr_save_state - 1; + /* regs_ever_live has LR marked as used if any sibcalls are present, but this should not force saving and restoring in the pro/epilogue. Likewise, reg_set_between_p thinks a sibcall *************** rs6000_emit_load_toc_table (int fromprol *** 15377,15388 **** } else { ! rtx tocsym; tocsym = gen_rtx_SYMBOL_REF (Pmode, toc_label_name); ! emit_insn (gen_load_toc_v4_PIC_1b (tocsym)); ! emit_move_insn (dest, ! gen_rtx_REG (Pmode, LR_REGNO)); emit_move_insn (temp0, gen_rtx_MEM (Pmode, dest)); } emit_insn (gen_addsi3 (dest, temp0, dest)); --- 15377,15388 ---- } else { ! rtx tocsym, lab; tocsym = gen_rtx_SYMBOL_REF (Pmode, toc_label_name); ! lab = gen_label_rtx (); ! emit_insn (gen_load_toc_v4_PIC_1b (tocsym, lab)); ! emit_move_insn (dest, gen_rtx_REG (Pmode, LR_REGNO)); emit_move_insn (temp0, gen_rtx_MEM (Pmode, dest)); } emit_insn (gen_addsi3 (dest, temp0, dest)); *************** rs6000_emit_eh_reg_restore (rtx source, *** 15444,15449 **** --- 15444,15455 ---- } else emit_move_insn (gen_rtx_REG (Pmode, LR_REGNO), operands[0]); + + /* Freeze lr_save_p. We've just emitted rtl that depends on the + state of lr_save_p so any change from here on would be a bug. In + particular, stop rs6000_ra_ever_killed from considering the SET + of lr we may have added just above. */ + cfun->machine->lr_save_state = info->lr_save_p + 1; } static GTY(()) alias_set_type set = -1; *************** rs6000_emit_stack_tie (void) *** 15548,15560 **** } /* Emit the correct code for allocating stack space, as insns. ! If COPY_R12, make sure a copy of the old frame is left in r12. ! If COPY_R11, make sure a copy of the old frame is left in r11, ! in preference to r12 if COPY_R12. The generated code may use hard register 0 as a temporary. */ static void ! rs6000_emit_allocate_stack (HOST_WIDE_INT size, int copy_r12, int copy_r11) { rtx insn; rtx stack_reg = gen_rtx_REG (Pmode, STACK_POINTER_REGNUM); --- 15554,15564 ---- } /* Emit the correct code for allocating stack space, as insns. ! If COPY_REG, make sure a copy of the old frame is left there. The generated code may use hard register 0 as a temporary. */ static void ! rs6000_emit_allocate_stack (HOST_WIDE_INT size, rtx copy_reg) { rtx insn; rtx stack_reg = gen_rtx_REG (Pmode, STACK_POINTER_REGNUM); *************** rs6000_emit_allocate_stack (HOST_WIDE_IN *** 15604,15614 **** warning (0, "stack limit expression is not supported"); } ! if (copy_r12 || copy_r11) ! emit_move_insn (copy_r11 ! ? gen_rtx_REG (Pmode, 11) ! : gen_rtx_REG (Pmode, 12), ! stack_reg); if (size > 32767) { --- 15608,15615 ---- warning (0, "stack limit expression is not supported"); } ! if (copy_reg) ! emit_move_insn (copy_reg, stack_reg); if (size > 32767) { *************** rs6000_emit_prologue (void) *** 16180,16199 **** ? (!saving_GPRs_inline && info->spe_64bit_regs_used == 0) : (!saving_FPRs_inline || !saving_GPRs_inline)); if (info->total_size < 32767) sp_offset = info->total_size; else ! frame_reg_rtx = (need_r11 ! ? gen_rtx_REG (Pmode, 11) ! : frame_ptr_rtx); ! rs6000_emit_allocate_stack (info->total_size, ! (frame_reg_rtx != sp_reg_rtx ! && (info->cr_save_p ! || info->lr_save_p ! || info->first_fp_reg_save < 64 ! || info->first_gp_reg_save < 32 ! )), ! need_r11); if (frame_reg_rtx != sp_reg_rtx) rs6000_emit_stack_tie (); } --- 16181,16213 ---- ? (!saving_GPRs_inline && info->spe_64bit_regs_used == 0) : (!saving_FPRs_inline || !saving_GPRs_inline)); + rtx copy_reg = need_r11 ? gen_rtx_REG (Pmode, 11) : NULL; + if (info->total_size < 32767) sp_offset = info->total_size; + else if (need_r11) + frame_reg_rtx = copy_reg; + else if (info->cr_save_p + || info->lr_save_p + || info->first_fp_reg_save < 64 + || info->first_gp_reg_save < 32 + || info->altivec_size != 0 + || info->vrsave_mask != 0 + || crtl->calls_eh_return) + { + copy_reg = frame_ptr_rtx; + frame_reg_rtx = copy_reg; + } else ! { ! /* The prologue won't be saving any regs so there is no need ! to set up a frame register to access any frame save area. ! We also won't be using sp_offset anywhere below, but set ! the correct value anyway to protect against future ! changes to this function. */ ! sp_offset = info->total_size; ! } ! rs6000_emit_allocate_stack (info->total_size, copy_reg); if (frame_reg_rtx != sp_reg_rtx) rs6000_emit_stack_tie (); } *************** rs6000_emit_prologue (void) *** 16627,16642 **** if (!WORLD_SAVE_P (info) && info->push_p && !(DEFAULT_ABI == ABI_V4 || crtl->calls_eh_return)) { if (info->total_size < 32767) ! sp_offset = info->total_size; else ! frame_reg_rtx = frame_ptr_rtx; ! rs6000_emit_allocate_stack (info->total_size, ! (frame_reg_rtx != sp_reg_rtx ! && ((info->altivec_size != 0) ! || (info->vrsave_mask != 0) ! )), ! FALSE); if (frame_reg_rtx != sp_reg_rtx) rs6000_emit_stack_tie (); } --- 16641,16659 ---- if (!WORLD_SAVE_P (info) && info->push_p && !(DEFAULT_ABI == ABI_V4 || crtl->calls_eh_return)) { + rtx copy_reg = NULL; + if (info->total_size < 32767) ! sp_offset = info->total_size; ! else if (info->altivec_size != 0 ! || info->vrsave_mask != 0) ! { ! copy_reg = frame_ptr_rtx; ! frame_reg_rtx = copy_reg; ! } else ! sp_offset = info->total_size; ! rs6000_emit_allocate_stack (info->total_size, copy_reg); if (frame_reg_rtx != sp_reg_rtx) rs6000_emit_stack_tie (); } *************** rs6000_emit_epilogue (int sibcall) *** 17152,17157 **** --- 17169,17184 ---- frame_reg_rtx = sp_reg_rtx; if (DEFAULT_ABI == ABI_V4) frame_reg_rtx = gen_rtx_REG (Pmode, 11); + /* Prevent reordering memory accesses against stack pointer restore. */ + else if (cfun->calls_alloca + || info->total_size > (TARGET_32BIT ? 220 : 288)) + { + rtx mem1 = gen_rtx_MEM (BLKmode, hard_frame_pointer_rtx); + rtx mem2 = gen_rtx_MEM (BLKmode, sp_reg_rtx); + MEM_NOTRAP_P (mem1) = 1; + MEM_NOTRAP_P (mem2) = 1; + emit_insn (gen_frame_tie (mem1, mem2)); + } emit_insn (TARGET_32BIT ? gen_addsi3 (frame_reg_rtx, hard_frame_pointer_rtx, *************** rs6000_emit_epilogue (int sibcall) *** 17164,17169 **** --- 17191,17204 ---- && DEFAULT_ABI != ABI_V4 && !crtl->calls_eh_return) { + /* Prevent reordering memory accesses against stack pointer restore. */ + if (cfun->calls_alloca + || info->total_size > (TARGET_32BIT ? 220 : 288)) + { + rtx mem = gen_rtx_MEM (BLKmode, sp_reg_rtx); + MEM_NOTRAP_P (mem) = 1; + emit_insn (gen_stack_tie (mem)); + } emit_insn (TARGET_32BIT ? gen_addsi3 (sp_reg_rtx, sp_reg_rtx, GEN_INT (info->total_size)) diff -Nrcpad gcc-4.4.4/gcc/config/rs6000/rs6000.md gcc-4.4.5/gcc/config/rs6000/rs6000.md *** gcc-4.4.4/gcc/config/rs6000/rs6000.md Fri Sep 25 00:00:01 2009 --- gcc-4.4.5/gcc/config/rs6000/rs6000.md Thu Jun 3 03:08:32 2010 *************** *** 10718,10727 **** (define_insn "load_toc_v4_PIC_1b" [(set (reg:SI LR_REGNO) ! (unspec:SI [(match_operand:SI 0 "immediate_operand" "s")] ! UNSPEC_TOCPTR))] "TARGET_ELF && DEFAULT_ABI != ABI_AIX && flag_pic == 2" ! "bcl 20,31,$+8\\n\\t.long %0-$" [(set_attr "type" "branch") (set_attr "length" "8")]) --- 10718,10729 ---- (define_insn "load_toc_v4_PIC_1b" [(set (reg:SI LR_REGNO) ! (unspec:SI [(match_operand:SI 0 "immediate_operand" "s") ! (label_ref (match_operand 1 "" ""))] ! UNSPEC_TOCPTR)) ! (match_dup 1)] "TARGET_ELF && DEFAULT_ABI != ABI_AIX && flag_pic == 2" ! "bcl 20,31,$+8\;.long %0-$" [(set_attr "type" "branch") (set_attr "length" "8")]) *************** *** 14732,14737 **** --- 14734,14748 ---- "" [(set_attr "length" "0")]) + ; Like stack_tie, but depend on both fp and sp based memory. + (define_insn "frame_tie" + [(set (match_operand:BLK 0 "memory_operand" "+m") + (unspec:BLK [(match_dup 0) + (match_operand:BLK 1 "memory_operand" "m")] UNSPEC_TIE))] + "" + "" + [(set_attr "length" "0")]) + (define_expand "epilogue" [(use (const_int 0))] diff -Nrcpad gcc-4.4.4/gcc/config/s390/2097.md gcc-4.4.5/gcc/config/s390/2097.md *** gcc-4.4.4/gcc/config/s390/2097.md Tue Nov 24 08:10:27 2009 --- gcc-4.4.5/gcc/config/s390/2097.md Wed Jun 2 12:00:02 2010 *************** *** 466,480 **** (eq_attr "type" "fsimpdf,fmuldf")) "z10_e1_BOTH, z10_Gate_FP") - ; LOAD ZERO produces a hex value but we need bin. Using the stage 7 - ; bypass causes an exception for format conversion which is very - ; expensive. So, make sure subsequent instructions only get the zero - ; in the normal way. - (define_insn_reservation "z10_fhex" 12 - (and (eq_attr "cpu" "z10") - (eq_attr "type" "fhex")) - "z10_e1_BOTH, z10_Gate_FP") - (define_insn_reservation "z10_fsimpsf" 6 (and (eq_attr "cpu" "z10") (eq_attr "type" "fsimpsf,fmulsf")) --- 466,471 ---- diff -Nrcpad gcc-4.4.4/gcc/config/s390/s390.c gcc-4.4.5/gcc/config/s390/s390.c *** gcc-4.4.4/gcc/config/s390/s390.c Thu Apr 8 11:42:59 2010 --- gcc-4.4.5/gcc/config/s390/s390.c Wed Jun 2 12:00:02 2010 *************** override_options (void) *** 1657,1663 **** if (!PARAM_SET_P (PARAM_MAX_UNROLL_TIMES)) set_param_value ("max-unroll-times", 32); if (!PARAM_SET_P (PARAM_MAX_COMPLETELY_PEELED_INSNS)) ! set_param_value ("max-completely-peeled-insns", 800); if (!PARAM_SET_P (PARAM_MAX_COMPLETELY_PEEL_TIMES)) set_param_value ("max-completely-peel-times", 64); } --- 1657,1663 ---- if (!PARAM_SET_P (PARAM_MAX_UNROLL_TIMES)) set_param_value ("max-unroll-times", 32); if (!PARAM_SET_P (PARAM_MAX_COMPLETELY_PEELED_INSNS)) ! set_param_value ("max-completely-peeled-insns", 2000); if (!PARAM_SET_P (PARAM_MAX_COMPLETELY_PEEL_TIMES)) set_param_value ("max-completely-peel-times", 64); } *************** legitimate_reload_constant_p (rtx op) *** 2794,2804 **** && larl_operand (op, VOIDmode)) return true; - /* Accept lzXX operands. */ - if (GET_CODE (op) == CONST_DOUBLE - && CONST_DOUBLE_OK_FOR_CONSTRAINT_P (op, 'G', "G")) - return true; - /* Accept double-word operands that can be split. */ if (GET_CODE (op) == CONST_INT && trunc_int_for_mode (INTVAL (op), word_mode) != INTVAL (op)) --- 2794,2799 ---- diff -Nrcpad gcc-4.4.4/gcc/config/s390/s390.md gcc-4.4.5/gcc/config/s390/s390.md *** gcc-4.4.4/gcc/config/s390/s390.md Mon Feb 22 11:32:39 2010 --- gcc-4.4.5/gcc/config/s390/s390.md Wed Jun 2 12:00:02 2010 *************** *** 105,115 **** (UNSPEC_SP_SET 700) (UNSPEC_SP_TEST 701) - ; Copy sign instructions - (UNSPEC_COPYSIGN 800) - ; Test Data Class (TDC) ! (UNSPEC_TDC_INSN 900) ]) ;; --- 105,112 ---- (UNSPEC_SP_SET 700) (UNSPEC_SP_TEST 701) ; Test Data Class (TDC) ! (UNSPEC_TDC_INSN 800) ]) ;; *************** *** 1876,1882 **** stcy\t%1,%0 mvi\t%S0,%b1 mviy\t%S0,%b1 ! *" [(set_attr "op_type" "RR,RI,RX,RXY,RX,RXY,SI,SIY,SS") (set_attr "type" "lr,*,*,*,store,store,store,store,*") (set_attr "z10prop" "z10_fr_E1, --- 1873,1879 ---- stcy\t%1,%0 mvi\t%S0,%b1 mviy\t%S0,%b1 ! #" [(set_attr "op_type" "RR,RI,RX,RXY,RX,RXY,SI,SIY,SS") (set_attr "type" "lr,*,*,*,store,store,store,store,*") (set_attr "z10prop" "z10_fr_E1, *************** *** 1956,1966 **** "") (define_insn "*mov_64" ! [(set (match_operand:TD_TF 0 "nonimmediate_operand" "=f,f,f,o, d,QS, d,o") ! (match_operand:TD_TF 1 "general_operand" " G,f,o,f,QS, d,dRT,d"))] "TARGET_64BIT" "@ - lzxr\t%0 lxr\t%0,%1 # # --- 1953,1962 ---- "") (define_insn "*mov_64" ! [(set (match_operand:TD_TF 0 "nonimmediate_operand" "=f,f,o, d,QS, d,o") ! (match_operand:TD_TF 1 "general_operand" " f,o,f,QS, d,dRT,d"))] "TARGET_64BIT" "@ lxr\t%0,%1 # # *************** *** 1968,1987 **** stmg\t%1,%N1,%S0 # #" ! [(set_attr "op_type" "RRE,RRE,*,*,RSY,RSY,*,*") ! (set_attr "type" "fhex,fsimptf,*,*,lm,stm,*,*")]) (define_insn "*mov_31" ! [(set (match_operand:TD_TF 0 "nonimmediate_operand" "=f,f,f,o") ! (match_operand:TD_TF 1 "general_operand" " G,f,o,f"))] "!TARGET_64BIT" "@ - lzxr\t%0 lxr\t%0,%1 # #" ! [(set_attr "op_type" "RRE,RRE,*,*") ! (set_attr "type" "fhex,fsimptf,*,*")]) ; TFmode in GPRs splitters --- 1964,1982 ---- stmg\t%1,%N1,%S0 # #" ! [(set_attr "op_type" "RRE,*,*,RSY,RSY,*,*") ! (set_attr "type" "fsimptf,*,*,lm,stm,*,*")]) (define_insn "*mov_31" ! [(set (match_operand:TD_TF 0 "nonimmediate_operand" "=f,f,o") ! (match_operand:TD_TF 1 "general_operand" " f,o,f"))] "!TARGET_64BIT" "@ lxr\t%0,%1 # #" ! [(set_attr "op_type" "RRE,*,*") ! (set_attr "type" "fsimptf,*,*")]) ; TFmode in GPRs splitters *************** *** 2072,2083 **** (define_insn "*mov_64dfp" [(set (match_operand:DD_DF 0 "nonimmediate_operand" ! "=f,f,f,d,f,f,R,T,d, d,RT") (match_operand:DD_DF 1 "general_operand" ! " G,f,d,f,R,T,f,f,d,RT, d"))] "TARGET_64BIT && TARGET_DFP" "@ - lzdr\t%0 ldr\t%0,%1 ldgr\t%0,%1 lgdr\t%0,%1 --- 2067,2077 ---- (define_insn "*mov_64dfp" [(set (match_operand:DD_DF 0 "nonimmediate_operand" ! "=f,f,d,f,f,R,T,d, d,RT") (match_operand:DD_DF 1 "general_operand" ! " f,d,f,R,T,f,f,d,RT, d"))] "TARGET_64BIT && TARGET_DFP" "@ ldr\t%0,%1 ldgr\t%0,%1 lgdr\t%0,%1 *************** *** 2088,2115 **** lgr\t%0,%1 lg\t%0,%1 stg\t%1,%0" ! [(set_attr "op_type" "RRE,RR,RRE,RRE,RX,RXY,RX,RXY,RRE,RXY,RXY") ! (set_attr "type" "fhex,floaddf,floaddf,floaddf,floaddf,floaddf, fstoredf,fstoredf,lr,load,store") ! (set_attr "z10prop" "*, ! *, ! *, ! *, ! *, ! *, ! *, ! *, ! z10_fr_E1, ! z10_fwd_A3, ! z10_rec") ]) (define_insn "*mov_64" ! [(set (match_operand:DD_DF 0 "nonimmediate_operand" "=f,f,f,f,R,T,d, d,RT") ! (match_operand:DD_DF 1 "general_operand" "G,f,R,T,f,f,d,RT, d"))] "TARGET_64BIT" "@ - lzdr\t%0 ldr\t%0,%1 ld\t%0,%1 ldy\t%0,%1 --- 2082,2098 ---- lgr\t%0,%1 lg\t%0,%1 stg\t%1,%0" ! [(set_attr "op_type" "RR,RRE,RRE,RX,RXY,RX,RXY,RRE,RXY,RXY") ! (set_attr "type" "floaddf,floaddf,floaddf,floaddf,floaddf, fstoredf,fstoredf,lr,load,store") ! (set_attr "z10prop" "*,*,*,*,*,*,*,z10_fr_E1,z10_fwd_A3,z10_rec") ]) (define_insn "*mov_64" ! [(set (match_operand:DD_DF 0 "nonimmediate_operand" "=f,f,f,R,T,d, d,RT") ! (match_operand:DD_DF 1 "general_operand" "f,R,T,f,f,d,RT, d"))] "TARGET_64BIT" "@ ldr\t%0,%1 ld\t%0,%1 ldy\t%0,%1 *************** *** 2118,2144 **** lgr\t%0,%1 lg\t%0,%1 stg\t%1,%0" ! [(set_attr "op_type" "RRE,RR,RX,RXY,RX,RXY,RRE,RXY,RXY") ! (set_attr "type" "fhex,fload,fload,fload, fstore,fstore,lr,load,store") ! (set_attr "z10prop" "*, ! *, ! *, ! *, ! *, ! *, ! z10_fr_E1, ! z10_fwd_A3, ! z10_rec")]) (define_insn "*mov_31" [(set (match_operand:DD_DF 0 "nonimmediate_operand" ! "=f,f,f,f,R,T,d,d,Q,S, d,o") (match_operand:DD_DF 1 "general_operand" ! " G,f,R,T,f,f,Q,S,d,d,dPRT,d"))] "!TARGET_64BIT" "@ - lzdr\t%0 ldr\t%0,%1 ld\t%0,%1 ldy\t%0,%1 --- 2101,2118 ---- lgr\t%0,%1 lg\t%0,%1 stg\t%1,%0" ! [(set_attr "op_type" "RR,RX,RXY,RX,RXY,RRE,RXY,RXY") ! (set_attr "type" "fload,fload,fload, fstore,fstore,lr,load,store") ! (set_attr "z10prop" "*,*,*,*,*,z10_fr_E1,z10_fwd_A3,z10_rec")]) (define_insn "*mov_31" [(set (match_operand:DD_DF 0 "nonimmediate_operand" ! "=f,f,f,R,T,d,d,Q,S, d,o") (match_operand:DD_DF 1 "general_operand" ! " f,R,T,f,f,Q,S,d,d,dPRT,d"))] "!TARGET_64BIT" "@ ldr\t%0,%1 ld\t%0,%1 ldy\t%0,%1 *************** *** 2150,2157 **** stmy\t%1,%N1,%S0 # #" ! [(set_attr "op_type" "RRE,RR,RX,RXY,RX,RXY,RS,RSY,RS,RSY,*,*") ! (set_attr "type" "fhex,fload,fload,fload, fstore,fstore,lm,lm,stm,stm,*,*")]) (define_split --- 2124,2131 ---- stmy\t%1,%N1,%S0 # #" ! [(set_attr "op_type" "RR,RX,RXY,RX,RXY,RS,RSY,RS,RSY,*,*") ! (set_attr "type" "fload,fload,fload, fstore,fstore,lm,lm,stm,stm,*,*")]) (define_split *************** *** 2201,2212 **** (define_insn "mov" [(set (match_operand:SD_SF 0 "nonimmediate_operand" ! "=f,f,f,f,R,T,d,d,d,R,T") (match_operand:SD_SF 1 "general_operand" ! " G,f,R,T,f,f,d,R,T,d,d"))] "" "@ - lzer\t%0 ler\t%0,%1 le\t%0,%1 ley\t%0,%1 --- 2175,2185 ---- (define_insn "mov" [(set (match_operand:SD_SF 0 "nonimmediate_operand" ! "=f,f,f,R,T,d,d,d,R,T") (match_operand:SD_SF 1 "general_operand" ! " f,R,T,f,f,d,R,T,d,d"))] "" "@ ler\t%0,%1 le\t%0,%1 ley\t%0,%1 *************** *** 2217,2236 **** ly\t%0,%1 st\t%1,%0 sty\t%1,%0" ! [(set_attr "op_type" "RRE,RR,RX,RXY,RX,RXY,RR,RX,RXY,RX,RXY") ! (set_attr "type" "fhex,fload,fload,fload, fstore,fstore,lr,load,load,store,store") ! (set_attr "z10prop" "*, ! *, ! *, ! *, ! *, ! *, ! z10_fr_E1, ! z10_fwd_A3, ! z10_fwd_A3, ! z10_rec, ! z10_rec")]) ; ; movcc instruction pattern --- 2190,2199 ---- ly\t%0,%1 st\t%1,%0 sty\t%1,%0" ! [(set_attr "op_type" "RR,RX,RXY,RX,RXY,RR,RX,RXY,RX,RXY") ! (set_attr "type" "fload,fload,fload, fstore,fstore,lr,load,load,store,store") ! (set_attr "z10prop" "*,*,*,*,*,z10_fr_E1,z10_fwd_A3,z10_fwd_A3,z10_rec,z10_rec")]) ; ; movcc instruction pattern diff -Nrcpad gcc-4.4.4/gcc/config/sh/sh.c gcc-4.4.5/gcc/config/sh/sh.c *** gcc-4.4.4/gcc/config/sh/sh.c Tue Mar 23 23:04:39 2010 --- gcc-4.4.5/gcc/config/sh/sh.c Wed May 5 22:27:57 2010 *************** find_barrier (int num_mova, rtx mova, rt *** 3884,3889 **** --- 3884,3890 ---- int si_limit; int hi_limit; rtx orig = from; + rtx last_symoff = NULL_RTX; /* For HImode: range is 510, add 4 because pc counts from address of second instruction after this one, subtract 2 for the jump instruction *************** find_barrier (int num_mova, rtx mova, rt *** 4015,4020 **** --- 4016,4031 ---- { switch (untangle_mova (&num_mova, &mova, from)) { + case 1: + if (flag_pic) + { + rtx src = SET_SRC (PATTERN (from)); + if (GET_CODE (src) == CONST + && GET_CODE (XEXP (src, 0)) == UNSPEC + && XINT (XEXP (src, 0), 1) == UNSPEC_SYMOFF) + last_symoff = from; + } + break; case 0: return find_barrier (0, 0, mova); case 2: { *************** find_barrier (int num_mova, rtx mova, rt *** 4120,4125 **** --- 4131,4142 ---- so we'll make one. */ rtx label = gen_label_rtx (); + /* Don't emit a constant table in the middle of insns for + casesi_worker_2. This is a bit overkill but is enough + because casesi_worker_2 wouldn't appear so frequently. */ + if (last_symoff) + from = last_symoff; + /* If we exceeded the range, then we must back up over the last instruction we looked at. Otherwise, we just need to undo the NEXT_INSN at the end of the loop. */ diff -Nrcpad gcc-4.4.4/gcc/config/sol2-gld.h gcc-4.4.5/gcc/config/sol2-gld.h *** gcc-4.4.4/gcc/config/sol2-gld.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/gcc/config/sol2-gld.h Wed Jun 2 17:45:45 2010 *************** *** 0 **** --- 1,9 ---- + /* Definitions of target machine for GCC, for any machine running Solaris 2 + using the GNU linker. */ + + /* Undefine this so that attribute((init_priority)) works. */ + #undef CTORS_SECTION_ASM_OP + #undef DTORS_SECTION_ASM_OP + + #undef SUPPORTS_INIT_PRIORITY + #define SUPPORTS_INIT_PRIORITY 1 diff -Nrcpad gcc-4.4.4/gcc/config/sol2.c gcc-4.4.5/gcc/config/sol2.c *** gcc-4.4.4/gcc/config/sol2.c Thu Aug 2 10:49:31 2007 --- gcc-4.4.5/gcc/config/sol2.c Wed Jun 2 17:51:29 2010 *************** solaris_output_init_fini (FILE *file, tr *** 104,117 **** { if (lookup_attribute ("init", DECL_ATTRIBUTES (decl))) { ! fprintf (file, "\t.pushsection\t\".init\"\n"); ASM_OUTPUT_CALL (file, decl); fprintf (file, "\t.popsection\n"); } if (lookup_attribute ("fini", DECL_ATTRIBUTES (decl))) { ! fprintf (file, "\t.pushsection\t\".fini\"\n"); ASM_OUTPUT_CALL (file, decl); fprintf (file, "\t.popsection\n"); } --- 104,117 ---- { if (lookup_attribute ("init", DECL_ATTRIBUTES (decl))) { ! fprintf (file, PUSHSECTION_FORMAT, ".init"); ASM_OUTPUT_CALL (file, decl); fprintf (file, "\t.popsection\n"); } if (lookup_attribute ("fini", DECL_ATTRIBUTES (decl))) { ! fprintf (file, PUSHSECTION_FORMAT, ".fini"); ASM_OUTPUT_CALL (file, decl); fprintf (file, "\t.popsection\n"); } diff -Nrcpad gcc-4.4.4/gcc/config/sol2.h gcc-4.4.5/gcc/config/sol2.h *** gcc-4.4.4/gcc/config/sol2.h Tue Sep 9 16:17:37 2008 --- gcc-4.4.5/gcc/config/sol2.h Wed Jun 2 17:51:29 2010 *************** __enable_execute_stack (void *addr) *** 221,226 **** --- 221,230 ---- { "init", 0, 0, true, false, false, NULL }, \ { "fini", 0, 0, true, false, false, NULL } + /* Solaris/x86 as and gas support the common ELF .section/.pushsection + syntax. */ + #define PUSHSECTION_FORMAT "\t.pushsection\t%s\n" + /* This is how to declare the size of a function. For Solaris, we output any .init or .fini entries here. */ #undef ASM_DECLARE_FUNCTION_SIZE diff -Nrcpad gcc-4.4.4/gcc/config/sparc/constraints.md gcc-4.4.5/gcc/config/sparc/constraints.md *** gcc-4.4.4/gcc/config/sparc/constraints.md Thu Nov 6 14:59:09 2008 --- gcc-4.4.5/gcc/config/sparc/constraints.md Wed Sep 22 08:36:35 2010 *************** *** 35,44 **** ;; In the non-V9 case, coerce V9 'e' class to 'f', so we can use 'e' in the ;; MD file for V8 and V9. ! (define_register_constraint "e" "TARGET_V9 ? EXTRA_FP_REGS : FP_REGS" "Any floating-point register") ! (define_register_constraint "f" "FP_REGS" "Lower floating-point register") (define_register_constraint "h" "(TARGET_V9 && TARGET_V8PLUS ? I64_REGS : NO_REGS)" --- 35,44 ---- ;; In the non-V9 case, coerce V9 'e' class to 'f', so we can use 'e' in the ;; MD file for V8 and V9. ! (define_register_constraint "e" "(TARGET_FPU ? (TARGET_V9 ? EXTRA_FP_REGS : FP_REGS) : NO_REGS)" "Any floating-point register") ! (define_register_constraint "f" "(TARGET_FPU ? FP_REGS : NO_REGS)" "Lower floating-point register") (define_register_constraint "h" "(TARGET_V9 && TARGET_V8PLUS ? I64_REGS : NO_REGS)" diff -Nrcpad gcc-4.4.4/gcc/config/sparc/sol2-gld-bi.h gcc-4.4.5/gcc/config/sparc/sol2-gld-bi.h *** gcc-4.4.4/gcc/config/sparc/sol2-gld-bi.h Sat Dec 20 07:40:24 2003 --- gcc-4.4.5/gcc/config/sparc/sol2-gld-bi.h Mon Jun 7 20:55:36 2010 *************** *** 9,33 **** #define LINK_ARCH64_SPEC \ LINK_ARCH64_SPEC_BASE "%{!static: -rpath-link %R/usr/lib/sparcv9}" #undef LINK_ARCH_SPEC #if DISABLE_MULTILIB #if DEFAULT_ARCH32_P #define LINK_ARCH_SPEC "\ ! %{m32:-m elf32_sparc %(link_arch32)} \ %{m64:%edoes not support multilib} \ %{!m32:%{!m64:%(link_arch_default)}} \ " #else #define LINK_ARCH_SPEC "\ %{m32:%edoes not support multilib} \ ! %{m64:-m elf64_sparc %(link_arch64)} \ %{!m32:%{!m64:%(link_arch_default)}} \ " #endif #else #define LINK_ARCH_SPEC "\ ! %{m32:-m elf32_sparc %(link_arch32)} \ ! %{m64:-m elf64_sparc %(link_arch64)} \ %{!m32:%{!m64:%(link_arch_default)}} \ " #endif --- 9,43 ---- #define LINK_ARCH64_SPEC \ LINK_ARCH64_SPEC_BASE "%{!static: -rpath-link %R/usr/lib/sparcv9}" + /* Since binutils 2.21, GNU ld supports new *_sol2 emulations to strictly + follow the Solaris 2 ABI. Prefer them if present. */ + #ifdef HAVE_LD_SOL2_EMULATION + #define SPARC32_EMULATION "elf32_sparc_sol2" + #define SPARC64_EMULATION "elf64_sparc_sol2" + #else + #define SPARC32_EMULATION "elf32_sparc" + #define SPARC64_EMULATION "elf64_sparc" + #endif + #undef LINK_ARCH_SPEC #if DISABLE_MULTILIB #if DEFAULT_ARCH32_P #define LINK_ARCH_SPEC "\ ! %{m32:-m " SPARC32_EMULATION " %(link_arch32)} \ %{m64:%edoes not support multilib} \ %{!m32:%{!m64:%(link_arch_default)}} \ " #else #define LINK_ARCH_SPEC "\ %{m32:%edoes not support multilib} \ ! %{m64:-m " SPARC64_EMULATION " %(link_arch64)} \ %{!m32:%{!m64:%(link_arch_default)}} \ " #endif #else #define LINK_ARCH_SPEC "\ ! %{m32:-m " SPARC32_EMULATION " %(link_arch32)} \ ! %{m64:-m " SPARC64_EMULATION " %(link_arch64)} \ %{!m32:%{!m64:%(link_arch_default)}} \ " #endif diff -Nrcpad gcc-4.4.4/gcc/config/sparc/sol2-gld.h gcc-4.4.5/gcc/config/sparc/sol2-gld.h *** gcc-4.4.4/gcc/config/sparc/sol2-gld.h Wed Dec 17 12:01:47 2003 --- gcc-4.4.5/gcc/config/sparc/sol2-gld.h Thu Jan 1 00:00:00 1970 *************** *** 1,9 **** - /* Definitions of target machine for GCC, for SPARC running Solaris 2 - using the GNU linker. */ - - /* Undefine this so that attribute((init_priority)) works. */ - #undef CTORS_SECTION_ASM_OP - #undef DTORS_SECTION_ASM_OP - - #undef SUPPORTS_INIT_PRIORITY - #define SUPPORTS_INIT_PRIORITY 1 --- 0 ---- diff -Nrcpad gcc-4.4.4/gcc/config/sparc/sol2.h gcc-4.4.5/gcc/config/sparc/sol2.h *** gcc-4.4.4/gcc/config/sparc/sol2.h Sat Nov 29 22:04:25 2008 --- gcc-4.4.5/gcc/config/sparc/sol2.h Wed Jun 2 17:51:29 2010 *************** *** 1,6 **** /* Definitions of target machine for GCC, for SPARC running Solaris 2 Copyright 1992, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, ! 2006, 2007, 2008 Free Software Foundation, Inc. Contributed by Ron Guilmette (rfg@netcom.com). Additional changes by David V. Henkel-Wallace (gumby@cygnus.com). --- 1,6 ---- /* Definitions of target machine for GCC, for SPARC running Solaris 2 Copyright 1992, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, ! 2006, 2007, 2008, 2010 Free Software Foundation, Inc. Contributed by Ron Guilmette (rfg@netcom.com). Additional changes by David V. Henkel-Wallace (gumby@cygnus.com). *************** along with GCC; see the file COPYING3. *** 194,196 **** --- 194,203 ---- (SIZE), (ALIGN) / BITS_PER_UNIT); \ } \ while (0) + + /* Solaris/SPARC as uses a non-standard .section/.pushsection syntax. + While gas supports it, too, we prefer the standard variant. */ + #ifndef USE_GAS + #undef PUSHSECTION_FORMAT + #define PUSHSECTION_FORMAT "\t.pushsection\t\"%s\"\n" + #endif diff -Nrcpad gcc-4.4.4/gcc/config/sparc/sparc.c gcc-4.4.5/gcc/config/sparc/sparc.c *** gcc-4.4.4/gcc/config/sparc/sparc.c Thu Feb 18 04:24:04 2010 --- gcc-4.4.5/gcc/config/sparc/sparc.c Fri Aug 6 23:23:29 2010 *************** void *** 5418,5431 **** function_arg_advance (struct sparc_args *cum, enum machine_mode mode, tree type, int named) { ! int slotno, regno, padding; /* We pass 0 for incoming_p here, it doesn't matter. */ ! slotno = function_arg_slotno (cum, mode, type, named, 0, ®no, &padding); ! /* If register required leading padding, add it. */ ! if (slotno != -1) ! cum->words += padding; if (TARGET_ARCH32) { --- 5418,5430 ---- function_arg_advance (struct sparc_args *cum, enum machine_mode mode, tree type, int named) { ! int regno, padding; /* We pass 0 for incoming_p here, it doesn't matter. */ ! function_arg_slotno (cum, mode, type, named, 0, ®no, &padding); ! /* If argument requires leading padding, add it. */ ! cum->words += padding; if (TARGET_ARCH32) { diff -Nrcpad gcc-4.4.4/gcc/config/sparc/sysv4.h gcc-4.4.5/gcc/config/sparc/sysv4.h *** gcc-4.4.4/gcc/config/sparc/sysv4.h Thu Feb 18 04:24:04 2010 --- gcc-4.4.5/gcc/config/sparc/sysv4.h Wed Jun 2 17:51:29 2010 *************** along with GCC; see the file COPYING3. *** 42,48 **** #undef FINI_SECTION_ASM_OP #undef READONLY_DATA_SECTION_ASM_OP #undef TYPE_OPERAND_FMT - #undef PUSHSECTION_FORMAT #undef STRING_ASM_OP #undef COMMON_ASM_OP #undef SKIP_ASM_OP --- 42,47 ---- *************** along with GCC; see the file COPYING3. *** 63,81 **** #define STRING_ASM_OP "\t.asciz\t" #define COMMON_ASM_OP "\t.common\t" #define SKIP_ASM_OP "\t.skip\t" - #define PUSHSECTION_ASM_OP "\t.pushsection\t" - #define POPSECTION_ASM_OP "\t.popsection" /* This is the format used to print the second operand of a .type pseudo-op for the SPARC/svr4 assembler. */ #define TYPE_OPERAND_FMT "#%s" - /* This is the format used to print a .pushsection pseudo-op (and its operand) - for the SPARC/svr4 assembler. */ - - #define PUSHSECTION_FORMAT "%s\"%s\"\n" - #undef ASM_OUTPUT_CASE_LABEL #define ASM_OUTPUT_CASE_LABEL(FILE, PREFIX, NUM, JUMPTABLE) \ do { ASM_OUTPUT_ALIGN ((FILE), Pmode == SImode ? 2 : 3); \ --- 62,73 ---- diff -Nrcpad gcc-4.4.4/gcc/config/spu/spu.c gcc-4.4.5/gcc/config/spu/spu.c *** gcc-4.4.4/gcc/config/spu/spu.c Fri Dec 4 19:52:42 2009 --- gcc-4.4.5/gcc/config/spu/spu.c Wed Aug 4 18:40:05 2010 *************** spu_emit_branch_hint (rtx before, rtx br *** 2291,2297 **** return; /* If we have a Basic block note, emit it after the basic block note. */ ! if (NOTE_KIND (before) == NOTE_INSN_BASIC_BLOCK) before = NEXT_INSN (before); branch_label = gen_label_rtx (); --- 2291,2297 ---- return; /* If we have a Basic block note, emit it after the basic block note. */ ! if (NOTE_INSN_BASIC_BLOCK_P (before)) before = NEXT_INSN (before); branch_label = gen_label_rtx (); diff -Nrcpad gcc-4.4.4/gcc/config.gcc gcc-4.4.5/gcc/config.gcc *** gcc-4.4.4/gcc/config.gcc Thu Feb 18 04:24:04 2010 --- gcc-4.4.5/gcc/config.gcc Sun Jun 13 22:16:50 2010 *************** *** 1,6 **** # GCC target-specific configuration file. # Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, ! # 2008, 2009 Free Software Foundation, Inc. #This file is part of GCC. --- 1,6 ---- # GCC target-specific configuration file. # Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, ! # 2008, 2009, 2010 Free Software Foundation, Inc. #This file is part of GCC. *************** case ${target} in *** 481,486 **** --- 481,492 ---- ;; esac fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h" + case ${target} in + *-*-freebsd[345].*) + :;; + *) + default_use_cxa_atexit=yes;; + esac ;; *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu) extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o" *************** i[34567]86-*-solaris2*) *** 1177,1182 **** --- 1183,1194 ---- ;; esac tm_file="${tm_file} i386/sol2.h" + if test x$gnu_ld = xyes; then + tm_file="${tm_file} sol2-gld.h" + fi + if test x$gas = xyes; then + tm_file="${tm_file} i386/sol2-gas.h" + fi tmake_file="${tmake_file} t-sol2 t-svr4" c_target_objs="${c_target_objs} sol2-c.o" cxx_target_objs="${cxx_target_objs} sol2-c.o" *************** sparc64-*-solaris2* | sparcv9-*-solaris2 *** 2216,2222 **** esac tm_file="${tm_file} sparc/sol2.h sparc/sol2-64.h sparc/sol2-bi.h" if test x$gnu_ld = xyes; then ! tm_file="${tm_file} sparc/sol2-gld.h sparc/sol2-gld-bi.h" fi if test x$gas = xyes; then tm_file="${tm_file} sparc/sol2-gas.h sparc/sol2-gas-bi.h" --- 2228,2234 ---- esac tm_file="${tm_file} sparc/sol2.h sparc/sol2-64.h sparc/sol2-bi.h" if test x$gnu_ld = xyes; then ! tm_file="${tm_file} sol2-gld.h sparc/sol2-gld-bi.h" fi if test x$gas = xyes; then tm_file="${tm_file} sparc/sol2-gas.h sparc/sol2-gas-bi.h" *************** sparc64-*-solaris2* | sparcv9-*-solaris2 *** 2228,2233 **** --- 2240,2248 ---- else tmake_file="$tmake_file t-slibgcc-sld" fi + if test x$gas = xyes; then + tm_file="usegas.h ${tm_file}" + fi c_target_objs="sol2-c.o" cxx_target_objs="sol2-c.o" extra_objs="sol2.o" *************** sparc-*-solaris2*) *** 2247,2253 **** esac tm_file="${tm_file} sparc/sol2.h" if test x$gnu_ld = xyes; then ! tm_file="${tm_file} sparc/sol2-gld.h" fi if test x$gas = xyes; then tm_file="${tm_file} sparc/sol2-gas.h" --- 2262,2268 ---- esac tm_file="${tm_file} sparc/sol2.h" if test x$gnu_ld = xyes; then ! tm_file="${tm_file} sol2-gld.h" fi if test x$gas = xyes; then tm_file="${tm_file} sparc/sol2-gas.h" *************** sparc-*-solaris2*) *** 2265,2270 **** --- 2280,2288 ---- if test x$gas = xyes; then tm_file="${tm_file} sparc/sol2-gas-bi.h" fi + if test x$gas = xyes; then + tm_file="usegas.h ${tm_file}" + fi tm_file="${tm_file} tm-dwarf2.h" tmake_file="$tmake_file sparc/t-sol2-64" test x$with_cpu != x || with_cpu=v9 diff -Nrcpad gcc-4.4.4/gcc/config.in gcc-4.4.5/gcc/config.in *** gcc-4.4.4/gcc/config.in Thu Apr 29 08:26:54 2010 --- gcc-4.4.5/gcc/config.in Fri Oct 1 08:26:18 2010 *************** *** 274,280 **** #endif ! /* Define if your assembler supports the sahf mnemonic. */ #ifndef USED_FOR_TARGET #undef HAVE_AS_IX86_SAHF #endif --- 274,292 ---- #endif ! /* Define if your assembler supports the .quad directive. */ ! #ifndef USED_FOR_TARGET ! #undef HAVE_AS_IX86_QUAD ! #endif ! ! ! /* Define true if the assembler supports 'rep , lock '. */ ! #ifndef USED_FOR_TARGET ! #undef HAVE_AS_IX86_REP_LOCK_PREFIX ! #endif ! ! ! /* Define if your assembler supports the sahf mnemonic in 64bit mode. */ #ifndef USED_FOR_TARGET #undef HAVE_AS_IX86_SAHF #endif *************** *** 1055,1060 **** --- 1067,1078 ---- #endif + /* Define if your linker supports the *_sol2 emulations. */ + #ifndef USED_FOR_TARGET + #undef HAVE_LD_SOL2_EMULATION + #endif + + /* Define if your linker supports -Bstatic/-Bdynamic option. */ #ifndef USED_FOR_TARGET #undef HAVE_LD_STATIC_DYNAMIC diff -Nrcpad gcc-4.4.4/gcc/configure gcc-4.4.5/gcc/configure *** gcc-4.4.4/gcc/configure Mon Oct 19 12:15:27 2009 --- gcc-4.4.5/gcc/configure Sun Jun 20 15:43:53 2010 *************** foobar:' > conftest.s *** 21359,21365 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } then ! gcc_cv_as_hidden=yes else echo "configure: failed program was" >&5 cat conftest.s >&5 --- 21359,21393 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } then ! ! # Solaris 9/x86 as incorrectly emits an alias for a hidden symbol with ! # STV_HIDDEN, so disable .hidden support if so. ! case "${target}" in ! i?86-*-solaris2*) ! if test x$gcc_cv_as != x && test x$gcc_cv_objdump != x; then ! cat > conftest.s <


    @end html + @heading @anchor{ix86-x-solaris289}i?86-*-solaris2.[89] + The Sun assembler in Solaris 8 and 9 has several bugs and limitations. + While GCC works around them, several features are missing, so it is + @c FIXME: which ones? + recommended to use the GNU assembler instead. There is no bundled + version, but the current version, from GNU binutils 2.20.1, is known to + work. + + Solaris~2/x86 doesn't support the execution of SSE/SSE2 instructions + before Solaris~9 4/04, even if the CPU supports them. Programs will + receive @code{SIGILL} if they try. The fix is available both in + Solaris~9 Update~6 and kernel patch 112234-12 or newer. There is no + corresponding patch for Solaris 8. To avoid this problem, + @option{-march} defaults to @samp{pentiumpro} on Solaris 8 and 9. If + you have the patch installed, you can configure GCC with an appropriate + @option{--with-arch} option, but need GNU @command{as} for SSE2 support. + + @html +
    + @end html @heading @anchor{ix86-x-solaris210}i?86-*-solaris2.10 Use this for Solaris 10 or later on x86 and x86-64 systems. This configuration is supported by GCC 4.0 and later versions only. diff -Nrcpad gcc-4.4.4/gcc/doc/invoke.texi gcc-4.4.5/gcc/doc/invoke.texi *** gcc-4.4.4/gcc/doc/invoke.texi Thu Apr 8 10:46:46 2010 --- gcc-4.4.5/gcc/doc/invoke.texi Wed Sep 8 18:13:03 2010 *************** invoking @option{-O2} on programs that u *** 5429,5435 **** Optimize yet more. @option{-O3} turns on all optimizations specified by @option{-O2} and also turns on the @option{-finline-functions}, @option{-funswitch-loops}, @option{-fpredictive-commoning}, ! @option{-fgcse-after-reload} and @option{-ftree-vectorize} options. @item -O0 @opindex O0 --- 5429,5436 ---- Optimize yet more. @option{-O3} turns on all optimizations specified by @option{-O2} and also turns on the @option{-finline-functions}, @option{-funswitch-loops}, @option{-fpredictive-commoning}, ! @option{-fgcse-after-reload}, @option{-ftree-vectorize} and ! @option{-fipa-cp-clone} options. @item -O0 @opindex O0 diff -Nrcpad gcc-4.4.4/gcc/doc/jcf-dump.1 gcc-4.4.5/gcc/doc/jcf-dump.1 *** gcc-4.4.4/gcc/doc/jcf-dump.1 Thu Apr 29 09:23:21 2010 --- gcc-4.4.5/gcc/doc/jcf-dump.1 Fri Oct 1 09:18:18 2010 *************** *** 1,15 **** ! .\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.07) .\" .\" Standard preamble: .\" ======================================================================== - .de Sh \" Subsection heading - .br - .if t .Sp - .ne 5 - .PP - \fB\\$1\fR - .PP - .. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp --- 1,7 ---- ! .\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) .\" .\" Standard preamble: .\" ======================================================================== .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp *************** *** 53,59 **** .el .ds Aq ' .\" .\" If the F register is turned on, we'll generate index entries on stderr for ! .\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .ie \nF \{\ --- 45,51 ---- .el .ds Aq ' .\" .\" If the F register is turned on, we'll generate index entries on stderr for ! .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .ie \nF \{\ *************** *** 132,138 **** .\" ======================================================================== .\" .IX Title "JCF-DUMP 1" ! .TH JCF-DUMP 1 "2010-04-29" "gcc-4.4.4" "GNU" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l --- 124,130 ---- .\" ======================================================================== .\" .IX Title "JCF-DUMP 1" ! .TH JCF-DUMP 1 "2010-10-01" "gcc-4.4.5" "GNU" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -Nrcpad gcc-4.4.4/gcc/doc/jv-convert.1 gcc-4.4.5/gcc/doc/jv-convert.1 *** gcc-4.4.4/gcc/doc/jv-convert.1 Thu Apr 29 09:23:21 2010 --- gcc-4.4.5/gcc/doc/jv-convert.1 Fri Oct 1 09:18:18 2010 *************** *** 1,15 **** ! .\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.07) .\" .\" Standard preamble: .\" ======================================================================== - .de Sh \" Subsection heading - .br - .if t .Sp - .ne 5 - .PP - \fB\\$1\fR - .PP - .. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp --- 1,7 ---- ! .\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) .\" .\" Standard preamble: .\" ======================================================================== .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp *************** *** 53,59 **** .el .ds Aq ' .\" .\" If the F register is turned on, we'll generate index entries on stderr for ! .\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .ie \nF \{\ --- 45,51 ---- .el .ds Aq ' .\" .\" If the F register is turned on, we'll generate index entries on stderr for ! .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .ie \nF \{\ *************** *** 132,138 **** .\" ======================================================================== .\" .IX Title "JV-CONVERT 1" ! .TH JV-CONVERT 1 "2010-04-29" "gcc-4.4.4" "GNU" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l --- 124,130 ---- .\" ======================================================================== .\" .IX Title "JV-CONVERT 1" ! .TH JV-CONVERT 1 "2010-10-01" "gcc-4.4.5" "GNU" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -Nrcpad gcc-4.4.4/gcc/doc/rebuild-gcj-db.1 gcc-4.4.5/gcc/doc/rebuild-gcj-db.1 *** gcc-4.4.4/gcc/doc/rebuild-gcj-db.1 Thu Apr 29 09:36:24 2010 --- gcc-4.4.5/gcc/doc/rebuild-gcj-db.1 Fri Oct 1 09:30:48 2010 *************** *** 1,15 **** ! .\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.07) .\" .\" Standard preamble: .\" ======================================================================== - .de Sh \" Subsection heading - .br - .if t .Sp - .ne 5 - .PP - \fB\\$1\fR - .PP - .. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp --- 1,7 ---- ! .\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) .\" .\" Standard preamble: .\" ======================================================================== .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp *************** *** 53,59 **** .el .ds Aq ' .\" .\" If the F register is turned on, we'll generate index entries on stderr for ! .\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .ie \nF \{\ --- 45,51 ---- .el .ds Aq ' .\" .\" If the F register is turned on, we'll generate index entries on stderr for ! .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .ie \nF \{\ *************** *** 132,138 **** .\" ======================================================================== .\" .IX Title "REBUILD-GCJ-DB 1" ! .TH REBUILD-GCJ-DB 1 "2010-04-29" "gcc-4.4.4" "GNU" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l --- 124,130 ---- .\" ======================================================================== .\" .IX Title "REBUILD-GCJ-DB 1" ! .TH REBUILD-GCJ-DB 1 "2010-10-01" "gcc-4.4.5" "GNU" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -Nrcpad gcc-4.4.4/gcc/doc/sourcebuild.texi gcc-4.4.5/gcc/doc/sourcebuild.texi *** gcc-4.4.4/gcc/doc/sourcebuild.texi Sun Jan 18 09:11:10 2009 --- gcc-4.4.5/gcc/doc/sourcebuild.texi Wed May 19 17:21:58 2010 *************** and before any @code{dg-additional-sourc *** 1035,1043 **** They require at least one argument, which can be an empty string if the specific procedure does not examine the argument. ! @item @{ dg-require-effective-target @var{keyword} @} Skip the test if the test target, including current multilib flags, is not covered by the effective-target keyword. This directive must appear after any @code{dg-do} directive in the test and before any @code{dg-additional-sources} directive. --- 1035,1046 ---- They require at least one argument, which can be an empty string if the specific procedure does not examine the argument. ! @item @{ dg-require-effective-target @var{keyword} [@{ @var{selector} @}] @} Skip the test if the test target, including current multilib flags, is not covered by the effective-target keyword. + If the directive includes the optional @samp{@{ @var{selector} @}} + then the effective-target test is only performed if the target system + matches the @var{selector}. This directive must appear after any @code{dg-do} directive in the test and before any @code{dg-additional-sources} directive. diff -Nrcpad gcc-4.4.4/gcc/doc/standards.texi gcc-4.4.5/gcc/doc/standards.texi *** gcc-4.4.4/gcc/doc/standards.texi Sun Mar 29 02:22:34 2009 --- gcc-4.4.5/gcc/doc/standards.texi Fri May 7 20:11:01 2010 *************** working paper for the C++0x standard; th *** 183,189 **** available on the ISO C++ committee's web site at @uref{http://www.open-std.org/jtc1/sc22/wg21/}. For information regarding the C++0x features available in the experimental C++0x mode, ! see @uref{http://gcc.gnu.org/gcc-4.3/cxx0x_status.html}. To select this standard in GCC, use the option @option{-std=c++0x}; to obtain all the diagnostics required by the standard, you should also specify @option{-pedantic} (or @option{-pedantic-errors} if you want them to be --- 183,189 ---- available on the ISO C++ committee's web site at @uref{http://www.open-std.org/jtc1/sc22/wg21/}. For information regarding the C++0x features available in the experimental C++0x mode, ! see @uref{http://gcc.gnu.org/projects/cxx0x.html}. To select this standard in GCC, use the option @option{-std=c++0x}; to obtain all the diagnostics required by the standard, you should also specify @option{-pedantic} (or @option{-pedantic-errors} if you want them to be diff -Nrcpad gcc-4.4.4/gcc/expmed.c gcc-4.4.5/gcc/expmed.c *** gcc-4.4.4/gcc/expmed.c Mon Mar 8 11:46:28 2010 --- gcc-4.4.5/gcc/expmed.c Fri Aug 6 07:52:04 2010 *************** expand_mult_const (enum machine_mode mod *** 2931,2939 **** switch (alg->op[opno]) { case alg_shift: ! accum = expand_shift (LSHIFT_EXPR, mode, accum, ! build_int_cst (NULL_TREE, log), ! NULL_RTX, 0); val_so_far <<= log; break; --- 2931,2941 ---- switch (alg->op[opno]) { case alg_shift: ! tem = expand_shift (LSHIFT_EXPR, mode, accum, ! build_int_cst (NULL_TREE, log), ! NULL_RTX, 0); ! /* REG_EQUAL note will be attached to the following insn. */ ! emit_move_insn (accum, tem); val_so_far <<= log; break; diff -Nrcpad gcc-4.4.4/gcc/expr.c gcc-4.4.5/gcc/expr.c *** gcc-4.4.4/gcc/expr.c Mon Mar 8 11:46:28 2010 --- gcc-4.4.5/gcc/expr.c Thu Sep 23 07:41:30 2010 *************** expand_expr_real_1 (tree exp, rtx target *** 8279,8285 **** { if (GET_CODE (op0) == SUBREG) op0 = force_reg (GET_MODE (op0), op0); ! op0 = gen_lowpart (mode, op0); } /* If both modes are integral, then we can convert from one to the other. */ --- 8279,8293 ---- { if (GET_CODE (op0) == SUBREG) op0 = force_reg (GET_MODE (op0), op0); ! temp = gen_lowpart_common (mode, op0); ! if (temp) ! op0 = temp; ! else ! { ! if (!REG_P (op0) && !MEM_P (op0)) ! op0 = force_reg (GET_MODE (op0), op0); ! op0 = gen_lowpart (mode, op0); ! } } /* If both modes are integral, then we can convert from one to the other. */ *************** expand_expr_real_1 (tree exp, rtx target *** 8314,8323 **** --- 8322,8353 ---- results. */ if (MEM_P (op0)) { + enum insn_code icode; op0 = copy_rtx (op0); if (TYPE_ALIGN_OK (type)) set_mem_align (op0, MAX (MEM_ALIGN (op0), TYPE_ALIGN (type))); + else if (mode != BLKmode + && MEM_ALIGN (op0) < GET_MODE_ALIGNMENT (mode) + /* If the target does have special handling for unaligned + loads of mode then use them. */ + && ((icode = optab_handler (movmisalign_optab, + mode)->insn_code) + != CODE_FOR_nothing)) + { + rtx reg, insn; + + op0 = adjust_address (op0, mode, 0); + /* We've already validated the memory, and we're creating a + new pseudo destination. The predicates really can't + fail. */ + reg = gen_reg_rtx (mode); + + /* Nor can the insn generator. */ + insn = GEN_FCN (icode) (reg, op0); + emit_insn (insn); + return reg; + } else if (STRICT_ALIGNMENT && mode != BLKmode && MEM_ALIGN (op0) < GET_MODE_ALIGNMENT (mode)) diff -Nrcpad gcc-4.4.4/gcc/fold-const.c gcc-4.4.5/gcc/fold-const.c *** gcc-4.4.4/gcc/fold-const.c Thu Jan 14 09:48:01 2010 --- gcc-4.4.5/gcc/fold-const.c Thu Aug 12 15:28:40 2010 *************** make_range (tree exp, int *pin_p, tree * *** 4479,4487 **** n_high = range_binop (MINUS_EXPR, exp_type, build_int_cst (exp_type, 0), 0, low, 0); ! low = n_low, high = n_high; ! exp = arg0; ! continue; case BIT_NOT_EXPR: /* ~ X -> -X - 1 */ --- 4479,4487 ---- n_high = range_binop (MINUS_EXPR, exp_type, build_int_cst (exp_type, 0), 0, low, 0); ! if (n_high != 0 && TREE_OVERFLOW (n_high)) ! break; ! goto normalize; case BIT_NOT_EXPR: /* ~ X -> -X - 1 */ *************** make_range (tree exp, int *pin_p, tree * *** 4514,4519 **** --- 4514,4520 ---- if (TYPE_OVERFLOW_UNDEFINED (arg0_type)) *strict_overflow_p = true; + normalize: /* Check for an unsigned range which has wrapped around the maximum value thus making n_high < n_low, and normalize it. */ if (n_low && n_high && tree_int_cst_lt (n_high, n_low)) diff -Nrcpad gcc-4.4.4/gcc/function.c gcc-4.4.5/gcc/function.c *** gcc-4.4.4/gcc/function.c Fri Nov 13 19:57:51 2009 --- gcc-4.4.5/gcc/function.c Mon Aug 16 20:24:54 2010 *************** instantiate_virtual_regs_in_insn (rtx in *** 1601,1607 **** if (!safe_insn_predicate (insn_code, i, x)) { start_sequence (); ! x = force_reg (insn_data[insn_code].operand[i].mode, x); seq = get_insns (); end_sequence (); if (seq) --- 1601,1613 ---- if (!safe_insn_predicate (insn_code, i, x)) { start_sequence (); ! if (REG_P (x)) ! { ! gcc_assert (REGNO (x) <= LAST_VIRTUAL_REGISTER); ! x = copy_to_reg (x); ! } ! else ! x = force_reg (insn_data[insn_code].operand[i].mode, x); seq = get_insns (); end_sequence (); if (seq) *************** gimplify_parameters (void) *** 3401,3412 **** DECL_IGNORED_P (local) = 0; /* If PARM was addressable, move that flag over to the local copy, as its address will be taken, ! not the PARMs. */ if (TREE_ADDRESSABLE (parm)) ! { ! TREE_ADDRESSABLE (parm) = 0; ! TREE_ADDRESSABLE (local) = 1; ! } } else { --- 3407,3416 ---- DECL_IGNORED_P (local) = 0; /* If PARM was addressable, move that flag over to the local copy, as its address will be taken, ! not the PARMs. Keep the parms address taken ! as we'll query that flag during gimplification. */ if (TREE_ADDRESSABLE (parm)) ! TREE_ADDRESSABLE (local) = 1; } else { diff -Nrcpad gcc-4.4.4/gcc/gengtype-lex.c gcc-4.4.5/gcc/gengtype-lex.c *** gcc-4.4.4/gcc/gengtype-lex.c Thu Apr 29 08:28:46 2010 --- gcc-4.4.5/gcc/gengtype-lex.c Fri Oct 1 08:28:04 2010 *************** int yy_flex_debug = 0; *** 936,942 **** #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; ! #line 1 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" /* -*- indented-text -*- */ /* Process source files and output type information. Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009 --- 936,942 ---- #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; ! #line 1 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" /* -*- indented-text -*- */ /* Process source files and output type information. Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009 *************** for more details. *** 957,963 **** You should have received a copy of the GNU General Public License along with GCC; see the file COPYING3. If not see . */ ! #line 23 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" #include "bconfig.h" #include "system.h" --- 957,963 ---- You should have received a copy of the GNU General Public License along with GCC; see the file COPYING3. If not see . */ ! #line 23 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" #include "bconfig.h" #include "system.h" *************** YY_DECL *** 1168,1174 **** register char *yy_cp, *yy_bp; register int yy_act; ! #line 58 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" /* Do this on entry to yylex(): */ *yylval = 0; --- 1168,1174 ---- register char *yy_cp, *yy_bp; register int yy_act; ! #line 58 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" /* Do this on entry to yylex(): */ *yylval = 0; *************** case 1: *** 1265,1271 **** (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 69 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { BEGIN(in_struct); return TYPEDEF; --- 1265,1271 ---- (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 69 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { BEGIN(in_struct); return TYPEDEF; *************** case 2: *** 1277,1283 **** (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 73 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { BEGIN(in_struct); return STRUCT; --- 1277,1283 ---- (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 73 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { BEGIN(in_struct); return STRUCT; *************** case 3: *** 1289,1295 **** (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 77 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { BEGIN(in_struct); return UNION; --- 1289,1295 ---- (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 77 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { BEGIN(in_struct); return UNION; *************** case 4: *** 1301,1307 **** (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 81 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { BEGIN(in_struct); return EXTERN; --- 1301,1307 ---- (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 81 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { BEGIN(in_struct); return EXTERN; *************** case 5: *** 1313,1319 **** (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 85 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { BEGIN(in_struct); return STATIC; --- 1313,1319 ---- (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 85 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { BEGIN(in_struct); return STATIC; *************** case 6: *** 1325,1331 **** (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 90 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { BEGIN(in_struct); return DEFVEC_OP; --- 1325,1331 ---- (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 90 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { BEGIN(in_struct); return DEFVEC_OP; *************** case 7: *** 1337,1343 **** (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 94 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { BEGIN(in_struct); return DEFVEC_I; --- 1337,1343 ---- (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 94 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { BEGIN(in_struct); return DEFVEC_I; *************** case 8: *** 1349,1355 **** (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 98 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { BEGIN(in_struct); return DEFVEC_ALLOC; --- 1349,1355 ---- (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 98 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { BEGIN(in_struct); return DEFVEC_ALLOC; *************** YY_RULE_SETUP *** 1359,1377 **** case 9: YY_RULE_SETUP ! #line 106 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { BEGIN(in_struct_comment); } YY_BREAK case 10: /* rule 10 can match eol */ YY_RULE_SETUP ! #line 108 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { update_lineno (yytext, yyleng); } YY_BREAK case 11: /* rule 11 can match eol */ YY_RULE_SETUP ! #line 109 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { lexer_line.line++; } YY_BREAK case 12: --- 1359,1377 ---- case 9: YY_RULE_SETUP ! #line 106 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { BEGIN(in_struct_comment); } YY_BREAK case 10: /* rule 10 can match eol */ YY_RULE_SETUP ! #line 108 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { update_lineno (yytext, yyleng); } YY_BREAK case 11: /* rule 11 can match eol */ YY_RULE_SETUP ! #line 109 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { lexer_line.line++; } YY_BREAK case 12: *************** case 12: *** 1380,1386 **** (yy_c_buf_p) = yy_cp = yy_bp + 5; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 111 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" /* don't care */ YY_BREAK case 13: --- 1380,1386 ---- (yy_c_buf_p) = yy_cp = yy_bp + 5; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 111 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" /* don't care */ YY_BREAK case 13: *************** case 13: *** 1389,1395 **** (yy_c_buf_p) = yy_cp = yy_bp + 3; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 112 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { return GTY_TOKEN; } YY_BREAK case 14: --- 1389,1395 ---- (yy_c_buf_p) = yy_cp = yy_bp + 3; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 112 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { return GTY_TOKEN; } YY_BREAK case 14: *************** case 14: *** 1398,1404 **** (yy_c_buf_p) = yy_cp = yy_bp + 3; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 113 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { return VEC_TOKEN; } YY_BREAK case 15: --- 1398,1404 ---- (yy_c_buf_p) = yy_cp = yy_bp + 3; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 113 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { return VEC_TOKEN; } YY_BREAK case 15: *************** case 15: *** 1407,1413 **** (yy_c_buf_p) = yy_cp = yy_bp + 5; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 114 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { return UNION; } YY_BREAK case 16: --- 1407,1413 ---- (yy_c_buf_p) = yy_cp = yy_bp + 5; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 114 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { return UNION; } YY_BREAK case 16: *************** case 16: *** 1416,1422 **** (yy_c_buf_p) = yy_cp = yy_bp + 6; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 115 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { return STRUCT; } YY_BREAK case 17: --- 1416,1422 ---- (yy_c_buf_p) = yy_cp = yy_bp + 6; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 115 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { return STRUCT; } YY_BREAK case 17: *************** case 17: *** 1425,1431 **** (yy_c_buf_p) = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 116 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { return ENUM; } YY_BREAK case 18: --- 1425,1431 ---- (yy_c_buf_p) = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 116 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { return ENUM; } YY_BREAK case 18: *************** case 18: *** 1434,1440 **** (yy_c_buf_p) = yy_cp = yy_bp + 9; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 117 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { return PTR_ALIAS; } YY_BREAK case 19: --- 1434,1440 ---- (yy_c_buf_p) = yy_cp = yy_bp + 9; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 117 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { return PTR_ALIAS; } YY_BREAK case 19: *************** case 19: *** 1443,1454 **** (yy_c_buf_p) = yy_cp = yy_bp + 10; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 118 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { return NESTED_PTR; } YY_BREAK case 20: YY_RULE_SETUP ! #line 119 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { return NUM; } YY_BREAK case 21: --- 1443,1454 ---- (yy_c_buf_p) = yy_cp = yy_bp + 10; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 118 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { return NESTED_PTR; } YY_BREAK case 20: YY_RULE_SETUP ! #line 119 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { return NUM; } YY_BREAK case 21: *************** case 21: *** 1457,1463 **** (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 120 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { *yylval = XDUPVAR (const char, yytext, yyleng, yyleng+1); return PARAM_IS; --- 1457,1463 ---- (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 120 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { *yylval = XDUPVAR (const char, yytext, yyleng, yyleng+1); return PARAM_IS; *************** case 22: *** 1468,1478 **** *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ ! #line 126 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" case 23: /* rule 23 can match eol */ YY_RULE_SETUP ! #line 126 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { size_t len; --- 1468,1478 ---- *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ ! #line 126 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" case 23: /* rule 23 can match eol */ YY_RULE_SETUP ! #line 126 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { size_t len; *************** case 24: *** 1490,1496 **** (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 138 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { *yylval = XDUPVAR (const char, yytext, yyleng, yyleng+1); return ID; --- 1490,1496 ---- (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 138 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { *yylval = XDUPVAR (const char, yytext, yyleng, yyleng+1); return ID; *************** YY_RULE_SETUP *** 1499,1505 **** case 25: /* rule 25 can match eol */ YY_RULE_SETUP ! #line 143 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { *yylval = XDUPVAR (const char, yytext+1, yyleng-2, yyleng-1); return STRING; --- 1499,1505 ---- case 25: /* rule 25 can match eol */ YY_RULE_SETUP ! #line 143 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { *yylval = XDUPVAR (const char, yytext+1, yyleng-2, yyleng-1); return STRING; *************** YY_RULE_SETUP *** 1509,1515 **** case 26: /* rule 26 can match eol */ YY_RULE_SETUP ! #line 148 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { *yylval = XDUPVAR (const char, yytext+1, yyleng-2, yyleng-1); return ARRAY; --- 1509,1515 ---- case 26: /* rule 26 can match eol */ YY_RULE_SETUP ! #line 148 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { *yylval = XDUPVAR (const char, yytext+1, yyleng-2, yyleng-1); return ARRAY; *************** YY_RULE_SETUP *** 1518,1524 **** case 27: /* rule 27 can match eol */ YY_RULE_SETUP ! #line 152 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { *yylval = XDUPVAR (const char, yytext+1, yyleng-2, yyleng); return CHAR; --- 1518,1524 ---- case 27: /* rule 27 can match eol */ YY_RULE_SETUP ! #line 152 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { *yylval = XDUPVAR (const char, yytext+1, yyleng-2, yyleng); return CHAR; *************** YY_RULE_SETUP *** 1526,1549 **** YY_BREAK case 28: YY_RULE_SETUP ! #line 157 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { return ELLIPSIS; } YY_BREAK case 29: YY_RULE_SETUP ! #line 158 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { return yytext[0]; } YY_BREAK /* ignore pp-directives */ case 30: /* rule 30 can match eol */ YY_RULE_SETUP ! #line 161 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" {lexer_line.line++;} YY_BREAK case 31: YY_RULE_SETUP ! #line 163 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { error_at_line (&lexer_line, "unexpected character `%s'", yytext); } --- 1526,1549 ---- YY_BREAK case 28: YY_RULE_SETUP ! #line 157 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { return ELLIPSIS; } YY_BREAK case 29: YY_RULE_SETUP ! #line 158 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { return yytext[0]; } YY_BREAK /* ignore pp-directives */ case 30: /* rule 30 can match eol */ YY_RULE_SETUP ! #line 161 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" {lexer_line.line++;} YY_BREAK case 31: YY_RULE_SETUP ! #line 163 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { error_at_line (&lexer_line, "unexpected character `%s'", yytext); } *************** YY_RULE_SETUP *** 1551,1580 **** case 32: YY_RULE_SETUP ! #line 168 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { BEGIN(in_comment); } YY_BREAK case 33: /* rule 33 can match eol */ YY_RULE_SETUP ! #line 169 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { lexer_line.line++; } YY_BREAK case 34: ! #line 171 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" case 35: /* rule 35 can match eol */ ! #line 172 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" case 36: /* rule 36 can match eol */ YY_RULE_SETUP ! #line 172 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" /* do nothing */ YY_BREAK case 37: /* rule 37 can match eol */ YY_RULE_SETUP ! #line 173 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { update_lineno (yytext, yyleng); } YY_BREAK case 38: --- 1551,1580 ---- case 32: YY_RULE_SETUP ! #line 168 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { BEGIN(in_comment); } YY_BREAK case 33: /* rule 33 can match eol */ YY_RULE_SETUP ! #line 169 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { lexer_line.line++; } YY_BREAK case 34: ! #line 171 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" case 35: /* rule 35 can match eol */ ! #line 172 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" case 36: /* rule 36 can match eol */ YY_RULE_SETUP ! #line 172 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" /* do nothing */ YY_BREAK case 37: /* rule 37 can match eol */ YY_RULE_SETUP ! #line 173 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { update_lineno (yytext, yyleng); } YY_BREAK case 38: *************** case 38: *** 1583,1603 **** (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 174 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" /* do nothing */ YY_BREAK case 39: /* rule 39 can match eol */ YY_RULE_SETUP ! #line 177 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { lexer_line.line++; } YY_BREAK case 40: ! #line 179 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" case 41: YY_RULE_SETUP ! #line 179 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" /* do nothing */ YY_BREAK case 42: --- 1583,1603 ---- (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 174 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" /* do nothing */ YY_BREAK case 39: /* rule 39 can match eol */ YY_RULE_SETUP ! #line 177 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { lexer_line.line++; } YY_BREAK case 40: ! #line 179 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" case 41: YY_RULE_SETUP ! #line 179 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" /* do nothing */ YY_BREAK case 42: *************** case 42: *** 1606,1630 **** (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 180 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" /* do nothing */ YY_BREAK case 43: YY_RULE_SETUP ! #line 182 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { BEGIN(INITIAL); } YY_BREAK case 44: YY_RULE_SETUP ! #line 183 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { BEGIN(in_struct); } YY_BREAK case 45: ! #line 186 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" case 46: YY_RULE_SETUP ! #line 186 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { error_at_line (&lexer_line, "unterminated comment or string; unexpected EOF"); --- 1606,1630 ---- (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP ! #line 180 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" /* do nothing */ YY_BREAK case 43: YY_RULE_SETUP ! #line 182 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { BEGIN(INITIAL); } YY_BREAK case 44: YY_RULE_SETUP ! #line 183 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { BEGIN(in_struct); } YY_BREAK case 45: ! #line 186 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" case 46: YY_RULE_SETUP ! #line 186 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { error_at_line (&lexer_line, "unterminated comment or string; unexpected EOF"); *************** YY_RULE_SETUP *** 1633,1652 **** case 47: /* rule 47 can match eol */ YY_RULE_SETUP ! #line 191 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" /* do nothing */ YY_BREAK case 48: /* rule 48 can match eol */ YY_RULE_SETUP ! #line 192 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" { error_at_line (&lexer_line, "stray GTY marker"); } YY_BREAK case 49: YY_RULE_SETUP ! #line 196 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK #line 1653 "gengtype-lex.c" --- 1633,1652 ---- case 47: /* rule 47 can match eol */ YY_RULE_SETUP ! #line 191 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" /* do nothing */ YY_BREAK case 48: /* rule 48 can match eol */ YY_RULE_SETUP ! #line 192 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" { error_at_line (&lexer_line, "stray GTY marker"); } YY_BREAK case 49: YY_RULE_SETUP ! #line 196 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK #line 1653 "gengtype-lex.c" *************** void yyfree (void * ptr ) *** 2613,2619 **** #define YYTABLES_NAME "yytables" ! #line 196 "/d/gcc-4.4.4/gcc-4.4.4/gcc/gengtype-lex.l" --- 2613,2619 ---- #define YYTABLES_NAME "yytables" ! #line 196 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l" diff -Nrcpad gcc-4.4.4/gcc/gimplify.c gcc-4.4.5/gcc/gimplify.c *** gcc-4.4.4/gcc/gimplify.c Thu Apr 8 11:47:13 2010 --- gcc-4.4.5/gcc/gimplify.c Thu Sep 2 08:00:55 2010 *************** enum gimplify_omp_var_data *** 74,82 **** enum omp_region_type { ORT_WORKSHARE = 0, - ORT_TASK = 1, ORT_PARALLEL = 2, ! ORT_COMBINED_PARALLEL = 3 }; struct gimplify_omp_ctx --- 74,83 ---- enum omp_region_type { ORT_WORKSHARE = 0, ORT_PARALLEL = 2, ! ORT_COMBINED_PARALLEL = 3, ! ORT_TASK = 4, ! ORT_UNTIED_TASK = 5 }; struct gimplify_omp_ctx *************** new_omp_context (enum omp_region_type re *** 320,326 **** c->privatized_types = pointer_set_create (); c->location = input_location; c->region_type = region_type; ! if (region_type != ORT_TASK) c->default_kind = OMP_CLAUSE_DEFAULT_SHARED; else c->default_kind = OMP_CLAUSE_DEFAULT_UNSPECIFIED; --- 321,327 ---- c->privatized_types = pointer_set_create (); c->location = input_location; c->region_type = region_type; ! if ((region_type & ORT_TASK) == 0) c->default_kind = OMP_CLAUSE_DEFAULT_SHARED; else c->default_kind = OMP_CLAUSE_DEFAULT_UNSPECIFIED; *************** gimplify_init_constructor (tree *expr_p, *** 3714,3724 **** } } ! /* If the target is volatile and we have non-zero elements ! initialize the target from a temporary. */ if (TREE_THIS_VOLATILE (object) && !TREE_ADDRESSABLE (type) ! && num_nonzero_elements > 0) { tree temp = create_tmp_var (TYPE_MAIN_VARIANT (type), NULL); TREE_OPERAND (*expr_p, 0) = temp; --- 3715,3726 ---- } } ! /* If the target is volatile, we have non-zero elements and more than ! one field to assign, initialize the target from a temporary. */ if (TREE_THIS_VOLATILE (object) && !TREE_ADDRESSABLE (type) ! && num_nonzero_elements > 0 ! && VEC_length (constructor_elt, elts) > 1) { tree temp = create_tmp_var (TYPE_MAIN_VARIANT (type), NULL); TREE_OPERAND (*expr_p, 0) = temp; *************** omp_add_variable (struct gimplify_omp_ct *** 5290,5295 **** --- 5292,5323 ---- splay_tree_insert (ctx->variables, (splay_tree_key)decl, flags); } + /* Notice a threadprivate variable DECL used in OpenMP context CTX. + This just prints out diagnostics about threadprivate variable uses + in untied tasks. If DECL2 is non-NULL, prevent this warning + on that variable. */ + + static bool + omp_notice_threadprivate_variable (struct gimplify_omp_ctx *ctx, tree decl, + tree decl2) + { + splay_tree_node n; + + if (ctx->region_type != ORT_UNTIED_TASK) + return false; + n = splay_tree_lookup (ctx->variables, (splay_tree_key)decl); + if (n == NULL) + { + error ("threadprivate variable %qs used in untied task", + IDENTIFIER_POINTER (DECL_NAME (decl))); + error ("%Henclosing task", &ctx->location); + splay_tree_insert (ctx->variables, (splay_tree_key)decl, 0); + } + if (decl2) + splay_tree_insert (ctx->variables, (splay_tree_key)decl2, 0); + return false; + } + /* Record the fact that DECL was used within the OpenMP context CTX. IN_CODE is true when real code uses DECL, and false when we should merely emit default(none) errors. Return true if DECL is going to *************** omp_notice_variable (struct gimplify_omp *** 5310,5323 **** if (is_global_var (decl)) { if (DECL_THREAD_LOCAL_P (decl)) ! return false; if (DECL_HAS_VALUE_EXPR_P (decl)) { tree value = get_base_address (DECL_VALUE_EXPR (decl)); if (value && DECL_P (value) && DECL_THREAD_LOCAL_P (value)) ! return false; } } --- 5338,5351 ---- if (is_global_var (decl)) { if (DECL_THREAD_LOCAL_P (decl)) ! return omp_notice_threadprivate_variable (ctx, decl, NULL_TREE); if (DECL_HAS_VALUE_EXPR_P (decl)) { tree value = get_base_address (DECL_VALUE_EXPR (decl)); if (value && DECL_P (value) && DECL_THREAD_LOCAL_P (value)) ! return omp_notice_threadprivate_variable (ctx, decl, value); } } *************** omp_notice_variable (struct gimplify_omp *** 5342,5350 **** { case OMP_CLAUSE_DEFAULT_NONE: error ("%qs not specified in enclosing parallel", ! IDENTIFIER_POINTER (DECL_NAME (decl))); ! error ("%Henclosing parallel", &ctx->location); ! /* FALLTHRU */ case OMP_CLAUSE_DEFAULT_SHARED: flags |= GOVD_SHARED; break; --- 5370,5382 ---- { case OMP_CLAUSE_DEFAULT_NONE: error ("%qs not specified in enclosing parallel", ! IDENTIFIER_POINTER (DECL_NAME ! (lang_hooks.decls.omp_report_decl (decl)))); ! if ((ctx->region_type & ORT_TASK) != 0) ! error ("%Henclosing task", &ctx->location); ! else ! error ("%Henclosing parallel", &ctx->location); ! /* FALLTHRU */ case OMP_CLAUSE_DEFAULT_SHARED: flags |= GOVD_SHARED; break; *************** omp_notice_variable (struct gimplify_omp *** 5356,5362 **** break; case OMP_CLAUSE_DEFAULT_UNSPECIFIED: /* decl will be either GOVD_FIRSTPRIVATE or GOVD_SHARED. */ ! gcc_assert (ctx->region_type == ORT_TASK); if (ctx->outer_context) omp_notice_variable (ctx->outer_context, decl, in_code); for (octx = ctx->outer_context; octx; octx = octx->outer_context) --- 5388,5394 ---- break; case OMP_CLAUSE_DEFAULT_UNSPECIFIED: /* decl will be either GOVD_FIRSTPRIVATE or GOVD_SHARED. */ ! gcc_assert ((ctx->region_type & ORT_TASK) != 0); if (ctx->outer_context) omp_notice_variable (ctx->outer_context, decl, in_code); for (octx = ctx->outer_context; octx; octx = octx->outer_context) *************** gimplify_omp_task (tree *expr_p, gimple_ *** 5859,5865 **** gimple_seq body = NULL; struct gimplify_ctx gctx; ! gimplify_scan_omp_clauses (&OMP_TASK_CLAUSES (expr), pre_p, ORT_TASK); push_gimplify_context (&gctx); --- 5891,5900 ---- gimple_seq body = NULL; struct gimplify_ctx gctx; ! gimplify_scan_omp_clauses (&OMP_TASK_CLAUSES (expr), pre_p, ! find_omp_clause (OMP_TASK_CLAUSES (expr), ! OMP_CLAUSE_UNTIED) ! ? ORT_UNTIED_TASK : ORT_TASK); push_gimplify_context (&gctx); *************** goa_stabilize_expr (tree *expr_p, gimple *** 6150,6157 **** --- 6185,6196 ---- { case TRUTH_ANDIF_EXPR: case TRUTH_ORIF_EXPR: + case TRUTH_AND_EXPR: + case TRUTH_OR_EXPR: + case TRUTH_XOR_EXPR: saw_lhs |= goa_stabilize_expr (&TREE_OPERAND (expr, 1), pre_p, lhs_addr, lhs_var); + case TRUTH_NOT_EXPR: saw_lhs |= goa_stabilize_expr (&TREE_OPERAND (expr, 0), pre_p, lhs_addr, lhs_var); break; diff -Nrcpad gcc-4.4.4/gcc/ira-color.c gcc-4.4.5/gcc/ira-color.c *** gcc-4.4.4/gcc/ira-color.c Wed Apr 22 20:16:13 2009 --- gcc-4.4.5/gcc/ira-color.c Thu Sep 23 13:07:01 2010 *************** static alloc_pool splay_tree_node_pool; *** 82,87 **** --- 82,93 ---- more costly although simpler. */ static VEC(ira_allocno_t,heap) *removed_splay_allocno_vec; + /* Helper for qsort comparison callbacks - return a positive integer if + X > Y, or a negative value otherwise. Use a conditional expression + instead of a difference computation to insulate from possible overflow + issues, e.g. X - Y < 0 for some X > 0 and Y < 0. */ + #define SORTGT(x,y) (((x) > (y)) ? 1 : -1) + /* This page contains functions used to find conflicts using allocno *************** allocno_priority_compare_func (const voi *** 1737,1744 **** pri1 = allocno_priorities[ALLOCNO_NUM (a1)]; pri2 = allocno_priorities[ALLOCNO_NUM (a2)]; ! if (pri2 - pri1) ! return pri2 - pri1; /* If regs are equally good, sort by allocnos, so that the results of qsort leave nothing to chance. */ --- 1743,1750 ---- pri1 = allocno_priorities[ALLOCNO_NUM (a1)]; pri2 = allocno_priorities[ALLOCNO_NUM (a2)]; ! if (pri2 != pri1) ! return SORTGT (pri2, pri1); /* If regs are equally good, sort by allocnos, so that the results of qsort leave nothing to chance. */ diff -Nrcpad gcc-4.4.4/gcc/ira.c gcc-4.4.5/gcc/ira.c *** gcc-4.4.4/gcc/ira.c Wed Mar 31 02:51:31 2010 --- gcc-4.4.5/gcc/ira.c Thu Sep 9 13:58:24 2010 *************** pseudo_for_reload_consideration_p (int r *** 2726,2733 **** { /* Consider spilled pseudos too for IRA because they still have a chance to get hard-registers in the reload when IRA is used. */ ! return (reg_renumber[regno] >= 0 ! || (ira_conflicts_p && flag_ira_share_spill_slots)); } /* Init LIVE_SUBREGS[ALLOCNUM] and LIVE_SUBREGS_USED[ALLOCNUM] using --- 2726,2732 ---- { /* Consider spilled pseudos too for IRA because they still have a chance to get hard-registers in the reload when IRA is used. */ ! return (reg_renumber[regno] >= 0 || ira_conflicts_p); } /* Init LIVE_SUBREGS[ALLOCNUM] and LIVE_SUBREGS_USED[ALLOCNUM] using *************** ira (FILE *f) *** 3147,3155 **** ira_assert (ira_conflicts_p || !loops_p); saved_flag_ira_share_spill_slots = flag_ira_share_spill_slots; ! if (too_high_register_pressure_p ()) /* It is just wasting compiler's time to pack spilled pseudos into ! stack slots in this case -- prohibit it. */ flag_ira_share_spill_slots = FALSE; ira_color (); --- 3146,3157 ---- ira_assert (ira_conflicts_p || !loops_p); saved_flag_ira_share_spill_slots = flag_ira_share_spill_slots; ! if (too_high_register_pressure_p () || cfun->calls_setjmp) /* It is just wasting compiler's time to pack spilled pseudos into ! stack slots in this case -- prohibit it. We also do this if ! there is setjmp call because a variable not modified between ! setjmp and longjmp the compiler is required to preserve its ! value and sharing slots does not guarantee it. */ flag_ira_share_spill_slots = FALSE; ira_color (); diff -Nrcpad gcc-4.4.4/gcc/langhooks-def.h gcc-4.4.5/gcc/langhooks-def.h *** gcc-4.4.4/gcc/langhooks-def.h Fri Feb 27 19:49:42 2009 --- gcc-4.4.5/gcc/langhooks-def.h Tue Jun 15 16:32:24 2010 *************** extern void lhd_do_nothing (void); *** 40,45 **** --- 40,46 ---- extern void lhd_do_nothing_t (tree); extern void lhd_do_nothing_i (int); extern void lhd_do_nothing_f (struct function *); + extern tree lhd_pass_through_t (tree); extern bool lhd_post_options (const char **); extern alias_set_type lhd_get_alias_set (tree); extern tree lhd_return_null_tree_v (void); *************** extern tree lhd_make_node (enum tree_cod *** 195,200 **** --- 196,202 ---- #define LANG_HOOKS_COMDAT_GROUP lhd_comdat_group #define LANG_HOOKS_OMP_PRIVATIZE_BY_REFERENCE hook_bool_const_tree_false #define LANG_HOOKS_OMP_PREDETERMINED_SHARING lhd_omp_predetermined_sharing + #define LANG_HOOKS_OMP_REPORT_DECL lhd_pass_through_t #define LANG_HOOKS_OMP_DISREGARD_VALUE_EXPR hook_bool_tree_bool_false #define LANG_HOOKS_OMP_PRIVATE_DEBUG_CLAUSE hook_bool_tree_bool_false #define LANG_HOOKS_OMP_PRIVATE_OUTER_REF hook_bool_tree_false *************** extern tree lhd_make_node (enum tree_cod *** 214,219 **** --- 216,222 ---- LANG_HOOKS_COMDAT_GROUP, \ LANG_HOOKS_OMP_PRIVATIZE_BY_REFERENCE, \ LANG_HOOKS_OMP_PREDETERMINED_SHARING, \ + LANG_HOOKS_OMP_REPORT_DECL, \ LANG_HOOKS_OMP_DISREGARD_VALUE_EXPR, \ LANG_HOOKS_OMP_PRIVATE_DEBUG_CLAUSE, \ LANG_HOOKS_OMP_PRIVATE_OUTER_REF, \ diff -Nrcpad gcc-4.4.4/gcc/langhooks.c gcc-4.4.5/gcc/langhooks.c *** gcc-4.4.4/gcc/langhooks.c Fri Feb 20 15:20:38 2009 --- gcc-4.4.5/gcc/langhooks.c Tue Jun 15 16:32:24 2010 *************** lhd_do_nothing_t (tree ARG_UNUSED (t)) *** 52,57 **** --- 52,64 ---- { } + /* Pass through (tree). */ + tree + lhd_pass_through_t (tree t) + { + return t; + } + /* Do nothing (int). */ void diff -Nrcpad gcc-4.4.4/gcc/langhooks.h gcc-4.4.5/gcc/langhooks.h *** gcc-4.4.4/gcc/langhooks.h Fri Feb 27 19:49:42 2009 --- gcc-4.4.5/gcc/langhooks.h Tue Jun 15 12:27:01 2010 *************** struct lang_hooks_for_decls *** 187,192 **** --- 187,196 ---- predetermined, OMP_CLAUSE_DEFAULT_UNSPECIFIED otherwise. */ enum omp_clause_default_kind (*omp_predetermined_sharing) (tree); + /* Return decl that should be reported for DEFAULT(NONE) failure + diagnostics. Usually the DECL passed in. */ + tree (*omp_report_decl) (tree); + /* Return true if DECL's DECL_VALUE_EXPR (if any) should be disregarded in OpenMP construct, because it is going to be remapped during OpenMP lowering. SHARED is true if DECL diff -Nrcpad gcc-4.4.4/gcc/po/ChangeLog gcc-4.4.5/gcc/po/ChangeLog *** gcc-4.4.4/gcc/po/ChangeLog Thu Apr 29 07:50:01 2010 --- gcc-4.4.5/gcc/po/ChangeLog Fri Oct 1 08:03:14 2010 *************** *** 1,3 **** --- 1,7 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/gcc/reginfo.c gcc-4.4.5/gcc/reginfo.c *** gcc-4.4.4/gcc/reginfo.c Mon Apr 19 10:06:13 2010 --- gcc-4.4.5/gcc/reginfo.c Tue Aug 17 14:25:52 2010 *************** fix_register (const char *name, int fixe *** 842,847 **** --- 842,855 ---- void globalize_reg (int i) { + #ifdef STACK_REGS + if (IN_RANGE (i, FIRST_STACK_REG, LAST_STACK_REG)) + { + error ("stack register used for global register variable"); + return; + } + #endif + if (fixed_regs[i] == 0 && no_global_reg_vars) error ("global register variable follows a function definition"); diff -Nrcpad gcc-4.4.4/gcc/reload1.c gcc-4.4.5/gcc/reload1.c *** gcc-4.4.4/gcc/reload1.c Thu Mar 26 19:21:18 2009 --- gcc-4.4.5/gcc/reload1.c Thu Sep 9 18:37:17 2010 *************** static void failed_reload (rtx, int); *** 431,437 **** static int set_reload_reg (int, int); static void choose_reload_regs_init (struct insn_chain *, rtx *); static void choose_reload_regs (struct insn_chain *); - static void merge_assigned_reloads (rtx); static void emit_input_reload_insns (struct insn_chain *, struct reload *, rtx, int); static void emit_output_reload_insns (struct insn_chain *, struct reload *, --- 431,436 ---- *************** reload_as_needed (int live_known) *** 4215,4226 **** Record the choices of reload reg in reload_reg_rtx. */ choose_reload_regs (chain); - /* Merge any reloads that we didn't combine for fear of - increasing the number of spill registers needed but now - discover can be safely merged. */ - if (SMALL_REGISTER_CLASSES) - merge_assigned_reloads (insn); - /* Generate the insns to reload operands into or out of their reload regs. */ emit_reload_insns (chain); --- 4214,4219 ---- *************** deallocate_reload_reg (int r) *** 6598,6749 **** reload_spill_index[r] = -1; } - /* If SMALL_REGISTER_CLASSES is nonzero, we may not have merged two - reloads of the same item for fear that we might not have enough reload - registers. However, normally they will get the same reload register - and hence actually need not be loaded twice. - - Here we check for the most common case of this phenomenon: when we have - a number of reloads for the same object, each of which were allocated - the same reload_reg_rtx, that reload_reg_rtx is not used for any other - reload, and is not modified in the insn itself. If we find such, - merge all the reloads and set the resulting reload to RELOAD_OTHER. - This will not increase the number of spill registers needed and will - prevent redundant code. */ - - static void - merge_assigned_reloads (rtx insn) - { - int i, j; - - /* Scan all the reloads looking for ones that only load values and - are not already RELOAD_OTHER and ones whose reload_reg_rtx are - assigned and not modified by INSN. */ - - for (i = 0; i < n_reloads; i++) - { - int conflicting_input = 0; - int max_input_address_opnum = -1; - int min_conflicting_input_opnum = MAX_RECOG_OPERANDS; - - if (rld[i].in == 0 || rld[i].when_needed == RELOAD_OTHER - || rld[i].out != 0 || rld[i].reg_rtx == 0 - || reg_set_p (rld[i].reg_rtx, insn)) - continue; - - /* Look at all other reloads. Ensure that the only use of this - reload_reg_rtx is in a reload that just loads the same value - as we do. Note that any secondary reloads must be of the identical - class since the values, modes, and result registers are the - same, so we need not do anything with any secondary reloads. */ - - for (j = 0; j < n_reloads; j++) - { - if (i == j || rld[j].reg_rtx == 0 - || ! reg_overlap_mentioned_p (rld[j].reg_rtx, - rld[i].reg_rtx)) - continue; - - if (rld[j].when_needed == RELOAD_FOR_INPUT_ADDRESS - && rld[j].opnum > max_input_address_opnum) - max_input_address_opnum = rld[j].opnum; - - /* If the reload regs aren't exactly the same (e.g, different modes) - or if the values are different, we can't merge this reload. - But if it is an input reload, we might still merge - RELOAD_FOR_INPUT_ADDRESS and RELOAD_FOR_OTHER_ADDRESS reloads. */ - - if (! rtx_equal_p (rld[i].reg_rtx, rld[j].reg_rtx) - || rld[j].out != 0 || rld[j].in == 0 - || ! rtx_equal_p (rld[i].in, rld[j].in)) - { - if (rld[j].when_needed != RELOAD_FOR_INPUT - || ((rld[i].when_needed != RELOAD_FOR_INPUT_ADDRESS - || rld[i].opnum > rld[j].opnum) - && rld[i].when_needed != RELOAD_FOR_OTHER_ADDRESS)) - break; - conflicting_input = 1; - if (min_conflicting_input_opnum > rld[j].opnum) - min_conflicting_input_opnum = rld[j].opnum; - } - } - - /* If all is OK, merge the reloads. Only set this to RELOAD_OTHER if - we, in fact, found any matching reloads. */ - - if (j == n_reloads - && max_input_address_opnum <= min_conflicting_input_opnum) - { - gcc_assert (rld[i].when_needed != RELOAD_FOR_OUTPUT); - - for (j = 0; j < n_reloads; j++) - if (i != j && rld[j].reg_rtx != 0 - && rtx_equal_p (rld[i].reg_rtx, rld[j].reg_rtx) - && (! conflicting_input - || rld[j].when_needed == RELOAD_FOR_INPUT_ADDRESS - || rld[j].when_needed == RELOAD_FOR_OTHER_ADDRESS)) - { - rld[i].when_needed = RELOAD_OTHER; - rld[j].in = 0; - reload_spill_index[j] = -1; - transfer_replacements (i, j); - } - - /* If this is now RELOAD_OTHER, look for any reloads that - load parts of this operand and set them to - RELOAD_FOR_OTHER_ADDRESS if they were for inputs, - RELOAD_OTHER for outputs. Note that this test is - equivalent to looking for reloads for this operand - number. - - We must take special care with RELOAD_FOR_OUTPUT_ADDRESS; - it may share registers with a RELOAD_FOR_INPUT, so we can - not change it to RELOAD_FOR_OTHER_ADDRESS. We should - never need to, since we do not modify RELOAD_FOR_OUTPUT. - - It is possible that the RELOAD_FOR_OPERAND_ADDRESS - instruction is assigned the same register as the earlier - RELOAD_FOR_OTHER_ADDRESS instruction. Merging these two - instructions will cause the RELOAD_FOR_OTHER_ADDRESS - instruction to be deleted later on. */ - - if (rld[i].when_needed == RELOAD_OTHER) - for (j = 0; j < n_reloads; j++) - if (rld[j].in != 0 - && rld[j].when_needed != RELOAD_OTHER - && rld[j].when_needed != RELOAD_FOR_OTHER_ADDRESS - && rld[j].when_needed != RELOAD_FOR_OUTPUT_ADDRESS - && rld[j].when_needed != RELOAD_FOR_OPERAND_ADDRESS - && (! conflicting_input - || rld[j].when_needed == RELOAD_FOR_INPUT_ADDRESS - || rld[j].when_needed == RELOAD_FOR_INPADDR_ADDRESS) - && reg_overlap_mentioned_for_reload_p (rld[j].in, - rld[i].in)) - { - int k; - - rld[j].when_needed - = ((rld[j].when_needed == RELOAD_FOR_INPUT_ADDRESS - || rld[j].when_needed == RELOAD_FOR_INPADDR_ADDRESS) - ? RELOAD_FOR_OTHER_ADDRESS : RELOAD_OTHER); - - /* Check to see if we accidentally converted two - reloads that use the same reload register with - different inputs to the same type. If so, the - resulting code won't work. */ - if (rld[j].reg_rtx) - for (k = 0; k < j; k++) - gcc_assert (rld[k].in == 0 || rld[k].reg_rtx == 0 - || rld[k].when_needed != rld[j].when_needed - || !rtx_equal_p (rld[k].reg_rtx, - rld[j].reg_rtx) - || rtx_equal_p (rld[k].in, - rld[j].in)); - } - } - } - } - /* These arrays are filled by emit_reload_insns and its subroutines. */ static rtx input_reload_insns[MAX_RECOG_OPERANDS]; static rtx other_input_address_reload_insns = 0; --- 6591,6596 ---- diff -Nrcpad gcc-4.4.4/gcc/sched-deps.c gcc-4.4.5/gcc/sched-deps.c *** gcc-4.4.4/gcc/sched-deps.c Fri Feb 20 15:20:38 2009 --- gcc-4.4.5/gcc/sched-deps.c Tue Aug 24 08:53:11 2010 *************** sched_free_deps (rtx head, rtx tail, boo *** 2850,2864 **** } /* Initialize variables for region data dependence analysis. ! n_bbs is the number of region blocks. */ void ! init_deps (struct deps *deps) { int max_reg = (reload_completed ? FIRST_PSEUDO_REGISTER : max_reg_num ()); deps->max_reg = max_reg; ! deps->reg_last = XCNEWVEC (struct deps_reg, max_reg); INIT_REG_SET (&deps->reg_last_in_use); INIT_REG_SET (&deps->reg_conditional_sets); --- 2850,2868 ---- } /* Initialize variables for region data dependence analysis. ! When LAZY_REG_LAST is true, do not allocate reg_last array ! of struct deps immediately. */ void ! init_deps (struct deps *deps, bool lazy_reg_last) { int max_reg = (reload_completed ? FIRST_PSEUDO_REGISTER : max_reg_num ()); deps->max_reg = max_reg; ! if (lazy_reg_last) ! deps->reg_last = NULL; ! else ! deps->reg_last = XCNEWVEC (struct deps_reg, max_reg); INIT_REG_SET (&deps->reg_last_in_use); INIT_REG_SET (&deps->reg_conditional_sets); *************** init_deps (struct deps *deps) *** 2877,2882 **** --- 2881,2898 ---- deps->readonly = 0; } + /* Init only reg_last field of DEPS, which was not allocated before as + we inited DEPS lazily. */ + void + init_deps_reg_last (struct deps *deps) + { + gcc_assert (deps && deps->max_reg > 0); + gcc_assert (deps->reg_last == NULL); + + deps->reg_last = XCNEWVEC (struct deps_reg, deps->max_reg); + } + + /* Free insn lists found in DEPS. */ void *************** free_deps (struct deps *deps) *** 2885,2890 **** --- 2901,2914 ---- unsigned i; reg_set_iterator rsi; + /* We set max_reg to 0 when this context was already freed. */ + if (deps->max_reg == 0) + { + gcc_assert (deps->reg_last == NULL); + return; + } + deps->max_reg = 0; + free_INSN_LIST_list (&deps->pending_read_insns); free_EXPR_LIST_list (&deps->pending_read_mems); free_INSN_LIST_list (&deps->pending_write_insns); *************** free_deps (struct deps *deps) *** 2907,2913 **** CLEAR_REG_SET (&deps->reg_last_in_use); CLEAR_REG_SET (&deps->reg_conditional_sets); ! free (deps->reg_last); deps->reg_last = NULL; deps = NULL; --- 2931,2940 ---- CLEAR_REG_SET (&deps->reg_last_in_use); CLEAR_REG_SET (&deps->reg_conditional_sets); ! /* As we initialize reg_last lazily, it is possible that we didn't allocate ! it at all. */ ! if (deps->reg_last) ! free (deps->reg_last); deps->reg_last = NULL; deps = NULL; diff -Nrcpad gcc-4.4.4/gcc/sched-ebb.c gcc-4.4.5/gcc/sched-ebb.c *** gcc-4.4.4/gcc/sched-ebb.c Fri Feb 20 15:20:38 2009 --- gcc-4.4.5/gcc/sched-ebb.c Tue Aug 24 08:53:11 2010 *************** schedule_ebb (rtx head, rtx tail) *** 477,483 **** init_deps_global (); /* Compute dependencies. */ ! init_deps (&tmp_deps); sched_analyze (&tmp_deps, head, tail); free_deps (&tmp_deps); --- 477,483 ---- init_deps_global (); /* Compute dependencies. */ ! init_deps (&tmp_deps, false); sched_analyze (&tmp_deps, head, tail); free_deps (&tmp_deps); diff -Nrcpad gcc-4.4.4/gcc/sched-int.h gcc-4.4.5/gcc/sched-int.h *** gcc-4.4.4/gcc/sched-int.h Fri Feb 20 15:20:38 2009 --- gcc-4.4.5/gcc/sched-int.h Tue Aug 24 08:53:11 2010 *************** extern bool sched_insns_conditions_mutex *** 1079,1085 **** extern bool sched_insn_is_legitimate_for_speculation_p (const_rtx, ds_t); extern void add_dependence (rtx, rtx, enum reg_note); extern void sched_analyze (struct deps *, rtx, rtx); ! extern void init_deps (struct deps *); extern void free_deps (struct deps *); extern void init_deps_global (void); extern void finish_deps_global (void); --- 1079,1086 ---- extern bool sched_insn_is_legitimate_for_speculation_p (const_rtx, ds_t); extern void add_dependence (rtx, rtx, enum reg_note); extern void sched_analyze (struct deps *, rtx, rtx); ! extern void init_deps (struct deps *, bool); ! extern void init_deps_reg_last (struct deps *); extern void free_deps (struct deps *); extern void init_deps_global (void); extern void finish_deps_global (void); diff -Nrcpad gcc-4.4.4/gcc/sched-rgn.c gcc-4.4.5/gcc/sched-rgn.c *** gcc-4.4.4/gcc/sched-rgn.c Thu Sep 18 08:29:48 2008 --- gcc-4.4.5/gcc/sched-rgn.c Tue Aug 24 08:53:11 2010 *************** sched_rgn_compute_dependencies (int rgn) *** 3081,3087 **** /* Initializations for region data dependence analysis. */ bb_deps = XNEWVEC (struct deps, current_nr_blocks); for (bb = 0; bb < current_nr_blocks; bb++) ! init_deps (bb_deps + bb); /* Initialize bitmap used in add_branch_dependences. */ insn_referenced = sbitmap_alloc (sched_max_luid); --- 3081,3087 ---- /* Initializations for region data dependence analysis. */ bb_deps = XNEWVEC (struct deps, current_nr_blocks); for (bb = 0; bb < current_nr_blocks; bb++) ! init_deps (bb_deps + bb, false); /* Initialize bitmap used in add_branch_dependences. */ insn_referenced = sbitmap_alloc (sched_max_luid); diff -Nrcpad gcc-4.4.4/gcc/sel-sched-dump.c gcc-4.4.5/gcc/sel-sched-dump.c *** gcc-4.4.4/gcc/sel-sched-dump.c Mon Sep 1 12:38:44 2008 --- gcc-4.4.5/gcc/sel-sched-dump.c Mon Jun 21 17:10:02 2010 *************** replace_str_in_buf (char *buf, const cha *** 565,571 **** } /* Replace characters in BUF that have special meaning in .dot file. */ ! void sel_prepare_string_for_dot_label (char *buf) { static char specials_from[7][2] = { "<", ">", "{", "|", "}", "\"", --- 565,571 ---- } /* Replace characters in BUF that have special meaning in .dot file. */ ! static void sel_prepare_string_for_dot_label (char *buf) { static char specials_from[7][2] = { "<", ">", "{", "|", "}", "\"", *************** sel_prepare_string_for_dot_label (char * *** 578,583 **** --- 578,605 ---- replace_str_in_buf (buf, specials_from[i], specials_to[i]); } + /* This function acts like printf but dumps to the sched_dump file. */ + void + sel_print (const char *fmt, ...) + { + va_list ap; + va_start (ap, fmt); + if (sched_dump_to_dot_p) + { + char *message; + if (vasprintf (&message, fmt, ap) >= 0 && message != NULL) + { + message = (char *) xrealloc (message, 2 * strlen (message) + 1); + sel_prepare_string_for_dot_label (message); + fprintf (sched_dump, "%s", message); + free (message); + } + } + else + vfprintf (sched_dump, fmt, ap); + va_end (ap); + } + /* Dump INSN with FLAGS. */ static void sel_dump_cfg_insn (insn_t insn, int flags) diff -Nrcpad gcc-4.4.4/gcc/sel-sched-dump.h gcc-4.4.5/gcc/sel-sched-dump.h *** gcc-4.4.4/gcc/sel-sched-dump.h Mon Sep 1 08:57:00 2008 --- gcc-4.4.5/gcc/sel-sched-dump.h Mon Jun 21 17:10:02 2010 *************** extern void dump_insn_1 (insn_t, int); *** 177,210 **** extern void dump_insn (insn_t); extern void debug_insn (insn_t); - extern void sel_prepare_string_for_dot_label (char *); - /* When this flag is on, we are dumping to the .dot file. When it is off, we are dumping to log. */ extern bool sched_dump_to_dot_p; - - /* This macro acts like printf but dumps information to the .dot file. - Used when dumping control flow. */ - #define sel_print_to_dot(...) \ - do { \ - int __j = 1 + 2 * snprintf (NULL, 0, __VA_ARGS__); \ - char *__s = XALLOCAVEC (char, __j); \ - snprintf (__s, __j, __VA_ARGS__); \ - sel_prepare_string_for_dot_label (__s); \ - fprintf (sched_dump, "%s", __s); \ - } while (0) - - /* This macro acts like printf but dumps to the sched_dump file. */ - #define sel_print(...) \ - do { \ - if (sched_dump_to_dot_p) \ - sel_print_to_dot (__VA_ARGS__); \ - else \ - fprintf (sched_dump, __VA_ARGS__); \ - } while (0) /* Functions from sel-sched-dump.c. */ extern const char * sel_print_insn (const_rtx, int); extern void free_sel_dump_data (void); --- 177,189 ---- extern void dump_insn (insn_t); extern void debug_insn (insn_t); /* When this flag is on, we are dumping to the .dot file. When it is off, we are dumping to log. */ extern bool sched_dump_to_dot_p; /* Functions from sel-sched-dump.c. */ + extern void sel_print (const char *fmt, ...) ATTRIBUTE_PRINTF_1; extern const char * sel_print_insn (const_rtx, int); extern void free_sel_dump_data (void); diff -Nrcpad gcc-4.4.4/gcc/sel-sched-ir.c gcc-4.4.5/gcc/sel-sched-ir.c *** gcc-4.4.4/gcc/sel-sched-ir.c Sat Oct 11 23:39:21 2008 --- gcc-4.4.5/gcc/sel-sched-ir.c Wed Sep 1 12:24:35 2010 *************** *** 1,5 **** /* Instruction scheduling pass. Selective scheduler and pipeliner. ! Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of GCC. --- 1,5 ---- /* Instruction scheduling pass. Selective scheduler and pipeliner. ! Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. *************** init_fence_for_scheduling (fence_t f) *** 258,267 **** /* Add new fence consisting of INSN and STATE to the list pointed to by LP. */ static void ! flist_add (flist_t *lp, insn_t insn, state_t state, deps_t dc, void *tc, ! insn_t last_scheduled_insn, VEC(rtx,gc) *executing_insns, ! int *ready_ticks, int ready_ticks_size, insn_t sched_next, ! int cycle, int cycle_issued_insns, bool starts_cycle_p, bool after_stall_p) { fence_t f; --- 258,267 ---- /* Add new fence consisting of INSN and STATE to the list pointed to by LP. */ static void ! flist_add (flist_t *lp, insn_t insn, state_t state, deps_t dc, void *tc, ! insn_t last_scheduled_insn, VEC(rtx,gc) *executing_insns, ! int *ready_ticks, int ready_ticks_size, insn_t sched_next, ! int cycle, int cycle_issued_insns, int issue_more, bool starts_cycle_p, bool after_stall_p) { fence_t f; *************** flist_add (flist_t *lp, insn_t insn, sta *** 286,291 **** --- 286,292 ---- FENCE_TC (f) = tc; FENCE_LAST_SCHEDULED_INSN (f) = last_scheduled_insn; + FENCE_ISSUE_MORE (f) = issue_more; FENCE_EXECUTING_INSNS (f) = executing_insns; FENCE_READY_TICKS (f) = ready_ticks; FENCE_READY_TICKS_SIZE (f) = ready_ticks_size; *************** reset_target_context (tc_t tc, bool clea *** 432,438 **** static void copy_deps_context (deps_t to, deps_t from) { ! init_deps (to); deps_join (to, from); } --- 433,439 ---- static void copy_deps_context (deps_t to, deps_t from) { ! init_deps (to, false); deps_join (to, from); } *************** create_deps_context (void) *** 449,455 **** { deps_t dc = alloc_deps_context (); ! init_deps (dc); return dc; } --- 450,456 ---- { deps_t dc = alloc_deps_context (); ! init_deps (dc, false); return dc; } *************** static void *** 483,489 **** reset_deps_context (deps_t dc) { clear_deps_context (dc); ! init_deps (dc); } /* This structure describes the dependence analysis hooks for advancing --- 484,490 ---- reset_deps_context (deps_t dc) { clear_deps_context (dc); ! init_deps (dc, false); } /* This structure describes the dependence analysis hooks for advancing *************** init_fences (insn_t old_fence) *** 616,623 **** XCNEWVEC (int, ready_ticks_size), /* ready_ticks */ ready_ticks_size, NULL_RTX /* sched_next */, ! 1 /* cycle */, 0 /* cycle_issued_insns */, ! 1 /* starts_cycle_p */, 0 /* after_stall_p */); } } --- 617,625 ---- XCNEWVEC (int, ready_ticks_size), /* ready_ticks */ ready_ticks_size, NULL_RTX /* sched_next */, ! 1 /* cycle */, 0 /* cycle_issued_insns */, ! issue_rate, /* issue_more */ ! 1 /* starts_cycle_p */, 0 /* after_stall_p */); } } *************** init_fences (insn_t old_fence) *** 627,641 **** 2) deps context and cycle is propagated from more probable edge; 3) all other fields are set to corresponding constant values. ! INSN, STATE, DC, TC, LAST_SCHEDULED_INSN, EXECUTING_INSNS, ! READY_TICKS, READY_TICKS_SIZE, SCHED_NEXT, CYCLE and AFTER_STALL_P ! are the corresponding fields of the second fence. */ static void merge_fences (fence_t f, insn_t insn, state_t state, deps_t dc, void *tc, rtx last_scheduled_insn, VEC(rtx, gc) *executing_insns, int *ready_ticks, int ready_ticks_size, ! rtx sched_next, int cycle, bool after_stall_p) { insn_t last_scheduled_insn_old = FENCE_LAST_SCHEDULED_INSN (f); --- 629,643 ---- 2) deps context and cycle is propagated from more probable edge; 3) all other fields are set to corresponding constant values. ! INSN, STATE, DC, TC, LAST_SCHEDULED_INSN, EXECUTING_INSNS, ! READY_TICKS, READY_TICKS_SIZE, SCHED_NEXT, CYCLE, ISSUE_MORE ! and AFTER_STALL_P are the corresponding fields of the second fence. */ static void merge_fences (fence_t f, insn_t insn, state_t state, deps_t dc, void *tc, rtx last_scheduled_insn, VEC(rtx, gc) *executing_insns, int *ready_ticks, int ready_ticks_size, ! rtx sched_next, int cycle, int issue_more, bool after_stall_p) { insn_t last_scheduled_insn_old = FENCE_LAST_SCHEDULED_INSN (f); *************** merge_fences (fence_t f, insn_t insn, *** 665,670 **** --- 667,673 ---- FENCE_CYCLE (f) = cycle; FENCE_LAST_SCHEDULED_INSN (f) = NULL; + FENCE_ISSUE_MORE (f) = issue_rate; VEC_free (rtx, gc, executing_insns); free (ready_ticks); if (FENCE_EXECUTING_INSNS (f)) *************** merge_fences (fence_t f, insn_t insn, *** 696,701 **** --- 699,705 ---- delete_target_context (tc); FENCE_LAST_SCHEDULED_INSN (f) = NULL; + FENCE_ISSUE_MORE (f) = issue_rate; } else if (candidate->src == BLOCK_FOR_INSN (last_scheduled_insn)) *************** merge_fences (fence_t f, insn_t insn, *** 712,717 **** --- 716,722 ---- FENCE_TC (f) = tc; FENCE_LAST_SCHEDULED_INSN (f) = last_scheduled_insn; + FENCE_ISSUE_MORE (f) = issue_more; } else { *************** merge_fences (fence_t f, insn_t insn, *** 795,804 **** other parameters. */ static void add_to_fences (flist_tail_t new_fences, insn_t insn, ! state_t state, deps_t dc, void *tc, rtx last_scheduled_insn, ! VEC(rtx, gc) *executing_insns, int *ready_ticks, ! int ready_ticks_size, rtx sched_next, int cycle, ! int cycle_issued_insns, bool starts_cycle_p, bool after_stall_p) { fence_t f = flist_lookup (FLIST_TAIL_HEAD (new_fences), insn); --- 800,810 ---- other parameters. */ static void add_to_fences (flist_tail_t new_fences, insn_t insn, ! state_t state, deps_t dc, void *tc, rtx last_scheduled_insn, ! VEC(rtx, gc) *executing_insns, int *ready_ticks, ! int ready_ticks_size, rtx sched_next, int cycle, ! int cycle_issued_insns, int issue_rate, ! bool starts_cycle_p, bool after_stall_p) { fence_t f = flist_lookup (FLIST_TAIL_HEAD (new_fences), insn); *************** add_to_fences (flist_tail_t new_fences, *** 807,822 **** flist_add (FLIST_TAIL_TAILP (new_fences), insn, state, dc, tc, last_scheduled_insn, executing_insns, ready_ticks, ready_ticks_size, sched_next, cycle, cycle_issued_insns, ! starts_cycle_p, after_stall_p); FLIST_TAIL_TAILP (new_fences) = &FLIST_NEXT (*FLIST_TAIL_TAILP (new_fences)); } else { ! merge_fences (f, insn, state, dc, tc, last_scheduled_insn, ! executing_insns, ready_ticks, ready_ticks_size, ! sched_next, cycle, after_stall_p); } } --- 813,828 ---- flist_add (FLIST_TAIL_TAILP (new_fences), insn, state, dc, tc, last_scheduled_insn, executing_insns, ready_ticks, ready_ticks_size, sched_next, cycle, cycle_issued_insns, ! issue_rate, starts_cycle_p, after_stall_p); FLIST_TAIL_TAILP (new_fences) = &FLIST_NEXT (*FLIST_TAIL_TAILP (new_fences)); } else { ! merge_fences (f, insn, state, dc, tc, last_scheduled_insn, ! executing_insns, ready_ticks, ready_ticks_size, ! sched_next, cycle, issue_rate, after_stall_p); } } *************** move_fence_to_fences (flist_t old_fences *** 835,841 **** merge_fences (f, old->insn, old->state, old->dc, old->tc, old->last_scheduled_insn, old->executing_insns, old->ready_ticks, old->ready_ticks_size, ! old->sched_next, old->cycle, old->after_stall_p); } else --- 841,847 ---- merge_fences (f, old->insn, old->state, old->dc, old->tc, old->last_scheduled_insn, old->executing_insns, old->ready_ticks, old->ready_ticks_size, ! old->sched_next, old->cycle, old->issue_more, old->after_stall_p); } else *************** add_clean_fence_to_fences (flist_tail_t *** 861,867 **** NULL_RTX, NULL, XCNEWVEC (int, ready_ticks_size), ready_ticks_size, NULL_RTX, FENCE_CYCLE (fence) + 1, ! 0, 1, FENCE_AFTER_STALL_P (fence)); } /* Add a new fence to NEW_FENCES list and initialize all of its data --- 867,873 ---- NULL_RTX, NULL, XCNEWVEC (int, ready_ticks_size), ready_ticks_size, NULL_RTX, FENCE_CYCLE (fence) + 1, ! 0, issue_rate, 1, FENCE_AFTER_STALL_P (fence)); } /* Add a new fence to NEW_FENCES list and initialize all of its data *************** add_dirty_fence_to_fences (flist_tail_t *** 885,890 **** --- 891,897 ---- FENCE_SCHED_NEXT (fence), FENCE_CYCLE (fence), FENCE_ISSUED_INSNS (fence), + FENCE_ISSUE_MORE (fence), FENCE_STARTS_CYCLE_P (fence), FENCE_AFTER_STALL_P (fence)); } *************** insert_in_history_vect (VEC (expr_histor *** 1505,1518 **** { expr_history_def *phist = VEC_index (expr_history_def, vect, ind); - /* When merging, either old vinsns are the *same* or, if not, both - old and new vinsns are different pointers. In the latter case, - though, new vinsns should be equal. */ - gcc_assert (phist->old_expr_vinsn == old_expr_vinsn - || (phist->new_expr_vinsn != new_expr_vinsn - && (vinsn_equal_p - (phist->old_expr_vinsn, old_expr_vinsn)))); - /* It is possible that speculation types of expressions that were propagated through different paths will be different here. In this case, merge the status to get the correct check later. */ --- 1512,1517 ---- *************** deps_init_id (idata_t id, insn_t insn, b *** 2679,2685 **** deps_init_id_data.force_unique_p = force_unique_p; deps_init_id_data.force_use_p = false; ! init_deps (dc); memcpy (&deps_init_id_sched_deps_info, &const_deps_init_id_sched_deps_info, --- 2678,2684 ---- deps_init_id_data.force_unique_p = force_unique_p; deps_init_id_data.force_use_p = false; ! init_deps (dc, false); memcpy (&deps_init_id_sched_deps_info, &const_deps_init_id_sched_deps_info, *************** init_first_time_insn_data (insn_t insn) *** 2751,2757 **** /* These are needed for nops too. */ INSN_LIVE (insn) = get_regset_from_pool (); INSN_LIVE_VALID_P (insn) = false; ! if (!INSN_NOP_P (insn)) { INSN_ANALYZED_DEPS (insn) = BITMAP_ALLOC (NULL); --- 2750,2756 ---- /* These are needed for nops too. */ INSN_LIVE (insn) = get_regset_from_pool (); INSN_LIVE_VALID_P (insn) = false; ! if (!INSN_NOP_P (insn)) { INSN_ANALYZED_DEPS (insn) = BITMAP_ALLOC (NULL); *************** init_first_time_insn_data (insn_t insn) *** 2759,2785 **** INSN_TRANSFORMED_INSNS (insn) = htab_create (16, hash_transformed_insns, eq_transformed_insns, free_transformed_insns); ! init_deps (&INSN_DEPS_CONTEXT (insn)); } } ! /* Free the same data as above for INSN. */ ! static void ! free_first_time_insn_data (insn_t insn) { gcc_assert (! first_time_insn_init (insn)); BITMAP_FREE (INSN_ANALYZED_DEPS (insn)); BITMAP_FREE (INSN_FOUND_DEPS (insn)); htab_delete (INSN_TRANSFORMED_INSNS (insn)); - return_regset_to_pool (INSN_LIVE (insn)); - INSN_LIVE (insn) = NULL; - INSN_LIVE_VALID_P (insn) = false; /* This is allocated only for bookkeeping insns. */ if (INSN_ORIGINATORS (insn)) BITMAP_FREE (INSN_ORIGINATORS (insn)); free_deps (&INSN_DEPS_CONTEXT (insn)); } /* Initialize region-scope data structures for basic blocks. */ --- 2758,2803 ---- INSN_TRANSFORMED_INSNS (insn) = htab_create (16, hash_transformed_insns, eq_transformed_insns, free_transformed_insns); ! init_deps (&INSN_DEPS_CONTEXT (insn), true); } } ! /* Free almost all above data for INSN that is scheduled already. ! Used for extra-large basic blocks. */ ! void ! free_data_for_scheduled_insn (insn_t insn) { gcc_assert (! first_time_insn_init (insn)); + if (! INSN_ANALYZED_DEPS (insn)) + return; + BITMAP_FREE (INSN_ANALYZED_DEPS (insn)); BITMAP_FREE (INSN_FOUND_DEPS (insn)); htab_delete (INSN_TRANSFORMED_INSNS (insn)); /* This is allocated only for bookkeeping insns. */ if (INSN_ORIGINATORS (insn)) BITMAP_FREE (INSN_ORIGINATORS (insn)); free_deps (&INSN_DEPS_CONTEXT (insn)); + + INSN_ANALYZED_DEPS (insn) = NULL; + + /* Clear the readonly flag so we would ICE when trying to recalculate + the deps context (as we believe that it should not happen). */ + (&INSN_DEPS_CONTEXT (insn))->readonly = 0; + } + + /* Free the same data as above for INSN. */ + static void + free_first_time_insn_data (insn_t insn) + { + gcc_assert (! first_time_insn_init (insn)); + + free_data_for_scheduled_insn (insn); + return_regset_to_pool (INSN_LIVE (insn)); + INSN_LIVE (insn) = NULL; + INSN_LIVE_VALID_P (insn) = false; } /* Initialize region-scope data structures for basic blocks. */ *************** has_dependence_p (expr_t expr, insn_t pr *** 3216,3221 **** --- 3234,3244 ---- return false; dc = &INSN_DEPS_CONTEXT (pred); + + /* We init this field lazily. */ + if (dc->reg_last == NULL) + init_deps_reg_last (dc); + if (!dc->readonly) { has_dependence_data.pro = NULL; *************** verify_backedges (void) *** 3484,3505 **** /* Functions to work with control flow. */ /* Tidy the possibly empty block BB. */ ! bool ! maybe_tidy_empty_bb (basic_block bb) { basic_block succ_bb, pred_bb; bool rescan_p; /* Keep empty bb only if this block immediately precedes EXIT and ! has incoming non-fallthrough edge. Otherwise remove it. */ ! if (!sel_bb_empty_p (bb) ! || (single_succ_p (bb) && single_succ (bb) == EXIT_BLOCK_PTR ! && (!single_pred_p (bb) ! || !(single_pred_edge (bb)->flags & EDGE_FALLTHRU)))) return false; free_data_sets (bb); /* Do not delete BB if it has more than one successor. --- 3507,3565 ---- /* Functions to work with control flow. */ + /* Recompute BLOCK_TO_BB and BB_FOR_BLOCK for current region so that blocks + are sorted in topological order (it might have been invalidated by + redirecting an edge). */ + static void + sel_recompute_toporder (void) + { + int i, n, rgn; + int *postorder, n_blocks; + + postorder = XALLOCAVEC (int, n_basic_blocks); + n_blocks = post_order_compute (postorder, false, false); + + rgn = CONTAINING_RGN (BB_TO_BLOCK (0)); + for (n = 0, i = n_blocks - 1; i >= 0; i--) + if (CONTAINING_RGN (postorder[i]) == rgn) + { + BLOCK_TO_BB (postorder[i]) = n; + BB_TO_BLOCK (n) = postorder[i]; + n++; + } + + /* Assert that we updated info for all blocks. We may miss some blocks if + this function is called when redirecting an edge made a block + unreachable, but that block is not deleted yet. */ + gcc_assert (n == RGN_NR_BLOCKS (rgn)); + } + /* Tidy the possibly empty block BB. */ ! static bool ! maybe_tidy_empty_bb (basic_block bb, bool recompute_toporder_p) { basic_block succ_bb, pred_bb; + edge e; + edge_iterator ei; bool rescan_p; /* Keep empty bb only if this block immediately precedes EXIT and ! has incoming non-fallthrough edge, or it has no predecessors or ! successors. Otherwise remove it. */ ! if (!sel_bb_empty_p (bb) ! || (single_succ_p (bb) && single_succ (bb) == EXIT_BLOCK_PTR ! && (!single_pred_p (bb) ! || !(single_pred_edge (bb)->flags & EDGE_FALLTHRU))) ! || EDGE_COUNT (bb->preds) == 0 ! || EDGE_COUNT (bb->succs) == 0) return false; + /* Do not attempt to redirect complex edges. */ + FOR_EACH_EDGE (e, ei, bb->preds) + if (e->flags & EDGE_COMPLEX) + return false; + free_data_sets (bb); /* Do not delete BB if it has more than one successor. *************** maybe_tidy_empty_bb (basic_block bb) *** 3518,3526 **** /* Redirect all non-fallthru edges to the next bb. */ while (rescan_p) { - edge e; - edge_iterator ei; - rescan_p = false; FOR_EACH_EDGE (e, ei, bb->preds) --- 3578,3583 ---- *************** maybe_tidy_empty_bb (basic_block bb) *** 3529,3535 **** if (!(e->flags & EDGE_FALLTHRU)) { ! sel_redirect_edge_and_branch (e, succ_bb); rescan_p = true; break; } --- 3586,3592 ---- if (!(e->flags & EDGE_FALLTHRU)) { ! recompute_toporder_p |= sel_redirect_edge_and_branch (e, succ_bb); rescan_p = true; break; } *************** maybe_tidy_empty_bb (basic_block bb) *** 3545,3554 **** { gcc_assert (pred_bb != NULL); ! move_bb_info (pred_bb, bb); remove_empty_bb (bb, true); } #ifdef ENABLE_CHECKING verify_backedges (); #endif --- 3602,3615 ---- { gcc_assert (pred_bb != NULL); ! if (in_current_region_p (pred_bb)) ! move_bb_info (pred_bb, bb); remove_empty_bb (bb, true); } + if (recompute_toporder_p) + sel_recompute_toporder (); + #ifdef ENABLE_CHECKING verify_backedges (); #endif *************** tidy_control_flow (basic_block xbb, bool *** 3565,3571 **** bool changed = true; /* First check whether XBB is empty. */ ! changed = maybe_tidy_empty_bb (xbb); if (changed || !full_tidying) return changed; --- 3626,3632 ---- bool changed = true; /* First check whether XBB is empty. */ ! changed = maybe_tidy_empty_bb (xbb, false); if (changed || !full_tidying) return changed; *************** tidy_control_flow (basic_block xbb, bool *** 3602,3625 **** /* Also this jump is not at the scheduling boundary. */ && !IN_CURRENT_FENCE_P (BB_END (xbb->prev_bb))) { /* Clear data structures of jump - jump itself will be removed by sel_redirect_edge_and_branch. */ clear_expr (INSN_EXPR (BB_END (xbb->prev_bb))); ! sel_redirect_edge_and_branch (EDGE_SUCC (xbb->prev_bb, 0), xbb); gcc_assert (EDGE_SUCC (xbb->prev_bb, 0)->flags & EDGE_FALLTHRU); /* It can turn out that after removing unused jump, basic block that contained that jump, becomes empty too. In such case remove it too. */ if (sel_bb_empty_p (xbb->prev_bb)) ! changed = maybe_tidy_empty_bb (xbb->prev_bb); } return changed; } ! /* Rip-off INSN from the insn stream. When ONLY_DISCONNECT is true, ! do not delete insn's data, because it will be later re-emitted. Return true if we have removed some blocks afterwards. */ bool sel_remove_insn (insn_t insn, bool only_disconnect, bool full_tidying) --- 3663,3709 ---- /* Also this jump is not at the scheduling boundary. */ && !IN_CURRENT_FENCE_P (BB_END (xbb->prev_bb))) { + bool recompute_toporder_p; /* Clear data structures of jump - jump itself will be removed by sel_redirect_edge_and_branch. */ clear_expr (INSN_EXPR (BB_END (xbb->prev_bb))); ! recompute_toporder_p ! = sel_redirect_edge_and_branch (EDGE_SUCC (xbb->prev_bb, 0), xbb); ! gcc_assert (EDGE_SUCC (xbb->prev_bb, 0)->flags & EDGE_FALLTHRU); /* It can turn out that after removing unused jump, basic block that contained that jump, becomes empty too. In such case remove it too. */ if (sel_bb_empty_p (xbb->prev_bb)) ! changed = maybe_tidy_empty_bb (xbb->prev_bb, recompute_toporder_p); ! else if (recompute_toporder_p) ! sel_recompute_toporder (); } return changed; } ! /* Purge meaningless empty blocks in the middle of a region. */ ! void ! purge_empty_blocks (void) ! { ! /* Do not attempt to delete preheader. */ ! int i = sel_is_loop_preheader_p (BASIC_BLOCK (BB_TO_BLOCK (0))) ? 1 : 0; ! ! while (i < current_nr_blocks) ! { ! basic_block b = BASIC_BLOCK (BB_TO_BLOCK (i)); ! ! if (maybe_tidy_empty_bb (b, false)) ! continue; ! ! i++; ! } ! } ! ! /* Rip-off INSN from the insn stream. When ONLY_DISCONNECT is true, ! do not delete insn's data, because it will be later re-emitted. Return true if we have removed some blocks afterwards. */ bool sel_remove_insn (insn_t insn, bool only_disconnect, bool full_tidying) *************** get_seqno_of_a_pred (insn_t insn) *** 3734,3740 **** return seqno; } ! /* Find the proper seqno for inserting at INSN. */ int get_seqno_by_preds (rtx insn) { --- 3818,3825 ---- return seqno; } ! /* Find the proper seqno for inserting at INSN. Returns -1 if no predecessors ! with positive seqno exist. */ int get_seqno_by_preds (rtx insn) { *************** get_seqno_by_preds (rtx insn) *** 3753,3759 **** for (i = 0, seqno = -1; i < n; i++) seqno = MAX (seqno, INSN_SEQNO (preds[i])); - gcc_assert (seqno > 0); return seqno; } --- 3838,3843 ---- *************** extend_insn_data (void) *** 3818,3825 **** - VEC_length (sel_insn_data_def, s_i_d)); if (reserve > 0 && ! VEC_space (sel_insn_data_def, s_i_d, reserve)) ! VEC_safe_grow_cleared (sel_insn_data_def, heap, s_i_d, ! 3 * sched_max_luid / 2); } /* Finalize data structures for insns from current region. */ --- 3902,3918 ---- - VEC_length (sel_insn_data_def, s_i_d)); if (reserve > 0 && ! VEC_space (sel_insn_data_def, s_i_d, reserve)) ! { ! int size; ! ! if (sched_max_luid / 2 > 1024) ! size = sched_max_luid + 1024; ! else ! size = 3 * sched_max_luid / 2; ! ! ! VEC_safe_grow_cleared (sel_insn_data_def, heap, s_i_d, size); ! } } /* Finalize data structures for insns from current region. */ *************** sel_bb_head (basic_block bb) *** 4198,4204 **** note = bb_note (bb); head = next_nonnote_insn (note); ! if (head && BLOCK_FOR_INSN (head) != bb) head = NULL_RTX; } --- 4291,4297 ---- note = bb_note (bb); head = next_nonnote_insn (note); ! if (head && (BARRIER_P (head) || BLOCK_FOR_INSN (head) != bb)) head = NULL_RTX; } *************** fallthru_bb_of_jump (rtx jump) *** 4261,4266 **** --- 4354,4364 ---- if (!any_condjump_p (jump)) return NULL; + /* A basic block that ends with a conditional jump may still have one successor + (and be followed by a barrier), we are not interested. */ + if (single_succ_p (BLOCK_FOR_INSN (jump))) + return NULL; + return FALLTHRU_EDGE (BLOCK_FOR_INSN (jump))->dest; } *************** sel_init_bbs (bb_vec_t bbs, basic_block *** 4286,4296 **** sched_scan (&ssi, bbs, bb, new_insns, NULL); } ! /* Restore other notes for the whole region. */ static void ! sel_restore_other_notes (void) { int bb; for (bb = 0; bb < current_nr_blocks; bb++) { --- 4384,4395 ---- sched_scan (&ssi, bbs, bb, new_insns, NULL); } ! /* Restore notes for the whole region. */ static void ! sel_restore_notes (void) { int bb; + insn_t insn; for (bb = 0; bb < current_nr_blocks; bb++) { *************** sel_restore_other_notes (void) *** 4305,4310 **** --- 4404,4413 ---- restore_other_notes (NULL, first); BB_NOTE_LIST (first) = NULL_RTX; + FOR_BB_INSNS (first, insn) + if (INSN_P (insn)) + reemit_notes (insn); + first = first->next_bb; } while (first != last); *************** sel_restore_other_notes (void) *** 4315,4321 **** void sel_finish_bbs (void) { ! sel_restore_other_notes (); /* Remove current loop preheader from this loop. */ if (current_loop_nest) --- 4418,4424 ---- void sel_finish_bbs (void) { ! sel_restore_notes (); /* Remove current loop preheader from this loop. */ if (current_loop_nest) *************** sel_create_recovery_block (insn_t orig_i *** 5252,5259 **** void sel_merge_blocks (basic_block a, basic_block b) { - gcc_assert (can_merge_blocks_p (a, b)); - sel_remove_empty_bb (b, true, false); merge_blocks (a, b); --- 5355,5360 ---- *************** sel_redirect_edge_and_branch_force (edge *** 5290,5303 **** sel_init_new_insn (jump, INSN_INIT_TODO_LUID | INSN_INIT_TODO_SIMPLEJUMP); } ! /* A wrapper for redirect_edge_and_branch. */ ! void sel_redirect_edge_and_branch (edge e, basic_block to) { bool latch_edge_p; basic_block src; int prev_max_uid; rtx jump; latch_edge_p = (pipelining_p && current_loop_nest --- 5391,5407 ---- sel_init_new_insn (jump, INSN_INIT_TODO_LUID | INSN_INIT_TODO_SIMPLEJUMP); } ! /* A wrapper for redirect_edge_and_branch. Return TRUE if blocks connected by ! redirected edge are in reverse topological order. */ ! bool sel_redirect_edge_and_branch (edge e, basic_block to) { bool latch_edge_p; basic_block src; int prev_max_uid; rtx jump; + edge redirected; + bool recompute_toporder_p = false; latch_edge_p = (pipelining_p && current_loop_nest *************** sel_redirect_edge_and_branch (edge e, ba *** 5305,5313 **** src = e->src; prev_max_uid = get_max_uid (); ! ! redirect_edge_and_branch (e, to); ! gcc_assert (last_added_blocks == NULL); /* When we've redirected a latch edge, update the header. */ if (latch_edge_p) --- 5409,5418 ---- src = e->src; prev_max_uid = get_max_uid (); ! ! redirected = redirect_edge_and_branch (e, to); ! ! gcc_assert (redirected && last_added_blocks == NULL); /* When we've redirected a latch edge, update the header. */ if (latch_edge_p) *************** sel_redirect_edge_and_branch (edge e, ba *** 5316,5324 **** --- 5421,5438 ---- gcc_assert (loop_latch_edge (current_loop_nest)); } + /* In rare situations, the topological relation between the blocks connected + by the redirected edge can change (see PR42245 for an example). Update + block_to_bb/bb_to_block. */ + if (CONTAINING_RGN (e->src->index) == CONTAINING_RGN (to->index) + && BLOCK_TO_BB (e->src->index) > BLOCK_TO_BB (to->index)) + recompute_toporder_p = true; + jump = find_new_jump (src, NULL, prev_max_uid); if (jump) sel_init_new_insn (jump, INSN_INIT_TODO_LUID | INSN_INIT_TODO_SIMPLEJUMP); + + return recompute_toporder_p; } /* This variable holds the cfg hooks used by the selective scheduler. */ *************** considered_for_pipelining_p (struct loop *** 5745,5751 **** latch. We can't use header here, because this header could be just removed preheader and it will give us the wrong region number. Latch can't be used because it could be in the inner loop too. */ ! if (LOOP_MARKED_FOR_PIPELINING_P (loop) && pipelining_p) { int rgn = CONTAINING_RGN (loop->latch->index); --- 5859,5865 ---- latch. We can't use header here, because this header could be just removed preheader and it will give us the wrong region number. Latch can't be used because it could be in the inner loop too. */ ! if (LOOP_MARKED_FOR_PIPELINING_P (loop)) { int rgn = CONTAINING_RGN (loop->latch->index); *************** sel_add_loop_preheaders (void) *** 5896,5902 **** --- 6010,6019 ---- for (i = 0; VEC_iterate (basic_block, preheader_blocks, i, bb); i++) + { + VEC_safe_push (basic_block, heap, last_added_blocks, bb); sel_add_bb (bb); + } VEC_free (basic_block, heap, preheader_blocks); } diff -Nrcpad gcc-4.4.4/gcc/sel-sched-ir.h gcc-4.4.5/gcc/sel-sched-ir.h *** gcc-4.4.4/gcc/sel-sched-ir.h Mon Sep 1 08:57:00 2008 --- gcc-4.4.5/gcc/sel-sched-ir.h Tue Aug 24 09:10:40 2010 *************** *** 1,6 **** /* Instruction scheduling pass. This file contains definitions used internally in the scheduler. ! Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of GCC. --- 1,6 ---- /* Instruction scheduling pass. This file contains definitions used internally in the scheduler. ! Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. *************** struct _fence *** 296,301 **** --- 296,304 ---- /* Insn, which has been scheduled last on this fence. */ rtx last_scheduled_insn; + /* The last value of can_issue_more variable on this fence. */ + int issue_more; + /* If non-NULL force the next scheduled insn to be SCHED_NEXT. */ rtx sched_next; *************** typedef struct _fence *fence_t; *** 325,330 **** --- 328,334 ---- #define FENCE_DC(F) ((F)->dc) #define FENCE_TC(F) ((F)->tc) #define FENCE_LAST_SCHEDULED_INSN(F) ((F)->last_scheduled_insn) + #define FENCE_ISSUE_MORE(F) ((F)->issue_more) #define FENCE_EXECUTING_INSNS(F) ((F)->executing_insns) #define FENCE_READY_TICKS(F) ((F)->ready_ticks) #define FENCE_READY_TICKS_SIZE(F) ((F)->ready_ticks_size) *************** struct _sel_insn_data *** 714,721 **** bitmap has its bit set. */ bitmap found_deps; ! /* An INSN_UID bit is set when this is a bookkeeping insn generated from ! a parent with this uid. */ bitmap originators; /* A hashtable caching the result of insn transformations through this one. */ --- 718,726 ---- bitmap has its bit set. */ bitmap found_deps; ! /* An INSN_UID bit is set when this is a bookkeeping insn generated from ! a parent with this uid. If a parent is a bookkeeping copy, all its ! originators are transitively included in this set. */ bitmap originators; /* A hashtable caching the result of insn transformations through this one. */ *************** get_all_loop_exits (basic_block bb) *** 1120,1126 **** /* Traverse all loop headers. */ for (i = 0; VEC_iterate (edge, exits, i, e); i++) ! if (in_current_region_p (e->dest)) { VEC(edge, heap) *next_exits = get_all_loop_exits (e->dest); --- 1125,1132 ---- /* Traverse all loop headers. */ for (i = 0; VEC_iterate (edge, exits, i, e); i++) ! if (in_current_region_p (e->dest) ! || inner_loop_header_p (e->dest)) { VEC(edge, heap) *next_exits = get_all_loop_exits (e->dest); *************** _eligible_successor_edge_p (edge e1, suc *** 1356,1367 **** && !(flags & SUCCS_OUT)) return false; e2 = EDGE_SUCC (bb, 0); bb = e2->dest; - - /* This couldn't happen inside a region. */ - gcc_assert (! in_current_region_p (bb) - || (flags & SUCCS_OUT)); } /* Save the second edge for later checks. */ --- 1362,1372 ---- && !(flags & SUCCS_OUT)) return false; + if (EDGE_COUNT (bb->succs) == 0) + return false; + e2 = EDGE_SUCC (bb, 0); bb = e2->dest; } /* Save the second edge for later checks. */ *************** extern bool tidy_control_flow (basic_blo *** 1575,1590 **** extern void free_bb_note_pool (void); extern void sel_remove_empty_bb (basic_block, bool, bool); ! extern bool maybe_tidy_empty_bb (basic_block bb); extern basic_block sel_split_edge (edge); extern basic_block sel_create_recovery_block (insn_t); extern void sel_merge_blocks (basic_block, basic_block); ! extern void sel_redirect_edge_and_branch (edge, basic_block); extern void sel_redirect_edge_and_branch_force (edge, basic_block); extern void sel_init_pipelining (void); extern void sel_finish_pipelining (void); extern void sel_sched_region (int); - extern void sel_find_rgns (void); extern loop_p get_loop_nest_for_rgn (unsigned int); extern bool considered_for_pipelining_p (struct loop *); extern void make_region_from_loop_preheader (VEC(basic_block, heap) **); --- 1580,1594 ---- extern void free_bb_note_pool (void); extern void sel_remove_empty_bb (basic_block, bool, bool); ! extern void purge_empty_blocks (void); extern basic_block sel_split_edge (edge); extern basic_block sel_create_recovery_block (insn_t); extern void sel_merge_blocks (basic_block, basic_block); ! extern bool sel_redirect_edge_and_branch (edge, basic_block); extern void sel_redirect_edge_and_branch_force (edge, basic_block); extern void sel_init_pipelining (void); extern void sel_finish_pipelining (void); extern void sel_sched_region (int); extern loop_p get_loop_nest_for_rgn (unsigned int); extern bool considered_for_pipelining_p (struct loop *); extern void make_region_from_loop_preheader (VEC(basic_block, heap) **); *************** extern void init_lv_sets (void); *** 1609,1614 **** --- 1613,1619 ---- extern void free_lv_sets (void); extern void setup_nop_and_exit_insns (void); extern void free_nop_and_exit_insns (void); + extern void free_data_for_scheduled_insn (insn_t); extern void setup_nop_vinsn (void); extern void free_nop_vinsn (void); extern void sel_set_sched_flags (void); diff -Nrcpad gcc-4.4.4/gcc/sel-sched.c gcc-4.4.5/gcc/sel-sched.c *** gcc-4.4.4/gcc/sel-sched.c Fri Feb 20 15:20:38 2009 --- gcc-4.4.5/gcc/sel-sched.c Sun Sep 12 20:35:53 2010 *************** *** 1,5 **** /* Instruction scheduling pass. Selective scheduler and pipeliner. ! Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GCC. --- 1,5 ---- /* Instruction scheduling pass. Selective scheduler and pipeliner. ! Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. *************** advance_one_cycle (fence_t fence) *** 587,592 **** --- 587,593 ---- FENCE_ISSUED_INSNS (fence) = 0; FENCE_STARTS_CYCLE_P (fence) = 1; can_issue_more = issue_rate; + FENCE_ISSUE_MORE (fence) = can_issue_more; for (i = 0; VEC_iterate (rtx, FENCE_EXECUTING_INSNS (fence), i, insn); ) { *************** count_occurrences_1 (rtx *cur_rtx, void *** 834,840 **** if (GET_CODE (*cur_rtx) == SUBREG && REG_P (p->x) ! && REGNO (SUBREG_REG (*cur_rtx)) == REGNO (p->x)) { /* ??? Do not support substituting regs inside subregs. In that case, simplify_subreg will be called by validate_replace_rtx, and --- 835,842 ---- if (GET_CODE (*cur_rtx) == SUBREG && REG_P (p->x) ! && (!REG_P (SUBREG_REG (*cur_rtx)) ! || REGNO (SUBREG_REG (*cur_rtx)) == REGNO (p->x))) { /* ??? Do not support substituting regs inside subregs. In that case, simplify_subreg will be called by validate_replace_rtx, and *************** mark_unavailable_hard_regs (def_t def, s *** 1227,1245 **** if (!reload_completed && !HARD_REGISTER_NUM_P (regno)) return; ! mode = GET_MODE (orig_dest); ! /* Stop when mode is not supported for renaming. Also can't proceed ! if the original register is one of the fixed_regs, global_regs or ! frame pointer. */ ! if (fixed_regs[regno] || global_regs[regno] #if FRAME_POINTER_REGNUM != HARD_FRAME_POINTER_REGNUM ! || (frame_pointer_needed && regno == HARD_FRAME_POINTER_REGNUM) #else ! || (frame_pointer_needed && regno == FRAME_POINTER_REGNUM) #endif ! ) { SET_HARD_REG_SET (reg_rename_p->unavailable_hard_regs); --- 1229,1247 ---- if (!reload_completed && !HARD_REGISTER_NUM_P (regno)) return; ! if (reload_completed) ! cl = get_reg_class (def->orig_insn); ! /* Stop if the original register is one of the fixed_regs, global_regs or ! frame pointer, or we could not discover its class. */ ! if (fixed_regs[regno] || global_regs[regno] #if FRAME_POINTER_REGNUM != HARD_FRAME_POINTER_REGNUM ! || (frame_pointer_needed && regno == HARD_FRAME_POINTER_REGNUM) #else ! || (frame_pointer_needed && regno == FRAME_POINTER_REGNUM) #endif ! || (reload_completed && cl == NO_REGS)) { SET_HARD_REG_SET (reg_rename_p->unavailable_hard_regs); *************** mark_unavailable_hard_regs (def_t def, s *** 1294,1304 **** /* Leave regs as 'available' only from the current register class. */ - cl = get_reg_class (def->orig_insn); - gcc_assert (cl != NO_REGS); COPY_HARD_REG_SET (reg_rename_p->available_for_renaming, reg_class_contents[cl]); /* Leave only registers available for this mode. */ if (!sel_hrd.regs_for_mode_ok[mode]) init_regs_for_mode (mode); --- 1296,1306 ---- /* Leave regs as 'available' only from the current register class. */ COPY_HARD_REG_SET (reg_rename_p->available_for_renaming, reg_class_contents[cl]); + mode = GET_MODE (orig_dest); + /* Leave only registers available for this mode. */ if (!sel_hrd.regs_for_mode_ok[mode]) init_regs_for_mode (mode); *************** choose_best_reg_1 (HARD_REG_SET hard_reg *** 1427,1432 **** --- 1429,1444 ---- 0, cur_reg, hrsi) if (! TEST_HARD_REG_BIT (hard_regs_used, cur_reg)) { + /* Check that all hard regs for mode are available. */ + for (i = 1, n = hard_regno_nregs[cur_reg][mode]; i < n; i++) + if (TEST_HARD_REG_BIT (hard_regs_used, cur_reg + i) + || !TEST_HARD_REG_BIT (reg_rename_p->available_for_renaming, + cur_reg + i)) + break; + + if (i < n) + continue; + /* All hard registers are available. */ if (best_new_reg < 0 || reg_rename_tick[cur_reg] < reg_rename_tick[best_new_reg]) *************** choose_best_reg (HARD_REG_SET hard_regs_ *** 1458,1463 **** --- 1470,1476 ---- rtx best_reg = choose_best_reg_1 (hard_regs_used, reg_rename_p, original_insns, is_orig_reg_p_ptr); + /* FIXME loop over hard_regno_nregs here. */ gcc_assert (best_reg == NULL_RTX || TEST_HARD_REG_BIT (sel_hrd.regs_ever_used, REGNO (best_reg))); *************** collect_unavailable_regs_from_bnds (expr *** 1641,1654 **** static bool try_replace_dest_reg (ilist_t orig_insns, rtx best_reg, expr_t expr) { - if (expr_dest_regno (expr) == REGNO (best_reg)) - { - EXPR_TARGET_AVAILABLE (expr) = 1; - return true; - } - - gcc_assert (orig_insns); - /* Try whether we'll be able to generate the insn 'dest := best_reg' at the place of the original operation. */ for (; orig_insns; orig_insns = ILIST_NEXT (orig_insns)) --- 1654,1659 ---- *************** try_replace_dest_reg (ilist_t orig_insns *** 1657,1670 **** gcc_assert (EXPR_SEPARABLE_P (INSN_EXPR (orig_insn))); ! if (!replace_src_with_reg_ok_p (orig_insn, best_reg) ! || !replace_dest_with_reg_ok_p (orig_insn, best_reg)) return false; } /* Make sure that EXPR has the right destination register. */ ! replace_dest_with_reg_in_expr (expr, best_reg); return true; } --- 1662,1680 ---- gcc_assert (EXPR_SEPARABLE_P (INSN_EXPR (orig_insn))); ! if (REGNO (best_reg) != REGNO (INSN_LHS (orig_insn)) ! && (! replace_src_with_reg_ok_p (orig_insn, best_reg) ! || ! replace_dest_with_reg_ok_p (orig_insn, best_reg))) return false; } /* Make sure that EXPR has the right destination register. */ ! if (expr_dest_regno (expr) != REGNO (best_reg)) ! replace_dest_with_reg_in_expr (expr, best_reg); ! else ! EXPR_TARGET_AVAILABLE (expr) = 1; ! return true; } *************** compute_av_set_at_bb_end (insn_t insn, i *** 2680,2687 **** VEC_index (int, sinfo->probs_ok, is), sinfo->all_prob); ! if (sinfo->all_succs_n > 1 ! && sinfo->all_succs_n == sinfo->succs_ok_n) { /* Find EXPR'es that came from *all* successors and save them into expr_in_all_succ_branches. This set will be used later --- 2690,2696 ---- VEC_index (int, sinfo->probs_ok, is), sinfo->all_prob); ! if (sinfo->all_succs_n > 1) { /* Find EXPR'es that came from *all* successors and save them into expr_in_all_succ_branches. This set will be used later *************** sel_target_adjust_priority (expr_t expr) *** 3238,3246 **** gcc_assert (EXPR_PRIORITY_ADJ (expr) >= 0); ! if (sched_verbose >= 2) ! sel_print ("sel_target_adjust_priority: insn %d, %d +%d = %d.\n", ! INSN_UID (EXPR_INSN_RTX (expr)), EXPR_PRIORITY (expr), EXPR_PRIORITY_ADJ (expr), new_priority); return new_priority; --- 3247,3255 ---- gcc_assert (EXPR_PRIORITY_ADJ (expr) >= 0); ! if (sched_verbose >= 4) ! sel_print ("sel_target_adjust_priority: insn %d, %d+%d = %d.\n", ! INSN_UID (EXPR_INSN_RTX (expr)), EXPR_PRIORITY (expr), EXPR_PRIORITY_ADJ (expr), new_priority); return new_priority; *************** invoke_reorder_hooks (fence_t fence) *** 4036,4043 **** ran_hook = true; } ! else ! issue_more = issue_rate; /* Ensure that ready list and vec_av_set are in line with each other, i.e. vec_av_set[i] == ready_element (&ready, i). */ --- 4045,4052 ---- ran_hook = true; } ! else ! issue_more = FENCE_ISSUE_MORE (fence); /* Ensure that ready list and vec_av_set are in line with each other, i.e. vec_av_set[i] == ready_element (&ready, i). */ *************** get_expr_cost (expr_t expr, fence_t fenc *** 4227,4235 **** if (recog_memoized (insn) < 0) { ! if (!FENCE_STARTS_CYCLE_P (fence) ! /* FIXME: Is this condition necessary? */ ! && VINSN_UNIQUE_P (EXPR_VINSN (expr)) && INSN_ASM_P (insn)) /* This is asm insn which is tryed to be issued on the cycle not first. Issue it on the next cycle. */ --- 4236,4242 ---- if (recog_memoized (insn) < 0) { ! if (!FENCE_STARTS_CYCLE_P (fence) && INSN_ASM_P (insn)) /* This is asm insn which is tryed to be issued on the cycle not first. Issue it on the next cycle. */ *************** find_seqno_for_bookkeeping (insn_t place *** 4524,4534 **** if (INSN_P (next) && JUMP_P (next) && BLOCK_FOR_INSN (next) == BLOCK_FOR_INSN (place_to_insert)) ! seqno = INSN_SEQNO (next); else if (INSN_SEQNO (join_point) > 0) seqno = INSN_SEQNO (join_point); else ! seqno = get_seqno_by_preds (place_to_insert); gcc_assert (seqno > 0); return seqno; --- 4531,4557 ---- if (INSN_P (next) && JUMP_P (next) && BLOCK_FOR_INSN (next) == BLOCK_FOR_INSN (place_to_insert)) ! { ! gcc_assert (INSN_SCHED_TIMES (next) == 0); ! seqno = INSN_SEQNO (next); ! } else if (INSN_SEQNO (join_point) > 0) seqno = INSN_SEQNO (join_point); else ! { ! seqno = get_seqno_by_preds (place_to_insert); ! ! /* Sometimes the fences can move in such a way that there will be ! no instructions with positive seqno around this bookkeeping. ! This means that there will be no way to get to it by a regular ! fence movement. Never mind because we pick up such pieces for ! rescheduling anyways, so any positive value will do for now. */ ! if (seqno < 0) ! { ! gcc_assert (pipelining_p); ! seqno = 1; ! } ! } gcc_assert (seqno > 0); return seqno; *************** static void *** 4661,4678 **** move_cond_jump (rtx insn, bnd_t bnd) { edge ft_edge; ! basic_block block_from, block_next, block_new; ! rtx next, prev, link; - /* BLOCK_FROM holds basic block of the jump. */ block_from = BLOCK_FOR_INSN (insn); ! /* Moving of jump should not cross any other jumps or ! beginnings of new basic blocks. */ ! gcc_assert (block_from == BLOCK_FOR_INSN (BND_TO (bnd))); /* Jump is moved to the boundary. */ - prev = BND_TO (bnd); next = PREV_INSN (insn); BND_TO (bnd) = insn; --- 4684,4718 ---- move_cond_jump (rtx insn, bnd_t bnd) { edge ft_edge; ! basic_block block_from, block_next, block_new, block_bnd, bb; ! rtx next, prev, link, head; block_from = BLOCK_FOR_INSN (insn); + block_bnd = BLOCK_FOR_INSN (BND_TO (bnd)); + prev = BND_TO (bnd); ! #ifdef ENABLE_CHECKING ! /* Moving of jump should not cross any other jumps or beginnings of new ! basic blocks. The only exception is when we move a jump through ! mutually exclusive insns along fallthru edges. */ ! if (block_from != block_bnd) ! { ! bb = block_from; ! for (link = PREV_INSN (insn); link != PREV_INSN (prev); ! link = PREV_INSN (link)) ! { ! if (INSN_P (link)) ! gcc_assert (sched_insns_conditions_mutex_p (insn, link)); ! if (BLOCK_FOR_INSN (link) && BLOCK_FOR_INSN (link) != bb) ! { ! gcc_assert (single_pred (bb) == BLOCK_FOR_INSN (link)); ! bb = BLOCK_FOR_INSN (link); ! } ! } ! } ! #endif /* Jump is moved to the boundary. */ next = PREV_INSN (insn); BND_TO (bnd) = insn; *************** move_cond_jump (rtx insn, bnd_t bnd) *** 4687,4714 **** gcc_assert (block_new->next_bb == block_next && block_from->next_bb == block_new); ! gcc_assert (BB_END (block_from) == insn); ! ! /* Move all instructions except INSN from BLOCK_FROM to ! BLOCK_NEW. */ ! for (link = prev; link != insn; link = NEXT_INSN (link)) { ! EXPR_ORIG_BB_INDEX (INSN_EXPR (link)) = block_new->index; ! df_insn_change_bb (link, block_new); ! } ! /* Set correct basic block and instructions properties. */ ! BB_END (block_new) = PREV_INSN (insn); ! NEXT_INSN (PREV_INSN (prev)) = insn; ! PREV_INSN (insn) = PREV_INSN (prev); /* Assert there is no jump to BLOCK_NEW, only fallthrough edge. */ gcc_assert (NOTE_INSN_BASIC_BLOCK_P (BB_HEAD (block_new))); - PREV_INSN (prev) = BB_HEAD (block_new); - NEXT_INSN (next) = NEXT_INSN (BB_HEAD (block_new)); - NEXT_INSN (BB_HEAD (block_new)) = prev; - PREV_INSN (NEXT_INSN (next)) = next; gcc_assert (!sel_bb_empty_p (block_from) && !sel_bb_empty_p (block_new)); --- 4727,4761 ---- gcc_assert (block_new->next_bb == block_next && block_from->next_bb == block_new); ! /* Move all instructions except INSN to BLOCK_NEW. */ ! bb = block_bnd; ! head = BB_HEAD (block_new); ! while (bb != block_from->next_bb) { ! rtx from, to; ! from = bb == block_bnd ? prev : sel_bb_head (bb); ! to = bb == block_from ? next : sel_bb_end (bb); ! /* The jump being moved can be the first insn in the block. ! In this case we don't have to move anything in this block. */ ! if (NEXT_INSN (to) != from) ! { ! reorder_insns (from, to, head); ! for (link = to; link != head; link = PREV_INSN (link)) ! EXPR_ORIG_BB_INDEX (INSN_EXPR (link)) = block_new->index; ! head = to; ! } ! ! /* Cleanup possibly empty blocks left. */ ! block_next = bb->next_bb; ! if (bb != block_from) ! tidy_control_flow (bb, false); ! bb = block_next; ! } /* Assert there is no jump to BLOCK_NEW, only fallthrough edge. */ gcc_assert (NOTE_INSN_BASIC_BLOCK_P (BB_HEAD (block_new))); gcc_assert (!sel_bb_empty_p (block_from) && !sel_bb_empty_p (block_new)); *************** move_exprs_to_boundary (bnd_t bnd, expr_ *** 4978,4989 **** --- 5025,5045 ---- EXECUTE_IF_SET_IN_BITMAP (current_copies, 0, book_uid, bi) { + unsigned uid; + bitmap_iterator bi; + /* We allocate these bitmaps lazily. */ if (! INSN_ORIGINATORS_BY_UID (book_uid)) INSN_ORIGINATORS_BY_UID (book_uid) = BITMAP_ALLOC (NULL); bitmap_copy (INSN_ORIGINATORS_BY_UID (book_uid), current_originators); + + /* Transitively add all originators' originators. */ + EXECUTE_IF_SET_IN_BITMAP (current_originators, 0, uid, bi) + if (INSN_ORIGINATORS_BY_UID (uid)) + bitmap_ior_into (INSN_ORIGINATORS_BY_UID (book_uid), + INSN_ORIGINATORS_BY_UID (uid)); } return should_move; *************** advance_state_on_fence (fence_t fence, i *** 5043,5048 **** --- 5099,5105 ---- if (sched_verbose >= 2) debug_state (FENCE_STATE (fence)); FENCE_STARTS_CYCLE_P (fence) = 0; + FENCE_ISSUE_MORE (fence) = can_issue_more; return asm_p; } *************** fill_insns (fence_t fence, int seqno, il *** 5224,5229 **** --- 5281,5287 ---- blist_add (&bnds, insn, NULL, FENCE_DC (fence)); bnds_tailp = &BLIST_NEXT (bnds); set_target_context (FENCE_TC (fence)); + can_issue_more = FENCE_ISSUE_MORE (fence); target_bb = INSN_BB (insn); /* Do while we can add any operation to the current group. */ *************** maybe_emit_renaming_copy (rtx insn, *** 5549,5562 **** moveop_static_params_p params) { bool insn_emitted = false; ! rtx cur_reg = expr_dest_reg (params->c_expr); ! gcc_assert (!cur_reg || (params->dest && REG_P (params->dest))); /* If original operation has expr and the register chosen for that expr is not original operation's dest reg, substitute operation's right hand side with the register chosen. */ ! if (cur_reg != NULL_RTX && REGNO (params->dest) != REGNO (cur_reg)) { insn_t reg_move_insn, reg_move_insn_rtx; --- 5607,5625 ---- moveop_static_params_p params) { bool insn_emitted = false; ! rtx cur_reg; ! /* Bail out early when expression can not be renamed at all. */ ! if (!EXPR_SEPARABLE_P (params->c_expr)) ! return false; ! ! cur_reg = expr_dest_reg (params->c_expr); ! gcc_assert (cur_reg && params->dest && REG_P (params->dest)); /* If original operation has expr and the register chosen for that expr is not original operation's dest reg, substitute operation's right hand side with the register chosen. */ ! if (REGNO (params->dest) != REGNO (cur_reg)) { insn_t reg_move_insn, reg_move_insn_rtx; *************** setup_current_loop_nest (int rgn) *** 6479,6501 **** gcc_assert (LOOP_MARKED_FOR_PIPELINING_P (current_loop_nest)); } - /* Purge meaningless empty blocks in the middle of a region. */ - static void - purge_empty_blocks (void) - { - int i ; - - for (i = 1; i < current_nr_blocks; ) - { - basic_block b = BASIC_BLOCK (BB_TO_BLOCK (i)); - - if (maybe_tidy_empty_bb (b)) - continue; - - i++; - } - } - /* Compute instruction priorities for current region. */ static void sel_compute_priorities (int rgn) --- 6542,6547 ---- *************** update_seqnos_and_stage (int min_seqno, *** 7074,7079 **** --- 7120,7131 ---- gcc_assert (INSN_SEQNO (insn) < 0); INSN_SEQNO (insn) += highest_seqno_in_use + max_seqno - min_seqno + 2; gcc_assert (INSN_SEQNO (insn) <= new_hs); + + /* When not pipelining, purge unneeded insn info on the scheduled insns. + For example, having reg_last array of INSN_DEPS_CONTEXT in memory may + require > 1GB of memory e.g. on limit-fnargs.c. */ + if (! pipelining_p) + free_data_for_scheduled_insn (insn); } ilist_clear (pscheduled_insns); diff -Nrcpad gcc-4.4.4/gcc/tree-cfgcleanup.c gcc-4.4.5/gcc/tree-cfgcleanup.c *** gcc-4.4.4/gcc/tree-cfgcleanup.c Tue Dec 1 19:44:34 2009 --- gcc-4.4.5/gcc/tree-cfgcleanup.c Fri May 21 09:30:07 2010 *************** *** 1,5 **** /* CFG cleanup for trees. ! Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GCC. --- 1,5 ---- /* CFG cleanup for trees. ! Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. *************** tree_forwarder_block_p (basic_block bb, *** 224,229 **** --- 224,230 ---- edge_iterator ei; edge e, succ; basic_block dest; + location_t locus; /* BB must have a single outgoing edge. */ if (single_succ_p (bb) != 1 *************** tree_forwarder_block_p (basic_block bb, *** 242,247 **** --- 243,250 ---- gcc_assert (bb != ENTRY_BLOCK_PTR); #endif + locus = single_succ_edge (bb)->goto_locus; + /* Now walk through the statements backward. We can ignore labels, anything else means this is not a forwarder block. */ for (gsi = gsi_last_bb (bb); !gsi_end_p (gsi); gsi_prev (&gsi)) *************** tree_forwarder_block_p (basic_block bb, *** 253,258 **** --- 256,263 ---- case GIMPLE_LABEL: if (DECL_NONLOCAL (gimple_label_label (stmt))) return false; + if (optimize == 0 && gimple_location (stmt) != locus) + return false; break; default: *************** tree_forwarder_block_p (basic_block bb, *** 289,294 **** --- 294,303 ---- if (!single_pred_p (dest)) return false; } + /* If goto_locus of any of the edges differs, prevent removing + the forwarder block for -O0. */ + if (optimize == 0 && e->goto_locus != locus) + return false; } return true; *************** cleanup_tree_cfg_bb (basic_block bb) *** 543,554 **** return true; retval = cleanup_control_flow_bb (bb); ! ! /* Forwarder blocks can carry line number information which is ! useful when debugging, so we only clean them up when ! optimizing. */ ! if (optimize > 0 ! && tree_forwarder_block_p (bb, false) && remove_forwarder_block (bb)) return true; --- 552,559 ---- return true; retval = cleanup_control_flow_bb (bb); ! ! if (tree_forwarder_block_p (bb, false) && remove_forwarder_block (bb)) return true; diff -Nrcpad gcc-4.4.4/gcc/tree-inline.c gcc-4.4.5/gcc/tree-inline.c *** gcc-4.4.4/gcc/tree-inline.c Mon Feb 8 15:50:59 2010 --- gcc-4.4.5/gcc/tree-inline.c Sat Sep 18 17:23:20 2010 *************** copy_phis_for_bb (basic_block bb, copy_b *** 1737,1748 **** edge_iterator ei; gimple phi; gimple_stmt_iterator si; for (si = gsi_start (phi_nodes (bb)); !gsi_end_p (si); gsi_next (&si)) { tree res, new_res; gimple new_phi; - edge new_edge; phi = gsi_stmt (si); res = PHI_RESULT (phi); --- 1737,1749 ---- edge_iterator ei; gimple phi; gimple_stmt_iterator si; + edge new_edge; + bool inserted = false; for (si = gsi_start (phi_nodes (bb)); !gsi_end_p (si); gsi_next (&si)) { tree res, new_res; gimple new_phi; phi = gsi_stmt (si); res = PHI_RESULT (phi); *************** copy_phis_for_bb (basic_block bb, copy_b *** 1771,1782 **** { gimple_seq stmts = NULL; new_arg = force_gimple_operand (new_arg, &stmts, true, NULL); ! gsi_insert_seq_on_edge_immediate (new_edge, stmts); } add_phi_arg (new_phi, new_arg, new_edge); } } } } --- 1772,1789 ---- { gimple_seq stmts = NULL; new_arg = force_gimple_operand (new_arg, &stmts, true, NULL); ! gsi_insert_seq_on_edge (new_edge, stmts); ! inserted = true; } add_phi_arg (new_phi, new_arg, new_edge); } } } + + /* Commit the delayed edge insertions. */ + if (inserted) + FOR_EACH_EDGE (new_edge, ei, new_bb->preds) + gsi_commit_one_edge_insert (new_edge, NULL); } diff -Nrcpad gcc-4.4.4/gcc/tree-predcom.c gcc-4.4.5/gcc/tree-predcom.c *** gcc-4.4.4/gcc/tree-predcom.c Wed Mar 4 17:50:20 2009 --- gcc-4.4.5/gcc/tree-predcom.c Thu Jul 1 12:47:26 2010 *************** execute_pred_commoning_cbck (struct loop *** 1893,1935 **** execute_pred_commoning (loop, dta->chains, dta->tmp_vars); } - /* Returns true if we can and should unroll LOOP FACTOR times. Number - of iterations of the loop is returned in NITER. */ - - static bool - should_unroll_loop_p (struct loop *loop, unsigned factor, - struct tree_niter_desc *niter) - { - edge exit; - - if (factor == 1) - return false; - - /* Check whether unrolling is possible. We only want to unroll loops - for that we are able to determine number of iterations. We also - want to split the extra iterations of the loop from its end, - therefore we require that the loop has precisely one - exit. */ - - exit = single_dom_exit (loop); - if (!exit) - return false; - - if (!number_of_iterations_exit (loop, exit, niter, false)) - return false; - - /* And of course, we must be able to duplicate the loop. */ - if (!can_duplicate_loop_p (loop)) - return false; - - /* The final loop should be small enough. */ - if (tree_num_loop_insns (loop, &eni_size_weights) * factor - > (unsigned) PARAM_VALUE (PARAM_MAX_UNROLLED_INSNS)) - return false; - - return true; - } - /* Base NAME and all the names in the chain of phi nodes that use it on variable VAR. The phi nodes are recognized by being in the copies of the header of the LOOP. */ --- 1893,1898 ---- *************** tree_predictive_commoning_loop (struct l *** 2596,2602 **** that its number of iterations is divisible by the factor. */ unroll_factor = determine_unroll_factor (chains); scev_reset (); ! unroll = should_unroll_loop_p (loop, unroll_factor, &desc); exit = single_dom_exit (loop); /* Execute the predictive commoning transformations, and possibly unroll the --- 2559,2566 ---- that its number of iterations is divisible by the factor. */ unroll_factor = determine_unroll_factor (chains); scev_reset (); ! unroll = (unroll_factor > 1 ! && can_unroll_loop_p (loop, unroll_factor, &desc)); exit = single_dom_exit (loop); /* Execute the predictive commoning transformations, and possibly unroll the diff -Nrcpad gcc-4.4.4/gcc/tree-ssa-dom.c gcc-4.4.5/gcc/tree-ssa-dom.c *** gcc-4.4.4/gcc/tree-ssa-dom.c Mon Dec 7 00:52:55 2009 --- gcc-4.4.5/gcc/tree-ssa-dom.c Tue Jul 27 13:05:17 2010 *************** record_edge_info (basic_block bb) *** 1764,1770 **** edge_info = allocate_edge_info (false_edge); record_conditions (edge_info, inverted, cond); ! if (code == NE_EXPR) { edge_info->lhs = op1; edge_info->rhs = op0; --- 1764,1770 ---- edge_info = allocate_edge_info (false_edge); record_conditions (edge_info, inverted, cond); ! if (TREE_CODE (inverted) == EQ_EXPR) { edge_info->lhs = op1; edge_info->rhs = op0; *************** record_edge_info (basic_block bb) *** 1791,1797 **** edge_info = allocate_edge_info (false_edge); record_conditions (edge_info, inverted, cond); ! if (TREE_CODE (cond) == NE_EXPR) { edge_info->lhs = op0; edge_info->rhs = op1; --- 1791,1797 ---- edge_info = allocate_edge_info (false_edge); record_conditions (edge_info, inverted, cond); ! if (TREE_CODE (inverted) == EQ_EXPR) { edge_info->lhs = op0; edge_info->rhs = op1; *************** propagate_rhs_into_lhs (gimple stmt, tre *** 2600,2605 **** --- 2600,2619 ---- continue; } + /* It's not ok to propagate into the definition stmt of RHS. + : + # prephitmp.12_36 = PHI + g_67.1_6 = prephitmp.12_36; + goto ; + While this is strictly all dead code we do not want to + deal with this here. */ + if (TREE_CODE (rhs) == SSA_NAME + && SSA_NAME_DEF_STMT (rhs) == use_stmt) + { + all = false; + continue; + } + /* Dump details. */ if (dump_file && (dump_flags & TDF_DETAILS)) { diff -Nrcpad gcc-4.4.4/gcc/tree-ssa-loop-ivopts.c gcc-4.4.5/gcc/tree-ssa-loop-ivopts.c *** gcc-4.4.4/gcc/tree-ssa-loop-ivopts.c Thu Apr 8 11:47:13 2010 --- gcc-4.4.5/gcc/tree-ssa-loop-ivopts.c Fri Apr 30 21:22:53 2010 *************** may_be_unaligned_p (tree ref, tree step) *** 1525,1540 **** if (mode != BLKmode) { ! double_int mul; ! tree al = build_int_cst (TREE_TYPE (step), ! GET_MODE_ALIGNMENT (mode) / BITS_PER_UNIT); ! if (base_align < GET_MODE_ALIGNMENT (mode) ! || bitpos % GET_MODE_ALIGNMENT (mode) != 0 ! || bitpos % BITS_PER_UNIT != 0) return true; ! ! if (!constant_multiple_of (step, al, &mul)) return true; } --- 1525,1542 ---- if (mode != BLKmode) { ! unsigned mode_align = GET_MODE_ALIGNMENT (mode); ! if (base_align < mode_align ! || (bitpos % mode_align) != 0 ! || (bitpos % BITS_PER_UNIT) != 0) return true; ! ! if (toffset ! && (highest_pow2_factor (toffset) * BITS_PER_UNIT) < mode_align) ! return true; ! ! if ((highest_pow2_factor (step) * BITS_PER_UNIT) < mode_align) return true; } diff -Nrcpad gcc-4.4.4/gcc/tree-ssa-pre.c gcc-4.4.5/gcc/tree-ssa-pre.c *** gcc-4.4.4/gcc/tree-ssa-pre.c Mon Mar 22 16:32:58 2010 --- gcc-4.4.5/gcc/tree-ssa-pre.c Fri May 21 12:56:49 2010 *************** create_component_ref_by_pieces_1 (basic_ *** 2509,2539 **** { case CALL_EXPR: { ! tree folded, sc = currop->op1; unsigned int nargs = 0; ! tree *args = XNEWVEC (tree, VEC_length (vn_reference_op_s, ! ref->operands) - 1); while (*operand < VEC_length (vn_reference_op_s, ref->operands)) { args[nargs] = create_component_ref_by_pieces_1 (block, ref, operand, stmts, domstmt); nargs++; } folded = build_call_array (currop->type, ! TREE_CODE (currop->op0) == FUNCTION_DECL ! ? build_fold_addr_expr (currop->op0) ! : currop->op0, nargs, args); free (args); if (sc) ! { ! pre_expr scexpr = get_or_alloc_expr_for (sc); ! sc = find_or_generate_expression (block, scexpr, stmts, domstmt); ! if (!sc) ! return NULL_TREE; ! CALL_EXPR_STATIC_CHAIN (folded) = sc; ! } return folded; } break; --- 2509,2554 ---- { case CALL_EXPR: { ! tree folded, sc = NULL_TREE; unsigned int nargs = 0; ! tree fn, *args; ! if (TREE_CODE (currop->op0) == FUNCTION_DECL) ! fn = currop->op0; ! else ! { ! pre_expr op0 = get_or_alloc_expr_for (currop->op0); ! fn = find_or_generate_expression (block, op0, stmts, domstmt); ! if (!fn) ! return NULL_TREE; ! } ! if (currop->op1) ! { ! pre_expr scexpr = get_or_alloc_expr_for (currop->op1); ! sc = find_or_generate_expression (block, scexpr, stmts, domstmt); ! if (!sc) ! return NULL_TREE; ! } ! args = XNEWVEC (tree, VEC_length (vn_reference_op_s, ! ref->operands) - 1); while (*operand < VEC_length (vn_reference_op_s, ref->operands)) { args[nargs] = create_component_ref_by_pieces_1 (block, ref, operand, stmts, domstmt); + if (!args[nargs]) + { + free (args); + return NULL_TREE; + } nargs++; } folded = build_call_array (currop->type, ! (TREE_CODE (fn) == FUNCTION_DECL ! ? build_fold_addr_expr (fn) : fn), nargs, args); free (args); if (sc) ! CALL_EXPR_STATIC_CHAIN (folded) = sc; return folded; } break; diff -Nrcpad gcc-4.4.4/gcc/tree-ssa-propagate.c gcc-4.4.5/gcc/tree-ssa-propagate.c *** gcc-4.4.4/gcc/tree-ssa-propagate.c Fri Feb 20 15:20:38 2009 --- gcc-4.4.5/gcc/tree-ssa-propagate.c Mon Jun 14 15:28:00 2010 *************** substitute_and_fold (prop_value_t *prop_ *** 1113,1120 **** } /* No point propagating into a stmt whose result is not used, ! but instead we might be able to remove a trivially dead stmt. */ ! if (gimple_get_lhs (stmt) && TREE_CODE (gimple_get_lhs (stmt)) == SSA_NAME && has_zero_uses (gimple_get_lhs (stmt)) && !stmt_could_throw_p (stmt) --- 1113,1124 ---- } /* No point propagating into a stmt whose result is not used, ! but instead we might be able to remove a trivially dead stmt. ! Don't do this when called from VRP, since the SSA_NAME which ! is going to be released could be still referenced in VRP ! ranges. */ ! if (!use_ranges_p ! && gimple_get_lhs (stmt) && TREE_CODE (gimple_get_lhs (stmt)) == SSA_NAME && has_zero_uses (gimple_get_lhs (stmt)) && !stmt_could_throw_p (stmt) diff -Nrcpad gcc-4.4.4/gcc/tree-ssa-structalias.c gcc-4.4.5/gcc/tree-ssa-structalias.c *** gcc-4.4.4/gcc/tree-ssa-structalias.c Wed Jan 20 13:06:40 2010 --- gcc-4.4.5/gcc/tree-ssa-structalias.c Sun Aug 8 15:51:14 2010 *************** get_constraint_for_component_ref (tree t *** 2928,2934 **** /* Some people like to do cute things like take the address of &0->a.b */ forzero = t; ! while (!SSA_VAR_P (forzero) && !CONSTANT_CLASS_P (forzero)) forzero = TREE_OPERAND (forzero, 0); if (CONSTANT_CLASS_P (forzero) && integer_zerop (forzero)) --- 2928,2935 ---- /* Some people like to do cute things like take the address of &0->a.b */ forzero = t; ! while (handled_component_p (forzero) ! || INDIRECT_REF_P (forzero)) forzero = TREE_OPERAND (forzero, 0); if (CONSTANT_CLASS_P (forzero) && integer_zerop (forzero)) diff -Nrcpad gcc-4.4.4/gcc/tree-switch-conversion.c gcc-4.4.5/gcc/tree-switch-conversion.c *** gcc-4.4.4/gcc/tree-switch-conversion.c Tue Dec 30 16:27:29 2008 --- gcc-4.4.5/gcc/tree-switch-conversion.c Tue Sep 7 11:07:31 2010 *************** eight) times the number of the actual sw *** 96,101 **** --- 96,102 ---- #include "diagnostic.h" #include "tree-dump.h" #include "timevar.h" + #include "langhooks.h" /* The main structure of the pass. */ struct switch_conv_info *************** gen_inbound_check (gimple swtch) *** 658,666 **** /* Make sure we do not generate arithmetics in a subrange. */ if (TREE_TYPE (TREE_TYPE (info.index_expr))) ! utype = unsigned_type_for (TREE_TYPE (TREE_TYPE (info.index_expr))); else ! utype = unsigned_type_for (TREE_TYPE (info.index_expr)); /* (end of) block 0 */ gsi = gsi_for_stmt (info.arr_ref_first); --- 659,669 ---- /* Make sure we do not generate arithmetics in a subrange. */ if (TREE_TYPE (TREE_TYPE (info.index_expr))) ! utype = lang_hooks.types.type_for_mode ! (TYPE_MODE (TREE_TYPE (TREE_TYPE (info.index_expr))), 1); else ! utype = lang_hooks.types.type_for_mode ! (TYPE_MODE (TREE_TYPE (info.index_expr)), 1); /* (end of) block 0 */ gsi = gsi_for_stmt (info.arr_ref_first); diff -Nrcpad gcc-4.4.4/include/ChangeLog gcc-4.4.5/include/ChangeLog *** gcc-4.4.4/include/ChangeLog Thu Apr 29 07:48:44 2010 --- gcc-4.4.5/include/ChangeLog Fri Oct 1 08:02:22 2010 *************** *** 1,3 **** --- 1,7 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/intl/ChangeLog gcc-4.4.5/intl/ChangeLog *** gcc-4.4.4/intl/ChangeLog Thu Apr 29 07:51:26 2010 --- gcc-4.4.5/intl/ChangeLog Fri Oct 1 08:04:18 2010 *************** *** 1,3 **** --- 1,7 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/libcpp/ChangeLog gcc-4.4.5/libcpp/ChangeLog *** gcc-4.4.4/libcpp/ChangeLog Thu Apr 29 07:52:20 2010 --- gcc-4.4.5/libcpp/ChangeLog Fri Oct 1 08:04:57 2010 *************** *** 1,3 **** --- 1,7 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/libcpp/po/ChangeLog gcc-4.4.5/libcpp/po/ChangeLog *** gcc-4.4.4/libcpp/po/ChangeLog Thu Apr 29 07:52:14 2010 --- gcc-4.4.5/libcpp/po/ChangeLog Fri Oct 1 08:04:52 2010 *************** *** 1,3 **** --- 1,7 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/libdecnumber/ChangeLog gcc-4.4.5/libdecnumber/ChangeLog *** gcc-4.4.4/libdecnumber/ChangeLog Thu Apr 29 07:51:48 2010 --- gcc-4.4.5/libdecnumber/ChangeLog Fri Oct 1 08:04:36 2010 *************** *** 1,3 **** --- 1,7 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/libgcc/ChangeLog gcc-4.4.5/libgcc/ChangeLog *** gcc-4.4.4/libgcc/ChangeLog Thu Apr 29 07:48:31 2010 --- gcc-4.4.5/libgcc/ChangeLog Fri Oct 1 08:02:08 2010 *************** *** 1,3 **** --- 1,12 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + + 2010-05-19 Rainer Orth + + * config/i386/32/sfp-machine.h (FP_HANDLE_EXCEPTIONS): Support Sun + assembler syntax. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/libgcc/config/i386/32/sfp-machine.h gcc-4.4.5/libgcc/config/i386/32/sfp-machine.h *** gcc-4.4.4/libgcc/config/i386/32/sfp-machine.h Sat Jul 5 16:45:55 2008 --- gcc-4.4.5/libgcc/config/i386/32/sfp-machine.h Wed May 19 15:56:56 2010 *************** struct fenv *** 145,152 **** if (_fex & FP_EX_DIVZERO) \ { \ float f = 1.0, g = 0.0; \ ! __asm__ __volatile__ ("fdivp" : "=t" (f) \ ! : "0" (f), "u" (g) \ : "st(1)"); \ __asm__ __volatile__ ("fwait"); \ } \ --- 145,152 ---- if (_fex & FP_EX_DIVZERO) \ { \ float f = 1.0, g = 0.0; \ ! __asm__ __volatile__ ("fdivp {%0, %y1|%y1, %0}" \ ! : "+t" (f) : "u" (g) \ : "st(1)"); \ __asm__ __volatile__ ("fwait"); \ } \ diff -Nrcpad gcc-4.4.4/libgcc/config/libbid/ChangeLog gcc-4.4.5/libgcc/config/libbid/ChangeLog *** gcc-4.4.4/libgcc/config/libbid/ChangeLog Thu Apr 29 07:48:24 2010 --- gcc-4.4.5/libgcc/config/libbid/ChangeLog Fri Oct 1 08:02:00 2010 *************** *** 1,3 **** --- 1,7 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/libgomp/ChangeLog gcc-4.4.5/libgomp/ChangeLog *** gcc-4.4.4/libgomp/ChangeLog Thu Apr 29 07:48:53 2010 --- gcc-4.4.5/libgomp/ChangeLog Fri Oct 1 08:02:29 2010 *************** *** 1,3 **** --- 1,27 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + + 2010-06-10 Rainer Orth + + Backport from mainline: + 2010-01-29 Rainer Orth + + * testsuite/libgomp.c++/task-1.C: Renamed err to e. + * testsuite/libgomp.c++/task-6.C: Likewise. + + 2010-04-30 Jakub Jelinek + + PR c/43893 + * testsuite/libgomp.c/pr43893.c: New test. + * testsuite/libgomp.c++/pr43893.C: New test. + + 2010-04-29 Jakub Jelinek + + PR other/43620 + * configure.ac (AM_INIT_AUTOMAKE): Add no-dist option. + * Makefile.in: Regenerated. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/libgomp/Makefile.in gcc-4.4.5/libgomp/Makefile.in *** gcc-4.4.4/libgomp/Makefile.in Thu Apr 29 08:26:54 2010 --- gcc-4.4.5/libgomp/Makefile.in Fri Oct 1 08:26:18 2010 *************** POST_UNINSTALL = : *** 38,52 **** build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! DIST_COMMON = $(am__configure_deps) $(srcdir)/../config.guess \ ! $(srcdir)/../config.sub $(srcdir)/../depcomp \ ! $(srcdir)/../install-sh $(srcdir)/../ltmain.sh \ ! $(srcdir)/../missing $(srcdir)/../mkinstalldirs \ ! $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ! $(srcdir)/config.h.in $(srcdir)/libgomp.spec.in \ ! $(srcdir)/libgomp_f.h.in $(srcdir)/omp.h.in \ ! $(srcdir)/omp_lib.f90.in $(srcdir)/omp_lib.h.in \ ! $(top_srcdir)/configure ChangeLog subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ --- 38,52 ---- build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! DIST_COMMON = $(srcdir)/../config.guess $(srcdir)/../config.sub \ ! ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ! $(top_srcdir)/configure $(am__configure_deps) \ ! $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \ ! $(srcdir)/omp.h.in $(srcdir)/omp_lib.h.in \ ! $(srcdir)/omp_lib.f90.in $(srcdir)/libgomp_f.h.in \ ! $(srcdir)/libgomp.spec.in $(srcdir)/../depcomp \ ! $(srcdir)/../ltmain.sh $(srcdir)/../config.guess \ ! $(srcdir)/../config.sub subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ *************** CCLD = $(CC) *** 100,106 **** LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libgomp_la_SOURCES) - DIST_SOURCES = $(libgomp_la_SOURCES) MULTISRCTOP = MULTIBUILDTOP = MULTIDIRS = --- 100,105 ---- *************** HEADERS = $(nodist_finclude_HEADERS) $(n *** 133,149 **** ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) - am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - DIST_ARCHIVES = $(distdir).tar.gz - GZIP_ENV = --best - distuninstallcheck_listfiles = find . -type f -print - distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ --- 132,137 ---- *************** GTAGS: *** 771,922 **** distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../config - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-info - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) - dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - - dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - - dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - - dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - - dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - - dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - - # This target untars the dist file and tries a VPATH configuration. Then - # it guarantees that the distribution is self-contained by making another - # tarfile. - distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' - distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 - distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 check-am: all-am check: check-recursive all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) all-multi $(HEADERS) \ --- 759,764 ---- *************** uninstall-info: uninstall-info-recursive *** 1049,1064 **** .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \ all-multi am--refresh check check-am clean clean-generic \ clean-libtool clean-multi clean-recursive \ ! clean-toolexeclibLTLIBRARIES ctags ctags-recursive dist \ ! dist-all dist-bzip2 dist-gzip dist-info dist-shar dist-tarZ \ ! dist-zip distcheck distclean distclean-compile \ ! distclean-generic distclean-hdr distclean-libtool \ ! distclean-multi distclean-recursive distclean-tags \ ! distcleancheck distdir distuninstallcheck dvi dvi-am html \ ! html-am info info-am install install-am install-data \ ! install-data-am install-exec install-exec-am install-info \ ! install-info-am install-man install-multi \ ! install-nodist_fincludeHEADERS \ install-nodist_libsubincludeHEADERS \ install-nodist_toolexeclibHEADERS install-strip \ install-toolexeclibLTLIBRARIES installcheck installcheck-am \ --- 891,903 ---- .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \ all-multi am--refresh check check-am clean clean-generic \ clean-libtool clean-multi clean-recursive \ ! clean-toolexeclibLTLIBRARIES ctags ctags-recursive dist-info \ ! distclean distclean-compile distclean-generic distclean-hdr \ ! distclean-libtool distclean-multi distclean-recursive \ ! distclean-tags dvi dvi-am html html-am info info-am install \ ! install-am install-data install-data-am install-exec \ ! install-exec-am install-info install-info-am install-man \ ! install-multi install-nodist_fincludeHEADERS \ install-nodist_libsubincludeHEADERS \ install-nodist_toolexeclibHEADERS install-strip \ install-toolexeclibLTLIBRARIES installcheck installcheck-am \ diff -Nrcpad gcc-4.4.4/libgomp/configure.ac gcc-4.4.5/libgomp/configure.ac *** gcc-4.4.4/libgomp/configure.ac Fri Sep 19 20:27:11 2008 --- gcc-4.4.5/libgomp/configure.ac Thu Apr 29 15:03:38 2010 *************** target_alias=${target_alias-$host_alias} *** 61,67 **** # -Wall: turns on all automake warnings... # -Wno-portability: ...except this one, since GNU make is required. # -Wno-override: ... and this one, since we do want this in testsuite. ! AM_INIT_AUTOMAKE([1.9.0 foreign -Wall -Wno-portability -Wno-override]) AM_ENABLE_MULTILIB(, ..) # Calculate toolexeclibdir --- 61,67 ---- # -Wall: turns on all automake warnings... # -Wno-portability: ...except this one, since GNU make is required. # -Wno-override: ... and this one, since we do want this in testsuite. ! AM_INIT_AUTOMAKE([1.9.0 foreign no-dist -Wall -Wno-portability -Wno-override]) AM_ENABLE_MULTILIB(, ..) # Calculate toolexeclibdir diff -Nrcpad gcc-4.4.4/libgomp/libgomp.info gcc-4.4.5/libgomp/libgomp.info *** gcc-4.4.4/libgomp/libgomp.info Thu Apr 29 10:13:50 2010 --- gcc-4.4.5/libgomp/libgomp.info Fri Oct 1 10:06:16 2010 *************** *** 1,5 **** This is libgomp.info, produced by makeinfo version 4.13 from ! /d/gcc-4.4.4/gcc-4.4.4/libgomp/libgomp.texi. Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. --- 1,5 ---- This is libgomp.info, produced by makeinfo version 4.13 from ! /d/gcc-4.4.5/gcc-4.4.5/libgomp/libgomp.texi. Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. diff -Nrcpad gcc-4.4.4/libgomp/testsuite/libgomp.c/pr43893.c gcc-4.4.5/libgomp/testsuite/libgomp.c/pr43893.c *** gcc-4.4.4/libgomp/testsuite/libgomp.c/pr43893.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/libgomp/testsuite/libgomp.c/pr43893.c Fri Apr 30 18:41:42 2010 *************** *** 0 **** --- 1,61 ---- + /* PR c/43893 */ + /* { dg-do run } */ + + extern void abort (void); + + int + main () + { + int c; + unsigned int i; + int j; + c = 0; + #pragma omp parallel for reduction(+:c) + for (i = 0; i < 1; i++) + c++; + if (c != 1) + abort (); + c = 0; + #pragma omp parallel for reduction(+:c) + for (i = 0; i <= 0; i++) + c++; + if (c != 1) + abort (); + c = 0; + #pragma omp parallel for reduction(+:c) + for (j = - __INT_MAX__ - 1; j < - __INT_MAX__; j++) + c++; + if (c != 1) + abort (); + c = 0; + #pragma omp parallel for reduction(+:c) + for (j = - __INT_MAX__ - 1; j <= - __INT_MAX__ - 1; j++) + c++; + if (c != 1) + abort (); + c = 0; + #pragma omp parallel for reduction(+:c) + for (i = 2U * __INT_MAX__ + 1; i > 2U * __INT_MAX__; i--) + c++; + if (c != 1) + abort (); + c = 0; + #pragma omp parallel for reduction(+:c) + for (i = 2U * __INT_MAX__ + 1; i >= 2U * __INT_MAX__ + 1; i--) + c++; + if (c != 1) + abort (); + c = 0; + #pragma omp parallel for reduction(+:c) + for (j = __INT_MAX__; j > __INT_MAX__ - 1; j--) + c++; + if (c != 1) + abort (); + c = 0; + #pragma omp parallel for reduction(+:c) + for (j = __INT_MAX__; j >= __INT_MAX__; j--) + c++; + if (c != 1) + abort (); + return 0; + } diff -Nrcpad gcc-4.4.4/libgomp/testsuite/libgomp.c++/pr43893.C gcc-4.4.5/libgomp/testsuite/libgomp.c++/pr43893.C *** gcc-4.4.4/libgomp/testsuite/libgomp.c++/pr43893.C Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/libgomp/testsuite/libgomp.c++/pr43893.C Fri Apr 30 18:41:42 2010 *************** *** 0 **** --- 1,125 ---- + // PR c/43893 + // { dg-do run } + + extern "C" void abort (); + + template + void + f1 () + { + int c; + T i; + c = 0; + #pragma omp parallel for reduction(+:c) + for (i = M; i < N; i++) + c++; + if (c != 1) + abort (); + } + + template + void + f2 () + { + int c; + T i; + c = 0; + #pragma omp parallel for reduction(+:c) + for (i = M; i <= N; i++) + c++; + if (c != 1) + abort (); + } + + template + void + f3 () + { + int c; + T i; + c = 0; + #pragma omp parallel for reduction(+:c) + for (i = M; i > N; i--) + c++; + if (c != 1) + abort (); + } + + template + void + f4 () + { + int c; + T i; + c = 0; + #pragma omp parallel for reduction(+:c) + for (i = M; i >= N; i--) + c++; + if (c != 1) + abort (); + } + + int + main () + { + int c; + unsigned int i; + int j; + c = 0; + #pragma omp parallel for reduction(+:c) + for (i = 0; i < 1; i++) + c++; + if (c != 1) + abort (); + f1 (); + c = 0; + #pragma omp parallel for reduction(+:c) + for (i = 0; i <= 0; i++) + c++; + if (c != 1) + abort (); + f2 (); + c = 0; + #pragma omp parallel for reduction(+:c) + for (j = - __INT_MAX__ - 1; j < - __INT_MAX__; j++) + c++; + if (c != 1) + abort (); + f1 (); + c = 0; + #pragma omp parallel for reduction(+:c) + for (j = - __INT_MAX__ - 1; j <= - __INT_MAX__ - 1; j++) + c++; + if (c != 1) + abort (); + f2 (); + c = 0; + #pragma omp parallel for reduction(+:c) + for (i = 2U * __INT_MAX__ + 1; i > 2U * __INT_MAX__; i--) + c++; + if (c != 1) + abort (); + f3 (); + c = 0; + #pragma omp parallel for reduction(+:c) + for (i = 2U * __INT_MAX__ + 1; i >= 2U * __INT_MAX__ + 1; i--) + c++; + if (c != 1) + abort (); + f4 (); + c = 0; + #pragma omp parallel for reduction(+:c) + for (j = __INT_MAX__; j > __INT_MAX__ - 1; j--) + c++; + if (c != 1) + abort (); + f3 (); + c = 0; + #pragma omp parallel for reduction(+:c) + for (j = __INT_MAX__; j >= __INT_MAX__; j--) + c++; + if (c != 1) + abort (); + f4 (); + return 0; + } diff -Nrcpad gcc-4.4.4/libgomp/testsuite/libgomp.c++/task-1.C gcc-4.4.5/libgomp/testsuite/libgomp.c++/task-1.C *** gcc-4.4.4/libgomp/testsuite/libgomp.c++/task-1.C Fri Jun 6 13:01:54 2008 --- gcc-4.4.5/libgomp/testsuite/libgomp.c++/task-1.C Thu Jun 10 12:32:12 2010 *************** f1 (int i, int j, int k) *** 20,26 **** } int v1 = 1, v2 = 2, v5 = 5; ! int err; void f2 (void) --- 20,26 ---- } int v1 = 1, v2 = 2, v5 = 5; ! int e; void f2 (void) *************** f2 (void) *** 35,46 **** #pragma omp task { if (++v1 != 8 || ++v2 != 3 || ++v3 != 4 || ++v4 != 5 || ++v5 != 6) ! err = 1; } #pragma omp taskwait if (v1 != 7 || v2 != 2 || v3 != 3 || v4 != 4 || v5 != 6) abort (); ! if (err) abort (); } } --- 35,46 ---- #pragma omp task { if (++v1 != 8 || ++v2 != 3 || ++v3 != 4 || ++v4 != 5 || ++v5 != 6) ! e = 1; } #pragma omp taskwait if (v1 != 7 || v2 != 2 || v3 != 3 || v4 != 4 || v5 != 6) abort (); ! if (e) abort (); } } diff -Nrcpad gcc-4.4.4/libgomp/testsuite/libgomp.c++/task-6.C gcc-4.4.5/libgomp/testsuite/libgomp.c++/task-6.C *** gcc-4.4.4/libgomp/testsuite/libgomp.c++/task-6.C Fri Jun 6 13:01:54 2008 --- gcc-4.4.5/libgomp/testsuite/libgomp.c++/task-6.C Thu Jun 10 12:32:12 2010 *************** f1 (T i, T j, T k) *** 21,27 **** } int v1 = 1, v2 = 2, v5 = 5; ! int err; template void --- 21,27 ---- } int v1 = 1, v2 = 2, v5 = 5; ! int e; template void *************** f2 (void) *** 37,48 **** #pragma omp task { if (++v1 != 8 || ++v2 != 3 || ++v3 != 4 || ++v4 != 5 || ++v5 != 6) ! err = 1; } #pragma omp taskwait if (v1 != 7 || v2 != 2 || v3 != 3 || v4 != 4 || v5 != 6) abort (); ! if (err) abort (); } } --- 37,48 ---- #pragma omp task { if (++v1 != 8 || ++v2 != 3 || ++v3 != 4 || ++v4 != 5 || ++v5 != 6) ! e = 1; } #pragma omp taskwait if (v1 != 7 || v2 != 2 || v3 != 3 || v4 != 4 || v5 != 6) abort (); ! if (e) abort (); } } diff -Nrcpad gcc-4.4.4/libiberty/ChangeLog gcc-4.4.5/libiberty/ChangeLog *** gcc-4.4.4/libiberty/ChangeLog Thu Apr 29 07:52:07 2010 --- gcc-4.4.5/libiberty/ChangeLog Fri Oct 1 08:04:46 2010 *************** *** 1,3 **** --- 1,24 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + + 2010-06-10 Jakub Jelinek + + PR other/43838 + * cp-demangle.c (struct d_print_info): Add flush_count field. + (d_print_init): Initialize it to 0. + (d_print_flush): Increment it. + (d_print_comp): If needed flush before appending ", ". Only + decrement dpi->len if no flushes happened during the recursive + call. + * testsuite/demangle-expected: Add a test for this. + + 2009-06-16 Nick Clifton + + PR 10197 + * testsuite/test-demangle.c: Rename getline to get_line to avoid + conflicts with system function of the same name. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/libiberty/cp-demangle.c gcc-4.4.5/libiberty/cp-demangle.c *** gcc-4.4.4/libiberty/cp-demangle.c Tue Jan 26 04:09:43 2010 --- gcc-4.4.5/libiberty/cp-demangle.c Thu Jun 10 15:31:56 2010 *************** struct d_print_info *** 302,307 **** --- 302,309 ---- /* The current index into any template argument packs we are using for printing. */ int pack_index; + /* Number of d_print_flush calls so far. */ + unsigned long int flush_count; }; #ifdef CP_DEMANGLE_DEBUG *************** d_print_init (struct d_print_info *dpi, *** 3064,3069 **** --- 3066,3072 ---- dpi->last_char = '\0'; dpi->templates = NULL; dpi->modifiers = NULL; + dpi->flush_count = 0; dpi->callback = callback; dpi->opaque = opaque; *************** d_print_flush (struct d_print_info *dpi) *** 3093,3098 **** --- 3096,3102 ---- dpi->buf[dpi->len] = '\0'; dpi->callback (dpi->buf, dpi->len, dpi->opaque); dpi->len = 0; + dpi->flush_count++; } /* Append characters and buffers for printing. */ *************** d_print_comp (struct d_print_info *dpi, *** 3819,3830 **** if (d_right (dc) != NULL) { size_t len; d_append_string (dpi, ", "); len = dpi->len; d_print_comp (dpi, d_right (dc)); /* If that didn't print anything (which can happen with empty template argument packs), remove the comma and space. */ ! if (dpi->len == len) dpi->len -= 2; } return; --- 3823,3840 ---- if (d_right (dc) != NULL) { size_t len; + unsigned long int flush_count; + /* Make sure ", " isn't flushed by d_append_string, otherwise + dpi->len -= 2 wouldn't work. */ + if (dpi->len >= sizeof (dpi->buf) - 2) + d_print_flush (dpi); d_append_string (dpi, ", "); len = dpi->len; + flush_count = dpi->flush_count; d_print_comp (dpi, d_right (dc)); /* If that didn't print anything (which can happen with empty template argument packs), remove the comma and space. */ ! if (dpi->flush_count == flush_count && dpi->len == len) dpi->len -= 2; } return; diff -Nrcpad gcc-4.4.4/libiberty/testsuite/demangle-expected gcc-4.4.5/libiberty/testsuite/demangle-expected *** gcc-4.4.4/libiberty/testsuite/demangle-expected Tue Jan 26 04:09:43 2010 --- gcc-4.4.5/libiberty/testsuite/demangle-expected Thu Jun 10 15:31:56 2010 *************** decltype (parm#1+((x())())) A::j(int, double) + --format=gnu-v3 + _ZN5aaaaa6bbbbbb5cccccIN23ddddddddddddddddddddddd3eeeENS2_4ffff16ggggggggggggggggENS0_9hhhhhhhhhES6_S6_S6_S6_S6_S6_S6_EE + aaaaa::bbbbbb::ccccc # # Used to crash the demangler. --format=gnu-v3 diff -Nrcpad gcc-4.4.4/libiberty/testsuite/test-demangle.c gcc-4.4.5/libiberty/testsuite/test-demangle.c *** gcc-4.4.4/libiberty/testsuite/test-demangle.c Thu Dec 21 01:29:27 2006 --- gcc-4.4.5/libiberty/testsuite/test-demangle.c Thu Jun 10 15:31:56 2010 *************** *** 1,5 **** /* Demangler test program, ! Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. Written by Zack Weinberg data; --- 46,52 ---- #define LINELEN 80 static void ! get_line(buf) struct line *buf; { char *data = buf->data; *************** main(argc, argv) *** 196,207 **** { const char *inp; ! getline (&format); if (feof (stdin)) break; ! getline (&input); ! getline (&expect); inp = protect_end (input.data); --- 196,207 ---- { const char *inp; ! get_line (&format); if (feof (stdin)) break; ! get_line (&input); ! get_line (&expect); inp = protect_end (input.data); *************** main(argc, argv) *** 322,328 **** if (no_params) { ! getline (&expect); result = cplus_demangle (inp, DMGL_ANSI|DMGL_TYPES); if (result --- 322,328 ---- if (no_params) { ! get_line (&expect); result = cplus_demangle (inp, DMGL_ANSI|DMGL_TYPES); if (result diff -Nrcpad gcc-4.4.4/libmudflap/ChangeLog gcc-4.4.5/libmudflap/ChangeLog *** gcc-4.4.4/libmudflap/ChangeLog Thu Apr 29 07:50:43 2010 --- gcc-4.4.5/libmudflap/ChangeLog Fri Oct 1 08:03:48 2010 *************** *** 1,3 **** --- 1,34 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + + 2010-06-20 Gerald Pfeifer + + Backport from mainline: + 2009-09-01 Loren J. Rittle + Andreas Schwab + + * testsuite/libmudflap.c/pass51-frag.c (MAP_FAILED): Define, + if not in system header; use it. On FreeBSD, must pass fd==-1 + with MAP_ANON flag. Correct mmap error check. + * testsuite/libmudflap.c/fail40-frag.c: Ditto. + + 2010-06-20 Gerald Pfeifer + + Backport from mainline: + 2009-09-01 Loren J. Rittle + + * mf-runtime.c (__mf_init): Support FreeBSD. + Prime mutex which calls calloc upon first lock to avoid deadlock. + * mf-hooks1.c (__mf_0fn_mmap): Support FreeBSD. + Ignore red zone allocation request for initial thread's stack. + + 2010-04-29 Jakub Jelinek + + PR other/43620 + * configure.ac (AM_INIT_AUTOMAKE): Add no-dist option. + * Makefile.in: Regenerated. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/libmudflap/Makefile.in gcc-4.4.5/libmudflap/Makefile.in *** gcc-4.4.4/libmudflap/Makefile.in Fri Sep 26 16:37:32 2008 --- gcc-4.4.5/libmudflap/Makefile.in Thu Apr 29 15:03:38 2010 *************** POST_UNINSTALL = : *** 38,50 **** build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! DIST_COMMON = $(am__configure_deps) $(nobase_libsubinclude_HEADERS) \ ! $(srcdir)/../compile $(srcdir)/../config.guess \ ! $(srcdir)/../config.sub $(srcdir)/../depcomp \ ! $(srcdir)/../install-sh $(srcdir)/../ltmain.sh \ ! $(srcdir)/../missing $(srcdir)/../mkinstalldirs \ ! $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ! $(srcdir)/config.h.in $(top_srcdir)/configure ChangeLog subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ --- 38,51 ---- build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! DIST_COMMON = $(srcdir)/../config.guess $(srcdir)/../config.sub \ ! ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ! $(top_srcdir)/configure $(am__configure_deps) \ ! $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \ ! $(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../compile \ ! $(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../depcomp \ ! $(srcdir)/../ltmain.sh $(srcdir)/../config.guess \ ! $(srcdir)/../config.sub $(nobase_libsubinclude_HEADERS) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ *************** CCLD = $(CC) *** 95,101 **** LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libmudflap_la_SOURCES) $(libmudflapth_la_SOURCES) - DIST_SOURCES = $(libmudflap_la_SOURCES) $(libmudflapth_la_SOURCES) MULTISRCTOP = MULTIBUILDTOP = MULTIDIRS = --- 96,101 ---- *************** HEADERS = $(nobase_libsubinclude_HEADERS *** 113,129 **** ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) - am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - DIST_ARCHIVES = $(distdir).tar.gz - GZIP_ENV = --best - distuninstallcheck_listfiles = find . -type f -print - distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ --- 113,118 ---- *************** GTAGS: *** 662,810 **** distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/.. $(distdir)/../config $(distdir)/testsuite - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) - dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - - dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - - dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - - dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - - dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - - dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - - # This target untars the dist file and tries a VPATH configuration. Then - # it guarantees that the distribution is self-contained by making another - # tarfile. - distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' - distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 - distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 check-am: all-am check: check-recursive all-am: Makefile $(LTLIBRARIES) all-multi $(HEADERS) config.h --- 651,656 ---- *************** uninstall-info: uninstall-info-recursive *** 897,913 **** .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-multi \ am--refresh check check-am clean clean-generic clean-libtool \ clean-multi clean-recursive clean-toolexeclibLTLIBRARIES ctags \ ! ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ ! dist-tarZ dist-zip distcheck distclean distclean-compile \ ! distclean-generic distclean-hdr distclean-libtool \ ! distclean-multi distclean-recursive distclean-tags \ ! distcleancheck distdir distuninstallcheck dvi dvi-am html \ ! html-am info info-am install install-am install-data \ ! install-data-am install-exec install-exec-am install-info \ ! install-info-am install-man install-multi \ ! install-nobase_libsubincludeHEADERS install-strip \ ! install-toolexeclibLTLIBRARIES installcheck installcheck-am \ ! installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-multi \ maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-multi \ --- 743,756 ---- .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-multi \ am--refresh check check-am clean clean-generic clean-libtool \ clean-multi clean-recursive clean-toolexeclibLTLIBRARIES ctags \ ! ctags-recursive distclean distclean-compile distclean-generic \ ! distclean-hdr distclean-libtool distclean-multi \ ! distclean-recursive distclean-tags dvi dvi-am html html-am \ ! info info-am install install-am install-data install-data-am \ ! install-exec install-exec-am install-info install-info-am \ ! install-man install-multi install-nobase_libsubincludeHEADERS \ ! install-strip install-toolexeclibLTLIBRARIES installcheck \ ! installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-multi \ maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-multi \ diff -Nrcpad gcc-4.4.4/libmudflap/configure.ac gcc-4.4.5/libmudflap/configure.ac *** gcc-4.4.4/libmudflap/configure.ac Fri Jan 23 04:58:03 2009 --- gcc-4.4.5/libmudflap/configure.ac Thu Apr 29 15:03:38 2010 *************** AC_CONFIG_SRCDIR(mf-runtime.c) *** 7,13 **** AC_CANONICAL_SYSTEM ACX_NONCANONICAL_TARGET ! AM_INIT_AUTOMAKE AC_MSG_CHECKING([for --enable-version-specific-runtime-libs]) AC_ARG_ENABLE(version-specific-runtime-libs, --- 7,13 ---- AC_CANONICAL_SYSTEM ACX_NONCANONICAL_TARGET ! AM_INIT_AUTOMAKE([no-dist]) AC_MSG_CHECKING([for --enable-version-specific-runtime-libs]) AC_ARG_ENABLE(version-specific-runtime-libs, diff -Nrcpad gcc-4.4.4/libmudflap/mf-hooks1.c gcc-4.4.5/libmudflap/mf-hooks1.c *** gcc-4.4.4/libmudflap/mf-hooks1.c Thu Apr 9 23:23:07 2009 --- gcc-4.4.5/libmudflap/mf-hooks1.c Sun Jun 20 19:40:29 2010 *************** WRAPPER(void, free, void *buf) *** 321,326 **** --- 321,331 ---- void * __mf_0fn_mmap (void *start, size_t l, int prot, int f, int fd, off_t off) { + #if defined(__FreeBSD__) + if (f == 0x1000 && fd == -1 && prot == 0 && off == 0) + return 0; + #endif /* Ignore red zone allocation request for initial thread's stack. */ + return (void *) -1; } #endif diff -Nrcpad gcc-4.4.4/libmudflap/mf-runtime.c gcc-4.4.5/libmudflap/mf-runtime.c *** gcc-4.4.4/libmudflap/mf-runtime.c Sat Jan 9 00:05:06 2010 --- gcc-4.4.5/libmudflap/mf-runtime.c Sun Jun 20 19:40:29 2010 *************** __mf_init () *** 695,700 **** --- 695,706 ---- if (LIKELY (__mf_starting_p == 0)) return; + #if defined(__FreeBSD__) && defined(LIBMUDFLAPTH) + pthread_self(); + LOCKTH (); + UNLOCKTH (); + #endif /* Prime mutex which calls calloc upon first lock to avoid deadlock. */ + /* This initial bootstrap phase requires that __mf_starting_p = 1. */ #ifdef PIC __mf_resolve_dynamics (); diff -Nrcpad gcc-4.4.4/libmudflap/testsuite/libmudflap.c/fail40-frag.c gcc-4.4.5/libmudflap/testsuite/libmudflap.c/fail40-frag.c *** gcc-4.4.4/libmudflap/testsuite/libmudflap.c/fail40-frag.c Wed Jun 15 16:15:40 2005 --- gcc-4.4.5/libmudflap/testsuite/libmudflap.c/fail40-frag.c Sun Jun 20 19:42:19 2010 *************** int main () *** 14,19 **** --- 14,22 ---- #ifndef MAP_ANONYMOUS #define MAP_ANONYMOUS MAP_ANON #endif + #ifndef MAP_FAILED + #define MAP_FAILED ((void *)-1) + #endif #ifdef HAVE_MMAP volatile unsigned char *p; unsigned num = getpagesize (); *************** int main () *** 23,30 **** /* Get a bit of usable address space. We really want an 2**N+1-sized object, so the low/high addresses wrap when hashed into the lookup cache. So we will manually unregister the entire mmap, then re-register a slice. */ ! p = mmap (NULL, num, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); ! if (p == NULL) return 1; /* Now unregister it, as if munmap was called. But don't actually munmap, so we can write into the memory. */ --- 26,33 ---- /* Get a bit of usable address space. We really want an 2**N+1-sized object, so the low/high addresses wrap when hashed into the lookup cache. So we will manually unregister the entire mmap, then re-register a slice. */ ! p = mmap (NULL, num, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); ! if (p == MAP_FAILED) return 1; /* Now unregister it, as if munmap was called. But don't actually munmap, so we can write into the memory. */ diff -Nrcpad gcc-4.4.4/libmudflap/testsuite/libmudflap.c/pass51-frag.c gcc-4.4.5/libmudflap/testsuite/libmudflap.c/pass51-frag.c *** gcc-4.4.4/libmudflap/testsuite/libmudflap.c/pass51-frag.c Wed Oct 13 18:27:16 2004 --- gcc-4.4.5/libmudflap/testsuite/libmudflap.c/pass51-frag.c Sun Jun 20 19:42:19 2010 *************** int main () *** 13,26 **** #ifndef MAP_ANONYMOUS #define MAP_ANONYMOUS MAP_ANON #endif #ifdef HAVE_MMAP void *p; unsigned pg = getpagesize (); int rc; p = mmap (NULL, 4 * pg, PROT_READ|PROT_WRITE, ! MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); ! if (p == NULL) return 1; memset (p, 0, 4*pg); --- 13,29 ---- #ifndef MAP_ANONYMOUS #define MAP_ANONYMOUS MAP_ANON #endif + #ifndef MAP_FAILED + #define MAP_FAILED ((void *)-1) + #endif #ifdef HAVE_MMAP void *p; unsigned pg = getpagesize (); int rc; p = mmap (NULL, 4 * pg, PROT_READ|PROT_WRITE, ! MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); ! if (p == MAP_FAILED) return 1; memset (p, 0, 4*pg); diff -Nrcpad gcc-4.4.4/libssp/ChangeLog gcc-4.4.5/libssp/ChangeLog *** gcc-4.4.4/libssp/ChangeLog Thu Apr 29 07:48:06 2010 --- gcc-4.4.5/libssp/ChangeLog Fri Oct 1 08:01:48 2010 *************** *** 1,3 **** --- 1,13 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + + 2010-04-29 Jakub Jelinek + + PR other/43620 + * configure.ac (AM_INIT_AUTOMAKE): Add no-dist option. + * Makefile.in: Regenerated. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/libssp/Makefile.in gcc-4.4.5/libssp/Makefile.in *** gcc-4.4.4/libssp/Makefile.in Fri Sep 26 16:43:24 2008 --- gcc-4.4.5/libssp/Makefile.in Thu Apr 29 15:03:38 2010 *************** POST_UNINSTALL = : *** 38,51 **** build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! DIST_COMMON = $(am__configure_deps) $(nobase_libsubinclude_HEADERS) \ ! $(srcdir)/../compile $(srcdir)/../config.guess \ ! $(srcdir)/../config.sub $(srcdir)/../depcomp \ ! $(srcdir)/../install-sh $(srcdir)/../ltmain.sh \ ! $(srcdir)/../missing $(srcdir)/../mkinstalldirs \ ! $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ! $(srcdir)/config.h.in $(top_srcdir)/configure \ ! $(top_srcdir)/ssp/ssp.h.in ChangeLog subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ --- 38,51 ---- build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! DIST_COMMON = $(srcdir)/../config.guess $(srcdir)/../config.sub \ ! ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ! $(top_srcdir)/configure $(am__configure_deps) \ ! $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \ ! $(top_srcdir)/ssp/ssp.h.in $(srcdir)/../compile \ ! $(srcdir)/../depcomp $(srcdir)/../ltmain.sh \ ! $(srcdir)/../config.guess $(srcdir)/../config.sub \ ! $(nobase_libsubinclude_HEADERS) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ *************** CCLD = $(CC) *** 94,100 **** LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libssp_la_SOURCES) $(libssp_nonshared_la_SOURCES) - DIST_SOURCES = $(libssp_la_SOURCES) $(libssp_nonshared_la_SOURCES) MULTISRCTOP = MULTIBUILDTOP = MULTIDIRS = --- 94,99 ---- *************** nobase_libsubincludeHEADERS_INSTALL = $( *** 105,121 **** HEADERS = $(nobase_libsubinclude_HEADERS) ETAGS = etags CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) - am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - DIST_ARCHIVES = $(distdir).tar.gz - GZIP_ENV = --best - distuninstallcheck_listfiles = find . -type f -print - distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ --- 104,109 ---- *************** GTAGS: *** 546,679 **** distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/.. $(distdir)/../config $(distdir)/ssp - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) - dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - - dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - - dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - - dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - - dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - - dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - - # This target untars the dist file and tries a VPATH configuration. Then - # it guarantees that the distribution is self-contained by making another - # tarfile. - distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' - distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 - distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) all-multi $(HEADERS) config.h --- 534,539 ---- *************** uninstall-am: uninstall-info-am uninstal *** 762,781 **** .PHONY: CTAGS GTAGS all all-am all-multi am--refresh check check-am \ clean clean-generic clean-libtool clean-multi \ ! clean-toolexeclibLTLIBRARIES ctags dist dist-all dist-bzip2 \ ! dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ ! distclean-compile distclean-generic distclean-hdr \ ! distclean-libtool distclean-multi distclean-tags \ ! distcleancheck distdir distuninstallcheck dvi dvi-am html \ ! html-am info info-am install install-am install-data \ ! install-data-am install-exec install-exec-am install-info \ ! install-info-am install-man install-multi \ ! install-nobase_libsubincludeHEADERS install-strip \ ! install-toolexeclibLTLIBRARIES installcheck installcheck-am \ ! installdirs maintainer-clean maintainer-clean-generic \ ! maintainer-clean-multi mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool mostlyclean-multi pdf \ ! pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ uninstall-nobase_libsubincludeHEADERS \ uninstall-toolexeclibLTLIBRARIES --- 622,639 ---- .PHONY: CTAGS GTAGS all all-am all-multi am--refresh check check-am \ clean clean-generic clean-libtool clean-multi \ ! clean-toolexeclibLTLIBRARIES ctags distclean distclean-compile \ ! distclean-generic distclean-hdr distclean-libtool \ ! distclean-multi distclean-tags dvi dvi-am html html-am info \ ! info-am install install-am install-data install-data-am \ ! install-exec install-exec-am install-info install-info-am \ ! install-man install-multi install-nobase_libsubincludeHEADERS \ ! install-strip install-toolexeclibLTLIBRARIES installcheck \ ! installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic maintainer-clean-multi mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ! mostlyclean-multi pdf pdf-am ps ps-am tags uninstall \ ! uninstall-am uninstall-info-am \ uninstall-nobase_libsubincludeHEADERS \ uninstall-toolexeclibLTLIBRARIES diff -Nrcpad gcc-4.4.4/libssp/configure.ac gcc-4.4.5/libssp/configure.ac *** gcc-4.4.4/libssp/configure.ac Fri Sep 29 21:18:51 2006 --- gcc-4.4.5/libssp/configure.ac Thu Apr 29 15:03:38 2010 *************** AC_CONFIG_SRCDIR(ssp.c) *** 8,14 **** AC_CANONICAL_SYSTEM ACX_NONCANONICAL_TARGET ! AM_INIT_AUTOMAKE AC_MSG_CHECKING([for --enable-version-specific-runtime-libs]) AC_ARG_ENABLE(version-specific-runtime-libs, --- 8,14 ---- AC_CANONICAL_SYSTEM ACX_NONCANONICAL_TARGET ! AM_INIT_AUTOMAKE([no-dist]) AC_MSG_CHECKING([for --enable-version-specific-runtime-libs]) AC_ARG_ENABLE(version-specific-runtime-libs, diff -Nrcpad gcc-4.4.4/maintainer-scripts/ChangeLog gcc-4.4.5/maintainer-scripts/ChangeLog *** gcc-4.4.4/maintainer-scripts/ChangeLog Thu Apr 29 07:51:40 2010 --- gcc-4.4.5/maintainer-scripts/ChangeLog Fri Oct 1 08:04:29 2010 *************** *** 1,3 **** --- 1,7 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + 2010-04-29 Release Manager * GCC 4.4.4 released. diff -Nrcpad gcc-4.4.4/zlib/ChangeLog gcc-4.4.5/zlib/ChangeLog *** gcc-4.4.4/zlib/ChangeLog Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/ChangeLog Fri Oct 1 08:05:22 2010 *************** *** 0 **** --- 1,879 ---- + 2010-10-01 Release Manager + + * GCC 4.4.5 released. + + 2010-04-29 Release Manager + + * GCC 4.4.4 released. + + 2010-01-21 Release Manager + + * GCC 4.4.3 released. + + 2009-10-15 Release Manager + + * GCC 4.4.2 released. + + 2009-07-22 Release Manager + + * GCC 4.4.1 released. + + 2009-04-21 Release Manager + + * GCC 4.4.0 released. + + + ChangeLog file for zlib + + Changes in 1.2.3 (18 July 2005) + - Apply security vulnerability fixes to contrib/infback9 as well + - Clean up some text files (carriage returns, trailing space) + - Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant] + + Changes in 1.2.2.4 (11 July 2005) + - Add inflatePrime() function for starting inflation at bit boundary + - Avoid some Visual C warnings in deflate.c + - Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit + compile + - Fix some spelling errors in comments [Betts] + - Correct inflateInit2() error return documentation in zlib.h + - Added zran.c example of compressed data random access to examples + directory, shows use of inflatePrime() + - Fix cast for assignments to strm->state in inflate.c and infback.c + - Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer] + - Move declarations of gf2 functions to right place in crc32.c [Oberhumer] + - Add cast in trees.c t avoid a warning [Oberhumer] + - Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer] + - Update make_vms.com [Zinser] + - Initialize state->write in inflateReset() since copied in inflate_fast() + - Be more strict on incomplete code sets in inflate_table() and increase + ENOUGH and MAXD -- this repairs a possible security vulnerability for + invalid inflate input. Thanks to Tavis Ormandy and Markus Oberhumer for + discovering the vulnerability and providing test cases. + - Add ia64 support to configure for HP-UX [Smith] + - Add error return to gzread() for format or i/o error [Levin] + - Use malloc.h for OS/2 [Necasek] + + Changes in 1.2.2.3 (27 May 2005) + - Replace 1U constants in inflate.c and inftrees.c for 64-bit compile + - Typecast fread() return values in gzio.c [Vollant] + - Remove trailing space in minigzip.c outmode (VC++ can't deal with it) + - Fix crc check bug in gzread() after gzungetc() [Heiner] + - Add the deflateTune() function to adjust internal compression parameters + - Add a fast gzip decompressor, gun.c, to examples (use of inflateBack) + - Remove an incorrect assertion in examples/zpipe.c + - Add C++ wrapper in infback9.h [Donais] + - Fix bug in inflateCopy() when decoding fixed codes + - Note in zlib.h how much deflateSetDictionary() actually uses + - Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used) + - Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer] + - Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer] + - Add gzdirect() function to indicate transparent reads + - Update contrib/minizip [Vollant] + - Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer] + - Add casts in crc32.c to avoid warnings [Oberhumer] + - Add contrib/masmx64 [Vollant] + - Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant] + + Changes in 1.2.2.2 (30 December 2004) + - Replace structure assignments in deflate.c and inflate.c with zmemcpy to + avoid implicit memcpy calls (portability for no-library compilation) + - Increase sprintf() buffer size in gzdopen() to allow for large numbers + - Add INFLATE_STRICT to check distances against zlib header + - Improve WinCE errno handling and comments [Chang] + - Remove comment about no gzip header processing in FAQ + - Add Z_FIXED strategy option to deflateInit2() to force fixed trees + - Add updated make_vms.com [Coghlan], update README + - Create a new "examples" directory, move gzappend.c there, add zpipe.c, + fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html. + - Add FAQ entry and comments in deflate.c on uninitialized memory access + - Add Solaris 9 make options in configure [Gilbert] + - Allow strerror() usage in gzio.c for STDC + - Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer] + - Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant] + - Use z_off_t for adler32_combine() and crc32_combine() lengths + - Make adler32() much faster for small len + - Use OS_CODE in deflate() default gzip header + + Changes in 1.2.2.1 (31 October 2004) + - Allow inflateSetDictionary() call for raw inflate + - Fix inflate header crc check bug for file names and comments + - Add deflateSetHeader() and gz_header structure for custom gzip headers + - Add inflateGetheader() to retrieve gzip headers + - Add crc32_combine() and adler32_combine() functions + - Add alloc_func, free_func, in_func, out_func to Z_PREFIX list + - Use zstreamp consistently in zlib.h (inflate_back functions) + - Remove GUNZIP condition from definition of inflate_mode in inflate.h + and in contrib/inflate86/inffast.S [Truta, Anderson] + - Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson] + - Update projects/README.projects and projects/visualc6 [Truta] + - Update win32/DLL_FAQ.txt [Truta] + - Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta] + - Deprecate Z_ASCII; use Z_TEXT instead [Truta] + - Use a new algorithm for setting strm->data_type in trees.c [Truta] + - Do not define an exit() prototype in zutil.c unless DEBUG defined + - Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta] + - Add comment in zlib.h for Z_NO_FLUSH parameter to deflate() + - Fix Darwin build version identification [Peterson] + + Changes in 1.2.2 (3 October 2004) + - Update zlib.h comments on gzip in-memory processing + - Set adler to 1 in inflateReset() to support Java test suite [Walles] + - Add contrib/dotzlib [Ravn] + - Update win32/DLL_FAQ.txt [Truta] + - Update contrib/minizip [Vollant] + - Move contrib/visual-basic.txt to old/ [Truta] + - Fix assembler builds in projects/visualc6/ [Truta] + + Changes in 1.2.1.2 (9 September 2004) + - Update INDEX file + - Fix trees.c to update strm->data_type (no one ever noticed!) + - Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown] + - Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE) + - Add limited multitasking protection to DYNAMIC_CRC_TABLE + - Add NO_vsnprintf for VMS in zutil.h [Mozilla] + - Don't declare strerror() under VMS [Mozilla] + - Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize + - Update contrib/ada [Anisimkov] + - Update contrib/minizip [Vollant] + - Fix configure to not hardcode directories for Darwin [Peterson] + - Fix gzio.c to not return error on empty files [Brown] + - Fix indentation; update version in contrib/delphi/ZLib.pas and + contrib/pascal/zlibpas.pas [Truta] + - Update mkasm.bat in contrib/masmx86 [Truta] + - Update contrib/untgz [Truta] + - Add projects/README.projects [Truta] + - Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta] + - Update win32/DLL_FAQ.txt [Truta] + - Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta] + - Remove an unnecessary assignment to curr in inftrees.c [Truta] + - Add OS/2 to exe builds in configure [Poltorak] + - Remove err dummy parameter in zlib.h [Kientzle] + + Changes in 1.2.1.1 (9 January 2004) + - Update email address in README + - Several FAQ updates + - Fix a big fat bug in inftrees.c that prevented decoding valid + dynamic blocks with only literals and no distance codes -- + Thanks to "Hot Emu" for the bug report and sample file + - Add a note to puff.c on no distance codes case. + + Changes in 1.2.1 (17 November 2003) + - Remove a tab in contrib/gzappend/gzappend.c + - Update some interfaces in contrib for new zlib functions + - Update zlib version number in some contrib entries + - Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta] + - Support shared libraries on Hurd and KFreeBSD [Brown] + - Fix error in NO_DIVIDE option of adler32.c + + Changes in 1.2.0.8 (4 November 2003) + - Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas + - Add experimental NO_DIVIDE #define in adler32.c + - Possibly faster on some processors (let me know if it is) + - Correct Z_BLOCK to not return on first inflate call if no wrap + - Fix strm->data_type on inflate() return to correctly indicate EOB + - Add deflatePrime() function for appending in the middle of a byte + - Add contrib/gzappend for an example of appending to a stream + - Update win32/DLL_FAQ.txt [Truta] + - Delete Turbo C comment in README [Truta] + - Improve some indentation in zconf.h [Truta] + - Fix infinite loop on bad input in configure script [Church] + - Fix gzeof() for concatenated gzip files [Johnson] + - Add example to contrib/visual-basic.txt [Michael B.] + - Add -p to mkdir's in Makefile.in [vda] + - Fix configure to properly detect presence or lack of printf functions + - Add AS400 support [Monnerat] + - Add a little Cygwin support [Wilson] + + Changes in 1.2.0.7 (21 September 2003) + - Correct some debug formats in contrib/infback9 + - Cast a type in a debug statement in trees.c + - Change search and replace delimiter in configure from % to # [Beebe] + - Update contrib/untgz to 0.2 with various fixes [Truta] + - Add build support for Amiga [Nikl] + - Remove some directories in old that have been updated to 1.2 + - Add dylib building for Mac OS X in configure and Makefile.in + - Remove old distribution stuff from Makefile + - Update README to point to DLL_FAQ.txt, and add comment on Mac OS X + - Update links in README + + Changes in 1.2.0.6 (13 September 2003) + - Minor FAQ updates + - Update contrib/minizip to 1.00 [Vollant] + - Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta] + - Update POSTINC comment for 68060 [Nikl] + - Add contrib/infback9 with deflate64 decoding (unsupported) + - For MVS define NO_vsnprintf and undefine FAR [van Burik] + - Add pragma for fdopen on MVS [van Burik] + + Changes in 1.2.0.5 (8 September 2003) + - Add OF to inflateBackEnd() declaration in zlib.h + - Remember start when using gzdopen in the middle of a file + - Use internal off_t counters in gz* functions to properly handle seeks + - Perform more rigorous check for distance-too-far in inffast.c + - Add Z_BLOCK flush option to return from inflate at block boundary + - Set strm->data_type on return from inflate + - Indicate bits unused, if at block boundary, and if in last block + - Replace size_t with ptrdiff_t in crc32.c, and check for correct size + - Add condition so old NO_DEFLATE define still works for compatibility + - FAQ update regarding the Windows DLL [Truta] + - INDEX update: add qnx entry, remove aix entry [Truta] + - Install zlib.3 into mandir [Wilson] + - Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta] + - Adapt the zlib interface to the new DLL convention guidelines [Truta] + - Introduce ZLIB_WINAPI macro to allow the export of functions using + the WINAPI calling convention, for Visual Basic [Vollant, Truta] + - Update msdos and win32 scripts and makefiles [Truta] + - Export symbols by name, not by ordinal, in win32/zlib.def [Truta] + - Add contrib/ada [Anisimkov] + - Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta] + - Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant] + - Add contrib/masm686 [Truta] + - Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm + [Truta, Vollant] + - Update contrib/delphi; rename to contrib/pascal; add example [Truta] + - Remove contrib/delphi2; add a new contrib/delphi [Truta] + - Avoid inclusion of the nonstandard in contrib/iostream, + and fix some method prototypes [Truta] + - Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip + [Truta] + - Avoid the use of backslash (\) in contrib/minizip [Vollant] + - Fix file time handling in contrib/untgz; update makefiles [Truta] + - Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines + [Vollant] + - Remove contrib/vstudio/vc15_16 [Vollant] + - Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta] + - Update README.contrib [Truta] + - Invert the assignment order of match_head and s->prev[...] in + INSERT_STRING [Truta] + - Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings + [Truta] + - Compare function pointers with 0, not with NULL or Z_NULL [Truta] + - Fix prototype of syncsearch in inflate.c [Truta] + - Introduce ASMINF macro to be enabled when using an ASM implementation + of inflate_fast [Truta] + - Change NO_DEFLATE to NO_GZCOMPRESS [Truta] + - Modify test_gzio in example.c to take a single file name as a + parameter [Truta] + - Exit the example.c program if gzopen fails [Truta] + - Add type casts around strlen in example.c [Truta] + - Remove casting to sizeof in minigzip.c; give a proper type + to the variable compared with SUFFIX_LEN [Truta] + - Update definitions of STDC and STDC99 in zconf.h [Truta] + - Synchronize zconf.h with the new Windows DLL interface [Truta] + - Use SYS16BIT instead of __32BIT__ to distinguish between + 16- and 32-bit platforms [Truta] + - Use far memory allocators in small 16-bit memory models for + Turbo C [Truta] + - Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in + zlibCompileFlags [Truta] + - Cygwin has vsnprintf [Wilson] + - In Windows16, OS_CODE is 0, as in MSDOS [Truta] + - In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson] + + Changes in 1.2.0.4 (10 August 2003) + - Minor FAQ updates + - Be more strict when checking inflateInit2's windowBits parameter + - Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well + - Add gzip wrapper option to deflateInit2 using windowBits + - Add updated QNX rule in configure and qnx directory [Bonnefoy] + - Make inflate distance-too-far checks more rigorous + - Clean up FAR usage in inflate + - Add casting to sizeof() in gzio.c and minigzip.c + + Changes in 1.2.0.3 (19 July 2003) + - Fix silly error in gzungetc() implementation [Vollant] + - Update contrib/minizip and contrib/vstudio [Vollant] + - Fix printf format in example.c + - Correct cdecl support in zconf.in.h [Anisimkov] + - Minor FAQ updates + + Changes in 1.2.0.2 (13 July 2003) + - Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons + - Attempt to avoid warnings in crc32.c for pointer-int conversion + - Add AIX to configure, remove aix directory [Bakker] + - Add some casts to minigzip.c + - Improve checking after insecure sprintf() or vsprintf() calls + - Remove #elif's from crc32.c + - Change leave label to inf_leave in inflate.c and infback.c to avoid + library conflicts + - Remove inflate gzip decoding by default--only enable gzip decoding by + special request for stricter backward compatibility + - Add zlibCompileFlags() function to return compilation information + - More typecasting in deflate.c to avoid warnings + - Remove leading underscore from _Capital #defines [Truta] + - Fix configure to link shared library when testing + - Add some Windows CE target adjustments [Mai] + - Remove #define ZLIB_DLL in zconf.h [Vollant] + - Add zlib.3 [Rodgers] + - Update RFC URL in deflate.c and algorithm.txt [Mai] + - Add zlib_dll_FAQ.txt to contrib [Truta] + - Add UL to some constants [Truta] + - Update minizip and vstudio [Vollant] + - Remove vestigial NEED_DUMMY_RETURN from zconf.in.h + - Expand use of NO_DUMMY_DECL to avoid all dummy structures + - Added iostream3 to contrib [Schwardt] + - Replace rewind() with fseek() for WinCE [Truta] + - Improve setting of zlib format compression level flags + - Report 0 for huffman and rle strategies and for level == 0 or 1 + - Report 2 only for level == 6 + - Only deal with 64K limit when necessary at compile time [Truta] + - Allow TOO_FAR check to be turned off at compile time [Truta] + - Add gzclearerr() function [Souza] + - Add gzungetc() function + + Changes in 1.2.0.1 (17 March 2003) + - Add Z_RLE strategy for run-length encoding [Truta] + - When Z_RLE requested, restrict matches to distance one + - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE + - Correct FASTEST compilation to allow level == 0 + - Clean up what gets compiled for FASTEST + - Incorporate changes to zconf.in.h [Vollant] + - Refine detection of Turbo C need for dummy returns + - Refine ZLIB_DLL compilation + - Include additional header file on VMS for off_t typedef + - Try to use _vsnprintf where it supplants vsprintf [Vollant] + - Add some casts in inffast.c + - Enchance comments in zlib.h on what happens if gzprintf() tries to + write more than 4095 bytes before compression + - Remove unused state from inflateBackEnd() + - Remove exit(0) from minigzip.c, example.c + - Get rid of all those darn tabs + - Add "check" target to Makefile.in that does the same thing as "test" + - Add "mostlyclean" and "maintainer-clean" targets to Makefile.in + - Update contrib/inflate86 [Anderson] + - Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant] + - Add msdos and win32 directories with makefiles [Truta] + - More additions and improvements to the FAQ + + Changes in 1.2.0 (9 March 2003) + - New and improved inflate code + - About 20% faster + - Does not allocate 32K window unless and until needed + - Automatically detects and decompresses gzip streams + - Raw inflate no longer needs an extra dummy byte at end + - Added inflateBack functions using a callback interface--even faster + than inflate, useful for file utilities (gzip, zip) + - Added inflateCopy() function to record state for random access on + externally generated deflate streams (e.g. in gzip files) + - More readable code (I hope) + - New and improved crc32() + - About 50% faster, thanks to suggestions from Rodney Brown + - Add deflateBound() and compressBound() functions + - Fix memory leak in deflateInit2() + - Permit setting dictionary for raw deflate (for parallel deflate) + - Fix const declaration for gzwrite() + - Check for some malloc() failures in gzio.c + - Fix bug in gzopen() on single-byte file 0x1f + - Fix bug in gzread() on concatenated file with 0x1f at end of buffer + and next buffer doesn't start with 0x8b + - Fix uncompress() to return Z_DATA_ERROR on truncated input + - Free memory at end of example.c + - Remove MAX #define in trees.c (conflicted with some libraries) + - Fix static const's in deflate.c, gzio.c, and zutil.[ch] + - Declare malloc() and free() in gzio.c if STDC not defined + - Use malloc() instead of calloc() in zutil.c if int big enough + - Define STDC for AIX + - Add aix/ with approach for compiling shared library on AIX + - Add HP-UX support for shared libraries in configure + - Add OpenUNIX support for shared libraries in configure + - Use $cc instead of gcc to build shared library + - Make prefix directory if needed when installing + - Correct Macintosh avoidance of typedef Byte in zconf.h + - Correct Turbo C memory allocation when under Linux + - Use libz.a instead of -lz in Makefile (assure use of compiled library) + - Update configure to check for snprintf or vsnprintf functions and their + return value, warn during make if using an insecure function + - Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that + is lost when library is used--resolution is to build new zconf.h + - Documentation improvements (in zlib.h): + - Document raw deflate and inflate + - Update RFCs URL + - Point out that zlib and gzip formats are different + - Note that Z_BUF_ERROR is not fatal + - Document string limit for gzprintf() and possible buffer overflow + - Note requirement on avail_out when flushing + - Note permitted values of flush parameter of inflate() + - Add some FAQs (and even answers) to the FAQ + - Add contrib/inflate86/ for x86 faster inflate + - Add contrib/blast/ for PKWare Data Compression Library decompression + - Add contrib/puff/ simple inflate for deflate format description + + Changes in 1.1.4 (11 March 2002) + - ZFREE was repeated on same allocation on some error conditions. + This creates a security problem described in + http://www.zlib.org/advisory-2002-03-11.txt + - Returned incorrect error (Z_MEM_ERROR) on some invalid data + - Avoid accesses before window for invalid distances with inflate window + less than 32K. + - force windowBits > 8 to avoid a bug in the encoder for a window size + of 256 bytes. (A complete fix will be available in 1.1.5). + + Changes in 1.1.3 (9 July 1998) + - fix "an inflate input buffer bug that shows up on rare but persistent + occasions" (Mark) + - fix gzread and gztell for concatenated .gz files (Didier Le Botlan) + - fix gzseek(..., SEEK_SET) in write mode + - fix crc check after a gzeek (Frank Faubert) + - fix miniunzip when the last entry in a zip file is itself a zip file + (J Lillge) + - add contrib/asm586 and contrib/asm686 (Brian Raiter) + See http://www.muppetlabs.com/~breadbox/software/assembly.html + - add support for Delphi 3 in contrib/delphi (Bob Dellaca) + - add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti) + - do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren) + - use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks) + - added a FAQ file + + - Support gzdopen on Mac with Metrowerks (Jason Linhart) + - Do not redefine Byte on Mac (Brad Pettit & Jason Linhart) + - define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young) + - avoid some warnings with Borland C (Tom Tanner) + - fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant) + - emulate utime() for WIN32 in contrib/untgz (Gilles Vollant) + - allow several arguments to configure (Tim Mooney, Frodo Looijaard) + - use libdir and includedir in Makefile.in (Tim Mooney) + - support shared libraries on OSF1 V4 (Tim Mooney) + - remove so_locations in "make clean" (Tim Mooney) + - fix maketree.c compilation error (Glenn, Mark) + - Python interface to zlib now in Python 1.5 (Jeremy Hylton) + - new Makefile.riscos (Rich Walker) + - initialize static descriptors in trees.c for embedded targets (Nick Smith) + - use "foo-gz" in example.c for RISCOS and VMS (Nick Smith) + - add the OS/2 files in Makefile.in too (Andrew Zabolotny) + - fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane) + - fix maketree.c to allow clean compilation of inffixed.h (Mark) + - fix parameter check in deflateCopy (Gunther Nikl) + - cleanup trees.c, use compressed_len only in debug mode (Christian Spieler) + - Many portability patches by Christian Spieler: + . zutil.c, zutil.h: added "const" for zmem* + . Make_vms.com: fixed some typos + . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists + . msdos/Makefile.msc: remove "default rtl link library" info from obj files + . msdos/Makefile.*: use model-dependent name for the built zlib library + . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc: + new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT) + - use define instead of typedef for Bytef also for MSC small/medium (Tom Lane) + - replace __far with _far for better portability (Christian Spieler, Tom Lane) + - fix test for errno.h in configure (Tim Newsham) + + Changes in 1.1.2 (19 March 98) + - added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant) + See http://www.winimage.com/zLibDll/unzip.html + - preinitialize the inflate tables for fixed codes, to make the code + completely thread safe (Mark) + - some simplifications and slight speed-up to the inflate code (Mark) + - fix gzeof on non-compressed files (Allan Schrum) + - add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs) + - use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn) + - added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny) + - add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori) + - do not wrap extern "C" around system includes (Tom Lane) + - mention zlib binding for TCL in README (Andreas Kupries) + - added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert) + - allow "make install prefix=..." even after configure (Glenn Randers-Pehrson) + - allow "configure --prefix $HOME" (Tim Mooney) + - remove warnings in example.c and gzio.c (Glenn Randers-Pehrson) + - move Makefile.sas to amiga/Makefile.sas + + Changes in 1.1.1 (27 Feb 98) + - fix macros _tr_tally_* in deflate.h for debug mode (Glenn Randers-Pehrson) + - remove block truncation heuristic which had very marginal effect for zlib + (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the + compression ratio on some files. This also allows inlining _tr_tally for + matches in deflate_slow. + - added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier) + + Changes in 1.1.0 (24 Feb 98) + - do not return STREAM_END prematurely in inflate (John Bowler) + - revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler) + - compile with -DFASTEST to get compression code optimized for speed only + - in minigzip, try mmap'ing the input file first (Miguel Albrecht) + - increase size of I/O buffers in minigzip.c and gzio.c (not a big gain + on Sun but significant on HP) + + - add a pointer to experimental unzip library in README (Gilles Vollant) + - initialize variable gcc in configure (Chris Herborth) + + Changes in 1.0.9 (17 Feb 1998) + - added gzputs and gzgets functions + - do not clear eof flag in gzseek (Mark Diekhans) + - fix gzseek for files in transparent mode (Mark Diekhans) + - do not assume that vsprintf returns the number of bytes written (Jens Krinke) + - replace EXPORT with ZEXPORT to avoid conflict with other programs + - added compress2 in zconf.h, zlib.def, zlib.dnt + - new asm code from Gilles Vollant in contrib/asm386 + - simplify the inflate code (Mark): + . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new() + . ZALLOC the length list in inflate_trees_fixed() instead of using stack + . ZALLOC the value area for huft_build() instead of using stack + . Simplify Z_FINISH check in inflate() + + - Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8 + - in inftrees.c, avoid cc -O bug on HP (Farshid Elahi) + - in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with + the declaration of FAR (Gilles VOllant) + - install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann) + - read_buf buf parameter of type Bytef* instead of charf* + - zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout) + - do not redeclare unlink in minigzip.c for WIN32 (John Bowler) + - fix check for presence of directories in "make install" (Ian Willis) + + Changes in 1.0.8 (27 Jan 1998) + - fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant) + - fix gzgetc and gzputc for big endian systems (Markus Oberhumer) + - added compress2() to allow setting the compression level + - include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong) + - use constant arrays for the static trees in trees.c instead of computing + them at run time (thanks to Ken Raeburn for this suggestion). To create + trees.h, compile with GEN_TREES_H and run "make test". + - check return code of example in "make test" and display result + - pass minigzip command line options to file_compress + - simplifying code of inflateSync to avoid gcc 2.8 bug + + - support CC="gcc -Wall" in configure -s (QingLong) + - avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn) + - fix test for shared library support to avoid compiler warnings + - zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant) + - check for TARGET_OS_MAC in addition to MACOS (Brad Pettit) + - do not use fdopen for Metrowerks on Mac (Brad Pettit)) + - add checks for gzputc and gzputc in example.c + - avoid warnings in gzio.c and deflate.c (Andreas Kleinert) + - use const for the CRC table (Ken Raeburn) + - fixed "make uninstall" for shared libraries + - use Tracev instead of Trace in infblock.c + - in example.c use correct compressed length for test_sync + - suppress +vnocompatwarnings in configure for HPUX (not always supported) + + Changes in 1.0.7 (20 Jan 1998) + - fix gzseek which was broken in write mode + - return error for gzseek to negative absolute position + - fix configure for Linux (Chun-Chung Chen) + - increase stack space for MSC (Tim Wegner) + - get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant) + - define EXPORTVA for gzprintf (Gilles Vollant) + - added man page zlib.3 (Rick Rodgers) + - for contrib/untgz, fix makedir() and improve Makefile + + - check gzseek in write mode in example.c + - allocate extra buffer for seeks only if gzseek is actually called + - avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant) + - add inflateSyncPoint in zconf.h + - fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def + + Changes in 1.0.6 (19 Jan 1998) + - add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and + gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code) + - Fix a deflate bug occurring only with compression level 0 (thanks to + Andy Buckler for finding this one). + - In minigzip, pass transparently also the first byte for .Z files. + - return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress() + - check Z_FINISH in inflate (thanks to Marc Schluper) + - Implement deflateCopy (thanks to Adam Costello) + - make static libraries by default in configure, add --shared option. + - move MSDOS or Windows specific files to directory msdos + - suppress the notion of partial flush to simplify the interface + (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4) + - suppress history buffer provided by application to simplify the interface + (this feature was not implemented anyway in 1.0.4) + - next_in and avail_in must be initialized before calling inflateInit or + inflateInit2 + - add EXPORT in all exported functions (for Windows DLL) + - added Makefile.nt (thanks to Stephen Williams) + - added the unsupported "contrib" directory: + contrib/asm386/ by Gilles Vollant + 386 asm code replacing longest_match(). + contrib/iostream/ by Kevin Ruland + A C++ I/O streams interface to the zlib gz* functions + contrib/iostream2/ by Tyge Løvset + Another C++ I/O streams interface + contrib/untgz/ by "Pedro A. Aranda Guti\irrez" + A very simple tar.gz file extractor using zlib + contrib/visual-basic.txt by Carlos Rios + How to use compress(), uncompress() and the gz* functions from VB. + - pass params -f (filtered data), -h (huffman only), -1 to -9 (compression + level) in minigzip (thanks to Tom Lane) + + - use const for rommable constants in deflate + - added test for gzseek and gztell in example.c + - add undocumented function inflateSyncPoint() (hack for Paul Mackerras) + - add undocumented function zError to convert error code to string + (for Tim Smithers) + - Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code. + - Use default memcpy for Symantec MSDOS compiler. + - Add EXPORT keyword for check_func (needed for Windows DLL) + - add current directory to LD_LIBRARY_PATH for "make test" + - create also a link for libz.so.1 + - added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura) + - use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX) + - added -soname for Linux in configure (Chun-Chung Chen, + - assign numbers to the exported functions in zlib.def (for Windows DLL) + - add advice in zlib.h for best usage of deflateSetDictionary + - work around compiler bug on Atari (cast Z_NULL in call of s->checkfn) + - allow compilation with ANSI keywords only enabled for TurboC in large model + - avoid "versionString"[0] (Borland bug) + - add NEED_DUMMY_RETURN for Borland + - use variable z_verbose for tracing in debug mode (L. Peter Deutsch). + - allow compilation with CC + - defined STDC for OS/2 (David Charlap) + - limit external names to 8 chars for MVS (Thomas Lund) + - in minigzip.c, use static buffers only for 16-bit systems + - fix suffix check for "minigzip -d foo.gz" + - do not return an error for the 2nd of two consecutive gzflush() (Felix Lee) + - use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau) + - added makelcc.bat for lcc-win32 (Tom St Denis) + - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe) + - Avoid expanded $Id: ChangeLog,v 1.5 2002/05/08 04:38:00 aoliva Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion. + - check for unistd.h in configure (for off_t) + - remove useless check parameter in inflate_blocks_free + - avoid useless assignment of s->check to itself in inflate_blocks_new + - do not flush twice in gzclose (thanks to Ken Raeburn) + - rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h + - use NO_ERRNO_H instead of enumeration of operating systems with errno.h + - work around buggy fclose on pipes for HP/UX + - support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson) + - fix configure if CC is already equal to gcc + + Changes in 1.0.5 (3 Jan 98) + - Fix inflate to terminate gracefully when fed corrupted or invalid data + - Use const for rommable constants in inflate + - Eliminate memory leaks on error conditions in inflate + - Removed some vestigial code in inflate + - Update web address in README + + Changes in 1.0.4 (24 Jul 96) + - In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF + bit, so the decompressor could decompress all the correct data but went + on to attempt decompressing extra garbage data. This affected minigzip too. + - zlibVersion and gzerror return const char* (needed for DLL) + - port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno) + - use z_error only for DEBUG (avoid problem with DLLs) + + Changes in 1.0.3 (2 Jul 96) + - use z_streamp instead of z_stream *, which is now a far pointer in MSDOS + small and medium models; this makes the library incompatible with previous + versions for these models. (No effect in large model or on other systems.) + - return OK instead of BUF_ERROR if previous deflate call returned with + avail_out as zero but there is nothing to do + - added memcmp for non STDC compilers + - define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly) + - define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO) + - better check for 16-bit mode MSC (avoids problem with Symantec) + + Changes in 1.0.2 (23 May 96) + - added Windows DLL support + - added a function zlibVersion (for the DLL support) + - fixed declarations using Bytef in infutil.c (pb with MSDOS medium model) + - Bytef is define's instead of typedef'd only for Borland C + - avoid reading uninitialized memory in example.c + - mention in README that the zlib format is now RFC1950 + - updated Makefile.dj2 + - added algorithm.doc + + Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion] + - fix array overlay in deflate.c which sometimes caused bad compressed data + - fix inflate bug with empty stored block + - fix MSDOS medium model which was broken in 0.99 + - fix deflateParams() which could generated bad compressed data. + - Bytef is define'd instead of typedef'ed (work around Borland bug) + - added an INDEX file + - new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32), + Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas) + - speed up adler32 for modern machines without auto-increment + - added -ansi for IRIX in configure + - static_init_done in trees.c is an int + - define unlink as delete for VMS + - fix configure for QNX + - add configure branch for SCO and HPUX + - avoid many warnings (unused variables, dead assignments, etc...) + - no fdopen for BeOS + - fix the Watcom fix for 32 bit mode (define FAR as empty) + - removed redefinition of Byte for MKWERKS + - work around an MWKERKS bug (incorrect merge of all .h files) + + Changes in 0.99 (27 Jan 96) + - allow preset dictionary shared between compressor and decompressor + - allow compression level 0 (no compression) + - add deflateParams in zlib.h: allow dynamic change of compression level + and compression strategy. + - test large buffers and deflateParams in example.c + - add optional "configure" to build zlib as a shared library + - suppress Makefile.qnx, use configure instead + - fixed deflate for 64-bit systems (detected on Cray) + - fixed inflate_blocks for 64-bit systems (detected on Alpha) + - declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2) + - always return Z_BUF_ERROR when deflate() has nothing to do + - deflateInit and inflateInit are now macros to allow version checking + - prefix all global functions and types with z_ with -DZ_PREFIX + - make falloc completely reentrant (inftrees.c) + - fixed very unlikely race condition in ct_static_init + - free in reverse order of allocation to help memory manager + - use zlib-1.0/* instead of zlib/* inside the tar.gz + - make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith + -Wconversion -Wstrict-prototypes -Wmissing-prototypes" + - allow gzread on concatenated .gz files + - deflateEnd now returns Z_DATA_ERROR if it was premature + - deflate is finally (?) fully deterministic (no matches beyond end of input) + - Document Z_SYNC_FLUSH + - add uninstall in Makefile + - Check for __cpluplus in zlib.h + - Better test in ct_align for partial flush + - avoid harmless warnings for Borland C++ + - initialize hash_head in deflate.c + - avoid warning on fdopen (gzio.c) for HP cc -Aa + - include stdlib.h for STDC compilers + - include errno.h for Cray + - ignore error if ranlib doesn't exist + - call ranlib twice for NeXTSTEP + - use exec_prefix instead of prefix for libz.a + - renamed ct_* as _tr_* to avoid conflict with applications + - clear z->msg in inflateInit2 before any error return + - initialize opaque in example.c, gzio.c, deflate.c and inflate.c + - fixed typo in zconf.h (_GNUC__ => __GNUC__) + - check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode) + - fix typo in Make_vms.com (f$trnlnm -> f$getsyi) + - in fcalloc, normalize pointer if size > 65520 bytes + - don't use special fcalloc for 32 bit Borland C++ + - use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc... + - use Z_BINARY instead of BINARY + - document that gzclose after gzdopen will close the file + - allow "a" as mode in gzopen. + - fix error checking in gzread + - allow skipping .gz extra-field on pipes + - added reference to Perl interface in README + - put the crc table in FAR data (I dislike more and more the medium model :) + - added get_crc_table + - added a dimension to all arrays (Borland C can't count). + - workaround Borland C bug in declaration of inflate_codes_new & inflate_fast + - guard against multiple inclusion of *.h (for precompiled header on Mac) + - Watcom C pretends to be Microsoft C small model even in 32 bit mode. + - don't use unsized arrays to avoid silly warnings by Visual C++: + warning C4746: 'inflate_mask' : unsized array treated as '__far' + (what's wrong with far data in far model?). + - define enum out of inflate_blocks_state to allow compilation with C++ + + Changes in 0.95 (16 Aug 95) + - fix MSDOS small and medium model (now easier to adapt to any compiler) + - inlined send_bits + - fix the final (:-) bug for deflate with flush (output was correct but + not completely flushed in rare occasions). + - default window size is same for compression and decompression + (it's now sufficient to set MAX_WBITS in zconf.h). + - voidp -> voidpf and voidnp -> voidp (for consistency with other + typedefs and because voidnp was not near in large model). + + Changes in 0.94 (13 Aug 95) + - support MSDOS medium model + - fix deflate with flush (could sometimes generate bad output) + - fix deflateReset (zlib header was incorrectly suppressed) + - added support for VMS + - allow a compression level in gzopen() + - gzflush now calls fflush + - For deflate with flush, flush even if no more input is provided. + - rename libgz.a as libz.a + - avoid complex expression in infcodes.c triggering Turbo C bug + - work around a problem with gcc on Alpha (in INSERT_STRING) + - don't use inline functions (problem with some gcc versions) + - allow renaming of Byte, uInt, etc... with #define. + - avoid warning about (unused) pointer before start of array in deflate.c + - avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c + - avoid reserved word 'new' in trees.c + + Changes in 0.93 (25 June 95) + - temporarily disable inline functions + - make deflate deterministic + - give enough lookahead for PARTIAL_FLUSH + - Set binary mode for stdin/stdout in minigzip.c for OS/2 + - don't even use signed char in inflate (not portable enough) + - fix inflate memory leak for segmented architectures + + Changes in 0.92 (3 May 95) + - don't assume that char is signed (problem on SGI) + - Clear bit buffer when starting a stored block + - no memcpy on Pyramid + - suppressed inftest.c + - optimized fill_window, put longest_match inline for gcc + - optimized inflate on stored blocks. + - untabify all sources to simplify patches + + Changes in 0.91 (2 May 95) + - Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h + - Document the memory requirements in zconf.h + - added "make install" + - fix sync search logic in inflateSync + - deflate(Z_FULL_FLUSH) now works even if output buffer too short + - after inflateSync, don't scare people with just "lo world" + - added support for DJGPP + + Changes in 0.9 (1 May 95) + - don't assume that zalloc clears the allocated memory (the TurboC bug + was Mark's bug after all :) + - let again gzread copy uncompressed data unchanged (was working in 0.71) + - deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented + - added a test of inflateSync in example.c + - moved MAX_WBITS to zconf.h because users might want to change that. + - document explicitly that zalloc(64K) on MSDOS must return a normalized + pointer (zero offset) + - added Makefiles for Microsoft C, Turbo C, Borland C++ + - faster crc32() + + Changes in 0.8 (29 April 95) + - added fast inflate (inffast.c) + - deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this + is incompatible with previous versions of zlib which returned Z_OK. + - work around a TurboC compiler bug (bad code for b << 0, see infutil.h) + (actually that was not a compiler bug, see 0.81 above) + - gzread no longer reads one extra byte in certain cases + - In gzio destroy(), don't reference a freed structure + - avoid many warnings for MSDOS + - avoid the ERROR symbol which is used by MS Windows + + Changes in 0.71 (14 April 95) + - Fixed more MSDOS compilation problems :( There is still a bug with + TurboC large model. + + Changes in 0.7 (14 April 95) + - Added full inflate support. + - Simplified the crc32() interface. The pre- and post-conditioning + (one's complement) is now done inside crc32(). WARNING: this is + incompatible with previous versions; see zlib.h for the new usage. + + Changes in 0.61 (12 April 95) + - workaround for a bug in TurboC. example and minigzip now work on MSDOS. + + Changes in 0.6 (11 April 95) + - added minigzip.c + - added gzdopen to reopen a file descriptor as gzFile + - added transparent reading of non-gziped files in gzread. + - fixed bug in gzread (don't read crc as data) + - fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose). + - don't allocate big arrays in the stack (for MSDOS) + - fix some MSDOS compilation problems + + Changes in 0.5: + - do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but + not yet Z_FULL_FLUSH. + - support decompression but only in a single step (forced Z_FINISH) + - added opaque object for zalloc and zfree. + - added deflateReset and inflateReset + - added a variable zlib_version for consistency checking. + - renamed the 'filter' parameter of deflateInit2 as 'strategy'. + Added Z_FILTERED and Z_HUFFMAN_ONLY constants. + + Changes in 0.4: + - avoid "zip" everywhere, use zlib instead of ziplib. + - suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush + if compression method == 8. + - added adler32 and crc32 + - renamed deflateOptions as deflateInit2, call one or the other but not both + - added the method parameter for deflateInit2. + - added inflateInit2 + - simplied considerably deflateInit and inflateInit by not supporting + user-provided history buffer. This is supported only in deflateInit2 + and inflateInit2. + + Changes in 0.3: + - prefix all macro names with Z_ + - use Z_FINISH instead of deflateEnd to finish compression. + - added Z_HUFFMAN_ONLY + - added gzerror() diff -Nrcpad gcc-4.4.4/zlib/ChangeLog.gcj gcc-4.4.5/zlib/ChangeLog.gcj *** gcc-4.4.4/zlib/ChangeLog.gcj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/ChangeLog.gcj Sun Mar 1 17:49:31 2009 *************** *** 0 **** --- 1,291 ---- + 2009-03-01 Ralf Wildenhues + + * configure: Regenerate. + + 2008-12-18 Ralf Wildenhues + + * configure: Regenerate. + + 2008-09-26 Peter O'Gorman + Steve Ellcey + + * configure: Regenerate for new libtool. + * Makefile.in: Ditto. + + 2008-06-17 Ralf Wildenhues + + * Makefile.in: Regenerate. + * configure: Regenerate. + + 2008-03-16 Ralf Wildenhues + + * aclocal.m4: Regenerate. + * configure: Likewise. + * Makefile.in: Likewise. + + 2008-01-24 David Edelsohn + + * configure: Regenerate. + + 2007-07-05 H.J. Lu + + * aclocal.m4: Regenerated. + + 2007-05-23 Steve Ellcey + + * Makefile.in: Regenerate. + * configure: Regenerate. + * aclocal.m4: Regenerate. + + 2007-04-14 Steve Ellcey + + * Makefile.am: Add -I .. to ACLOCAL_AMFLAGS. + * Makefile.in: Regenerate. + + 2007-03-01 Brooks Moses + + * Makefile.am: Add dummy install-pdf target. + * Makefile.in: Regenerate + + 2007-01-16 Jack Howarth + + * Makefile.am: Add ACLOCAL_AMFLAGS to use multi.m4. + * aclocal.m4: Regenerate. + * configure: Regenerate. + * Makefile.in: Regenerate. + + 2006-06-13 Carlos O'Donell + + * Makefile.am: Add html and install-html stubs. + * Makefile.in: Regenerate. + * aclocal.m4: Regenerate. + + 2005-06-14 Tom Tromey + + * Imported zlib 1.2.3; merged local changes. + + 2005-06-14 Tom Tromey + + PR libgcj/19877: + * configure, aclocal.m4, Makefile.in: Rebuilt. + + 2005-06-06 Rainer Orth + + * zconf.h (NO_vsnprintf): Define on Tru64 UNIX V4.0. + + 2005-05-09 Mike Stump + + * configure: Regenerate. + + 2005-04-12 Mike Stump + + * configure: Regenerate. + + 2004-11-24 Kelley Cook + + * configure: Regenerate for libtool change. + + 2004-11-24 Kelley Cook + + * Makefile.in, aclocal.m4: Regenerate with automake 1.9.3. + + 2004-11-22 Eric Botcazou + + * zconf.h: Define NO_vsnprintf on Solaris 2.5.1. + + 2004-10-11 Tom Tromey + + PR libgcj/14856: + * Imported zlib 1.2.1; merged local changes. + + 2005-06-15 Paolo Bonzini + + * Makefile.am: Remove useless multilib rules. + * configure.ac: Rewrite multilib support to use + features of recent automakes. + * aclocal.m4: Regenerate with Automake 1.8.5. + * Makefile.in: Regenerate with Automake 1.8.5. + * configure: Regenerate. + + 2004-04-12 Kelley Cook + + * Makefile.am: Add in libz_a_CFLAGS as recommended by automake doc. + * Makefile.in: Regenerate with automake 1.7.9. + * aclocal.m4: Likewise. + * configure: Regenerate. + + 2004-04-10 Kelley Cook + + * configure.in: Rename file to ... + * configure.ac: ...this. + * Makefile.in: Regenerate. + + 2004-04-09 Nathanael Nerode + + * configure.in: Update to autoconf 2.59; clean up slightly. + * acinclude.m4: Update to autoconf 2.59. + * aclocal.m4: Regenerate. + * Makefile.in: Regenerate. + * configure: Regenerate. + + 2004-01-14 Kelley Cook + + * configure.in: Add in AC_PREREQ(2.13) + + 2003-09-09 Alan Modra + + * configure: Regenerate. + + 2003-07-11 Nathanael Nerode + + PR bootstrap/7126 + * configure.in: Correct zlib version number. + * configure: Regenerate. + + 2003-07-11 Gerald Pfeifer + + * README: Note that zlib is not part of GCC. + + 2003-03-12 Andreas Schwab + + * configure.in: Avoid trailing /. in toolexeclibdir. + * configure: Rebuilt. + + 2003-02-20 Alexandre Oliva + + * configure.in: Propagate ORIGINAL_LD_FOR_MULTILIBS to + config.status. + * configure: Rebuilt. + + 2003-02-19 Alexandre Oliva + + * configure.in (multiosdir): Set to nothing if compiler is not GCC + or if it doesn't support -print-multi-os-directory. + * configure: Rebuilt. + + 2002-09-22 Kaveh R. Ghazi + + * Makefile.am (all-multi): Fix multilib parallel build. + + 2002-05-16 Rainer Orth + + * configure.in: Allow for PWDCMD to override hardcoded pwd. + * configure: Regenerate. + + * ChangeLog: Move entries to ChangeLog.gcj. + + 2002-05-08 Alexandre Oliva + + * configure.in (ORIGINAL_LD_FOR_MULTILIBS): Preserve LD at + script entry, and set LD to it when configuring multilibs. + * configure: Rebuilt. + + 2002-03-17 Bryce McKinlay + + * Makefile.am: Make target library a convenience library. + * Makefile.in: Rebuilt. + + 2002-03-11 Tom Tromey + + * ChangeLog.gcj: Imported 1.1.4, while preserving local changes. + + 2001-07-03 Tom Tromey + + Fix for PR bootstrap/3281: + * configure, Makefile.in: Rebuilt. + * configure.in: Set mkinstalldirs, for in-tree build. + + 2001-06-09 Alexandre Oliva , Stephen L Moshier + + * configure.in (AC_EXEEXT): Work around in case it expands to + nothing, as in autoconf 2.50. + * configure: Rebuilt. + + 2001-05-13 Alexandre Oliva + + * acinclude.m4: Use ../libtool.m4. + * configure.in: Use ${zlib_basedir}/.. for AC_CONFIG_AUX_DIR. + * acinclude.m4, configure, Makefile.in: Rebuilt. + + 2000-10-24 Chris Demetriou + + * configure.in: Invoke AC_PROG_CPP unconditionally before + conditional feature tests. + + 2000-10-10 Alexandre Oliva + + * configure.in (zlib_basedir): Cope with empty with_target_subdir + * configure: Rebuilt. + + 2000-09-06 Alexandre Oliva + + * configure.in (multilib): Enable by default only for target. + * configure: Rebuilt. + + Sun Sep 3 12:37:12 2000 Anthony Green + + * configure.in: Add TARGET_LIBRARY conditional. + * configure: Rebuilt. + * Makefile.am: If we're building a build host library, call the + library libz.a and don't use libtool. + * Makefile.in: Rebuilt. + + 1999-10-04 Tom Tromey + + * configure: Rebuilt. + * configure.in: Call AC_EXEEXT after LIB_AC_PROG_CC, but don't + actually let AC_EXEEXT run. + + 1999-09-28 Tom Tromey + + * aclocal.m4, configure: Rebuilt. + * acinclude.m4 (LIB_AC_PROG_CC): Provide appropriate AC_PROG_ symbol. + + Mon Aug 9 18:33:38 1999 Rainer Orth + + * Makefile.in: Rebuilt. + * Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native + builds. + + * configure: Rebuilt. + * configure.in: Properly align --help output, fix capitalization. + + 1999-08-02 Tom Tromey + + * aclocal.m4, configure: Rebuilt for new libtool. + + 1999-07-19 Alexandre Oliva + + * Makefile.am (*-recursive, *-am, *-multi): Automake does not + generate *-recursive for this Makefile, use *-am instead. + * Makefile.in: Rebuilt. + + 1999-06-21 Tom Tromey + + * Makefile.in: Rebuilt. + * Makefile.am (libzgcj_la_LDFLAGS): Use -version-info, not + -release. + + * Makefile.in: Rebuilt. + * Makefile.am (toolexeclibdir): Define as libdir when + appropriate. + * configure: Rebuilt. + * configure.in (USE_LIBDIR): New conditional. + + 1999-05-10 Tom Tromey + + * configure, Makefile.in: Rebuilt. + * Makefile.am (EXTRA_LTLIBRARIES): New macro. + (toolexeclib_LTLIBRARIES): Use @target_all@. + * configure.in: Recognize --with-system-zlib. Subst target_all. + + 1999-05-04 Tom Tromey + + * Makefile.in: Replace with automake-generated file. + * Makefile.am: New file. + * configure: Replaced with autoconf-generated script. + * aclocal.m4: New file. + * acinclude.m4: New file. + * configure.in: New file. + * Makefile: Removed. + diff -Nrcpad gcc-4.4.4/zlib/FAQ gcc-4.4.5/zlib/FAQ *** gcc-4.4.4/zlib/FAQ Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/FAQ Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,339 ---- + + Frequently Asked Questions about zlib + + + If your question is not there, please check the zlib home page + http://www.zlib.org which may have more recent information. + The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html + + + 1. Is zlib Y2K-compliant? + + Yes. zlib doesn't handle dates. + + 2. Where can I get a Windows DLL version? + + The zlib sources can be compiled without change to produce a DLL. + See the file win32/DLL_FAQ.txt in the zlib distribution. + Pointers to the precompiled DLL are found in the zlib web site at + http://www.zlib.org. + + 3. Where can I get a Visual Basic interface to zlib? + + See + * http://www.dogma.net/markn/articles/zlibtool/zlibtool.htm + * contrib/visual-basic.txt in the zlib distribution + * win32/DLL_FAQ.txt in the zlib distribution + + 4. compress() returns Z_BUF_ERROR. + + Make sure that before the call of compress, the length of the compressed + buffer is equal to the total size of the compressed buffer and not + zero. For Visual Basic, check that this parameter is passed by reference + ("as any"), not by value ("as long"). + + 5. deflate() or inflate() returns Z_BUF_ERROR. + + Before making the call, make sure that avail_in and avail_out are not + zero. When setting the parameter flush equal to Z_FINISH, also make sure + that avail_out is big enough to allow processing all pending input. + Note that a Z_BUF_ERROR is not fatal--another call to deflate() or + inflate() can be made with more input or output space. A Z_BUF_ERROR + may in fact be unavoidable depending on how the functions are used, since + it is not possible to tell whether or not there is more output pending + when strm.avail_out returns with zero. + + 6. Where's the zlib documentation (man pages, etc.)? + + It's in zlib.h for the moment, and Francis S. Lin has converted it to a + web page zlib.html. Volunteers to transform this to Unix-style man pages, + please contact us (zlib@gzip.org). Examples of zlib usage are in the files + example.c and minigzip.c. + + 7. Why don't you use GNU autoconf or libtool or ...? + + Because we would like to keep zlib as a very small and simple + package. zlib is rather portable and doesn't need much configuration. + + 8. I found a bug in zlib. + + Most of the time, such problems are due to an incorrect usage of + zlib. Please try to reproduce the problem with a small program and send + the corresponding source to us at zlib@gzip.org . Do not send + multi-megabyte data files without prior agreement. + + 9. Why do I get "undefined reference to gzputc"? + + If "make test" produces something like + + example.o(.text+0x154): undefined reference to `gzputc' + + check that you don't have old files libz.* in /usr/lib, /usr/local/lib or + /usr/X11R6/lib. Remove any old versions, then do "make install". + + 10. I need a Delphi interface to zlib. + + See the contrib/delphi directory in the zlib distribution. + + 11. Can zlib handle .zip archives? + + Not by itself, no. See the directory contrib/minizip in the zlib + distribution. + + 12. Can zlib handle .Z files? + + No, sorry. You have to spawn an uncompress or gunzip subprocess, or adapt + the code of uncompress on your own. + + 13. How can I make a Unix shared library? + + make clean + ./configure -s + make + + 14. How do I install a shared zlib library on Unix? + + After the above, then: + + make install + + However, many flavors of Unix come with a shared zlib already installed. + Before going to the trouble of compiling a shared version of zlib and + trying to install it, you may want to check if it's already there! If you + can #include , it's there. The -lz option will probably link to it. + + 15. I have a question about OttoPDF. + + We are not the authors of OttoPDF. The real author is on the OttoPDF web + site: Joel Hainley, jhainley@myndkryme.com. + + 16. Can zlib decode Flate data in an Adobe PDF file? + + Yes. See http://www.fastio.com/ (ClibPDF), or http://www.pdflib.com/ . + To modify PDF forms, see http://sourceforge.net/projects/acroformtool/ . + + 17. Why am I getting this "register_frame_info not found" error on Solaris? + + After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib + generates an error such as: + + ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so: + symbol __register_frame_info: referenced symbol not found + + The symbol __register_frame_info is not part of zlib, it is generated by + the C compiler (cc or gcc). You must recompile applications using zlib + which have this problem. This problem is specific to Solaris. See + http://www.sunfreeware.com for Solaris versions of zlib and applications + using zlib. + + 18. Why does gzip give an error on a file I make with compress/deflate? + + The compress and deflate functions produce data in the zlib format, which + is different and incompatible with the gzip format. The gz* functions in + zlib on the other hand use the gzip format. Both the zlib and gzip + formats use the same compressed data format internally, but have different + headers and trailers around the compressed data. + + 19. Ok, so why are there two different formats? + + The gzip format was designed to retain the directory information about + a single file, such as the name and last modification date. The zlib + format on the other hand was designed for in-memory and communication + channel applications, and has a much more compact header and trailer and + uses a faster integrity check than gzip. + + 20. Well that's nice, but how do I make a gzip file in memory? + + You can request that deflate write the gzip format instead of the zlib + format using deflateInit2(). You can also request that inflate decode + the gzip format using inflateInit2(). Read zlib.h for more details. + + 21. Is zlib thread-safe? + + Yes. However any library routines that zlib uses and any application- + provided memory allocation routines must also be thread-safe. zlib's gz* + functions use stdio library routines, and most of zlib's functions use the + library memory allocation routines by default. zlib's Init functions allow + for the application to provide custom memory allocation routines. + + Of course, you should only operate on any given zlib or gzip stream from a + single thread at a time. + + 22. Can I use zlib in my commercial application? + + Yes. Please read the license in zlib.h. + + 23. Is zlib under the GNU license? + + No. Please read the license in zlib.h. + + 24. The license says that altered source versions must be "plainly marked". So + what exactly do I need to do to meet that requirement? + + You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In + particular, the final version number needs to be changed to "f", and an + identification string should be appended to ZLIB_VERSION. Version numbers + x.x.x.f are reserved for modifications to zlib by others than the zlib + maintainers. For example, if the version of the base zlib you are altering + is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and + ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3". You can also + update the version strings in deflate.c and inftrees.c. + + For altered source distributions, you should also note the origin and + nature of the changes in zlib.h, as well as in ChangeLog and README, along + with the dates of the alterations. The origin should include at least your + name (or your company's name), and an email address to contact for help or + issues with the library. + + Note that distributing a compiled zlib library along with zlib.h and + zconf.h is also a source distribution, and so you should change + ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes + in zlib.h as you would for a full source distribution. + + 25. Will zlib work on a big-endian or little-endian architecture, and can I + exchange compressed data between them? + + Yes and yes. + + 26. Will zlib work on a 64-bit machine? + + It should. It has been tested on 64-bit machines, and has no dependence + on any data types being limited to 32-bits in length. If you have any + difficulties, please provide a complete problem report to zlib@gzip.org + + 27. Will zlib decompress data from the PKWare Data Compression Library? + + No. The PKWare DCL uses a completely different compressed data format + than does PKZIP and zlib. However, you can look in zlib's contrib/blast + directory for a possible solution to your problem. + + 28. Can I access data randomly in a compressed stream? + + No, not without some preparation. If when compressing you periodically + use Z_FULL_FLUSH, carefully write all the pending data at those points, + and keep an index of those locations, then you can start decompression + at those points. You have to be careful to not use Z_FULL_FLUSH too + often, since it can significantly degrade compression. + + 29. Does zlib work on MVS, OS/390, CICS, etc.? + + We don't know for sure. We have heard occasional reports of success on + these systems. If you do use it on one of these, please provide us with + a report, instructions, and patches that we can reference when we get + these questions. Thanks. + + 30. Is there some simpler, easier to read version of inflate I can look at + to understand the deflate format? + + First off, you should read RFC 1951. Second, yes. Look in zlib's + contrib/puff directory. + + 31. Does zlib infringe on any patents? + + As far as we know, no. In fact, that was originally the whole point behind + zlib. Look here for some more information: + + http://www.gzip.org/#faq11 + + 32. Can zlib work with greater than 4 GB of data? + + Yes. inflate() and deflate() will process any amount of data correctly. + Each call of inflate() or deflate() is limited to input and output chunks + of the maximum value that can be stored in the compiler's "unsigned int" + type, but there is no limit to the number of chunks. Note however that the + strm.total_in and strm_total_out counters may be limited to 4 GB. These + counters are provided as a convenience and are not used internally by + inflate() or deflate(). The application can easily set up its own counters + updated after each call of inflate() or deflate() to count beyond 4 GB. + compress() and uncompress() may be limited to 4 GB, since they operate in a + single call. gzseek() and gztell() may be limited to 4 GB depending on how + zlib is compiled. See the zlibCompileFlags() function in zlib.h. + + The word "may" appears several times above since there is a 4 GB limit + only if the compiler's "long" type is 32 bits. If the compiler's "long" + type is 64 bits, then the limit is 16 exabytes. + + 33. Does zlib have any security vulnerabilities? + + The only one that we are aware of is potentially in gzprintf(). If zlib + is compiled to use sprintf() or vsprintf(), then there is no protection + against a buffer overflow of a 4K string space, other than the caller of + gzprintf() assuring that the output will not exceed 4K. On the other + hand, if zlib is compiled to use snprintf() or vsnprintf(), which should + normally be the case, then there is no vulnerability. The ./configure + script will display warnings if an insecure variation of sprintf() will + be used by gzprintf(). Also the zlibCompileFlags() function will return + information on what variant of sprintf() is used by gzprintf(). + + If you don't have snprintf() or vsnprintf() and would like one, you can + find a portable implementation here: + + http://www.ijs.si/software/snprintf/ + + Note that you should be using the most recent version of zlib. Versions + 1.1.3 and before were subject to a double-free vulnerability. + + 34. Is there a Java version of zlib? + + Probably what you want is to use zlib in Java. zlib is already included + as part of the Java SDK in the java.util.zip package. If you really want + a version of zlib written in the Java language, look on the zlib home + page for links: http://www.zlib.org/ + + 35. I get this or that compiler or source-code scanner warning when I crank it + up to maximally-pedantic. Can't you guys write proper code? + + Many years ago, we gave up attempting to avoid warnings on every compiler + in the universe. It just got to be a waste of time, and some compilers + were downright silly. So now, we simply make sure that the code always + works. + + 36. Valgrind (or some similar memory access checker) says that deflate is + performing a conditional jump that depends on an uninitialized value. + Isn't that a bug? + + No. That is intentional for performance reasons, and the output of + deflate is not affected. This only started showing up recently since + zlib 1.2.x uses malloc() by default for allocations, whereas earlier + versions used calloc(), which zeros out the allocated memory. + + 37. Will zlib read the (insert any ancient or arcane format here) compressed + data format? + + Probably not. Look in the comp.compression FAQ for pointers to various + formats and associated software. + + 38. How can I encrypt/decrypt zip files with zlib? + + zlib doesn't support encryption. The original PKZIP encryption is very weak + and can be broken with freely available programs. To get strong encryption, + use GnuPG, http://www.gnupg.org/ , which already includes zlib compression. + For PKZIP compatible "encryption", look at http://www.info-zip.org/ + + 39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings? + + "gzip" is the gzip format, and "deflate" is the zlib format. They should + probably have called the second one "zlib" instead to avoid confusion + with the raw deflate compressed data format. While the HTTP 1.1 RFC 2616 + correctly points to the zlib specification in RFC 1950 for the "deflate" + transfer encoding, there have been reports of servers and browsers that + incorrectly produce or expect raw deflate data per the deflate + specficiation in RFC 1951, most notably Microsoft. So even though the + "deflate" transfer encoding using the zlib format would be the more + efficient approach (and in fact exactly what the zlib format was designed + for), using the "gzip" transfer encoding is probably more reliable due to + an unfortunate choice of name on the part of the HTTP 1.1 authors. + + Bottom line: use the gzip format for HTTP 1.1 encoding. + + 40. Does zlib support the new "Deflate64" format introduced by PKWare? + + No. PKWare has apparently decided to keep that format proprietary, since + they have not documented it as they have previous compression formats. + In any case, the compression improvements are so modest compared to other + more modern approaches, that it's not worth the effort to implement. + + 41. Can you please sign these lengthy legal documents and fax them back to us + so that we can use your software in our product? + + No. Go away. Shoo. diff -Nrcpad gcc-4.4.4/zlib/INDEX gcc-4.4.5/zlib/INDEX *** gcc-4.4.4/zlib/INDEX Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/INDEX Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,51 ---- + ChangeLog history of changes + FAQ Frequently Asked Questions about zlib + INDEX this file + Makefile makefile for Unix (generated by configure) + Makefile.in makefile for Unix (template for configure) + README guess what + algorithm.txt description of the (de)compression algorithm + configure configure script for Unix + zconf.in.h template for zconf.h (used by configure) + + amiga/ makefiles for Amiga SAS C + as400/ makefiles for IBM AS/400 + msdos/ makefiles for MSDOS + old/ makefiles for various architectures and zlib documentation + files that have not yet been updated for zlib 1.2.x + projects/ projects for various Integrated Development Environments + qnx/ makefiles for QNX + win32/ makefiles for Windows + + zlib public header files (must be kept): + zconf.h + zlib.h + + private source files used to build the zlib library: + adler32.c + compress.c + crc32.c + crc32.h + deflate.c + deflate.h + gzio.c + infback.c + inffast.c + inffast.h + inffixed.h + inflate.c + inflate.h + inftrees.c + inftrees.h + trees.c + trees.h + uncompr.c + zutil.c + zutil.h + + source files for sample programs: + example.c + minigzip.c + + unsupported contribution by third parties + See contrib/README.contrib diff -Nrcpad gcc-4.4.4/zlib/Makefile.am gcc-4.4.5/zlib/Makefile.am *** gcc-4.4.4/zlib/Makefile.am Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/Makefile.am Sat Apr 14 19:52:27 2007 *************** *** 0 **** --- 1,69 ---- + ## Process this file with automake to create Makefile.in. + + AUTOMAKE_OPTIONS = 1.8 cygnus + + ACLOCAL_AMFLAGS = -I .. -I ../config + + ZLIB_SOURCES = adler32.c compress.c crc32.c crc32.h deflate.c \ + deflate.h gzio.c infback.c inffast.c inffast.h inffixed.h inflate.c \ + inflate.h inftrees.c inftrees.h trees.c trees.h uncompr.c zconf.h \ + zconf.in.h zlib.h zutil.c zutil.h + + if TARGET_LIBRARY + noinst_LTLIBRARIES = libzgcj_convenience.la + libzgcj_convenience_la_SOURCES = $(ZLIB_SOURCES) + else + toolexeclib_LIBRARIES = libz.a + libz_a_SOURCES = $(ZLIB_SOURCES) + libz_a_CFLAGS = $(AM_CFLAGS) + endif + + # Work around what appears to be a GNU make bug handling MAKEFLAGS + # values defined in terms of make variables, as is the case for CC and + # friends when we are called from the top level Makefile. + AM_MAKEFLAGS = \ + "AR_FLAGS=$(AR_FLAGS)" \ + "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ + "CFLAGS=$(CFLAGS)" \ + "CXXFLAGS=$(CXXFLAGS)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ + "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ + "LDFLAGS=$(LDFLAGS)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ + "MAKE=$(MAKE)" \ + "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ + "PICFLAG=$(PICFLAG)" \ + "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ + "SHELL=$(SHELL)" \ + "EXPECT=$(EXPECT)" \ + "RUNTEST=$(RUNTEST)" \ + "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ + "exec_prefix=$(exec_prefix)" \ + "infodir=$(infodir)" \ + "libdir=$(libdir)" \ + "prefix=$(prefix)" \ + "tooldir=$(tooldir)" \ + "AR=$(AR)" \ + "AS=$(AS)" \ + "CC=$(CC)" \ + "CXX=$(CXX)" \ + "LD=$(LD)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "NM=$(NM)" \ + "PICFLAG=$(PICFLAG)" \ + "RANLIB=$(RANLIB)" \ + "DESTDIR=$(DESTDIR)" + + # No html support. + # No install-html or install-pdf support in automake yet + .PHONY: html install-html install-pdf + + html: + install-html: + install-pdf: + diff -Nrcpad gcc-4.4.4/zlib/Makefile.in gcc-4.4.5/zlib/Makefile.in *** gcc-4.4.4/zlib/Makefile.in Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/Makefile.in Fri Sep 26 16:28:27 2008 *************** *** 0 **** --- 1,639 ---- + # Makefile.in generated by automake 1.9.6 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY, to the extent permitted by law; without + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + + @SET_MAKE@ + + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = . + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c + INSTALL_HEADER = $(INSTALL_DATA) + transform = $(program_transform_name) + NORMAL_INSTALL = : + PRE_INSTALL = : + POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ + DIST_COMMON = $(srcdir)/../config.guess $(srcdir)/../config.sub README \ + ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/../mkinstalldirs $(srcdir)/../compile \ + $(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../compile \ + $(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../compile \ + $(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../compile \ + $(srcdir)/../compile $(srcdir)/../compile \ + $(srcdir)/../ltmain.sh $(srcdir)/../config.guess \ + $(srcdir)/../config.sub + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ + $(top_srcdir)/../config/multi.m4 \ + $(top_srcdir)/../config/override.m4 \ + $(top_srcdir)/../config/proginstall.m4 \ + $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ + $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/../config/no-executables.m4 \ + $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno + CONFIG_CLEAN_FILES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; + am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + am__installdirs = "$(DESTDIR)$(toolexeclibdir)" + toolexeclibLIBRARIES_INSTALL = $(INSTALL_DATA) + LIBRARIES = $(toolexeclib_LIBRARIES) + ARFLAGS = cru + libz_a_AR = $(AR) $(ARFLAGS) + libz_a_LIBADD = + am__objects_1 = libz_a-adler32.$(OBJEXT) libz_a-compress.$(OBJEXT) \ + libz_a-crc32.$(OBJEXT) libz_a-deflate.$(OBJEXT) \ + libz_a-gzio.$(OBJEXT) libz_a-infback.$(OBJEXT) \ + libz_a-inffast.$(OBJEXT) libz_a-inflate.$(OBJEXT) \ + libz_a-inftrees.$(OBJEXT) libz_a-trees.$(OBJEXT) \ + libz_a-uncompr.$(OBJEXT) libz_a-zutil.$(OBJEXT) + @TARGET_LIBRARY_FALSE@am_libz_a_OBJECTS = $(am__objects_1) + libz_a_OBJECTS = $(am_libz_a_OBJECTS) + LTLIBRARIES = $(noinst_LTLIBRARIES) + libzgcj_convenience_la_LIBADD = + am__objects_2 = adler32.lo compress.lo crc32.lo deflate.lo gzio.lo \ + infback.lo inffast.lo inflate.lo inftrees.lo trees.lo \ + uncompr.lo zutil.lo + @TARGET_LIBRARY_TRUE@am_libzgcj_convenience_la_OBJECTS = \ + @TARGET_LIBRARY_TRUE@ $(am__objects_2) + libzgcj_convenience_la_OBJECTS = $(am_libzgcj_convenience_la_OBJECTS) + @TARGET_LIBRARY_TRUE@am_libzgcj_convenience_la_rpath = + DEFAULT_INCLUDES = -I. -I$(srcdir) + depcomp = + am__depfiles_maybe = + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(libz_a_SOURCES) $(libzgcj_convenience_la_SOURCES) + MULTISRCTOP = + MULTIBUILDTOP = + MULTIDIRS = + MULTISUBDIR = + MULTIDO = true + MULTICLEAN = true + ETAGS = etags + CTAGS = ctags + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + COMPPATH = @COMPPATH@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + FGREP = @FGREP@ + GREP = @GREP@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LD = @LD@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TARGET_LIBRARY_FALSE = @TARGET_LIBRARY_FALSE@ + TARGET_LIBRARY_TRUE = @TARGET_LIBRARY_TRUE@ + VERSION = @VERSION@ + ac_ct_AR = @ac_ct_AR@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + ac_ct_LIPO = @ac_ct_LIPO@ + ac_ct_NMEDIT = @ac_ct_NMEDIT@ + ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ + ac_ct_OTOOL = @ac_ct_OTOOL@ + ac_ct_OTOOL64 = @ac_ct_OTOOL64@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ + am__tar = @am__tar@ + am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + mkinstalldirs = @mkinstalldirs@ + multi_basedir = @multi_basedir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_all = @target_all@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ + toolexecdir = @toolexecdir@ + toolexeclibdir = @toolexeclibdir@ + AUTOMAKE_OPTIONS = 1.8 cygnus + ACLOCAL_AMFLAGS = -I .. -I ../config + ZLIB_SOURCES = adler32.c compress.c crc32.c crc32.h deflate.c \ + deflate.h gzio.c infback.c inffast.c inffast.h inffixed.h inflate.c \ + inflate.h inftrees.c inftrees.h trees.c trees.h uncompr.c zconf.h \ + zconf.in.h zlib.h zutil.c zutil.h + + @TARGET_LIBRARY_TRUE@noinst_LTLIBRARIES = libzgcj_convenience.la + @TARGET_LIBRARY_TRUE@libzgcj_convenience_la_SOURCES = $(ZLIB_SOURCES) + @TARGET_LIBRARY_FALSE@toolexeclib_LIBRARIES = libz.a + @TARGET_LIBRARY_FALSE@libz_a_SOURCES = $(ZLIB_SOURCES) + @TARGET_LIBRARY_FALSE@libz_a_CFLAGS = $(AM_CFLAGS) + + # Work around what appears to be a GNU make bug handling MAKEFLAGS + # values defined in terms of make variables, as is the case for CC and + # friends when we are called from the top level Makefile. + AM_MAKEFLAGS = \ + "AR_FLAGS=$(AR_FLAGS)" \ + "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ + "CFLAGS=$(CFLAGS)" \ + "CXXFLAGS=$(CXXFLAGS)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ + "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ + "LDFLAGS=$(LDFLAGS)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ + "MAKE=$(MAKE)" \ + "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ + "PICFLAG=$(PICFLAG)" \ + "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ + "SHELL=$(SHELL)" \ + "EXPECT=$(EXPECT)" \ + "RUNTEST=$(RUNTEST)" \ + "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ + "exec_prefix=$(exec_prefix)" \ + "infodir=$(infodir)" \ + "libdir=$(libdir)" \ + "prefix=$(prefix)" \ + "tooldir=$(tooldir)" \ + "AR=$(AR)" \ + "AS=$(AS)" \ + "CC=$(CC)" \ + "CXX=$(CXX)" \ + "LD=$(LD)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "NM=$(NM)" \ + "PICFLAG=$(PICFLAG)" \ + "RANLIB=$(RANLIB)" \ + "DESTDIR=$(DESTDIR)" + + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj + am--refresh: + @: + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ + cd $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + + $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + install-toolexeclibLIBRARIES: $(toolexeclib_LIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(toolexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexeclibdir)" + @list='$(toolexeclib_LIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(toolexeclibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(toolexeclibdir)/$$f'"; \ + $(toolexeclibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(toolexeclibdir)/$$f"; \ + else :; fi; \ + done + @$(POST_INSTALL) + @list='$(toolexeclib_LIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + p=$(am__strip_dir) \ + echo " $(RANLIB) '$(DESTDIR)$(toolexeclibdir)/$$p'"; \ + $(RANLIB) "$(DESTDIR)$(toolexeclibdir)/$$p"; \ + else :; fi; \ + done + + uninstall-toolexeclibLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(toolexeclib_LIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(toolexeclibdir)/$$p'"; \ + rm -f "$(DESTDIR)$(toolexeclibdir)/$$p"; \ + done + + clean-toolexeclibLIBRARIES: + -test -z "$(toolexeclib_LIBRARIES)" || rm -f $(toolexeclib_LIBRARIES) + libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) + -rm -f libz.a + $(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD) + $(RANLIB) libz.a + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libzgcj_convenience.la: $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_DEPENDENCIES) + $(LINK) $(am_libzgcj_convenience_la_rpath) $(libzgcj_convenience_la_LDFLAGS) $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c + + .c.o: + $(COMPILE) -c $< + + .c.obj: + $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + $(LTCOMPILE) -c -o $@ $< + + libz_a-adler32.o: adler32.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-adler32.o `test -f 'adler32.c' || echo '$(srcdir)/'`adler32.c + + libz_a-adler32.obj: adler32.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-adler32.obj `if test -f 'adler32.c'; then $(CYGPATH_W) 'adler32.c'; else $(CYGPATH_W) '$(srcdir)/adler32.c'; fi` + + libz_a-compress.o: compress.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-compress.o `test -f 'compress.c' || echo '$(srcdir)/'`compress.c + + libz_a-compress.obj: compress.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-compress.obj `if test -f 'compress.c'; then $(CYGPATH_W) 'compress.c'; else $(CYGPATH_W) '$(srcdir)/compress.c'; fi` + + libz_a-crc32.o: crc32.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-crc32.o `test -f 'crc32.c' || echo '$(srcdir)/'`crc32.c + + libz_a-crc32.obj: crc32.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-crc32.obj `if test -f 'crc32.c'; then $(CYGPATH_W) 'crc32.c'; else $(CYGPATH_W) '$(srcdir)/crc32.c'; fi` + + libz_a-deflate.o: deflate.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-deflate.o `test -f 'deflate.c' || echo '$(srcdir)/'`deflate.c + + libz_a-deflate.obj: deflate.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-deflate.obj `if test -f 'deflate.c'; then $(CYGPATH_W) 'deflate.c'; else $(CYGPATH_W) '$(srcdir)/deflate.c'; fi` + + libz_a-gzio.o: gzio.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-gzio.o `test -f 'gzio.c' || echo '$(srcdir)/'`gzio.c + + libz_a-gzio.obj: gzio.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-gzio.obj `if test -f 'gzio.c'; then $(CYGPATH_W) 'gzio.c'; else $(CYGPATH_W) '$(srcdir)/gzio.c'; fi` + + libz_a-infback.o: infback.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-infback.o `test -f 'infback.c' || echo '$(srcdir)/'`infback.c + + libz_a-infback.obj: infback.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-infback.obj `if test -f 'infback.c'; then $(CYGPATH_W) 'infback.c'; else $(CYGPATH_W) '$(srcdir)/infback.c'; fi` + + libz_a-inffast.o: inffast.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-inffast.o `test -f 'inffast.c' || echo '$(srcdir)/'`inffast.c + + libz_a-inffast.obj: inffast.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-inffast.obj `if test -f 'inffast.c'; then $(CYGPATH_W) 'inffast.c'; else $(CYGPATH_W) '$(srcdir)/inffast.c'; fi` + + libz_a-inflate.o: inflate.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-inflate.o `test -f 'inflate.c' || echo '$(srcdir)/'`inflate.c + + libz_a-inflate.obj: inflate.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-inflate.obj `if test -f 'inflate.c'; then $(CYGPATH_W) 'inflate.c'; else $(CYGPATH_W) '$(srcdir)/inflate.c'; fi` + + libz_a-inftrees.o: inftrees.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-inftrees.o `test -f 'inftrees.c' || echo '$(srcdir)/'`inftrees.c + + libz_a-inftrees.obj: inftrees.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-inftrees.obj `if test -f 'inftrees.c'; then $(CYGPATH_W) 'inftrees.c'; else $(CYGPATH_W) '$(srcdir)/inftrees.c'; fi` + + libz_a-trees.o: trees.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-trees.o `test -f 'trees.c' || echo '$(srcdir)/'`trees.c + + libz_a-trees.obj: trees.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-trees.obj `if test -f 'trees.c'; then $(CYGPATH_W) 'trees.c'; else $(CYGPATH_W) '$(srcdir)/trees.c'; fi` + + libz_a-uncompr.o: uncompr.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-uncompr.o `test -f 'uncompr.c' || echo '$(srcdir)/'`uncompr.c + + libz_a-uncompr.obj: uncompr.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-uncompr.obj `if test -f 'uncompr.c'; then $(CYGPATH_W) 'uncompr.c'; else $(CYGPATH_W) '$(srcdir)/uncompr.c'; fi` + + libz_a-zutil.o: zutil.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-zutil.o `test -f 'zutil.c' || echo '$(srcdir)/'`zutil.c + + libz_a-zutil.obj: zutil.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libz_a_CFLAGS) $(CFLAGS) -c -o libz_a-zutil.obj `if test -f 'zutil.c'; then $(CYGPATH_W) 'zutil.c'; else $(CYGPATH_W) '$(srcdir)/zutil.c'; fi` + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs + + distclean-libtool: + -rm -f libtool + + # GNU Make needs to see an explicit $(MAKE) variable in the command it + # runs to enable its job server during parallel builds. Hence the + # comments below. + all-multi: + $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE) + install-multi: + $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE) + + mostlyclean-multi: + $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE) + clean-multi: + $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE) + distclean-multi: + $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE) + maintainer-clean-multi: + $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE) + uninstall-info-am: + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + check-am: + check: check-am + all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) all-multi + installdirs: + for dir in "$(DESTDIR)$(toolexeclibdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am + install-data: install-data-am + uninstall: uninstall-am + + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: + + clean-generic: + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + clean: clean-am clean-multi + + clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-toolexeclibLIBRARIES mostlyclean-am + + distclean: distclean-am distclean-multi + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + + info: info-am + + info-am: + + install-data-am: + + install-exec-am: install-multi install-toolexeclibLIBRARIES + + install-info: install-info-am + + install-man: + + installcheck-am: + + maintainer-clean: maintainer-clean-am maintainer-clean-multi + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic + + mostlyclean: mostlyclean-am mostlyclean-multi + + mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + + uninstall-am: uninstall-toolexeclibLIBRARIES + + .PHONY: CTAGS GTAGS all all-am all-multi am--refresh check check-am \ + clean clean-generic clean-libtool clean-multi \ + clean-noinstLTLIBRARIES clean-toolexeclibLIBRARIES ctags \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-multi distclean-tags dvi dvi-am \ + html html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-multi install-strip \ + install-toolexeclibLIBRARIES installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + maintainer-clean-multi mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool mostlyclean-multi pdf \ + pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ + uninstall-toolexeclibLIBRARIES + + + # No html support. + # No install-html or install-pdf support in automake yet + .PHONY: html install-html install-pdf + + html: + install-html: + install-pdf: + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff -Nrcpad gcc-4.4.4/zlib/README gcc-4.4.5/zlib/README *** gcc-4.4.4/zlib/README Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/README Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,128 ---- + This directory contains the zlib package, which is not part of GCC but + shipped with GCC as convenience. + + ZLIB DATA COMPRESSION LIBRARY + + zlib 1.2.3 is a general purpose data compression library. All the code is + thread safe. The data format used by the zlib library is described by RFCs + (Request for Comments) 1950 to 1952 in the files + http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) + and rfc1952.txt (gzip format). These documents are also available in other + formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html + + All functions of the compression library are documented in the file zlib.h + (volunteer to write man pages welcome, contact zlib@gzip.org). A usage example + of the library is given in the file example.c which also tests that the library + is working correctly. Another example is given in the file minigzip.c. The + compression library itself is composed of all source files except example.c and + minigzip.c. + + To compile all files and run the test program, follow the instructions given at + the top of Makefile. In short "make test; make install" should work for most + machines. For Unix: "./configure; make test; make install". For MSDOS, use one + of the special makefiles such as Makefile.msc. For VMS, use make_vms.com. + + Questions about zlib should be sent to , or to Gilles Vollant + for the Windows DLL version. The zlib home page is + http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem, + please check this site to verify that you have the latest version of zlib; + otherwise get the latest version and check whether the problem still exists or + not. + + PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking + for help. + + Mark Nelson wrote an article about zlib for the Jan. 1997 + issue of Dr. Dobb's Journal; a copy of the article is available in + http://dogma.net/markn/articles/zlibtool/zlibtool.htm + + The changes made in version 1.2.3 are documented in the file ChangeLog. + + Unsupported third party contributions are provided in directory "contrib". + + A Java implementation of zlib is available in the Java Development Kit + http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html + See the zlib home page http://www.zlib.org for details. + + A Perl interface to zlib written by Paul Marquess is in the + CPAN (Comprehensive Perl Archive Network) sites + http://www.cpan.org/modules/by-module/Compress/ + + A Python interface to zlib written by A.M. Kuchling is + available in Python 1.5 and later versions, see + http://www.python.org/doc/lib/module-zlib.html + + A zlib binding for TCL written by Andreas Kupries is + availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html + + An experimental package to read and write files in .zip format, written on top + of zlib by Gilles Vollant , is available in the + contrib/minizip directory of zlib. + + + Notes for some targets: + + - For Windows DLL versions, please see win32/DLL_FAQ.txt + + - For 64-bit Irix, deflate.c must be compiled without any optimization. With + -O, one libpng test fails. The test works in 32 bit mode (with the -n32 + compiler flag). The compiler bug has been reported to SGI. + + - zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works + when compiled with cc. + + - On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is + necessary to get gzprintf working correctly. This is done by configure. + + - zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with + other compilers. Use "make test" to check your compiler. + + - gzdopen is not supported on RISCOS, BEOS and by some Mac compilers. + + - For PalmOs, see http://palmzlib.sourceforge.net/ + + - When building a shared, i.e. dynamic library on Mac OS X, the library must be + installed before testing (do "make install" before "make test"), since the + library location is specified in the library. + + + Acknowledgments: + + The deflate format used by zlib was defined by Phil Katz. The deflate + and zlib specifications were written by L. Peter Deutsch. Thanks to all the + people who reported problems and suggested various improvements in zlib; + they are too numerous to cite here. + + Copyright notice: + + (C) 1995-2004 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + If you use the zlib library in a product, we would appreciate *not* + receiving lengthy legal documents to sign. The sources are provided + for free but without warranty of any kind. The library has been + entirely written by Jean-loup Gailly and Mark Adler; it does not + include third-party code. + + If you redistribute modified sources, we would appreciate that you include + in the file ChangeLog history information documenting your changes. Please + read the FAQ for more information on the distribution of modified source + versions. diff -Nrcpad gcc-4.4.4/zlib/acinclude.m4 gcc-4.4.5/zlib/acinclude.m4 *** gcc-4.4.4/zlib/acinclude.m4 Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/acinclude.m4 Mon Sep 12 17:02:07 2005 *************** *** 0 **** --- 1,9 ---- + sinclude(../config/no-executables.m4) + sinclude(../libtool.m4) + dnl The lines below arrange for aclocal not to bring libtool.m4 + dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake + dnl to add a definition of LIBTOOL to Makefile.in. + ifelse(yes,no,[ + AC_DEFUN([AM_PROG_LIBTOOL],) + AC_SUBST(LIBTOOL) + ]) diff -Nrcpad gcc-4.4.4/zlib/aclocal.m4 gcc-4.4.5/zlib/aclocal.m4 *** gcc-4.4.4/zlib/aclocal.m4 Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/aclocal.m4 Fri Apr 18 10:28:53 2008 *************** *** 0 **** --- 1,868 ---- + # generated automatically by aclocal 1.9.6 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + # 2005 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY, to the extent permitted by law; without + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + + # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # AM_AUTOMAKE_VERSION(VERSION) + # ---------------------------- + # Automake X.Y traces this macro to ensure aclocal.m4 has been + # generated from the m4 files accompanying Automake X.Y. + AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) + + # AM_SET_CURRENT_AUTOMAKE_VERSION + # ------------------------------- + # Call AM_AUTOMAKE_VERSION so it can be traced. + # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.9.6])]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets + # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to + # `$srcdir', `$srcdir/..', or `$srcdir/../..'. + # + # Of course, Automake must honor this variable whenever it calls a + # tool from the auxiliary directory. The problem is that $srcdir (and + # therefore $ac_aux_dir as well) can be either absolute or relative, + # depending on how configure is run. This is pretty annoying, since + # it makes $ac_aux_dir quite unusable in subdirectories: in the top + # source directory, any form will work fine, but in subdirectories a + # relative path needs to be adjusted first. + # + # $ac_aux_dir/missing + # fails when called from a subdirectory if $ac_aux_dir is relative + # $top_srcdir/$ac_aux_dir/missing + # fails if $ac_aux_dir is absolute, + # fails when called from a subdirectory in a VPATH build with + # a relative $ac_aux_dir + # + # The reason of the latter failure is that $top_srcdir and $ac_aux_dir + # are both prefixed by $srcdir. In an in-source build this is usually + # harmless because $srcdir is `.', but things will broke when you + # start a VPATH build or use an absolute $srcdir. + # + # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, + # iff we strip the leading $srcdir from $ac_aux_dir. That would be: + # am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` + # and then we would define $MISSING as + # MISSING="\${SHELL} $am_aux_dir/missing" + # This will work as long as MISSING is not called from configure, because + # unfortunately $(top_srcdir) has no meaning in configure. + # However there are other variables, like CC, which are often used in + # configure, and could therefore not use this "fixed" $ac_aux_dir. + # + # Another solution, used here, is to always expand $ac_aux_dir to an + # absolute PATH. The drawback is that using absolute paths prevent a + # configured tree to be moved without reconfiguration. + + AC_DEFUN([AM_AUX_DIR_EXPAND], + [dnl Rely on autoconf to set up CDPATH properly. + AC_PREREQ([2.50])dnl + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` + ]) + + # AM_CONDITIONAL -*- Autoconf -*- + + # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # serial 7 + + # AM_CONDITIONAL(NAME, SHELL-CONDITION) + # ------------------------------------- + # Define a conditional. + AC_DEFUN([AM_CONDITIONAL], + [AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl + AC_SUBST([$1_TRUE]) + AC_SUBST([$1_FALSE]) + if $2; then + $1_TRUE= + $1_FALSE='#' + else + $1_TRUE='#' + $1_FALSE= + fi + AC_CONFIG_COMMANDS_PRE( + [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. + Usually this means the macro was only invoked conditionally.]]) + fi])]) + + + # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # serial 8 + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, + # will think it sees a *use*, and therefore will trigger all it's + # C support machinery. Also note that it means that autoscan, seeing + # CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + + # _AM_DEPENDENCIES(NAME) + # ---------------------- + # See how the compiler implements dependency checking. + # NAME is "CC", "CXX", "GCJ", or "OBJC". + # We try a few techniques and use that to set a single cache variable. + # + # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was + # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular + # dependency, and given that the user is not expected to run this macro, + # just rely on AC_PROG_CC. + AC_DEFUN([_AM_DEPENDENCIES], + [AC_REQUIRE([AM_SET_DEPDIR])dnl + AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl + AC_REQUIRE([AM_MAKE_INCLUDE])dnl + AC_REQUIRE([AM_DEP_TRACK])dnl + + ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + + AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], + [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir + else + am_cv_$1_dependencies_compiler_type=none + fi + ]) + AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) + AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) + ]) + + + # AM_SET_DEPDIR + # ------------- + # Choose a directory name for dependency files. + # This macro is AC_REQUIREd in _AM_DEPENDENCIES + AC_DEFUN([AM_SET_DEPDIR], + [AC_REQUIRE([AM_SET_LEADING_DOT])dnl + AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl + ]) + + + # AM_DEP_TRACK + # ------------ + AC_DEFUN([AM_DEP_TRACK], + [AC_ARG_ENABLE(dependency-tracking, + [ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) + if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi + AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) + AC_SUBST([AMDEPBACKSLASH]) + ]) + + # Generate code to set up dependency tracking. -*- Autoconf -*- + + # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + #serial 3 + + # _AM_OUTPUT_DEPENDENCY_COMMANDS + # ------------------------------ + AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], + [for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done + ])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + + # AM_OUTPUT_DEPENDENCY_COMMANDS + # ----------------------------- + # This macro should only be invoked once -- use via AC_REQUIRE. + # + # This code is only required when automatic dependency tracking + # is enabled. FIXME. This creates each `.P' file that we will + # need in order to bootstrap the dependency handling code. + AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], + [AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) + ]) + + # Do all the work for Automake. -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # serial 12 + + # This macro actually does too much. Some checks are only needed if + # your package does certain things. But this isn't really a big deal. + + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) + # AM_INIT_AUTOMAKE([OPTIONS]) + # ----------------------------------------------- + # The call with PACKAGE and VERSION arguments is the old style + # call (pre autoconf-2.50), which is being phased out. PACKAGE + # and VERSION should now be passed to AC_INIT and removed from + # the call to AM_INIT_AUTOMAKE. + # We support both call styles for the transition. After + # the next Automake release, Autoconf can make the AC_INIT + # arguments mandatory, and then we can depend on a new Autoconf + # release and drop the old call support. + AC_DEFUN([AM_INIT_AUTOMAKE], + [AC_PREREQ([2.58])dnl + dnl Autoconf wants to disallow AM_ names. We explicitly allow + dnl the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl + # test to see if srcdir already configured + if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi + + # test whether we have cygpath + if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi + fi + AC_SUBST([CYGPATH_W]) + + # Define the identity of the package. + dnl Distinguish between old-style and new-style calls. + m4_ifval([$2], + [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], + [_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + + _AM_IF_OPTION([no-define],, + [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + + # Some tools Automake needs. + AC_REQUIRE([AM_SANITY_CHECK])dnl + AC_REQUIRE([AC_ARG_PROGRAM])dnl + AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) + AM_MISSING_PROG(AUTOCONF, autoconf) + AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) + AM_MISSING_PROG(AUTOHEADER, autoheader) + AM_MISSING_PROG(MAKEINFO, makeinfo) + AM_PROG_INSTALL_SH + AM_PROG_INSTALL_STRIP + AC_REQUIRE([AM_PROG_MKDIR_P])dnl + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. + AC_REQUIRE([AC_PROG_AWK])dnl + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AM_SET_LEADING_DOT])dnl + _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) + _AM_IF_OPTION([no-dependencies],, + [AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + ]) + ]) + + + # When config.status generates a header, we must update the stamp-h file. + # This file resides in the same directory as the config header + # that is generated. The stamp files are numbered to have different names. + + # Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the + # loop where config.status creates the headers, so we can generate + # our stamp files there. + AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], + [# Compute $1's index in $config_headers. + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done + echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # AM_PROG_INSTALL_SH + # ------------------ + # Define $install_sh. + AC_DEFUN([AM_PROG_INSTALL_SH], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl + install_sh=${install_sh-"$am_aux_dir/install-sh"} + AC_SUBST(install_sh)]) + + # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- + # From Jim Meyering + + # Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # serial 4 + + AC_DEFUN([AM_MAINTAINER_MODE], + [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, + [ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl + ] + ) + + AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + + # Check to see how 'make' treats includes. -*- Autoconf -*- + + # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # serial 3 + + # AM_MAKE_INCLUDE() + # ----------------- + # Check to see how make treats includes. + AC_DEFUN([AM_MAKE_INCLUDE], + [am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: + @echo done + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. + AC_MSG_CHECKING([for style of include used by $am_make]) + am__include="#" + am__quote= + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf + # We grep out `Entering directory' and `Leaving directory' + # messages which can occur if `w' ends up in MAKEFLAGS. + # In particular we don't look at `^make:' because GNU make might + # be invoked under some other name (usually "gmake"), in which + # case it prints its new name instead of `make'. + if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU + fi + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi + fi + AC_SUBST([am__include]) + AC_SUBST([am__quote]) + AC_MSG_RESULT([$_am_result]) + rm -f confinc confmf + ]) + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + + # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # serial 4 + + # AM_MISSING_PROG(NAME, PROGRAM) + # ------------------------------ + AC_DEFUN([AM_MISSING_PROG], + [AC_REQUIRE([AM_MISSING_HAS_RUN]) + $1=${$1-"${am_missing_run}$2"} + AC_SUBST($1)]) + + + # AM_MISSING_HAS_RUN + # ------------------ + # Define MISSING if not defined so far and test if it supports --run. + # If it does, set am_missing_run to use it, otherwise, to nothing. + AC_DEFUN([AM_MISSING_HAS_RUN], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl + test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " + else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) + fi + ]) + + # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # AM_PROG_MKDIR_P + # --------------- + # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. + # + # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories + # created by `make install' are always world readable, even if the + # installer happens to have an overly restrictive umask (e.g. 077). + # This was a mistake. There are at least two reasons why we must not + # use `-m 0755': + # - it causes special bits like SGID to be ignored, + # - it may be too restrictive (some setups expect 775 directories). + # + # Do not use -m 0755 and let people choose whatever they expect by + # setting umask. + # + # We cannot accept any implementation of `mkdir' that recognizes `-p'. + # Some implementations (such as Solaris 8's) are not thread-safe: if a + # parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' + # concurrently, both version can detect that a/ is missing, but only + # one can create it and the other will error out. Consequently we + # restrict ourselves to GNU make (using the --version option ensures + # this.) + AC_DEFUN([AM_PROG_MKDIR_P], + [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi + fi + AC_SUBST([mkdir_p])]) + + # Helper functions for option handling. -*- Autoconf -*- + + # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # serial 3 + + # _AM_MANGLE_OPTION(NAME) + # ----------------------- + AC_DEFUN([_AM_MANGLE_OPTION], + [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + + # _AM_SET_OPTION(NAME) + # ------------------------------ + # Set option NAME. Presently that only means defining a flag for this option. + AC_DEFUN([_AM_SET_OPTION], + [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + + # _AM_SET_OPTIONS(OPTIONS) + # ---------------------------------- + # OPTIONS is a space-separated list of Automake options. + AC_DEFUN([_AM_SET_OPTIONS], + [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + + # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) + # ------------------------------------------- + # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. + AC_DEFUN([_AM_IF_OPTION], + [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + + # Check to make sure that the build environment is sane. -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # serial 4 + + # AM_SANITY_CHECK + # --------------- + AC_DEFUN([AM_SANITY_CHECK], + [AC_MSG_CHECKING([whether build environment is sane]) + # Just in case + sleep 1 + echo timestamp > conftest.file + # Do `set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). + if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + + test "$[2]" = conftest.file + ) + then + # Ok. + : + else + AC_MSG_ERROR([newly created file is older than distributed files! + Check your system clock]) + fi + AC_MSG_RESULT(yes)]) + + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # AM_PROG_INSTALL_STRIP + # --------------------- + # One issue with vendor `install' (even GNU) is that you can't + # specify the program used to strip binaries. This is especially + # annoying in cross-compiling environments, where the build's strip + # is unlikely to handle the host's binaries. + # Fortunately install-sh will honor a STRIPPROG variable, so we + # always use install-sh in `make install-strip', and initialize + # STRIPPROG with the value of the STRIP variable (set by the user). + AC_DEFUN([AM_PROG_INSTALL_STRIP], + [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right + # tool to use in cross-compilation environments, therefore Automake + # will honor the `STRIP' environment variable to overrule this program. + dnl Don't test for $cross_compiling = yes, because it might be `maybe'. + if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) + fi + INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + + # Check how to create a tarball. -*- Autoconf -*- + + # Copyright (C) 2004, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # serial 2 + + # _AM_PROG_TAR(FORMAT) + # -------------------- + # Check how to create a tarball in format FORMAT. + # FORMAT should be one of `v7', `ustar', or `pax'. + # + # Substitute a variable $(am__tar) that is a command + # writing to stdout a FORMAT-tarball containing the directory + # $tardir. + # tardir=directory && $(am__tar) > result.tar + # + # Substitute a variable $(am__untar) that extract such + # a tarball read from stdin. + # $(am__untar) < result.tar + AC_DEFUN([_AM_PROG_TAR], + [# Always define AMTAR for backward compatibility. + AM_MISSING_PROG([AMTAR], [tar]) + m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) + AC_MSG_CHECKING([how to create a $1 tar archive]) + # Loop over all known methods to create a tar archive until one works. + _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + # Do not fold the above two line into one, because Tru64 sh and + # Solaris sh will not grok spaces in the rhs of `-'. + for _am_tool in $_am_tools + do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) + AC_SUBST([am__untar]) + ]) # _AM_PROG_TAR + + m4_include([../config/depstand.m4]) + m4_include([../config/lead-dot.m4]) + m4_include([../config/multi.m4]) + m4_include([../config/override.m4]) + m4_include([../config/proginstall.m4]) + m4_include([../ltoptions.m4]) + m4_include([../ltsugar.m4]) + m4_include([../ltversion.m4]) + m4_include([../lt~obsolete.m4]) + m4_include([acinclude.m4]) diff -Nrcpad gcc-4.4.4/zlib/adler32.c gcc-4.4.5/zlib/adler32.c *** gcc-4.4.4/zlib/adler32.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/adler32.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,149 ---- + /* adler32.c -- compute the Adler-32 checksum of a data stream + * Copyright (C) 1995-2004 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* @(#) $Id: adler32.c,v 1.1.1.2 2002/03/11 21:53:23 tromey Exp $ */ + + #define ZLIB_INTERNAL + #include "zlib.h" + + #define BASE 65521UL /* largest prime smaller than 65536 */ + #define NMAX 5552 + /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ + + #define DO1(buf,i) {adler += (buf)[i]; sum2 += adler;} + #define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); + #define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); + #define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); + #define DO16(buf) DO8(buf,0); DO8(buf,8); + + /* use NO_DIVIDE if your processor does not do division in hardware */ + #ifdef NO_DIVIDE + # define MOD(a) \ + do { \ + if (a >= (BASE << 16)) a -= (BASE << 16); \ + if (a >= (BASE << 15)) a -= (BASE << 15); \ + if (a >= (BASE << 14)) a -= (BASE << 14); \ + if (a >= (BASE << 13)) a -= (BASE << 13); \ + if (a >= (BASE << 12)) a -= (BASE << 12); \ + if (a >= (BASE << 11)) a -= (BASE << 11); \ + if (a >= (BASE << 10)) a -= (BASE << 10); \ + if (a >= (BASE << 9)) a -= (BASE << 9); \ + if (a >= (BASE << 8)) a -= (BASE << 8); \ + if (a >= (BASE << 7)) a -= (BASE << 7); \ + if (a >= (BASE << 6)) a -= (BASE << 6); \ + if (a >= (BASE << 5)) a -= (BASE << 5); \ + if (a >= (BASE << 4)) a -= (BASE << 4); \ + if (a >= (BASE << 3)) a -= (BASE << 3); \ + if (a >= (BASE << 2)) a -= (BASE << 2); \ + if (a >= (BASE << 1)) a -= (BASE << 1); \ + if (a >= BASE) a -= BASE; \ + } while (0) + # define MOD4(a) \ + do { \ + if (a >= (BASE << 4)) a -= (BASE << 4); \ + if (a >= (BASE << 3)) a -= (BASE << 3); \ + if (a >= (BASE << 2)) a -= (BASE << 2); \ + if (a >= (BASE << 1)) a -= (BASE << 1); \ + if (a >= BASE) a -= BASE; \ + } while (0) + #else + # define MOD(a) a %= BASE + # define MOD4(a) a %= BASE + #endif + + /* ========================================================================= */ + uLong ZEXPORT adler32(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; + { + unsigned long sum2; + unsigned n; + + /* split Adler-32 into component sums */ + sum2 = (adler >> 16) & 0xffff; + adler &= 0xffff; + + /* in case user likes doing a byte at a time, keep it fast */ + if (len == 1) { + adler += buf[0]; + if (adler >= BASE) + adler -= BASE; + sum2 += adler; + if (sum2 >= BASE) + sum2 -= BASE; + return adler | (sum2 << 16); + } + + /* initial Adler-32 value (deferred check for len == 1 speed) */ + if (buf == Z_NULL) + return 1L; + + /* in case short lengths are provided, keep it somewhat fast */ + if (len < 16) { + while (len--) { + adler += *buf++; + sum2 += adler; + } + if (adler >= BASE) + adler -= BASE; + MOD4(sum2); /* only added so many BASE's */ + return adler | (sum2 << 16); + } + + /* do length NMAX blocks -- requires just one modulo operation */ + while (len >= NMAX) { + len -= NMAX; + n = NMAX / 16; /* NMAX is divisible by 16 */ + do { + DO16(buf); /* 16 sums unrolled */ + buf += 16; + } while (--n); + MOD(adler); + MOD(sum2); + } + + /* do remaining bytes (less than NMAX, still just one modulo) */ + if (len) { /* avoid modulos if none remaining */ + while (len >= 16) { + len -= 16; + DO16(buf); + buf += 16; + } + while (len--) { + adler += *buf++; + sum2 += adler; + } + MOD(adler); + MOD(sum2); + } + + /* return recombined sums */ + return adler | (sum2 << 16); + } + + /* ========================================================================= */ + uLong ZEXPORT adler32_combine(adler1, adler2, len2) + uLong adler1; + uLong adler2; + z_off_t len2; + { + unsigned long sum1; + unsigned long sum2; + unsigned rem; + + /* the derivation of this formula is left as an exercise for the reader */ + rem = (unsigned)(len2 % BASE); + sum1 = adler1 & 0xffff; + sum2 = rem * sum1; + MOD(sum2); + sum1 += (adler2 & 0xffff) + BASE - 1; + sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; + if (sum1 > BASE) sum1 -= BASE; + if (sum1 > BASE) sum1 -= BASE; + if (sum2 > (BASE << 1)) sum2 -= (BASE << 1); + if (sum2 > BASE) sum2 -= BASE; + return sum1 | (sum2 << 16); + } diff -Nrcpad gcc-4.4.4/zlib/algorithm.txt gcc-4.4.5/zlib/algorithm.txt *** gcc-4.4.4/zlib/algorithm.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/algorithm.txt Mon Sep 12 17:02:07 2005 *************** *** 0 **** --- 1,209 ---- + 1. Compression algorithm (deflate) + + The deflation algorithm used by gzip (also zip and zlib) is a variation of + LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in + the input data. The second occurrence of a string is replaced by a + pointer to the previous string, in the form of a pair (distance, + length). Distances are limited to 32K bytes, and lengths are limited + to 258 bytes. When a string does not occur anywhere in the previous + 32K bytes, it is emitted as a sequence of literal bytes. (In this + description, `string' must be taken as an arbitrary sequence of bytes, + and is not restricted to printable characters.) + + Literals or match lengths are compressed with one Huffman tree, and + match distances are compressed with another tree. The trees are stored + in a compact form at the start of each block. The blocks can have any + size (except that the compressed data for one block must fit in + available memory). A block is terminated when deflate() determines that + it would be useful to start another block with fresh trees. (This is + somewhat similar to the behavior of LZW-based _compress_.) + + Duplicated strings are found using a hash table. All input strings of + length 3 are inserted in the hash table. A hash index is computed for + the next 3 bytes. If the hash chain for this index is not empty, all + strings in the chain are compared with the current input string, and + the longest match is selected. + + The hash chains are searched starting with the most recent strings, to + favor small distances and thus take advantage of the Huffman encoding. + The hash chains are singly linked. There are no deletions from the + hash chains, the algorithm simply discards matches that are too old. + + To avoid a worst-case situation, very long hash chains are arbitrarily + truncated at a certain length, determined by a runtime option (level + parameter of deflateInit). So deflate() does not always find the longest + possible match but generally finds a match which is long enough. + + deflate() also defers the selection of matches with a lazy evaluation + mechanism. After a match of length N has been found, deflate() searches for + a longer match at the next input byte. If a longer match is found, the + previous match is truncated to a length of one (thus producing a single + literal byte) and the process of lazy evaluation begins again. Otherwise, + the original match is kept, and the next match search is attempted only N + steps later. + + The lazy match evaluation is also subject to a runtime parameter. If + the current match is long enough, deflate() reduces the search for a longer + match, thus speeding up the whole process. If compression ratio is more + important than speed, deflate() attempts a complete second search even if + the first match is already long enough. + + The lazy match evaluation is not performed for the fastest compression + modes (level parameter 1 to 3). For these fast modes, new strings + are inserted in the hash table only when no match was found, or + when the match is not too long. This degrades the compression ratio + but saves time since there are both fewer insertions and fewer searches. + + + 2. Decompression algorithm (inflate) + + 2.1 Introduction + + The key question is how to represent a Huffman code (or any prefix code) so + that you can decode fast. The most important characteristic is that shorter + codes are much more common than longer codes, so pay attention to decoding the + short codes fast, and let the long codes take longer to decode. + + inflate() sets up a first level table that covers some number of bits of + input less than the length of longest code. It gets that many bits from the + stream, and looks it up in the table. The table will tell if the next + code is that many bits or less and how many, and if it is, it will tell + the value, else it will point to the next level table for which inflate() + grabs more bits and tries to decode a longer code. + + How many bits to make the first lookup is a tradeoff between the time it + takes to decode and the time it takes to build the table. If building the + table took no time (and if you had infinite memory), then there would only + be a first level table to cover all the way to the longest code. However, + building the table ends up taking a lot longer for more bits since short + codes are replicated many times in such a table. What inflate() does is + simply to make the number of bits in the first table a variable, and then + to set that variable for the maximum speed. + + For inflate, which has 286 possible codes for the literal/length tree, the size + of the first table is nine bits. Also the distance trees have 30 possible + values, and the size of the first table is six bits. Note that for each of + those cases, the table ended up one bit longer than the ``average'' code + length, i.e. the code length of an approximately flat code which would be a + little more than eight bits for 286 symbols and a little less than five bits + for 30 symbols. + + + 2.2 More details on the inflate table lookup + + Ok, you want to know what this cleverly obfuscated inflate tree actually + looks like. You are correct that it's not a Huffman tree. It is simply a + lookup table for the first, let's say, nine bits of a Huffman symbol. The + symbol could be as short as one bit or as long as 15 bits. If a particular + symbol is shorter than nine bits, then that symbol's translation is duplicated + in all those entries that start with that symbol's bits. For example, if the + symbol is four bits, then it's duplicated 32 times in a nine-bit table. If a + symbol is nine bits long, it appears in the table once. + + If the symbol is longer than nine bits, then that entry in the table points + to another similar table for the remaining bits. Again, there are duplicated + entries as needed. The idea is that most of the time the symbol will be short + and there will only be one table look up. (That's whole idea behind data + compression in the first place.) For the less frequent long symbols, there + will be two lookups. If you had a compression method with really long + symbols, you could have as many levels of lookups as is efficient. For + inflate, two is enough. + + So a table entry either points to another table (in which case nine bits in + the above example are gobbled), or it contains the translation for the symbol + and the number of bits to gobble. Then you start again with the next + ungobbled bit. + + You may wonder: why not just have one lookup table for how ever many bits the + longest symbol is? The reason is that if you do that, you end up spending + more time filling in duplicate symbol entries than you do actually decoding. + At least for deflate's output that generates new trees every several 10's of + kbytes. You can imagine that filling in a 2^15 entry table for a 15-bit code + would take too long if you're only decoding several thousand symbols. At the + other extreme, you could make a new table for every bit in the code. In fact, + that's essentially a Huffman tree. But then you spend two much time + traversing the tree while decoding, even for short symbols. + + So the number of bits for the first lookup table is a trade of the time to + fill out the table vs. the time spent looking at the second level and above of + the table. + + Here is an example, scaled down: + + The code being decoded, with 10 symbols, from 1 to 6 bits long: + + A: 0 + B: 10 + C: 1100 + D: 11010 + E: 11011 + F: 11100 + G: 11101 + H: 11110 + I: 111110 + J: 111111 + + Let's make the first table three bits long (eight entries): + + 000: A,1 + 001: A,1 + 010: A,1 + 011: A,1 + 100: B,2 + 101: B,2 + 110: -> table X (gobble 3 bits) + 111: -> table Y (gobble 3 bits) + + Each entry is what the bits decode as and how many bits that is, i.e. how + many bits to gobble. Or the entry points to another table, with the number of + bits to gobble implicit in the size of the table. + + Table X is two bits long since the longest code starting with 110 is five bits + long: + + 00: C,1 + 01: C,1 + 10: D,2 + 11: E,2 + + Table Y is three bits long since the longest code starting with 111 is six + bits long: + + 000: F,2 + 001: F,2 + 010: G,2 + 011: G,2 + 100: H,2 + 101: H,2 + 110: I,3 + 111: J,3 + + So what we have here are three tables with a total of 20 entries that had to + be constructed. That's compared to 64 entries for a single table. Or + compared to 16 entries for a Huffman tree (six two entry tables and one four + entry table). Assuming that the code ideally represents the probability of + the symbols, it takes on the average 1.25 lookups per symbol. That's compared + to one lookup for the single table, or 1.66 lookups per symbol for the + Huffman tree. + + There, I think that gives you a picture of what's going on. For inflate, the + meaning of a particular symbol is often more than just a letter. It can be a + byte (a "literal"), or it can be either a length or a distance which + indicates a base value and a number of bits to fetch after the code that is + added to the base value. Or it might be the special end-of-block code. The + data structures created in inftrees.c try to encode all that information + compactly in the tables. + + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + + References: + + [LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data + Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3, + pp. 337-343. + + ``DEFLATE Compressed Data Format Specification'' available in + http://www.ietf.org/rfc/rfc1951.txt diff -Nrcpad gcc-4.4.4/zlib/amiga/Makefile.pup gcc-4.4.5/zlib/amiga/Makefile.pup *** gcc-4.4.4/zlib/amiga/Makefile.pup Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/amiga/Makefile.pup Mon Oct 11 18:45:43 2004 *************** *** 0 **** --- 1,66 ---- + # Amiga powerUP (TM) Makefile + # makefile for libpng and SAS C V6.58/7.00 PPC compiler + # Copyright (C) 1998 by Andreas R. Kleinert + + LIBNAME = libzip.a + + CC = scppc + CFLAGS = NOSTKCHK NOSINT OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL \ + OPTLOOP OPTRDEP=8 OPTDEP=8 OPTCOMP=8 NOVER + AR = ppc-amigaos-ar cr + RANLIB = ppc-amigaos-ranlib + LD = ppc-amigaos-ld -r + LDFLAGS = -o + LDLIBS = LIB:scppc.a LIB:end.o + RM = delete quiet + + OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ + zutil.o inflate.o infback.o inftrees.o inffast.o + + TEST_OBJS = example.o minigzip.o + + all: example minigzip + + check: test + test: all + example + echo hello world | minigzip | minigzip -d + + $(LIBNAME): $(OBJS) + $(AR) $@ $(OBJS) + -$(RANLIB) $@ + + example: example.o $(LIBNAME) + $(LD) $(LDFLAGS) $@ LIB:c_ppc.o $@.o $(LIBNAME) $(LDLIBS) + + minigzip: minigzip.o $(LIBNAME) + $(LD) $(LDFLAGS) $@ LIB:c_ppc.o $@.o $(LIBNAME) $(LDLIBS) + + mostlyclean: clean + clean: + $(RM) *.o example minigzip $(LIBNAME) foo.gz + + zip: + zip -ul9 zlib README ChangeLog Makefile Make????.??? Makefile.?? \ + descrip.mms *.[ch] + + tgz: + cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \ + zlib/Make????.??? zlib/Makefile.?? zlib/descrip.mms zlib/*.[ch] + + # DO NOT DELETE THIS LINE -- make depend depends on it. + + adler32.o: zlib.h zconf.h + compress.o: zlib.h zconf.h + crc32.o: crc32.h zlib.h zconf.h + deflate.o: deflate.h zutil.h zlib.h zconf.h + example.o: zlib.h zconf.h + gzio.o: zutil.h zlib.h zconf.h + inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h + inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h + infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h + inftrees.o: zutil.h zlib.h zconf.h inftrees.h + minigzip.o: zlib.h zconf.h + trees.o: deflate.h zutil.h zlib.h zconf.h trees.h + uncompr.o: zlib.h zconf.h + zutil.o: zutil.h zlib.h zconf.h diff -Nrcpad gcc-4.4.4/zlib/amiga/Makefile.sas gcc-4.4.5/zlib/amiga/Makefile.sas *** gcc-4.4.4/zlib/amiga/Makefile.sas Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/amiga/Makefile.sas Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,65 ---- + # SMakefile for zlib + # Modified from the standard UNIX Makefile Copyright Jean-loup Gailly + # Osma Ahvenlampi + # Amiga, SAS/C 6.56 & Smake + + CC=sc + CFLAGS=OPT + #CFLAGS=OPT CPU=68030 + #CFLAGS=DEBUG=LINE + LDFLAGS=LIB z.lib + + SCOPTIONS=OPTSCHED OPTINLINE OPTALIAS OPTTIME OPTINLOCAL STRMERGE \ + NOICONS PARMS=BOTH NOSTACKCHECK UTILLIB NOVERSION ERRORREXX \ + DEF=POSTINC + + OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ + zutil.o inflate.o infback.o inftrees.o inffast.o + + TEST_OBJS = example.o minigzip.o + + all: SCOPTIONS example minigzip + + check: test + test: all + example + echo hello world | minigzip | minigzip -d + + install: z.lib + copy clone zlib.h zconf.h INCLUDE: + copy clone z.lib LIB: + + z.lib: $(OBJS) + oml z.lib r $(OBJS) + + example: example.o z.lib + $(CC) $(CFLAGS) LINK TO $@ example.o $(LDFLAGS) + + minigzip: minigzip.o z.lib + $(CC) $(CFLAGS) LINK TO $@ minigzip.o $(LDFLAGS) + + mostlyclean: clean + clean: + -delete force quiet example minigzip *.o z.lib foo.gz *.lnk SCOPTIONS + + SCOPTIONS: Makefile.sas + copy to $@ 64K on 16-bit machine: */ + if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; + #endif + stream.next_out = dest; + stream.avail_out = (uInt)*destLen; + if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; + + stream.zalloc = (alloc_func)0; + stream.zfree = (free_func)0; + stream.opaque = (voidpf)0; + + err = deflateInit(&stream, level); + if (err != Z_OK) return err; + + err = deflate(&stream, Z_FINISH); + if (err != Z_STREAM_END) { + deflateEnd(&stream); + return err == Z_OK ? Z_BUF_ERROR : err; + } + *destLen = stream.total_out; + + err = deflateEnd(&stream); + return err; + } + + /* =========================================================================== + */ + int ZEXPORT compress (dest, destLen, source, sourceLen) + Bytef *dest; + uLongf *destLen; + const Bytef *source; + uLong sourceLen; + { + return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION); + } + + /* =========================================================================== + If the default memLevel or windowBits for deflateInit() is changed, then + this function needs to be updated. + */ + uLong ZEXPORT compressBound (sourceLen) + uLong sourceLen; + { + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11; + } diff -Nrcpad gcc-4.4.4/zlib/configure gcc-4.4.5/zlib/configure *** gcc-4.4.4/zlib/configure Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/configure Sun Mar 1 17:49:31 2009 *************** *** 0 **** --- 1,13574 ---- + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. + # Generated by GNU Autoconf 2.59. + # + # Copyright (C) 2003 Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## --------------------- ## + ## M4sh Initialization. ## + ## --------------------- ## + + # Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix + fi + DUALCASE=1; export DUALCASE # for MKS sh + + # Support unset when possible. + if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset + else + as_unset=false + fi + + + # Work around bugs in pre-3.0 UWIN ksh. + $as_unset ENV MAIL MAILPATH + PS1='$ ' + PS2='> ' + PS4='+ ' + + # NLS nuisances. + for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME + do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi + done + + # Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr + else + as_expr=false + fi + + if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename + else + as_basename=false + fi + + + # Name of the executable. + as_me=`$as_basename "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || + echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + + # PATH needs CR, and LINENO needs CR and PATH. + # Avoid depending upon Character Ranges. + as_cr_letters='abcdefghijklmnopqrstuvwxyz' + as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' + as_cr_Letters=$as_cr_letters$as_cr_LETTERS + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + + # The user is always right. + if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh + fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done + done + ;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit + } + + + case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' + ' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; + esac + + if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr + else + as_expr=false + fi + + rm -f conf$$ conf$$.exe conf$$.file + echo >conf$$.file + if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi + rm -f conf$$ conf$$.exe conf$$.file + + if mkdir -p . 2>/dev/null; then + as_mkdir_p=: + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false + fi + + as_executable_p="test -f" + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + + # Sed expression to map a string onto a valid variable name. + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + + # IFS + # We need space, tab and new line, in precisely that order. + as_nl=' + ' + IFS=" $as_nl" + + # CDPATH. + $as_unset CDPATH + + + + # Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + + case X$lt_ECHO in + X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` + ;; + esac + + ECHO=${lt_ECHO-echo} + if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : + elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then + # Yippee, $ECHO works! + : + else + # Restart under the correct shell. + exec $SHELL "$0" --no-reexec ${1+"$@"} + fi + + if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat <<_LT_EOF + $* + _LT_EOF + exit 0 + fi + + # The HP-UX ksh and POSIX shell print the target directory to stdout + # if CDPATH is set. + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + if test -z "$lt_ECHO"; then + if test "X${echo_test_string+set}" != Xset; then + # find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if { echo_test_string=`eval $cmd`; } 2>/dev/null && + { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null + then + break + fi + done + fi + + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : + else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" + + if test "X$ECHO" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + ECHO='print -r' + elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} + else + # Try using printf. + ECHO='printf %s\n' + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + ECHO="$CONFIG_SHELL $0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$CONFIG_SHELL $0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do + if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "$0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} + else + # Oops. We lost completely, so just stick with echo. + ECHO=echo + fi + fi + fi + fi + fi + fi + + # Copy echo and quote the copy suitably for passing to libtool from + # the Makefile, instead of quoting the original, which is used later. + lt_ECHO=$ECHO + if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" + fi + + + + + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + + exec 6>&1 + + # + # Initializations. + # + ac_default_prefix=/usr/local + ac_config_libobj_dir=. + cross_compiling=no + subdirs= + MFLAGS= + MAKEFLAGS= + SHELL=${CONFIG_SHELL-/bin/sh} + + # Maximum number of lines to put in a shell here document. + # This variable seems obsolete. It should probably be removed, and + # only ac_max_sed_lines should be used. + : ${ac_max_here_lines=38} + + # Identity of this package. + PACKAGE_NAME= + PACKAGE_TARNAME= + PACKAGE_VERSION= + PACKAGE_STRING= + PACKAGE_BUGREPORT= + + ac_unique_file="zlib.h" + # Factoring default headers for most tests. + ac_includes_default="\ + #include + #if HAVE_SYS_TYPES_H + # include + #endif + #if HAVE_SYS_STAT_H + # include + #endif + #if STDC_HEADERS + # include + # include + #else + # if HAVE_STDLIB_H + # include + # endif + #endif + #if HAVE_STRING_H + # if !STDC_HEADERS && HAVE_MEMORY_H + # include + # endif + # include + #endif + #if HAVE_STRINGS_H + # include + #endif + #if HAVE_INTTYPES_H + # include + #else + # if HAVE_STDINT_H + # include + # endif + #endif + #if HAVE_UNISTD_H + # include + #endif" + + ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS multi_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os mkinstalldirs INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT COMPPATH CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS LIBTOOL SED EGREP FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM LN_S OBJDUMP ac_ct_OBJDUMP AR ac_ct_AR RANLIB ac_ct_RANLIB lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP CPPFLAGS target_all toolexecdir toolexeclibdir TARGET_LIBRARY_TRUE TARGET_LIBRARY_FALSE LIBOBJS LTLIBOBJS' + ac_subst_files='' + ac_pwd=`pwd` + + # Initialize some variables set by options. + ac_init_help= + ac_init_version=false + # The variables have the same names as the options, with + # dashes changed to underlines. + cache_file=/dev/null + exec_prefix=NONE + no_create= + no_recursion= + prefix=NONE + program_prefix=NONE + program_suffix=NONE + program_transform_name=s,x,x, + silent= + site= + srcdir= + verbose= + x_includes=NONE + x_libraries=NONE + + # Installation directory options. + # These are left unexpanded so users can "make install exec_prefix=/foo" + # and all the variables that are supposed to be based on exec_prefix + # by default will actually change. + # Use braces instead of parens because sh, perl, etc. also accept them. + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' + datadir='${prefix}/share' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' + libdir='${exec_prefix}/lib' + includedir='${prefix}/include' + oldincludedir='/usr/include' + infodir='${prefix}/info' + mandir='${prefix}/man' + + ac_prev= + for ac_option + do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval "$ac_prev=\$ac_option" + ac_prev= + continue + fi + + ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case $ac_option in + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + eval "enable_$ac_feature=no" ;; + + -enable-* | --enable-*) + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + *) ac_optarg=yes ;; + esac + eval "enable_$ac_feature='$ac_optarg'" ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package| sed 's/-/_/g'` + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + *) ac_optarg=yes ;; + esac + eval "with_$ac_package='$ac_optarg'" ;; + + -without-* | --without-*) + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/-/_/g'` + eval "with_$ac_package=no" ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) { echo "$as_me: error: unrecognized option: $ac_option + Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` + eval "$ac_envvar='$ac_optarg'" + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + + esac + done + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + { echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } + fi + + # Be sure to have absolute paths. + for ac_var in exec_prefix prefix + do + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* | NONE | '' ) ;; + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; + esac + done + + # Be sure to have absolute paths. + for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ + localstatedir libdir includedir oldincludedir infodir mandir + do + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* ) ;; + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; + esac + done + + # There might be people who depend on the old broken behavior: `$host' + # used to hold the argument of --host etc. + # FIXME: To remove some day. + build=$build_alias + host=$host_alias + target=$target_alias + + # FIXME: To remove some day. + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi + fi + + ac_tool_prefix= + test -n "$host_alias" && ac_tool_prefix=$host_alias- + + test "$silent" = yes && exec 6>/dev/null + + + # Find the source files, if location was not specified. + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then its parent. + ac_confdir=`(dirname "$0") 2>/dev/null || + $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r $srcdir/$ac_unique_file; then + srcdir=.. + fi + else + ac_srcdir_defaulted=no + fi + if test ! -r $srcdir/$ac_unique_file; then + if test "$ac_srcdir_defaulted" = yes; then + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 + { (exit 1); exit 1; }; } + else + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } + fi + fi + (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } + srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` + ac_env_build_alias_set=${build_alias+set} + ac_env_build_alias_value=$build_alias + ac_cv_env_build_alias_set=${build_alias+set} + ac_cv_env_build_alias_value=$build_alias + ac_env_host_alias_set=${host_alias+set} + ac_env_host_alias_value=$host_alias + ac_cv_env_host_alias_set=${host_alias+set} + ac_cv_env_host_alias_value=$host_alias + ac_env_target_alias_set=${target_alias+set} + ac_env_target_alias_value=$target_alias + ac_cv_env_target_alias_set=${target_alias+set} + ac_cv_env_target_alias_value=$target_alias + ac_env_CPP_set=${CPP+set} + ac_env_CPP_value=$CPP + ac_cv_env_CPP_set=${CPP+set} + ac_cv_env_CPP_value=$CPP + ac_env_CPPFLAGS_set=${CPPFLAGS+set} + ac_env_CPPFLAGS_value=$CPPFLAGS + ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} + ac_cv_env_CPPFLAGS_value=$CPPFLAGS + + # + # Report the --help message. + # + if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF + \`configure' configures this package to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + + To assign environment variables (e.g., CC, CFLAGS...), specify them as + VAR=VALUE. See below for descriptions of some of the useful variables. + + Defaults for the options are specified in brackets. + + Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + + _ACEOF + + cat <<_ACEOF + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + + By default, \`make install' will install all the files in + \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify + an installation prefix other than \`$ac_default_prefix' using \`--prefix', + for instance \`--prefix=\$HOME'. + + For better control, use the options below. + + Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data [PREFIX/share] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --infodir=DIR info documentation [PREFIX/info] + --mandir=DIR man documentation [PREFIX/man] + _ACEOF + + cat <<\_ACEOF + + Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + + System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] + --target=TARGET configure for building compilers for TARGET [HOST] + _ACEOF + fi + + if test -n "$ac_init_help"; then + + cat <<\_ACEOF + + Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-multilib build many library versions (default) + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors + --enable-shared[=PKGS] + build shared libraries [default=yes] + --enable-static[=PKGS] + build static libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-target-subdir=SUBDIR + configuring in a subdirectory + --with-cross-host=HOST configuring with a cross compiler + --with-system-zlib use installed libz + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + + Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have + headers in a nonstandard directory + CPP C preprocessor + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. + + _ACEOF + fi + + if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + ac_popdir=`pwd` + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d $ac_dir || continue + ac_builddir=. + + if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` + else + ac_dir_suffix= ac_top_builddir= + fi + + case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; + esac + + # Do not use `cd foo && pwd` to compute absolute paths, because + # the directories may not exist. + case `pwd` in + .) ac_abs_builddir="$ac_dir";; + *) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; + esac + case $ac_abs_builddir in + .) ac_abs_top_builddir=${ac_top_builddir}.;; + *) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; + esac + case $ac_abs_builddir in + .) ac_abs_srcdir=$ac_srcdir;; + *) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; + esac + case $ac_abs_builddir in + .) ac_abs_top_srcdir=$ac_top_srcdir;; + *) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; + esac + + cd $ac_dir + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_srcdir/configure.gnu; then + echo + $SHELL $ac_srcdir/configure.gnu --help=recursive + elif test -f $ac_srcdir/configure; then + echo + $SHELL $ac_srcdir/configure --help=recursive + elif test -f $ac_srcdir/configure.ac || + test -f $ac_srcdir/configure.in; then + echo + $ac_configure --help + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi + cd $ac_popdir + done + fi + + test -n "$ac_init_help" && exit 0 + if $ac_init_version; then + cat <<\_ACEOF + + Copyright (C) 2003 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF + exit 0 + fi + exec 5>config.log + cat >&5 <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was + generated by GNU Autoconf 2.59. Invocation command line was + + $ $0 $@ + + _ACEOF + { + cat <<_ASUNAME + ## --------- ## + ## Platform. ## + ## --------- ## + + hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` + uname -m = `(uname -m) 2>/dev/null || echo unknown` + uname -r = `(uname -r) 2>/dev/null || echo unknown` + uname -s = `(uname -s) 2>/dev/null || echo unknown` + uname -v = `(uname -v) 2>/dev/null || echo unknown` + + /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` + /bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + + /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` + /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` + /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` + hostinfo = `(hostinfo) 2>/dev/null || echo unknown` + /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` + /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` + /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + + _ASUNAME + + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" + done + + } >&5 + + cat >&5 <<_ACEOF + + + ## ----------- ## + ## Core tests. ## + ## ----------- ## + + _ACEOF + + + # Keep a trace of the command line. + # Strip out --no-create and --no-recursion so they do not pile up. + # Strip out --silent because we don't want to record it for future runs. + # Also quote any args containing shell meta-characters. + # Make two passes to allow for proper duplicate-argument suppression. + ac_configure_args= + ac_configure_args0= + ac_configure_args1= + ac_sep= + ac_must_keep_next=false + for ac_pass in 1 2 + do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " + ;; + esac + done + done + $as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } + $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } + + # When interrupted or exit'd, cleanup temporary files, and complete + # config.log. We remove comments because anyway the quotes in there + # would cause problems or look ugly. + # WARNING: Be sure not to use single quotes in there, as some shells, + # such as our DU 5.0 friend, will then `close' the trap. + trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + cat <<\_ASBOX + ## ---------------- ## + ## Cache variables. ## + ## ---------------- ## + _ASBOX + echo + # The following way of writing the cache mishandles newlines in values, + { + (set) 2>&1 | + case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in + *ac_space=\ *) + sed -n \ + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + ;; + *) + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; + } + echo + + cat <<\_ASBOX + ## ----------------- ## + ## Output variables. ## + ## ----------------- ## + _ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX + ## ------------- ## + ## Output files. ## + ## ------------- ## + _ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX + ## ----------- ## + ## confdefs.h. ## + ## ----------- ## + _ASBOX + echo + sed "/^$/d" confdefs.h | sort + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status + ' 0 + for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + done + ac_signal=0 + + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -rf conftest* confdefs.h + # AIX cpp loses on an empty file, so make sure it contains at least a newline. + echo >confdefs.h + + # Predefined preprocessor variables. + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_NAME "$PACKAGE_NAME" + _ACEOF + + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_TARNAME "$PACKAGE_TARNAME" + _ACEOF + + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_VERSION "$PACKAGE_VERSION" + _ACEOF + + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_STRING "$PACKAGE_STRING" + _ACEOF + + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" + _ACEOF + + + # Let the site file select an alternate cache file if it wants to. + # Prefer explicitly selected file to automatically selected ones. + if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi + fi + for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi + done + + if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 + echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; + *) . ./$cache_file;; + esac + fi + else + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 + echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi + + # Check that the precious variables saved in the cache have kept the same + # value. + ac_cache_corrupted=false + for ac_var in `(set) 2>&1 | + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val="\$ac_cv_env_${ac_var}_value" + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 + echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 + echo "$as_me: former value: \`$ac_old_val'" >&2;} + { echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 + echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + esac + fi + done + if $ac_cache_corrupted; then + { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + echo "$as_me: error: in \`$ac_pwd':" >&2;} + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 + echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } + fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + + + + + + + + + + + + + + + + + + + # Default to --enable-multilib + # Check whether --enable-multilib or --disable-multilib was given. + if test "${enable_multilib+set}" = set; then + enableval="$enable_multilib" + case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) { { echo "$as_me:$LINENO: error: bad value $enableval for multilib option" >&5 + echo "$as_me: error: bad value $enableval for multilib option" >&2;} + { (exit 1); exit 1; }; } ;; + esac + else + multilib=yes + fi; + + # We may get other options which we leave undocumented: + # --with-target-subdir, --with-multisrctop, --with-multisubdir + # See config-ml.in if you want the gory details. + + if test "$srcdir" = "."; then + if test "$with_target_subdir" != "."; then + multi_basedir="$srcdir/$with_multisrctop../.." + else + multi_basedir="$srcdir/$with_multisrctop.." + fi + else + multi_basedir="$srcdir/.." + fi + + + # Even if the default multilib is not a cross compilation, + # it may be that some of the other multilibs are. + if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe + fi + + ac_config_commands="$ac_config_commands default-1" + + + ac_aux_dir= + for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f $ac_dir/shtool; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi + done + if test -z "$ac_aux_dir"; then + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { (exit 1); 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. + + # Make sure we can run config.sub. + $ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 + echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + + echo "$as_me:$LINENO: checking build system type" >&5 + echo $ECHO_N "checking build system type... $ECHO_C" >&6 + if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_build_alias=$build_alias + test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` + test -z "$ac_cv_build_alias" && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 + echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } + ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi + echo "$as_me:$LINENO: result: $ac_cv_build" >&5 + echo "${ECHO_T}$ac_cv_build" >&6 + build=$ac_cv_build + build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + + echo "$as_me:$LINENO: checking host system type" >&5 + echo $ECHO_N "checking host system type... $ECHO_C" >&6 + if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_host_alias=$host_alias + test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias + ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi + echo "$as_me:$LINENO: result: $ac_cv_host" >&5 + echo "${ECHO_T}$ac_cv_host" >&6 + host=$ac_cv_host + host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + + echo "$as_me:$LINENO: checking target system type" >&5 + echo $ECHO_N "checking target system type... $ECHO_C" >&6 + if test "${ac_cv_target+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_target_alias=$target_alias + test "x$ac_cv_target_alias" = "x" && + ac_cv_target_alias=$ac_cv_host_alias + ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi + echo "$as_me:$LINENO: result: $ac_cv_target" >&5 + echo "${ECHO_T}$ac_cv_target" >&6 + target=$ac_cv_target + target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + + # The aliases save the names the user supplied, while $host etc. + # will get canonicalized. + test -n "$target_alias" && + test "$program_prefix$program_suffix$program_transform_name" = \ + NONENONEs,x,x, && + program_prefix=${target_alias}- + + # This works around an automake problem. + mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" + + + am__api_version="1.9" + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or + # incompatible versions: + # SysV /etc/install, /usr/sbin/install + # SunOS /usr/etc/install + # IRIX /sbin/install + # AIX /bin/install + # AmigaOS /C/install, which installs bootblocks on floppy discs + # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag + # AFS /usr/afsws/bin/install, which mishandles nonexistent args + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. + # Reject install programs that cannot install multiple files. + echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 + echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 + if test -z "$INSTALL"; then + if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. + case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; + esac + done + + rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi + fi + echo "$as_me:$LINENO: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # 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_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + echo "$as_me:$LINENO: checking whether build environment is sane" >&5 + echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 + # Just in case + sleep 1 + echo timestamp > conftest.file + # Do `set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). + if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken + alias in your environment" >&5 + echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken + alias in your environment" >&2;} + { (exit 1); exit 1; }; } + fi + + test "$2" = conftest.file + ) + then + # Ok. + : + else + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! + Check your system clock" >&5 + echo "$as_me: error: newly created file is older than distributed files! + Check your system clock" >&2;} + { (exit 1); exit 1; }; } + fi + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + test "$program_prefix" != NONE && + 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" + # Double any \ or $. echo might interpret backslashes. + # By default was `s,x,x', remove it if useless. + cat <<\_ACEOF >conftest.sed + s/[\\$]/&&/g;s/;s,x,x,$// + _ACEOF + program_transform_name=`echo $program_transform_name | sed -f conftest.sed` + rm conftest.sed + + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` + + test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " + else + am_missing_run= + { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 + echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi + fi + + for ac_prog in gawk mawk nawk awk + 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 "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then + echo "$as_me:$LINENO: result: $AWK" >&5 + echo "${ECHO_T}$AWK" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$AWK" && break + done + + echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 + echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` + if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.make <<\_ACEOF + all: + @echo 'ac_maketemp="$(MAKE)"' + _ACEOF + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` + if test -n "$ac_maketemp"; then + eval ac_cv_prog_make_${ac_make}_set=yes + else + eval ac_cv_prog_make_${ac_make}_set=no + fi + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi + + rm -rf .tst 2>/dev/null + mkdir .tst 2>/dev/null + if test -d .tst; then + am__leading_dot=. + else + am__leading_dot=_ + fi + rmdir .tst 2>/dev/null + + # test to see if srcdir already configured + if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 + echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } + fi + + # test whether we have cygpath + if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi + fi + + + # Define the identity of the package. + PACKAGE=zlib + VERSION=1.1.4 + + + cat >>confdefs.h <<_ACEOF + #define PACKAGE "$PACKAGE" + _ACEOF + + + cat >>confdefs.h <<_ACEOF + #define VERSION "$VERSION" + _ACEOF + + # Some tools Automake needs. + + ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + + AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + + AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + + AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + + install_sh=${install_sh-"$am_aux_dir/install-sh"} + + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right + # tool to use in cross-compilation environments, therefore Automake + # will honor the `STRIP' environment variable to overrule this program. + if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then + echo "$as_me:$LINENO: result: $STRIP" >&5 + echo "${ECHO_T}$STRIP" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + echo "${ECHO_T}$ac_ct_STRIP" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + STRIP=$ac_ct_STRIP + else + STRIP="$ac_cv_prog_STRIP" + fi + + fi + INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. + # Always define AMTAR for backward compatibility. + + AMTAR=${AMTAR-"${am_missing_run}tar"} + + am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + + + + + + echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 + echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. + if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" + USE_MAINTAINER_MODE=$enableval + else + USE_MAINTAINER_MODE=no + fi; + echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 + echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 + + + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' + else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= + fi + + MAINT=$MAINTAINER_MODE_TRUE + + + + + # Check whether --with-target-subdir or --without-target-subdir was given. + if test "${with_target_subdir+set}" = set; then + withval="$with_target_subdir" + + fi; + + if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then + COMPPATH=. + else + COMPPATH=.. + fi + + + + # Check whether --with-cross-host or --without-cross-host was given. + if test "${with_cross_host+set}" = set; then + withval="$with_cross_host" + + fi; + + # Check whether --enable-multilib or --disable-multilib was given. + if test "${enable_multilib+set}" = set; then + enableval="$enable_multilib" + case "${enableval}" in + yes) multilib=yes ;; + no) multilib=no ;; + *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for multilib option" >&5 + echo "$as_me: error: bad value ${enableval} for multilib option" >&2;} + { (exit 1); exit 1; }; } ;; + esac + else + test -z "$with_target_subdir" && multilib=no || multilib=yes + fi; + + # Check whether --with-system-zlib or --without-system-zlib was given. + if test "${with_system_zlib+set}" = set; then + withval="$with_system_zlib" + + fi; + + # Make sure we don't test executables when making cross-tools. + + + # The same as in boehm-gc and libstdc++. Have to borrow it from there. + # We must force CC to /not/ be precious variables; otherwise + # the wrong, non-multilib-adjusted value will be used in multilibs. + # As a side effect, we have to subst CFLAGS ourselves. + + + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + CC=$ac_ct_CC + else + CC="$ac_cv_prog_CC" + fi + + if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + CC=$ac_ct_CC + else + CC="$ac_cv_prog_CC" + fi + + fi + 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 "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + ac_prog_rejected=no + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi + fi + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$CC" && break + done + fi + if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl + 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 "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$ac_ct_CC" && break + done + + CC=$ac_ct_CC + fi + + fi + + + test -z "$CC" && { { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH + See \`config.log' for more details." >&5 + echo "$as_me: error: no acceptable C compiler found in \$PATH + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + + # Provide some information about the compiler. + echo "$as_me:$LINENO:" \ + "checking for C compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` + { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + { (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + { (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + int + main () + { + + ; + return 0; + } + _ACEOF + # FIXME: Cleanup? + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + gcc_no_link=no + else + gcc_no_link=yes + fi + + if test x$gcc_no_link = xyes; then + # Setting cross_compile will disable run tests; it will + # also disable AC_CHECK_FILE but that's generally + # correct if we can't link. + cross_compiling=yes + EXEEXT= + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + int + main () + { + + ; + return 0; + } + _ACEOF + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files a.out a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. + echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 + echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 + ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Find the output, starting from the most likely. This scheme is + # not robust to junk in `.', hence go to wildcards (a.*) only as a last + # resort. + + # Be careful to initialize this variable, since it used to be cached. + # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. + ac_cv_exeext= + # b.out is created by i960 compilers. + for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out + do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; + esac + done + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + { { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { echo "$as_me:$LINENO: error: C compiler cannot create executables + See \`config.log' for more details." >&5 + echo "$as_me: error: C compiler cannot create executables + See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + fi + + ac_exeext=$ac_cv_exeext + echo "$as_me:$LINENO: result: $ac_file" >&5 + echo "${ECHO_T}$ac_file" >&6 + + # Check the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. + echo "$as_me:$LINENO: checking whether the C compiler works" >&5 + echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 + # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. + If you meant to cross compile, use \`--host'. + See \`config.log' for more details." >&5 + echo "$as_me: error: cannot run C compiled programs. + If you meant to cross compile, use \`--host'. + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + fi + fi + fi + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + + rm -f a.out a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save + # Check the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. + echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 + echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $cross_compiling" >&5 + echo "${ECHO_T}$cross_compiling" >&6 + + echo "$as_me:$LINENO: checking for suffix of executables" >&5 + echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will + # work properly (i.e., refer to `conftest.exe'), while it won't with + # `rm'. + for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + export ac_cv_exeext + break;; + * ) break;; + esac + done + else + { { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link + See \`config.log' for more details." >&5 + echo "$as_me: error: cannot compute suffix of executables: cannot compile and link + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + fi + + rm -f conftest$ac_cv_exeext + echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 + echo "${ECHO_T}$ac_cv_exeext" >&6 + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT + fi + echo "$as_me:$LINENO: checking for suffix of object files" >&5 + echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 + if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + int + main () + { + + ; + return 0; + } + _ACEOF + rm -f conftest.o conftest.obj + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac + done + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + { { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile + See \`config.log' for more details." >&5 + echo "$as_me: error: cannot compute suffix of object files: cannot compile + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + fi + + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 + echo "${ECHO_T}$ac_cv_objext" >&6 + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT + echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 + echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 + if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + int + main () + { + #ifndef __GNUC__ + choke me + #endif + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi + echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 + echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 + GCC=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS + CFLAGS="-g" + echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 + echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 + if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + int + main () + { + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_prog_cc_g=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi + else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi + fi + echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 + echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 + if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_prog_cc_stdc=no + ac_save_CC=$CC + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include + #include + #include + #include + /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ + struct buf { int x; }; + FILE * (*rcsopen) (struct buf *, struct stat *, int); + static char *e (p, i) + char **p; + int i; + { + return p[i]; + } + static char *f (char * (*g) (char **, int), char **p, ...) + { + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; + } + + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std1 is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std1. */ + int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + + int test (int i, double x); + struct s1 {int (*f) (int a);}; + struct s2 {int (*f) (double a);}; + int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); + int argc; + char **argv; + int + main () + { + return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; + } + _ACEOF + # Don't try gcc -ansi; that turns off useful extensions and + # breaks some systems' header files. + # AIX -qlanglvl=ansi + # Ultrix and OSF/1 -std1 + # HP-UX 10.20 and later -Ae + # HP-UX older versions -Aa -D_HPUX_SOURCE + # SVR4 -Xc -D__EXTENSIONS__ + for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg + break + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f conftest.err conftest.$ac_objext + done + rm -f conftest.$ac_ext conftest.$ac_objext + CC=$ac_save_CC + + fi + + case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 + echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; + esac + + # Some people use a C++ compiler to compile C. Since we use `exit', + # in C++ we need to declare it. In case someone uses the same compiler + # for both compiling C and C++ we need to have the C++ compiler decide + # the declaration of exit, since it's the most demanding environment. + cat >conftest.$ac_ext <<_ACEOF + #ifndef __cplusplus + choke me + #endif + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + '' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' + do + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_declaration + #include + int + main () + { + exit (42); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + continue + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_declaration + int + main () + { + exit (42); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done + rm -f conftest* + if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h + fi + + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" + + ac_config_commands="$ac_config_commands depfiles" + + + am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: + @echo done + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. + echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 + echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 + am__include="#" + am__quote= + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf + # We grep out `Entering directory' and `Leaving directory' + # messages which can occur if `w' ends up in MAKEFLAGS. + # In particular we don't look at `^make:' because GNU make might + # be invoked under some other name (usually "gmake"), in which + # case it prints its new name instead of `make'. + if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU + fi + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi + fi + + + echo "$as_me:$LINENO: result: $_am_result" >&5 + echo "${ECHO_T}$_am_result" >&6 + rm -f confinc confmf + + # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. + if test "${enable_dependency_tracking+set}" = set; then + enableval="$enable_dependency_tracking" + + fi; + if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi + + + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' + else + AMDEP_TRUE='#' + AMDEP_FALSE= + fi + + + + + depcc="$CC" am_compiler_list= + + echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 + echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 + if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir + else + am_cv_CC_dependencies_compiler_type=none + fi + + fi + echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 + echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' + else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= + fi + + + + + + + case `pwd` in + *\ * | *\ *) + { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + esac + + + + macro_version='2.2.6' + macro_revision='1.3012' + + + + + + + + + + + + + + ltmain="$ac_aux_dir/ltmain.sh" + + echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 + echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 + if test "${lt_cv_path_SED+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # Loop through the user's path and test for sed and gsed. + # Then use that list of sed's as ones to test for truncation. + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done + done + IFS=$as_save_IFS + lt_ac_max=0 + lt_ac_count=0 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris + # along with /bin/sed that truncates output. + for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done + done + + fi + + SED=$lt_cv_path_SED + + echo "$as_me:$LINENO: result: $SED" >&5 + echo "${ECHO_T}$SED" >&6 + + test -z "$SED" && SED=sed + Xsed="$SED -e 1s/^X//" + + + + + + + + + + + + echo "$as_me:$LINENO: checking for egrep" >&5 + echo $ECHO_N "checking for egrep... $ECHO_C" >&6 + if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi + fi + echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 + echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + + + echo "$as_me:$LINENO: checking for fgrep" >&5 + echo $ECHO_N "checking for fgrep... $ECHO_C" >&6 + if test "${ac_cv_prog_fgrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if echo 'ab*c' | (grep -F 'ab*c') >/dev/null 2>&1 + then ac_cv_prog_fgrep='grep -F' + else ac_cv_prog_fgrep='fgrep' + fi + fi + echo "$as_me:$LINENO: result: $ac_cv_prog_fgrep" >&5 + echo "${ECHO_T}$ac_cv_prog_fgrep" >&6 + FGREP=$ac_cv_prog_fgrep + + + test -z "$GREP" && GREP=grep + + + + + + + + + + + + + + + + + + + + # Check whether --with-gnu-ld or --without-gnu-ld was given. + if test "${with_gnu_ld+set}" = set; then + withval="$with_gnu_ld" + test "$withval" = no || with_gnu_ld=yes + else + with_gnu_ld=no + fi; + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + echo "$as_me:$LINENO: checking for ld used by $CC" >&5 + echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac + elif test "$with_gnu_ld" = yes; then + echo "$as_me:$LINENO: checking for GNU ld" >&5 + echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + else + echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + fi + if test "${lt_cv_path_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 + echo "${ECHO_T}$LD" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 + echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } + echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 + echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 + if test "${lt_cv_prog_gnu_ld+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 &5 + echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 + with_gnu_ld=$lt_cv_prog_gnu_ld + + + + + + + + + + echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 + echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6 + if test "${lt_cv_path_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" + else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + : ${lt_cv_path_NM=no} + fi + fi + echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 + echo "${ECHO_T}$lt_cv_path_NM" >&6 + if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" + else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$ac_tool_prefix"; then + for ac_prog in "dumpbin -symbols" "link -dump -symbols" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_DUMPBIN+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + DUMPBIN=$ac_cv_prog_DUMPBIN + if test -n "$DUMPBIN"; then + echo "$as_me:$LINENO: result: $DUMPBIN" >&5 + echo "${ECHO_T}$DUMPBIN" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$DUMPBIN" && break + done + fi + if test -z "$DUMPBIN"; then + ac_ct_DUMPBIN=$DUMPBIN + for ac_prog in "dumpbin -symbols" "link -dump -symbols" + 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 "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN + if test -n "$ac_ct_DUMPBIN"; then + echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 + echo "${ECHO_T}$ac_ct_DUMPBIN" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$ac_ct_DUMPBIN" && break + done + test -n "$ac_ct_DUMPBIN" || ac_ct_DUMPBIN=":" + + DUMPBIN=$ac_ct_DUMPBIN + fi + + + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi + fi + test -z "$NM" && NM=nm + + + + + + + echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 + echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6 + if test "${lt_cv_nm_interface+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:3704: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:3707: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 + (eval echo "\"\$as_me:3710: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* + fi + echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 + echo "${ECHO_T}$lt_cv_nm_interface" >&6 + + echo "$as_me:$LINENO: checking whether ln -s works" >&5 + echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no, using $LN_S" >&5 + echo "${ECHO_T}no, using $LN_S" >&6 + fi + + # find the maximum length of command line arguments + echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 + echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 + if test "${lt_cv_sys_max_cmd_len+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ + = "XX$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac + + fi + + if test -n $lt_cv_sys_max_cmd_len ; then + echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 + echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 + else + echo "$as_me:$LINENO: result: none" >&5 + echo "${ECHO_T}none" >&6 + fi + max_cmd_len=$lt_cv_sys_max_cmd_len + + + + + + + : ${CP="cp -f"} + : ${MV="mv -f"} + : ${RM="rm -f"} + + echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 + echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6 + # Try some XSI features + xsi_shell=no + ( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes + echo "$as_me:$LINENO: result: $xsi_shell" >&5 + echo "${ECHO_T}$xsi_shell" >&6 + + + echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 + echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6 + lt_shell_append=no + ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes + echo "$as_me:$LINENO: result: $lt_shell_append" >&5 + echo "${ECHO_T}$lt_shell_append" >&6 + + + if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset + else + lt_unset=false + fi + + + + + + # test EBCDIC or ASCII + case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; + esac + + + + + + + + + + echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 + echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 + if test "${lt_cv_ld_reload_flag+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_ld_reload_flag='-r' + fi + echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 + echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 + reload_flag=$lt_cv_ld_reload_flag + case $reload_flag in + "" | " "*) ;; + *) reload_flag=" $reload_flag" ;; + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; + esac + + + + + + + + + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_OBJDUMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then + echo "$as_me:$LINENO: result: $OBJDUMP" >&5 + echo "${ECHO_T}$OBJDUMP" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false" + fi + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then + echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 + echo "${ECHO_T}$ac_ct_OBJDUMP" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + OBJDUMP=$ac_ct_OBJDUMP + else + OBJDUMP="$ac_cv_prog_OBJDUMP" + fi + + test -z "$OBJDUMP" && OBJDUMP=objdump + + + + + + + + + + echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 + echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6 + if test "${lt_cv_deplibs_check_method+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_file_magic_cmd='$MAGIC_CMD' + lt_cv_file_magic_test_file= + lt_cv_deplibs_check_method='unknown' + # Need to set the preceding variable on all platforms that support + # interlibrary dependencies. + # 'none' -- dependencies not supported. + # `unknown' -- same as none, but documents that we really don't know. + # 'pass_all' -- all dependencies passed with no checks. + # 'test_compile' -- check by making test program. + # 'file_magic [[regex]]' -- check by looking for files in library path + # which responds to the $file_magic_cmd with a given extended regex. + # If you have `file' or equivalent on your system and you're not sure + # whether `pass_all' will *always* work, you probably want this one. + + case $host_os in + aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; + + beos*) + lt_cv_deplibs_check_method=pass_all + ;; + + bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + + cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + + mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + + cegcc) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + + darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + + freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + + gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + + hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + + interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; + + irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + + # This must be Linux ELF. + linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; + + newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + + *nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + + openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; + + osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + + rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + + solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + + sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + + tpf*) + lt_cv_deplibs_check_method=pass_all + ;; + esac + + fi + echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 + echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown + + + + + + + + + + + + + if test -n "$ac_tool_prefix"; then + # 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 "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then + echo "$as_me:$LINENO: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" + fi + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then + echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + AR=$ac_ct_AR + else + AR="$ac_cv_prog_AR" + fi + + test -z "$AR" && AR=ar + test -z "$AR_FLAGS" && AR_FLAGS=cru + + + + + + + + + + + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then + echo "$as_me:$LINENO: result: $STRIP" >&5 + echo "${ECHO_T}$STRIP" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + echo "${ECHO_T}$ac_ct_STRIP" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + STRIP=$ac_ct_STRIP + else + STRIP="$ac_cv_prog_STRIP" + fi + + test -z "$STRIP" && STRIP=: + + + + + + + if test -n "$ac_tool_prefix"; then + # 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 "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then + echo "$as_me:$LINENO: result: $RANLIB" >&5 + echo "${ECHO_T}$RANLIB" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" + fi + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 + echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + RANLIB=$ac_ct_RANLIB + else + RANLIB="$ac_cv_prog_RANLIB" + fi + + test -z "$RANLIB" && RANLIB=: + + + + + + + # Determine commands to create old-style static archives. + old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' + old_postinstall_cmds='chmod 644 $oldlib' + old_postuninstall_cmds= + + if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + + # If no C compiler flags were specified, use CFLAGS. + LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + + # Allow CC to be a program name with arguments. + compiler=$CC + + + # Check for command to grab the raw symbol name followed by C symbol from nm. + echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 + echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 + if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + # These are sane defaults that work on at least a few old systems. + # [They come from Ultrix. What could be older than Ultrix?!! ;)] + + # Character class describing NM global symbol codes. + symcode='[BCDEGRST]' + + # Regexp to match symbols that can be accessed directly from C. + sympat='\([_A-Za-z][_A-Za-z0-9]*\)' + + # Define system-specific variables. + case $host_os in + aix*) + symcode='[BCDT]' + ;; + cygwin* | mingw* | pw32* | cegcc*) + symcode='[ABCDGISTW]' + ;; + hpux*) + if test "$host_cpu" = ia64; then + symcode='[ABCDEGRST]' + fi + ;; + irix* | nonstopux*) + symcode='[BCDEGRST]' + ;; + osf*) + symcode='[BCDEGQRST]' + ;; + solaris*) + symcode='[BDRT]' + ;; + sco3.2v5*) + symcode='[DT]' + ;; + sysv4.2uw2*) + symcode='[DT]' + ;; + sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' + ;; + sysv4) + symcode='[DFNSTU]' + ;; + esac + + # If we're using GNU nm, then use its standard symbol codes. + case `$NM -V 2>&1` in + *GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; + esac + + # Transform an extracted symbol line into a proper C declaration. + # Some systems (esp. on ia64) link data and code symbols differently, + # so use this general approach. + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" + lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + + # Handle CRLF in mingw tool chain + opt_cr= + case $build_os in + mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; + esac + + # Try without a prefix underscore, then with it. + for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ + " {last_section=section; section=\$ 3};"\ + " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ + " \$ 0!~/External *\|/{next};"\ + " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ + " {if(hide[section]) next};"\ + " {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ + " {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ + " s[1]~/^[@?]/{print s[1], s[1]; next};"\ + " s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ + " ' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF + #ifdef __cplusplus + extern "C" { + #endif + char nm_test_var; + void nm_test_func(void); + void nm_test_func(void){} + #ifdef __cplusplus + } + #endif + int main(){nm_test_var='a';nm_test_func();return(0);} + _LT_EOF + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Now try to grab the symbols. + nlist=conftest.nm + if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext + #ifdef __cplusplus + extern "C" { + #endif + + _LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + + /* The mapping between symbol names and symbols. */ + const struct { + const char *name; + void *address; + } + lt__PROGRAM__LTX_preloaded_symbols[] = + { + { "@PROGRAM@", (void *) 0 }, + _LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} + }; + + /* This works around a problem in FreeBSD linker */ + #ifdef FREEBSD_WORKAROUND + static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; + } + #endif + + #ifdef __cplusplus + } + #endif + _LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" + else + echo "cannot find nm_test_func in $nlist" >&5 + fi + else + echo "cannot find nm_test_var in $nlist" >&5 + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 + fi + else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi + done + + fi + + if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= + fi + if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + echo "$as_me:$LINENO: result: failed" >&5 + echo "${ECHO_T}failed" >&6 + else + echo "$as_me:$LINENO: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + fi + + + + + + + + + + + + + + + + + + + + + + + + # Check whether --enable-libtool-lock or --disable-libtool-lock was given. + if test "${enable_libtool_lock+set}" = set; then + enableval="$enable_libtool_lock" + + fi; + test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + + # Some flags need to be propagated to the compiler or linker for good + # libtool support. + case $host in + ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; + *-*-irix6*) + # Find out which ABI we are using. + echo '#line 4868 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + + x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + + *-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 + echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 + if test "${lt_cv_cc_needs_belf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + int + main () + { + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + lt_cv_cc_needs_belf=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + lt_cv_cc_needs_belf=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi + echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 + echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; + sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + esac + + need_locks="$enable_libtool_lock" + + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. + set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + DSYMUTIL=$ac_cv_prog_DSYMUTIL + if test -n "$DSYMUTIL"; then + echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 + echo "${ECHO_T}$DSYMUTIL" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. + set dummy dsymutil; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + test -z "$ac_cv_prog_ac_ct_DSYMUTIL" && ac_cv_prog_ac_ct_DSYMUTIL=":" + fi + fi + ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL + if test -n "$ac_ct_DSYMUTIL"; then + echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 + echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + DSYMUTIL=$ac_ct_DSYMUTIL + else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" + fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. + set dummy ${ac_tool_prefix}nmedit; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + NMEDIT=$ac_cv_prog_NMEDIT + if test -n "$NMEDIT"; then + echo "$as_me:$LINENO: result: $NMEDIT" >&5 + echo "${ECHO_T}$NMEDIT" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. + set dummy nmedit; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + test -z "$ac_cv_prog_ac_ct_NMEDIT" && ac_cv_prog_ac_ct_NMEDIT=":" + fi + fi + ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT + if test -n "$ac_ct_NMEDIT"; then + echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 + echo "${ECHO_T}$ac_ct_NMEDIT" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + NMEDIT=$ac_ct_NMEDIT + else + NMEDIT="$ac_cv_prog_NMEDIT" + fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. + set dummy ${ac_tool_prefix}lipo; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LIPO+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + LIPO=$ac_cv_prog_LIPO + if test -n "$LIPO"; then + echo "$as_me:$LINENO: result: $LIPO" >&5 + echo "${ECHO_T}$LIPO" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + if test -z "$ac_cv_prog_LIPO"; then + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. + set dummy lipo; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_LIPO="lipo" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + test -z "$ac_cv_prog_ac_ct_LIPO" && ac_cv_prog_ac_ct_LIPO=":" + fi + fi + ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO + if test -n "$ac_ct_LIPO"; then + echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 + echo "${ECHO_T}$ac_ct_LIPO" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + LIPO=$ac_ct_LIPO + else + LIPO="$ac_cv_prog_LIPO" + fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_OTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + OTOOL=$ac_cv_prog_OTOOL + if test -n "$OTOOL"; then + echo "$as_me:$LINENO: result: $OTOOL" >&5 + echo "${ECHO_T}$OTOOL" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + if test -z "$ac_cv_prog_OTOOL"; then + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. + set dummy otool; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL="otool" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + test -z "$ac_cv_prog_ac_ct_OTOOL" && ac_cv_prog_ac_ct_OTOOL=":" + fi + fi + ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL + if test -n "$ac_ct_OTOOL"; then + echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 + echo "${ECHO_T}$ac_ct_OTOOL" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + OTOOL=$ac_ct_OTOOL + else + OTOOL="$ac_cv_prog_OTOOL" + fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool64; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_OTOOL64+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + OTOOL64=$ac_cv_prog_OTOOL64 + if test -n "$OTOOL64"; then + echo "$as_me:$LINENO: result: $OTOOL64" >&5 + echo "${ECHO_T}$OTOOL64" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. + set dummy otool64; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL64="otool64" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + test -z "$ac_cv_prog_ac_ct_OTOOL64" && ac_cv_prog_ac_ct_OTOOL64=":" + fi + fi + ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 + if test -n "$ac_ct_OTOOL64"; then + echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 + echo "${ECHO_T}$ac_ct_OTOOL64" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + OTOOL64=$ac_ct_OTOOL64 + else + OTOOL64="$ac_cv_prog_OTOOL64" + fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 + echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6 + if test "${lt_cv_apple_cc_single_mod+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi + fi + echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 + echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6 + echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 + echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6 + if test "${lt_cv_ld_exported_symbols_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + int + main () + { + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + lt_cv_ld_exported_symbols_list=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + lt_cv_ld_exported_symbols_list=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + + fi + echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 + echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6 + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 + echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #ifdef __STDC__ + # include + #else + # include + #endif + Syntax error + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + : + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. + continue + fi + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. + continue + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. + ac_preproc_ok=: + break + fi + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext + if $ac_preproc_ok; then + break + fi + + done + ac_cv_prog_CPP=$CPP + + fi + CPP=$ac_cv_prog_CPP + else + ac_cv_prog_CPP=$CPP + fi + echo "$as_me:$LINENO: result: $CPP" >&5 + echo "${ECHO_T}$CPP" >&6 + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #ifdef __STDC__ + # include + #else + # include + #endif + Syntax error + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + : + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. + continue + fi + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. + continue + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. + ac_preproc_ok=: + break + fi + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext + if $ac_preproc_ok; then + : + else + { { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check + See \`config.log' for more details." >&5 + echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + echo "$as_me:$LINENO: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include + #include + #include + #include + + int + main () + { + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_stdc=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : + else + ac_cv_header_stdc=no + fi + rm -f conftest* + + 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 <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : + else + ac_cv_header_stdc=no + fi + rm -f conftest* + + fi + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include + #if ((' ' & 0x0FF) == 0x020) + # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) + #else + # define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) + # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) + #endif + + #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) + int + main () + { + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); + } + _ACEOF + rm -f conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else + echo "$as_me: program exited with status $ac_status" >&5 + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) + ac_cv_header_stdc=no + fi + rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi + fi + echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + + cat >>confdefs.h <<\_ACEOF + #define STDC_HEADERS 1 + _ACEOF + + fi + + # On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default + + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi + + done + + + + for ac_header in dlfcn.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default + + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi + + done + + + + # Set options + + + + enable_dlopen=no + + + enable_win32_dll=no + + + # Check whether --enable-shared or --disable-shared was given. + if test "${enable_shared+set}" = set; then + enableval="$enable_shared" + p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac + else + enable_shared=yes + fi; + + + + + + + + + # Check whether --enable-static or --disable-static was given. + if test "${enable_static+set}" = set; then + enableval="$enable_static" + p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac + else + enable_static=yes + fi; + + + + + + + + + + # Check whether --with-pic or --without-pic was given. + if test "${with_pic+set}" = set; then + withval="$with_pic" + pic_mode="$withval" + else + pic_mode=default + fi; + + test -z "$pic_mode" && pic_mode=default + + + + + + + + # Check whether --enable-fast-install or --disable-fast-install was given. + if test "${enable_fast_install+set}" = set; then + enableval="$enable_fast_install" + p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac + else + enable_fast_install=yes + fi; + + + + + + + + + + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + + + + + + + + + + + + + + + + + + + + + + + test -z "$LN_S" && LN_S="ln -s" + + + + + + + + + + + + + + + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + + echo "$as_me:$LINENO: checking for objdir" >&5 + echo $ECHO_N "checking for objdir... $ECHO_C" >&6 + if test "${lt_cv_objdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + rm -f .libs 2>/dev/null + mkdir .libs 2>/dev/null + if test -d .libs; then + lt_cv_objdir=.libs + else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs + fi + rmdir .libs 2>/dev/null + fi + echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 + echo "${ECHO_T}$lt_cv_objdir" >&6 + objdir=$lt_cv_objdir + + + + + + cat >>confdefs.h <<_ACEOF + #define LT_OBJDIR "$lt_cv_objdir/" + _ACEOF + + + + + + + + + + + + + + + + + + case $host_os in + aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; + esac + + # Sed substitution that helps us do robust quoting. It backslashifies + # metacharacters that are still active within double-quoted strings. + sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + + # Same as above, but do not quote variable references. + double_quote_subst='s/\(["`\\]\)/\\\1/g' + + # Sed substitution to delay expansion of an escaped shell variable in a + # double_quote_subst'ed string. + delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + + # Sed substitution to delay expansion of an escaped single quote. + delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + + # Sed substitution to avoid accidental globbing in evaled expressions + no_glob_subst='s/\*/\\\*/g' + + # Global variables: + ofile=libtool + can_build_shared=yes + + # All known linkers require a `.a' archive for static linking (except MSVC, + # which needs '.lib'). + libext=a + + with_gnu_ld="$lt_cv_prog_gnu_ld" + + old_CC="$CC" + old_CFLAGS="$CFLAGS" + + # Set sane defaults for various variables + test -z "$CC" && CC=cc + test -z "$LTCC" && LTCC=$CC + test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS + test -z "$LD" && LD=ld + test -z "$ac_objext" && ac_objext=o + + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + + # Only perform the check for file, if the check method requires it + test -z "$MAGIC_CMD" && MAGIC_CMD=file + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 + echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 + if test "${lt_cv_path_MAGIC_CMD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; + *) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/${ac_tool_prefix}file; then + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + + *** Warning: the command libtool uses to detect shared libraries, + *** $file_magic_cmd, produces output that libtool cannot recognize. + *** The result is that libtool may fail to recognize shared libraries + *** as such. This will affect the creation of libtool libraries that + *** depend on shared libraries, but programs linked with such libtool + *** libraries will work regardless of this problem. Nevertheless, you + *** may want to report the problem to your system manager and/or to + *** bug-libtool@gnu.org + + _LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; + esac + fi + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + echo "${ECHO_T}$MAGIC_CMD" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + + + + + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + echo "$as_me:$LINENO: checking for file" >&5 + echo $ECHO_N "checking for file... $ECHO_C" >&6 + if test "${lt_cv_path_MAGIC_CMD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; + *) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/file; then + lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + + *** Warning: the command libtool uses to detect shared libraries, + *** $file_magic_cmd, produces output that libtool cannot recognize. + *** The result is that libtool may fail to recognize shared libraries + *** as such. This will affect the creation of libtool libraries that + *** depend on shared libraries, but programs linked with such libtool + *** libraries will work regardless of this problem. Nevertheless, you + *** may want to report the problem to your system manager and/or to + *** bug-libtool@gnu.org + + _LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; + esac + fi + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + echo "${ECHO_T}$MAGIC_CMD" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + + else + MAGIC_CMD=: + fi + fi + + fi + ;; + esac + + # Use C for the default configuration in the libtool script + + lt_save_CC="$CC" + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + # Source file extension for C test sources. + ac_ext=c + + # Object file extension for compiled C test sources. + objext=o + objext=$objext + + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(){return(0);}' + + + + + + + + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + + # If no C compiler flags were specified, use CFLAGS. + LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + + # Allow CC to be a program name with arguments. + compiler=$CC + + # Save the default compiler, since it gets overwritten when the other + # tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. + compiler_DEFAULT=$CC + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" >conftest.$ac_ext + eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $RM conftest* + + ac_outfile=conftest.$ac_objext + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` + $RM -r conftest* + + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + if test -n "$compiler"; then + + lt_prog_compiler_no_builtin_flag= + + if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 + if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:6659: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:6663: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $RM conftest* + + fi + echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 + echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 + + if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" + else + : + fi + + fi + + + + + + + lt_prog_compiler_wl= + lt_prog_compiler_pic= + lt_prog_compiler_static= + + echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 + echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + ;; + + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; + + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + xl*) + # IBM XL C 8.0/Fortran 10.1 on PPC + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-qpic' + lt_prog_compiler_static='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + esac + ;; + esac + ;; + + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + + rdos*) + lt_prog_compiler_static='-non_shared' + ;; + + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac + ;; + + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; + + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; + + *) + lt_prog_compiler_can_build_shared=no + ;; + esac + fi + + case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; + esac + echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 + echo "${ECHO_T}$lt_prog_compiler_pic" >&6 + + + + + + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic"; then + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 + if test "${lt_cv_prog_compiler_pic_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:6998: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:7002: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes + fi + fi + $RM conftest* + + fi + echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 + echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6 + + if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; + esac + else + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no + fi + + fi + + + + + + + # + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" + echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 + if test "${lt_cv_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works=yes + fi + else + lt_cv_prog_compiler_static_works=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + + fi + echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 + echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6 + + if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : + else + lt_prog_compiler_static= + fi + + + + + + + + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 + if test "${lt_cv_prog_compiler_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:7103: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:7107: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + + fi + echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 + echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 + + + + + + + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 + if test "${lt_cv_prog_compiler_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:7158: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:7162: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + + fi + echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 + echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 + + + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 + echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + echo "$as_me:$LINENO: result: $hard_links" >&5 + echo "${ECHO_T}$hard_links" >&6 + if test "$hard_links" = no; then + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi + else + need_locks=no + fi + + + + + + + echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 + + runpath_var= + allow_undefined_flag= + always_export_symbols=no + archive_cmds= + archive_expsym_cmds= + compiler_needs_object=no + enable_shared_with_static_runtimes=no + export_dynamic_flag_spec= + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + hardcode_automatic=no + hardcode_direct=no + hardcode_direct_absolute=no + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= + hardcode_libdir_separator= + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no + link_all_deplibs=unknown + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= + old_archive_from_expsyms_cmds= + thread_safe_flag_spec= + whole_archive_flag_spec= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + ld_shlibs=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 + + *** Warning: the GNU linker, at least up to release 2.9.1, is reported + *** to be unable to reliably create shared libraries on AIX. + *** Therefore, libtool is disabling shared libraries support. If you + *** really care for shared libraries, you may want to modify your PATH + *** so that a non-GNU linker is found, and then restart. + + _LT_EOF + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs=no + fi + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; + + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag= + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; + xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + xlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld='-rpath $libdir' + archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + ld_shlibs=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 + + *** Warning: The releases 2.8.* of the GNU linker cannot reliably + *** create shared libraries on Solaris systems. Therefore, libtool + *** is disabling shared libraries support. We urge you to upgrade GNU + *** binutils to release 2.9.1 or newer. Another option is to modify + *** your PATH or compiler configuration so that the native linker is + *** used, and then restart. + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 + + *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not + *** reliably create shared libraries on SCO systems. Therefore, libtool + *** is disabling shared libraries support. We urge you to upgrade GNU + *** binutils to release 2.16.91.0.3 or newer. Another option is to modify + *** your PATH or compiler configuration so that the native linker is + *** used, and then restart. + + _LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; + + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds='' + hardcode_direct=yes + hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + file_list_spec='${wl}-f,' + + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + export_dynamic_flag_spec='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + int + main () + { + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + int + main () + { + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + archive_cmds_need_lc=yes + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes + ;; + + darwin* | rhapsody*) + + + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + whole_archive_flag_spec='' + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=echo + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + + else + ld_shlibs=no + fi + + ;; + + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + freebsd1*) + ld_shlibs=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + hpux9*) + if test "$GCC" = yes; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld='+b $libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + *) + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + int foo(void) {} + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; + + *nto* | *qnx*) + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + else + ld_shlibs=no + fi + ;; + + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + archive_cmds_need_lc='no' + hardcode_libdir_separator=: + ;; + + solaris*) + no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; + esac + link_all_deplibs=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; + + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + *) + ld_shlibs=no + ;; + esac + + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + export_dynamic_flag_spec='${wl}-Blargedynsym' + ;; + esac + fi + fi + + echo "$as_me:$LINENO: result: $ld_shlibs" >&5 + echo "${ECHO_T}$ld_shlibs" >&6 + test "$ld_shlibs" = no && can_build_shared=no + + with_gnu_ld=$with_gnu_ld + + + + + + + + + + + + + + + + # + # Do we need to explicitly link libc? + # + case "x$archive_cmds_need_lc" in + x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + if test "${lt_cv_archive_cmds_need_lc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + + fi + echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5 + echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc + ;; + esac + fi + ;; + esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 + + if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } + }'` + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + fi + library_names_spec= + libname_spec='lib$name' + soname_spec= + shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= + finish_eval= + shlibpath_var= + shlibpath_overrides_runpath=unknown + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" + need_lib_prefix=unknown + hardcode_into_libs=no + + # when you set need_version to no, make sure it does not cause -set_version + # flags to be left without arguments + need_version=unknown + + case $host_os in + aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + + aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + + beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + + bsdi[45]*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + + cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + + darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + + dgux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + + freebsd1*) + dynamic_linker=no + ;; + + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + + gnu*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; + + hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; + + interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + + irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + + # No shared lib support for Linux oldld, aout, or coff. + linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + + # This must be Linux ELF. + linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + int + main () + { + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then + lt_cv_shlibpath_overrides_runpath=yes + fi + + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + + fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + + netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + + newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + + *nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + + openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + + os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + + osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + + rdos*) + dynamic_linker=no + ;; + + solaris*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + + sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + + sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + + tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + + uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + + *) + dynamic_linker=no + ;; + esac + echo "$as_me:$LINENO: result: $dynamic_linker" >&5 + echo "${ECHO_T}$dynamic_linker" >&6 + test "$dynamic_linker" = no && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + + if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" + fi + if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 + hardcode_action= + if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || + test "X$hardcode_automatic" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi + else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported + fi + echo "$as_me:$LINENO: result: $hardcode_action" >&5 + echo "${ECHO_T}$hardcode_action" >&6 + + if test "$hardcode_action" = relink || + test "$inherit_rpath" = yes; then + # Fast installation is not supported + enable_fast_install=no + elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless + fi + + + + + + + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown + else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char dlopen (); + int + main () + { + dlopen (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dl_dlopen=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 + echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 + if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + + fi + + ;; + + *) + echo "$as_me:$LINENO: checking for shl_load" >&5 + echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 + if test "${ac_cv_func_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + /* Define shl_load to an innocuous variant, in case declares shl_load. + For example, HP-UX 11i declares gettimeofday. */ + #define shl_load innocuous_shl_load + + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shl_load (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + + #ifdef __STDC__ + # include + #else + # include + #endif + + #undef shl_load + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + { + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char shl_load (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ + #if defined (__stub_shl_load) || defined (__stub___shl_load) + choke me + #else + char (*f) () = shl_load; + #endif + #ifdef __cplusplus + } + #endif + + int + main () + { + return f != shl_load; + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shl_load=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_shl_load=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 + echo "${ECHO_T}$ac_cv_func_shl_load" >&6 + if test $ac_cv_func_shl_load = yes; then + lt_cv_dlopen="shl_load" + else + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 + echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 + if test "${ac_cv_lib_dld_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char shl_load (); + int + main () + { + shl_load (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_shl_load=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dld_shl_load=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 + echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 + if test $ac_cv_lib_dld_shl_load = yes; then + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + else + echo "$as_me:$LINENO: checking for dlopen" >&5 + echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 + if test "${ac_cv_func_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + /* Define dlopen to an innocuous variant, in case declares dlopen. + For example, HP-UX 11i declares gettimeofday. */ + #define dlopen innocuous_dlopen + + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlopen (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + + #ifdef __STDC__ + # include + #else + # include + #endif + + #undef dlopen + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + { + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char dlopen (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ + #if defined (__stub_dlopen) || defined (__stub___dlopen) + choke me + #else + char (*f) () = dlopen; + #endif + #ifdef __cplusplus + } + #endif + + int + main () + { + return f != dlopen; + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_dlopen=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_dlopen=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 + echo "${ECHO_T}$ac_cv_func_dlopen" >&6 + if test $ac_cv_func_dlopen = yes; then + lt_cv_dlopen="dlopen" + else + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char dlopen (); + int + main () + { + dlopen (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dl_dlopen=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 + echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 + if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 + echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 + if test "${ac_cv_lib_svld_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsvld $LIBS" + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char dlopen (); + int + main () + { + dlopen (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_svld_dlopen=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_svld_dlopen=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 + echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 + if test $ac_cv_lib_svld_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 + echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 + if test "${ac_cv_lib_dld_dld_link+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char dld_link (); + int + main () + { + dld_link (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_dld_link=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dld_dld_link=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 + echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 + if test $ac_cv_lib_dld_dld_link = yes; then + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + + + fi + + + fi + + + fi + + + fi + + + fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 + echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 + if test "${lt_cv_dlopen_self+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF + #line 10025 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H + #include + #endif + + #include + + #ifdef RTLD_GLOBAL + # define LT_DLGLOBAL RTLD_GLOBAL + #else + # ifdef DL_GLOBAL + # define LT_DLGLOBAL DL_GLOBAL + # else + # define LT_DLGLOBAL 0 + # endif + #endif + + /* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ + #ifndef LT_DLLAZY_OR_NOW + # ifdef RTLD_LAZY + # define LT_DLLAZY_OR_NOW RTLD_LAZY + # else + # ifdef DL_LAZY + # define LT_DLLAZY_OR_NOW DL_LAZY + # else + # ifdef RTLD_NOW + # define LT_DLLAZY_OR_NOW RTLD_NOW + # else + # ifdef DL_NOW + # define LT_DLLAZY_OR_NOW DL_NOW + # else + # define LT_DLLAZY_OR_NOW 0 + # endif + # endif + # endif + # endif + #endif + + void fnord() { int i=42;} + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; + } + _LT_EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi + fi + rm -fr conftest* + + + fi + echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 + echo "${ECHO_T}$lt_cv_dlopen_self" >&6 + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 + echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 + if test "${lt_cv_dlopen_self_static+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF + #line 10121 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H + #include + #endif + + #include + + #ifdef RTLD_GLOBAL + # define LT_DLGLOBAL RTLD_GLOBAL + #else + # ifdef DL_GLOBAL + # define LT_DLGLOBAL DL_GLOBAL + # else + # define LT_DLGLOBAL 0 + # endif + #endif + + /* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ + #ifndef LT_DLLAZY_OR_NOW + # ifdef RTLD_LAZY + # define LT_DLLAZY_OR_NOW RTLD_LAZY + # else + # ifdef DL_LAZY + # define LT_DLLAZY_OR_NOW DL_LAZY + # else + # ifdef RTLD_NOW + # define LT_DLLAZY_OR_NOW RTLD_NOW + # else + # ifdef DL_NOW + # define LT_DLLAZY_OR_NOW DL_NOW + # else + # define LT_DLLAZY_OR_NOW 0 + # endif + # endif + # endif + # endif + #endif + + void fnord() { int i=42;} + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; + } + _LT_EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi + fi + rm -fr conftest* + + + fi + echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 + echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac + fi + + + + + + + + + + + + + + + + + + striplib= + old_striplib= + echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 + echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 + if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + # FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + ;; + esac + fi + + + + + + + + + + + + + # Report which library types will actually be built + echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 + echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $can_build_shared" >&5 + echo "${ECHO_T}$can_build_shared" >&6 + + echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 + echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + echo "$as_me:$LINENO: result: $enable_shared" >&5 + echo "${ECHO_T}$enable_shared" >&6 + + echo "$as_me:$LINENO: checking whether to build static libraries" >&5 + echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + echo "$as_me:$LINENO: result: $enable_static" >&5 + echo "${ECHO_T}$enable_static" >&6 + + + + + fi + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + CC="$lt_save_CC" + + + + + + + + + + + + + + ac_config_commands="$ac_config_commands libtool" + + + + + # Only expand once: + + + + # Find CPP now so that any conditional tests below won't do it and + # thereby make the resulting definitions conditional. + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 + echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #ifdef __STDC__ + # include + #else + # include + #endif + Syntax error + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + : + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. + continue + fi + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. + continue + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. + ac_preproc_ok=: + break + fi + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext + if $ac_preproc_ok; then + break + fi + + done + ac_cv_prog_CPP=$CPP + + fi + CPP=$ac_cv_prog_CPP + else + ac_cv_prog_CPP=$CPP + fi + echo "$as_me:$LINENO: result: $CPP" >&5 + echo "${ECHO_T}$CPP" >&6 + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #ifdef __STDC__ + # include + #else + # include + #endif + Syntax error + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + : + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. + continue + fi + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. + continue + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. + ac_preproc_ok=: + break + fi + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext + if $ac_preproc_ok; then + : + else + { { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check + See \`config.log' for more details." >&5 + echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + if test -n "$with_cross_host"; then + # We are being configured with a cross compiler. AC_REPLACE_FUNCS + # may not work correctly, because the compiler may not be able to + # link executables. + + # We assume newlib. This lets us hard-code the functions we know + # we'll have. + cat >>confdefs.h <<\_ACEOF + #define HAVE_MEMCPY 1 + _ACEOF + + cat >>confdefs.h <<\_ACEOF + #define HAVE_STRERROR 1 + _ACEOF + + + # We ignore --with-system-zlib in this case. + target_all=libzgcj.la + else + if test x$gcc_no_link = xyes; then + if test "x${ac_cv_func_mmap_fixed_mapped+set}" != xset; then + ac_cv_func_mmap_fixed_mapped=no + fi + fi + if test "x${ac_cv_func_mmap_fixed_mapped}" != xno; then + + + for ac_header in stdlib.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else + # Is the header compilable? + echo "$as_me:$LINENO: checking $ac_header usability" >&5 + echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? + echo "$as_me:$LINENO: checking $ac_header presence" >&5 + echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <$ac_header> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + rm -f conftest.err conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 + echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 + echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 + echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 + echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 + echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX + ## ------------------------------------------ ## + ## Report this to the AC_PACKAGE_NAME lists. ## + ## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac + echo "$as_me:$LINENO: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + + fi + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi + + done + + + for ac_func in getpagesize + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + /* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ + #define $ac_func innocuous_$ac_func + + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + + #ifdef __STDC__ + # include + #else + # include + #endif + + #undef $ac_func + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + { + #endif + /* 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 (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else + char (*f) () = $ac_func; + #endif + #ifdef __cplusplus + } + #endif + + int + main () + { + return f != $ac_func; + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + + echo "$as_me:$LINENO: checking for working mmap" >&5 + echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 + if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then + ac_cv_func_mmap_fixed_mapped=no + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default + /* malloc might have been renamed as rpl_malloc. */ + #undef malloc + + /* Thanks to Mike Haertel and Jim Avera for this test. + Here is a matrix of mmap possibilities: + mmap private not fixed + mmap private fixed at somewhere currently unmapped + mmap private fixed at somewhere already mapped + mmap shared not fixed + mmap shared fixed at somewhere currently unmapped + mmap shared fixed at somewhere already mapped + For private mappings, we should verify that changes cannot be read() + back from the file, nor mmap's back from the file at a different + address. (There have been systems where private was not correctly + implemented like the infamous i386 svr4.0, and systems where the + VM page cache was not coherent with the file system buffer cache + like early versions of FreeBSD and possibly contemporary NetBSD.) + For shared mappings, we should conversely verify that changes get + propagated back to all the places they're supposed to be. + + Grep wants private fixed already mapped. + The main things grep needs to know about mmap are: + * does it exist and is it safe to write into the mmap'd area + * how to use it (BSD variants) */ + + #include + #include + + #if !STDC_HEADERS && !HAVE_STDLIB_H + char *malloc (); + #endif + + /* This mess was copied from the GNU getpagesize.h. */ + #if !HAVE_GETPAGESIZE + /* Assume that all systems that can run configure have sys/param.h. */ + # if !HAVE_SYS_PARAM_H + # define HAVE_SYS_PARAM_H 1 + # endif + + # ifdef _SC_PAGESIZE + # define getpagesize() sysconf(_SC_PAGESIZE) + # else /* no _SC_PAGESIZE */ + # if HAVE_SYS_PARAM_H + # include + # ifdef EXEC_PAGESIZE + # define getpagesize() EXEC_PAGESIZE + # else /* no EXEC_PAGESIZE */ + # ifdef NBPG + # define getpagesize() NBPG * CLSIZE + # ifndef CLSIZE + # define CLSIZE 1 + # endif /* no CLSIZE */ + # else /* no NBPG */ + # ifdef NBPC + # define getpagesize() NBPC + # else /* no NBPC */ + # ifdef PAGESIZE + # define getpagesize() PAGESIZE + # endif /* PAGESIZE */ + # endif /* no NBPC */ + # endif /* no NBPG */ + # endif /* no EXEC_PAGESIZE */ + # else /* no HAVE_SYS_PARAM_H */ + # define getpagesize() 8192 /* punt totally */ + # endif /* no HAVE_SYS_PARAM_H */ + # endif /* no _SC_PAGESIZE */ + + #endif /* no HAVE_GETPAGESIZE */ + + int + main () + { + char *data, *data2, *data3; + int i, pagesize; + int fd; + + pagesize = getpagesize (); + + /* First, make a file with some known garbage in it. */ + data = (char *) malloc (pagesize); + if (!data) + exit (1); + for (i = 0; i < pagesize; ++i) + *(data + i) = rand (); + umask (0); + fd = creat ("conftest.mmap", 0600); + if (fd < 0) + exit (1); + if (write (fd, data, pagesize) != pagesize) + exit (1); + close (fd); + + /* Next, try to mmap the file at a fixed address which already has + something else allocated at it. If we can, also make sure that + we see the same garbage. */ + fd = open ("conftest.mmap", O_RDWR); + if (fd < 0) + exit (1); + data2 = (char *) malloc (2 * pagesize); + if (!data2) + exit (1); + data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1); + if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, 0L)) + exit (1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data2 + i)) + exit (1); + + /* Finally, make sure that changes to the mapped area do not + percolate back to the file as seen by read(). (This is a bug on + some variants of i386 svr4.0.) */ + for (i = 0; i < pagesize; ++i) + *(data2 + i) = *(data2 + i) + 1; + data3 = (char *) malloc (pagesize); + if (!data3) + exit (1); + if (read (fd, data3, pagesize) != pagesize) + exit (1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data3 + i)) + exit (1); + close (fd); + exit (0); + } + _ACEOF + rm -f conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_mmap_fixed_mapped=yes + else + echo "$as_me: program exited with status $ac_status" >&5 + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) + ac_cv_func_mmap_fixed_mapped=no + fi + rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi + echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 + echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 + if test $ac_cv_func_mmap_fixed_mapped = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_MMAP 1 + _ACEOF + + fi + rm -f conftest.mmap + + fi + + + for ac_func in memcpy strerror + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + /* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ + #define $ac_func innocuous_$ac_func + + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + + #ifdef __STDC__ + # include + #else + # include + #endif + + #undef $ac_func + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + { + #endif + /* 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 (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else + char (*f) () = $ac_func; + #endif + #ifdef __cplusplus + } + #endif + + int + main () + { + return f != $ac_func; + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + + + if test "$with_system_zlib" = yes; then + echo "$as_me:$LINENO: checking for deflate in -lz" >&5 + echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6 + if test "${ac_cv_lib_z_deflate+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lz $LIBS" + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 + echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } + fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char deflate (); + int + main () + { + deflate (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_z_deflate=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_z_deflate=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 + echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6 + if test $ac_cv_lib_z_deflate = yes; then + target_all= + else + target_all=libzgcj.la + fi + + else + target_all=libzgcj.la + fi + fi + + + + + for ac_header in unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else + # Is the header compilable? + echo "$as_me:$LINENO: checking $ac_header usability" >&5 + echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? + echo "$as_me:$LINENO: checking $ac_header presence" >&5 + echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <$ac_header> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + rm -f conftest.err conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 + echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 + echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 + echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 + echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 + echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX + ## ------------------------------------------ ## + ## Report this to the AC_PACKAGE_NAME lists. ## + ## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac + echo "$as_me:$LINENO: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + + fi + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi + + done + + + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' + toolexeclibdir='$(toolexecdir)/lib' + else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' + fi + if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then + multiosdir=/`$CC -print-multi-os-directory` + case $multiosdir in + /.) multiosdir= ;; # Avoid trailing /. + esac + else + multiosdir= + fi + toolexeclibdir=${toolexeclibdir}${multiosdir} + + + + + + if test -n "$with_target_subdir"; then + TARGET_LIBRARY_TRUE= + TARGET_LIBRARY_FALSE='#' + else + TARGET_LIBRARY_TRUE='#' + TARGET_LIBRARY_FALSE= + fi + + + if test "${multilib}" = "yes"; then + multilib_arg="--enable-multilib" + else + multilib_arg= + fi + + ac_config_files="$ac_config_files Makefile" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure + # scripts and configure runs, see configure's option --config-cache. + # It is not useful on other systems. If it contains results you don't + # want to keep, you may remove or edit it. + # + # config.status only pays attention to the cache file if you give it + # the --recheck option to rerun configure. + # + # `ac_cv_env_foo' variables (set or unset) will be overridden when + # loading this file, other *unset* `ac_cv_foo' will be assigned the + # following values. + + _ACEOF + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. + # So, don't put newlines in cache variables' values. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. + { + (set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; + } | + sed ' + t clear + : clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + : end' >>confcache + if diff $cache_file confcache >/dev/null 2>&1; then :; else + if test -w $cache_file; then + test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + cat confcache >$cache_file + else + echo "not updating unwritable cache $cache_file" + fi + fi + rm -f confcache + + test "x$prefix" = xNONE && prefix=$ac_default_prefix + # Let make expand exec_prefix. + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + + # VPATH may cause trouble with some makes, so we remove $(srcdir), + # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty + # (actually we leave an empty line to preserve line numbers). + if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ + s/:*\$(srcdir):*/:/; + s/:*\${srcdir}:*/:/; + s/:*@srcdir@:*/:/; + s/^\([^=]*=[ ]*\):*/\1/; + s/:*$//; + s/^[^=]*=[ ]*$//; + }' + fi + + # Transform confdefs.h into DEFS. + # Protect against shell expansion while executing Makefile rules. + # Protect against Makefile macro expansion. + # + # If the first sed substitution is executed (which looks for macros that + # take arguments), then we branch to the quote section. Otherwise, + # look for a macro that doesn't take arguments. + cat >confdef2opt.sed <<\_ACEOF + t clear + : clear + s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g + t quote + s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g + t quote + d + : quote + s,[ `~#$^&*(){}\\|;'"<>?],\\&,g + s,\[,\\&,g + s,\],\\&,g + s,\$,$$,g + p + _ACEOF + # We use echo to avoid assuming a particular line-breaking character. + # The extra dot is to prevent the shell from consuming trailing + # line-breaks from the sub-command output. A line-break within + # single-quotes doesn't work because, if this script is created in a + # platform that uses two characters for line-breaks (e.g., DOS), tr + # would break. + ac_LF_and_DOT=`echo; echo .` + DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` + rm -f confdef2opt.sed + + + ac_libobjs= + ac_ltlibobjs= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + done + LIBOBJS=$ac_libobjs + + LTLIBOBJS=$ac_ltlibobjs + + + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${TARGET_LIBRARY_TRUE}" && test -z "${TARGET_LIBRARY_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"TARGET_LIBRARY\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"TARGET_LIBRARY\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" + { echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. + # Compiler output produced by configure, useful for debugging + # configure, is in config.log if it exists. + + debug=false + ac_cs_recheck=false + ac_cs_silent=false + SHELL=\${CONFIG_SHELL-$SHELL} + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF + ## --------------------- ## + ## M4sh Initialization. ## + ## --------------------- ## + + # Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix + fi + DUALCASE=1; export DUALCASE # for MKS sh + + # Support unset when possible. + if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset + else + as_unset=false + fi + + + # Work around bugs in pre-3.0 UWIN ksh. + $as_unset ENV MAIL MAILPATH + PS1='$ ' + PS2='> ' + PS4='+ ' + + # NLS nuisances. + for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME + do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi + done + + # Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr + else + as_expr=false + fi + + if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename + else + as_basename=false + fi + + + # Name of the executable. + as_me=`$as_basename "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || + echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + + # PATH needs CR, and LINENO needs CR and PATH. + # Avoid depending upon Character Ranges. + as_cr_letters='abcdefghijklmnopqrstuvwxyz' + as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' + as_cr_Letters=$as_cr_letters$as_cr_LETTERS + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + + # The user is always right. + if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh + fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 + echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done + done + ;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 + echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit + } + + + case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' + ' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; + esac + + if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr + else + as_expr=false + fi + + rm -f conf$$ conf$$.exe conf$$.file + echo >conf$$.file + if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi + rm -f conf$$ conf$$.exe conf$$.file + + if mkdir -p . 2>/dev/null; then + as_mkdir_p=: + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false + fi + + as_executable_p="test -f" + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + + # Sed expression to map a string onto a valid variable name. + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + + # IFS + # We need space, tab and new line, in precisely that order. + as_nl=' + ' + IFS=" $as_nl" + + # CDPATH. + $as_unset CDPATH + + exec 6>&1 + + # Open the log real soon, to keep \$[0] and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. Logging --version etc. is OK. + exec 5>>config.log + { + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX + ## Running $as_me. ## + _ASBOX + } >&5 + cat >&5 <<_CSEOF + + This file was extended by $as_me, which was + generated by GNU Autoconf 2.59. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + + _CSEOF + echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 + echo >&5 + _ACEOF + + # Files that config.status was made for. + if test -n "$ac_config_files"; then + echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS + fi + + if test -n "$ac_config_headers"; then + echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS + fi + + if test -n "$ac_config_links"; then + echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS + fi + + if test -n "$ac_config_commands"; then + echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS + fi + + cat >>$CONFIG_STATUS <<\_ACEOF + + ac_cs_usage="\ + \`$as_me' instantiates files from templates according to the + current configuration. + + Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + + Configuration files: + $config_files + + Configuration commands: + $config_commands + + Report bugs to ." + _ACEOF + + cat >>$CONFIG_STATUS <<_ACEOF + ac_cs_version="\\ + config.status + configured by $0, generated by GNU Autoconf 2.59, + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" + + Copyright (C) 2003 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + srcdir=$srcdir + INSTALL="$INSTALL" + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF + # If no file are specified by the user, then we need to provide default + # value. By we need to know if files were specified by the user. + ac_need_defaults=: + while test $# != 0 + do + case $1 in + --*=*) + ac_option=`expr "x$1" : 'x\([^=]*\)='` + ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + *) # This is not an option, so the user has probably given explicit + # arguments. + ac_option=$1 + ac_need_defaults=false;; + esac + + case $ac_option in + # Handling of the options. + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --vers* | -V ) + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header + { { echo "$as_me:$LINENO: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; } ;; + + *) ac_config_targets="$ac_config_targets $1" ;; + + esac + shift + done + + ac_configure_extra_args= + + if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" + fi + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + if \$ac_cs_recheck; then + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + fi + + _ACEOF + + cat >>$CONFIG_STATUS <<_ACEOF + # + # INIT-COMMANDS section. + # + + + srcdir="$srcdir" + host="$host" + target="$target" + with_multisubdir="$with_multisubdir" + with_multisrctop="$with_multisrctop" + with_target_subdir="$with_target_subdir" + ac_configure_args="${multilib_arg} ${ac_configure_args}" + multi_basedir="$multi_basedir" + CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + CC="$CC" + AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + + + # The HP-UX ksh and POSIX shell print the target directory to stdout + # if CDPATH is set. + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + sed_quote_subst='$sed_quote_subst' + double_quote_subst='$double_quote_subst' + delay_variable_subst='$delay_variable_subst' + macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' + macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' + enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' + enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' + pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' + enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' + host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' + host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' + host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' + build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' + build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' + build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' + SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' + Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' + GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' + EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' + FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' + LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' + NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' + LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' + max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' + ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' + exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' + lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' + lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' + lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' + reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' + reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' + OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' + deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' + file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' + AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' + AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' + STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' + RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' + old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' + old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' + old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' + CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' + CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' + compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' + GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' + lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' + lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' + lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' + lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' + objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' + SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' + ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' + MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' + lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' + lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' + lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' + lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' + lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' + need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' + DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' + NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' + LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' + OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' + OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' + libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' + shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' + extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' + archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' + enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' + export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' + whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' + compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' + old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' + old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' + archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' + archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' + module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' + module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' + with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' + allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' + no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' + hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' + hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' + hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' + hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' + hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' + hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' + hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' + hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' + inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' + link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' + fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' + always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' + export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' + exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' + include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' + prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' + file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' + variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' + need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' + need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' + version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' + runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' + shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' + shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' + libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' + library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' + soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' + postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' + postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' + finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' + finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' + hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' + sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' + sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' + hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' + enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' + enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' + enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' + old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' + striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' + + LTCC='$LTCC' + LTCFLAGS='$LTCFLAGS' + compiler='$compiler_DEFAULT' + + # Quote evaled strings. + for var in SED \ + GREP \ + EGREP \ + FGREP \ + LD \ + NM \ + LN_S \ + lt_SP2NL \ + lt_NL2SP \ + reload_flag \ + OBJDUMP \ + deplibs_check_method \ + file_magic_cmd \ + AR \ + AR_FLAGS \ + STRIP \ + RANLIB \ + CC \ + CFLAGS \ + compiler \ + lt_cv_sys_global_symbol_pipe \ + lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ + SHELL \ + ECHO \ + lt_prog_compiler_no_builtin_flag \ + lt_prog_compiler_wl \ + lt_prog_compiler_pic \ + lt_prog_compiler_static \ + lt_cv_prog_compiler_c_o \ + need_locks \ + DSYMUTIL \ + NMEDIT \ + LIPO \ + OTOOL \ + OTOOL64 \ + shrext_cmds \ + export_dynamic_flag_spec \ + whole_archive_flag_spec \ + compiler_needs_object \ + with_gnu_ld \ + allow_undefined_flag \ + no_undefined_flag \ + hardcode_libdir_flag_spec \ + hardcode_libdir_flag_spec_ld \ + hardcode_libdir_separator \ + fix_srcfile_path \ + exclude_expsyms \ + include_expsyms \ + file_list_spec \ + variables_saved_for_relink \ + libname_spec \ + library_names_spec \ + soname_spec \ + finish_eval \ + old_striplib \ + striplib; do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac + done + + # Double-quote double-evaled strings. + for var in reload_cmds \ + old_postinstall_cmds \ + old_postuninstall_cmds \ + old_archive_cmds \ + extract_expsyms_cmds \ + old_archive_from_new_cmds \ + old_archive_from_expsyms_cmds \ + archive_cmds \ + archive_expsym_cmds \ + module_cmds \ + module_expsym_cmds \ + export_symbols_cmds \ + prelink_cmds \ + postinstall_cmds \ + postuninstall_cmds \ + finish_cmds \ + sys_lib_search_path_spec \ + sys_lib_dlsearch_path_spec; do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac + done + + # Fix-up fallback echo if it was mangled by the above quoting rules. + case \$lt_ECHO in + *'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` + ;; + esac + + ac_aux_dir='$ac_aux_dir' + xsi_shell='$xsi_shell' + lt_shell_append='$lt_shell_append' + + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes INIT. + if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + + + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile' + + + + + _ACEOF + + + + cat >>$CONFIG_STATUS <<\_ACEOF + for ac_config_target in $ac_config_targets + do + case "$ac_config_target" in + # Handling of arguments. + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "libtool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac + done + + # If the user did not use the arguments to specify the items to instantiate, + # then the envvar interface is used. Set only those that are not. + # We use the long form for the default assignment because of an extremely + # bizarre bug on SunOS 4.1.3. + if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands + fi + + # Have a temporary directory for convenience. Make it in the build tree + # simply because there is no reason to put it here, and in addition, + # creating and moving files from /tmp can sometimes cause problems. + # Create a temporary directory, and hook for its removal unless debugging. + $debug || + { + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 + } + + # Create a (secure) tmp directory for tmp files. + + { + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" + } || + { + tmp=./confstat$$-$RANDOM + (umask 077 && mkdir $tmp) + } || + { + echo "$me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } + } + + _ACEOF + + cat >>$CONFIG_STATUS <<_ACEOF + + # + # CONFIG_FILES section. + # + + # No need to generate the scripts if there are no CONFIG_FILES. + # This happens for instance when ./config.status config.h + if test -n "\$CONFIG_FILES"; then + # Protect against being on the right side of a sed subst in config.status. + sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; + s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF + s,@SHELL@,$SHELL,;t t + s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t + s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t + s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t + s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t + s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t + s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t + s,@exec_prefix@,$exec_prefix,;t t + s,@prefix@,$prefix,;t t + s,@program_transform_name@,$program_transform_name,;t t + s,@bindir@,$bindir,;t t + s,@sbindir@,$sbindir,;t t + s,@libexecdir@,$libexecdir,;t t + s,@datadir@,$datadir,;t t + s,@sysconfdir@,$sysconfdir,;t t + s,@sharedstatedir@,$sharedstatedir,;t t + s,@localstatedir@,$localstatedir,;t t + s,@libdir@,$libdir,;t t + s,@includedir@,$includedir,;t t + s,@oldincludedir@,$oldincludedir,;t t + s,@infodir@,$infodir,;t t + s,@mandir@,$mandir,;t t + s,@build_alias@,$build_alias,;t t + s,@host_alias@,$host_alias,;t t + s,@target_alias@,$target_alias,;t t + s,@DEFS@,$DEFS,;t t + s,@ECHO_C@,$ECHO_C,;t t + s,@ECHO_N@,$ECHO_N,;t t + s,@ECHO_T@,$ECHO_T,;t t + s,@LIBS@,$LIBS,;t t + s,@multi_basedir@,$multi_basedir,;t t + s,@build@,$build,;t t + s,@build_cpu@,$build_cpu,;t t + s,@build_vendor@,$build_vendor,;t t + s,@build_os@,$build_os,;t t + s,@host@,$host,;t t + s,@host_cpu@,$host_cpu,;t t + s,@host_vendor@,$host_vendor,;t t + s,@host_os@,$host_os,;t t + s,@target@,$target,;t t + s,@target_cpu@,$target_cpu,;t t + s,@target_vendor@,$target_vendor,;t t + s,@target_os@,$target_os,;t t + s,@mkinstalldirs@,$mkinstalldirs,;t t + s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t + s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t + s,@INSTALL_DATA@,$INSTALL_DATA,;t t + s,@CYGPATH_W@,$CYGPATH_W,;t t + s,@PACKAGE@,$PACKAGE,;t t + s,@VERSION@,$VERSION,;t t + s,@ACLOCAL@,$ACLOCAL,;t t + s,@AUTOCONF@,$AUTOCONF,;t t + s,@AUTOMAKE@,$AUTOMAKE,;t t + s,@AUTOHEADER@,$AUTOHEADER,;t t + s,@MAKEINFO@,$MAKEINFO,;t t + s,@install_sh@,$install_sh,;t t + s,@STRIP@,$STRIP,;t t + s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t + s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t + s,@mkdir_p@,$mkdir_p,;t t + s,@AWK@,$AWK,;t t + s,@SET_MAKE@,$SET_MAKE,;t t + s,@am__leading_dot@,$am__leading_dot,;t t + s,@AMTAR@,$AMTAR,;t t + s,@am__tar@,$am__tar,;t t + s,@am__untar@,$am__untar,;t t + s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t + s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t + s,@MAINT@,$MAINT,;t t + s,@COMPPATH@,$COMPPATH,;t t + s,@CC@,$CC,;t t + s,@ac_ct_CC@,$ac_ct_CC,;t t + s,@EXEEXT@,$EXEEXT,;t t + s,@OBJEXT@,$OBJEXT,;t t + s,@DEPDIR@,$DEPDIR,;t t + s,@am__include@,$am__include,;t t + s,@am__quote@,$am__quote,;t t + s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t + s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t + s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t + s,@CCDEPMODE@,$CCDEPMODE,;t t + s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t + s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t + s,@CFLAGS@,$CFLAGS,;t t + s,@LIBTOOL@,$LIBTOOL,;t t + s,@SED@,$SED,;t t + s,@EGREP@,$EGREP,;t t + s,@FGREP@,$FGREP,;t t + s,@GREP@,$GREP,;t t + s,@LD@,$LD,;t t + s,@DUMPBIN@,$DUMPBIN,;t t + s,@ac_ct_DUMPBIN@,$ac_ct_DUMPBIN,;t t + s,@NM@,$NM,;t t + s,@LN_S@,$LN_S,;t t + s,@OBJDUMP@,$OBJDUMP,;t t + s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t + s,@AR@,$AR,;t t + s,@ac_ct_AR@,$ac_ct_AR,;t t + s,@RANLIB@,$RANLIB,;t t + s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t + s,@lt_ECHO@,$lt_ECHO,;t t + s,@DSYMUTIL@,$DSYMUTIL,;t t + s,@ac_ct_DSYMUTIL@,$ac_ct_DSYMUTIL,;t t + s,@NMEDIT@,$NMEDIT,;t t + s,@ac_ct_NMEDIT@,$ac_ct_NMEDIT,;t t + s,@LIPO@,$LIPO,;t t + s,@ac_ct_LIPO@,$ac_ct_LIPO,;t t + s,@OTOOL@,$OTOOL,;t t + s,@ac_ct_OTOOL@,$ac_ct_OTOOL,;t t + s,@OTOOL64@,$OTOOL64,;t t + s,@ac_ct_OTOOL64@,$ac_ct_OTOOL64,;t t + s,@CPP@,$CPP,;t t + s,@CPPFLAGS@,$CPPFLAGS,;t t + s,@target_all@,$target_all,;t t + s,@toolexecdir@,$toolexecdir,;t t + s,@toolexeclibdir@,$toolexeclibdir,;t t + s,@TARGET_LIBRARY_TRUE@,$TARGET_LIBRARY_TRUE,;t t + s,@TARGET_LIBRARY_FALSE@,$TARGET_LIBRARY_FALSE,;t t + s,@LIBOBJS@,$LIBOBJS,;t t + s,@LTLIBOBJS@,$LTLIBOBJS,;t t + CEOF + + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF + # Split the substitutions into bite-sized pieces for seds with + # small command number limits, like on Digital OSF/1 and HP-UX. + ac_max_sed_lines=48 + ac_sed_frag=1 # Number of current file. + ac_beg=1 # First line for current file. + ac_end=$ac_max_sed_lines # Line after last line for current file. + ac_more_lines=: + ac_sed_cmds= + while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + else + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + fi + if test ! -s $tmp/subs.frag; then + ac_more_lines=false + else + # The purpose of the label and of the branching condition is to + # speed up the sed processing (if there are no `@' at all, there + # is no need to browse any of the substitutions). + # These are the two extra sed commands mentioned above. + (echo ':t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + else + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + fi + ac_sed_frag=`expr $ac_sed_frag + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_lines` + fi + done + if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat + fi + fi # test -n "$CONFIG_FILES" + + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF + for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; + esac + + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. + ac_dir=`(dirname "$ac_file") 2>/dev/null || + $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || + $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 + echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + ac_builddir=. + + if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` + else + ac_dir_suffix= ac_top_builddir= + fi + + case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; + esac + + # Do not use `cd foo && pwd` to compute absolute paths, because + # the directories may not exist. + case `pwd` in + .) ac_abs_builddir="$ac_dir";; + *) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; + esac + case $ac_abs_builddir in + .) ac_abs_top_builddir=${ac_top_builddir}.;; + *) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; + esac + case $ac_abs_builddir in + .) ac_abs_srcdir=$ac_srcdir;; + *) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; + esac + case $ac_abs_builddir in + .) ac_abs_top_srcdir=$ac_top_srcdir;; + *) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; + esac + + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + esac + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo "$f";; + *) # Relative + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub + $extrasub + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF + :t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b + s,@configure_input@,$configure_input,;t t + s,@srcdir@,$ac_srcdir,;t t + s,@abs_srcdir@,$ac_abs_srcdir,;t t + s,@top_srcdir@,$ac_top_srcdir,;t t + s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t + s,@builddir@,$ac_builddir,;t t + s,@abs_builddir@,$ac_abs_builddir,;t t + s,@top_builddir@,$ac_top_builddir,;t t + s,@abs_top_builddir@,$ac_abs_top_builddir,;t t + s,@INSTALL@,$ac_INSTALL,;t t + " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out + rm -f $tmp/stdin + if test x"$ac_file" != x-; then + mv $tmp/out $ac_file + else + cat $tmp/out + rm -f $tmp/out + fi + + done + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF + + # + # CONFIG_COMMANDS section. + # + for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue + ac_dest=`echo "$ac_file" | sed 's,:.*,,'` + ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_dir=`(dirname "$ac_dest") 2>/dev/null || + $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X"$ac_dest" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || + $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 + echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + ac_builddir=. + + if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` + else + ac_dir_suffix= ac_top_builddir= + fi + + case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; + esac + + # Do not use `cd foo && pwd` to compute absolute paths, because + # the directories may not exist. + case `pwd` in + .) ac_abs_builddir="$ac_dir";; + *) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; + esac + case $ac_abs_builddir in + .) ac_abs_top_builddir=${ac_top_builddir}.;; + *) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; + esac + case $ac_abs_builddir in + .) ac_abs_srcdir=$ac_srcdir;; + *) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; + esac + case $ac_abs_builddir in + .) ac_abs_top_srcdir=$ac_top_srcdir;; + *) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; + esac + + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 + echo "$as_me: executing $ac_dest commands" >&6;} + case $ac_dest in + default-1 ) + # Only add multilib support code if we just rebuilt the top-level + # Makefile. + case " $CONFIG_FILES " in + *" Makefile "*) + ac_file=Makefile . ${multi_basedir}/config-ml.in + ;; + esac ;; + depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`(dirname "$mf") 2>/dev/null || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`(dirname "$file") 2>/dev/null || + $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p $dirpart/$fdir + else + as_dir=$dirpart/$fdir + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || + $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 + echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + { (exit 1); exit 1; }; }; } + + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done + ;; + libtool ) + + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" + #! $SHELL + + # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. + # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION + # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, + # 2006, 2007, 2008 Free Software Foundation, Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is part of GNU Libtool. + # + # GNU Libtool 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. + # + # As a special exception to the GNU General Public License, + # if you distribute this file as part of a program or library that + # is built using GNU Libtool, you may include this file under the + # same distribution terms that you use for the rest of that program. + # + # GNU Libtool is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with GNU Libtool; see the file COPYING. If not, a copy + # can be downloaded from http://www.gnu.org/licenses/gpl.html, or + # obtained by writing to the Free Software Foundation, Inc., + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + + # The names of the tagged configurations supported by this script. + available_tags="" + + # ### BEGIN LIBTOOL CONFIG + + # Which release of libtool.m4 was used? + macro_version=$macro_version + macro_revision=$macro_revision + + # Whether or not to build shared libraries. + build_libtool_libs=$enable_shared + + # Whether or not to build static libraries. + build_old_libs=$enable_static + + # What type of objects to build. + pic_mode=$pic_mode + + # Whether or not to optimize for fast installation. + fast_install=$enable_fast_install + + # The host system. + host_alias=$host_alias + host=$host + host_os=$host_os + + # The build system. + build_alias=$build_alias + build=$build + build_os=$build_os + + # A sed program that does not truncate output. + SED=$lt_SED + + # Sed that helps us avoid accidentally triggering echo(1) options like -n. + Xsed="\$SED -e 1s/^X//" + + # A grep program that handles long lines. + GREP=$lt_GREP + + # An ERE matcher. + EGREP=$lt_EGREP + + # A literal string matcher. + FGREP=$lt_FGREP + + # A BSD- or MS-compatible name lister. + NM=$lt_NM + + # Whether we need soft or hard links. + LN_S=$lt_LN_S + + # What is the maximum length of a command? + max_cmd_len=$max_cmd_len + + # Object file suffix (normally "o"). + objext=$ac_objext + + # Executable file suffix (normally ""). + exeext=$exeext + + # whether the shell understands "unset". + lt_unset=$lt_unset + + # turn spaces into newlines. + SP2NL=$lt_lt_SP2NL + + # turn newlines into spaces. + NL2SP=$lt_lt_NL2SP + + # How to create reloadable object files. + reload_flag=$lt_reload_flag + reload_cmds=$lt_reload_cmds + + # An object symbol dumper. + OBJDUMP=$lt_OBJDUMP + + # Method to check whether dependent libraries are shared objects. + deplibs_check_method=$lt_deplibs_check_method + + # Command to use when deplibs_check_method == "file_magic". + file_magic_cmd=$lt_file_magic_cmd + + # The archiver. + AR=$lt_AR + AR_FLAGS=$lt_AR_FLAGS + + # A symbol stripping program. + STRIP=$lt_STRIP + + # Commands used to install an old-style archive. + RANLIB=$lt_RANLIB + old_postinstall_cmds=$lt_old_postinstall_cmds + old_postuninstall_cmds=$lt_old_postuninstall_cmds + + # A C compiler. + LTCC=$lt_CC + + # LTCC compiler flags. + LTCFLAGS=$lt_CFLAGS + + # Take the output of nm and produce a listing of raw symbols and C names. + global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + + # Transform the output of nm in a proper C declaration. + global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + + # Transform the output of nm in a C name address pair. + global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + + # Transform the output of nm in a C name address pair when lib prefix is needed. + global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix + + # The name of the directory that contains temporary libtool files. + objdir=$objdir + + # Shell to use when invoking shell scripts. + SHELL=$lt_SHELL + + # An echo program that does not interpret backslashes. + ECHO=$lt_ECHO + + # Used to examine libraries when file_magic_cmd begins with "file". + MAGIC_CMD=$MAGIC_CMD + + # Must we lock files when doing compilation? + need_locks=$lt_need_locks + + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. + DSYMUTIL=$lt_DSYMUTIL + + # Tool to change global to local symbols on Mac OS X. + NMEDIT=$lt_NMEDIT + + # Tool to manipulate fat objects and archives on Mac OS X. + LIPO=$lt_LIPO + + # ldd/readelf like tool for Mach-O binaries on Mac OS X. + OTOOL=$lt_OTOOL + + # ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. + OTOOL64=$lt_OTOOL64 + + # Old archive suffix (normally "a"). + libext=$libext + + # Shared library suffix (normally ".so"). + shrext_cmds=$lt_shrext_cmds + + # The commands to extract the exported symbol list from a shared archive. + extract_expsyms_cmds=$lt_extract_expsyms_cmds + + # Variables whose values should be saved in libtool wrapper scripts and + # restored at link time. + variables_saved_for_relink=$lt_variables_saved_for_relink + + # Do we need the "lib" prefix for modules? + need_lib_prefix=$need_lib_prefix + + # Do we need a version for libraries? + need_version=$need_version + + # Library versioning type. + version_type=$version_type + + # Shared library runtime path variable. + runpath_var=$runpath_var + + # Shared library path variable. + shlibpath_var=$shlibpath_var + + # Is shlibpath searched before the hard-coded library search path? + shlibpath_overrides_runpath=$shlibpath_overrides_runpath + + # Format of library name prefix. + libname_spec=$lt_libname_spec + + # List of archive names. First name is the real one, the rest are links. + # The last name is the one that the linker finds with -lNAME + library_names_spec=$lt_library_names_spec + + # The coded name of the library, if different from the real name. + soname_spec=$lt_soname_spec + + # Command to use after installation of a shared archive. + postinstall_cmds=$lt_postinstall_cmds + + # Command to use after uninstallation of a shared archive. + postuninstall_cmds=$lt_postuninstall_cmds + + # Commands used to finish a libtool library installation in a directory. + finish_cmds=$lt_finish_cmds + + # As "finish_cmds", except a single script fragment to be evaled but + # not shown. + finish_eval=$lt_finish_eval + + # Whether we should hardcode library paths into libraries. + hardcode_into_libs=$hardcode_into_libs + + # Compile-time system search path for libraries. + sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + + # Run-time system search path for libraries. + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Whether dlopen is supported. + dlopen_support=$enable_dlopen + + # Whether dlopen of programs is supported. + dlopen_self=$enable_dlopen_self + + # Whether dlopen of statically linked programs is supported. + dlopen_self_static=$enable_dlopen_self_static + + # Commands to strip libraries. + old_striplib=$lt_old_striplib + striplib=$lt_striplib + + + # The linker used to build libraries. + LD=$lt_LD + + # Commands used to build an old-style archive. + old_archive_cmds=$lt_old_archive_cmds + + # A language specific compiler. + CC=$lt_compiler + + # Is the compiler the GNU compiler? + with_gcc=$GCC + + # Compiler flag to turn off builtin functions. + no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + + # How to pass a linker flag through the compiler. + wl=$lt_lt_prog_compiler_wl + + # Additional compiler flags for building library objects. + pic_flag=$lt_lt_prog_compiler_pic + + # Compiler flag to prevent dynamic linking. + link_static_flag=$lt_lt_prog_compiler_static + + # Does compiler simultaneously support -c and -o options? + compiler_c_o=$lt_lt_cv_prog_compiler_c_o + + # Whether or not to add -lc for building shared libraries. + build_libtool_need_lc=$archive_cmds_need_lc + + # Whether or not to disallow shared libs when runtime libs are static. + allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes + + # Compiler flag to allow reflexive dlopens. + export_dynamic_flag_spec=$lt_export_dynamic_flag_spec + + # Compiler flag to generate shared objects directly from archives. + whole_archive_flag_spec=$lt_whole_archive_flag_spec + + # Whether the compiler copes with passing no objects directly. + compiler_needs_object=$lt_compiler_needs_object + + # Create an old-style archive from a shared archive. + old_archive_from_new_cmds=$lt_old_archive_from_new_cmds + + # Create a temporary old-style archive to link instead of a shared archive. + old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds + + # Commands used to build a shared archive. + archive_cmds=$lt_archive_cmds + archive_expsym_cmds=$lt_archive_expsym_cmds + + # Commands used to build a loadable module if different from building + # a shared archive. + module_cmds=$lt_module_cmds + module_expsym_cmds=$lt_module_expsym_cmds + + # Whether we are building with GNU ld or not. + with_gnu_ld=$lt_with_gnu_ld + + # Flag that allows shared libraries with undefined symbols to be built. + allow_undefined_flag=$lt_allow_undefined_flag + + # Flag that enforces no undefined symbols. + no_undefined_flag=$lt_no_undefined_flag + + # Flag to hardcode \$libdir into a binary during linking. + # This must work even if \$libdir does not exist + hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec + + # If ld is used when linking, flag to hardcode \$libdir into a binary + # during linking. This must work even if \$libdir does not exist. + hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld + + # Whether we need a single "-rpath" flag with a separated argument. + hardcode_libdir_separator=$lt_hardcode_libdir_separator + + # Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes + # DIR into the resulting binary. + hardcode_direct=$hardcode_direct + + # Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes + # DIR into the resulting binary and the resulting library dependency is + # "absolute",i.e impossible to change by setting \${shlibpath_var} if the + # library is relocated. + hardcode_direct_absolute=$hardcode_direct_absolute + + # Set to "yes" if using the -LDIR flag during linking hardcodes DIR + # into the resulting binary. + hardcode_minus_L=$hardcode_minus_L + + # Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR + # into the resulting binary. + hardcode_shlibpath_var=$hardcode_shlibpath_var + + # Set to "yes" if building a shared library automatically hardcodes DIR + # into the library and all subsequent libraries and executables linked + # against it. + hardcode_automatic=$hardcode_automatic + + # Set to yes if linker adds runtime paths of dependent libraries + # to runtime path list. + inherit_rpath=$inherit_rpath + + # Whether libtool must link a program against all its dependency libraries. + link_all_deplibs=$link_all_deplibs + + # Fix the shell variable \$srcfile for the compiler. + fix_srcfile_path=$lt_fix_srcfile_path + + # Set to "yes" if exported symbols are required. + always_export_symbols=$always_export_symbols + + # The commands to list exported symbols. + export_symbols_cmds=$lt_export_symbols_cmds + + # Symbols that should not be listed in the preloaded symbols. + exclude_expsyms=$lt_exclude_expsyms + + # Symbols that must always be exported. + include_expsyms=$lt_include_expsyms + + # Commands necessary for linking programs (against libraries) with templates. + prelink_cmds=$lt_prelink_cmds + + # Specify filename containing input files. + file_list_spec=$lt_file_list_spec + + # How to hardcode a shared library path into an executable. + hardcode_action=$hardcode_action + + # ### END LIBTOOL CONFIG + + _LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + _LT_EOF + ;; + esac + + + ltmain="$ac_aux_dir/ltmain.sh" + + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + case $xsi_shell in + yes) + cat << \_LT_EOF >> "$cfgfile" + + # func_dirname file append nondir_replacement + # Compute the dirname of FILE. If nonempty, add APPEND to the result, + # otherwise set result to NONDIR_REPLACEMENT. + func_dirname () + { + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + } + + # func_basename file + func_basename () + { + func_basename_result="${1##*/}" + } + + # func_dirname_and_basename file append nondir_replacement + # perform func_basename and func_dirname in a single function + # call: + # dirname: Compute the dirname of FILE. If nonempty, + # add APPEND to the result, otherwise set result + # to NONDIR_REPLACEMENT. + # value returned in "$func_dirname_result" + # basename: Compute filename of FILE. + # value retuned in "$func_basename_result" + # Implementation must be kept synchronized with func_dirname + # and func_basename. For efficiency, we do not delegate to + # those functions but instead duplicate the functionality here. + func_dirname_and_basename () + { + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}" + } + + # func_stripname prefix suffix name + # strip PREFIX and SUFFIX off of NAME. + # PREFIX and SUFFIX must not contain globbing or regex special + # characters, hashes, percent signs, but SUFFIX may contain a leading + # dot (in which case that matches only a dot). + func_stripname () + { + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"} + } + + # func_opt_split + func_opt_split () + { + func_opt_split_opt=${1%%=*} + func_opt_split_arg=${1#*=} + } + + # func_lo2o object + func_lo2o () + { + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac + } + + # func_xform libobj-or-source + func_xform () + { + func_xform_result=${1%.*}.lo + } + + # func_arith arithmetic-term... + func_arith () + { + func_arith_result=$(( $* )) + } + + # func_len string + # STRING may not start with a hyphen. + func_len () + { + func_len_result=${#1} + } + + _LT_EOF + ;; + *) # Bourne compatible functions. + cat << \_LT_EOF >> "$cfgfile" + + # func_dirname file append nondir_replacement + # Compute the dirname of FILE. If nonempty, add APPEND to the result, + # otherwise set result to NONDIR_REPLACEMENT. + func_dirname () + { + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + } + + # func_basename file + func_basename () + { + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` + } + + + # func_stripname prefix suffix name + # strip PREFIX and SUFFIX off of NAME. + # PREFIX and SUFFIX must not contain globbing or regex special + # characters, hashes, percent signs, but SUFFIX may contain a leading + # dot (in which case that matches only a dot). + # func_strip_suffix prefix name + func_stripname () + { + case ${2} in + .*) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; + esac + } + + # sed scripts: + my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^-[^=]*=//' + + # func_opt_split + func_opt_split () + { + func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` + } + + # func_lo2o object + func_lo2o () + { + func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` + } + + # func_xform libobj-or-source + func_xform () + { + func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` + } + + # func_arith arithmetic-term... + func_arith () + { + func_arith_result=`expr "$@"` + } + + # func_len string + # STRING may not start with a hyphen. + func_len () + { + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } + + _LT_EOF + esac + + case $lt_shell_append in + yes) + cat << \_LT_EOF >> "$cfgfile" + + # func_append var value + # Append VALUE to the end of shell variable VAR. + func_append () + { + eval "$1+=\$2" + } + _LT_EOF + ;; + *) + cat << \_LT_EOF >> "$cfgfile" + + # func_append var value + # Append VALUE to the end of shell variable VAR. + func_append () + { + eval "$1=\$$1\$2" + } + + _LT_EOF + ;; + esac + + + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + + ;; + esac + done + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF + + { (exit 0); exit 0; } + _ACEOF + chmod +x $CONFIG_STATUS + ac_clean_files=$ac_clean_files_save + + + # configure is writing to config.log, and then calls config.status. + # config.status does its own redirection, appending to config.log. + # Unfortunately, on DOS this fails, as config.log is still kept open + # by configure, so config.status won't be able to write to it; its + # output is simply discarded. So we exec the FD to /dev/null, + # effectively closing config.log, so it can be properly (re)opened and + # appended to by config.status. When coming back to configure, we + # need to make the FD available again. + if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } + fi + diff -Nrcpad gcc-4.4.4/zlib/configure.ac gcc-4.4.5/zlib/configure.ac *** gcc-4.4.4/zlib/configure.ac Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/configure.ac Mon Sep 12 17:02:07 2005 *************** *** 0 **** --- 1,123 ---- + dnl Process this with autoconf to create configure + + AC_PREREQ(2.59) + AC_INIT + AC_CONFIG_SRCDIR([zlib.h]) + + AM_ENABLE_MULTILIB(, ..) + + AC_CANONICAL_SYSTEM + + # This works around an automake problem. + mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" + AC_SUBST(mkinstalldirs) + + AM_INIT_AUTOMAKE(zlib, 1.1.4) + + AM_MAINTAINER_MODE + + dnl We use these options to decide which functions to include. + AC_ARG_WITH(target-subdir, + [ --with-target-subdir=SUBDIR + configuring in a subdirectory]) + + if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then + COMPPATH=. + else + COMPPATH=.. + fi + AC_SUBST(COMPPATH) + + AC_ARG_WITH(cross-host, + [ --with-cross-host=HOST configuring with a cross compiler]) + + dnl Default to --enable-multilib + AC_ARG_ENABLE(multilib, + [ --enable-multilib build many library versions (default)], + [case "${enableval}" in + yes) multilib=yes ;; + no) multilib=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; + esac], [test -z "$with_target_subdir" && multilib=no || multilib=yes])dnl + + AC_ARG_WITH(system-zlib, + [ --with-system-zlib use installed libz]) + + # Make sure we don't test executables when making cross-tools. + GCC_NO_EXECUTABLES + + # The same as in boehm-gc and libstdc++. Have to borrow it from there. + # We must force CC to /not/ be precious variables; otherwise + # the wrong, non-multilib-adjusted value will be used in multilibs. + # As a side effect, we have to subst CFLAGS ourselves. + + m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) + m4_define([_AC_ARG_VAR_PRECIOUS],[]) + AC_PROG_CC + m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) + + AC_SUBST(CFLAGS) + + AC_PROG_LIBTOOL + + # Find CPP now so that any conditional tests below won't do it and + # thereby make the resulting definitions conditional. + AC_PROG_CPP + + if test -n "$with_cross_host"; then + # We are being configured with a cross compiler. AC_REPLACE_FUNCS + # may not work correctly, because the compiler may not be able to + # link executables. + + # We assume newlib. This lets us hard-code the functions we know + # we'll have. + AC_DEFINE(HAVE_MEMCPY) + AC_DEFINE(HAVE_STRERROR) + + # We ignore --with-system-zlib in this case. + target_all=libzgcj.la + else + AC_FUNC_MMAP + AC_CHECK_FUNCS(memcpy strerror) + + if test "$with_system_zlib" = yes; then + AC_CHECK_LIB(z, deflate, target_all=, target_all=libzgcj.la) + else + target_all=libzgcj.la + fi + fi + + AC_SUBST(target_all) + + AC_CHECK_HEADERS(unistd.h) + + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' + toolexeclibdir='$(toolexecdir)/lib' + else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' + fi + if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then + multiosdir=/`$CC -print-multi-os-directory` + case $multiosdir in + /.) multiosdir= ;; # Avoid trailing /. + esac + else + multiosdir= + fi + toolexeclibdir=${toolexeclibdir}${multiosdir} + AC_SUBST(toolexecdir) + AC_SUBST(toolexeclibdir) + + AM_CONDITIONAL(TARGET_LIBRARY, test -n "$with_target_subdir") + + if test "${multilib}" = "yes"; then + multilib_arg="--enable-multilib" + else + multilib_arg= + fi + + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT diff -Nrcpad gcc-4.4.4/zlib/contrib/README.contrib gcc-4.4.5/zlib/contrib/README.contrib *** gcc-4.4.4/zlib/contrib/README.contrib Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/README.contrib Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,71 ---- + All files under this contrib directory are UNSUPPORTED. There were + provided by users of zlib and were not tested by the authors of zlib. + Use at your own risk. Please contact the authors of the contributions + for help about these, not the zlib authors. Thanks. + + + ada/ by Dmitriy Anisimkov + Support for Ada + See http://zlib-ada.sourceforge.net/ + + asm586/ + asm686/ by Brian Raiter + asm code for Pentium and PPro/PII, using the AT&T (GNU as) syntax + See http://www.muppetlabs.com/~breadbox/software/assembly.html + + blast/ by Mark Adler + Decompressor for output of PKWare Data Compression Library (DCL) + + delphi/ by Cosmin Truta + Support for Delphi and C++ Builder + + dotzlib/ by Henrik Ravn + Support for Microsoft .Net and Visual C++ .Net + + infback9/ by Mark Adler + Unsupported diffs to infback to decode the deflate64 format + + inflate86/ by Chris Anderson + Tuned x86 gcc asm code to replace inflate_fast() + + iostream/ by Kevin Ruland + A C++ I/O streams interface to the zlib gz* functions + + iostream2/ by Tyge Løvset + Another C++ I/O streams interface + + iostream3/ by Ludwig Schwardt + and Kevin Ruland + Yet another C++ I/O streams interface + + masm686/ by Dan Higdon + and Chuck Walbourn + asm code for Pentium Pro/PII, using the MASM syntax + + masmx64/ by Gilles Vollant + x86 64-bit (AMD64 and Intel EM64t) code for x64 assembler to + replace longest_match() and inflate_fast() + + masmx86/ by Gilles Vollant + x86 asm code to replace longest_match() and inflate_fast(), + for Visual C++ and MASM + + minizip/ by Gilles Vollant + Mini zip and unzip based on zlib + See http://www.winimage.com/zLibDll/unzip.html + + pascal/ by Bob Dellaca et al. + Support for Pascal + + puff/ by Mark Adler + Small, low memory usage inflate. Also serves to provide an + unambiguous description of the deflate format. + + testzlib/ by Gilles Vollant + Example of the use of zlib + + untgz/ by Pedro A. Aranda Gutierrez + A very simple tar.gz file extractor using zlib + + vstudio/ by Gilles Vollant + Building a minizip-enhanced zlib with Microsoft Visual Studio diff -Nrcpad gcc-4.4.4/zlib/contrib/ada/buffer_demo.adb gcc-4.4.5/zlib/contrib/ada/buffer_demo.adb *** gcc-4.4.4/zlib/contrib/ada/buffer_demo.adb Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/ada/buffer_demo.adb Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,106 ---- + ---------------------------------------------------------------- + -- ZLib for Ada thick binding. -- + -- -- + -- Copyright (C) 2002-2004 Dmitriy Anisimkov -- + -- -- + -- Open source license information is in the zlib.ads file. -- + ---------------------------------------------------------------- + -- + -- $Id: buffer_demo.adb,v 1.3 2004/09/06 06:55:35 vagul Exp $ + + -- This demo program provided by Dr Steve Sangwine + -- + -- Demonstration of a problem with Zlib-Ada (already fixed) when a buffer + -- of exactly the correct size is used for decompressed data, and the last + -- few bytes passed in to Zlib are checksum bytes. + + -- This program compresses a string of text, and then decompresses the + -- compressed text into a buffer of the same size as the original text. + + with Ada.Streams; use Ada.Streams; + with Ada.Text_IO; + + with ZLib; use ZLib; + + procedure Buffer_Demo is + EOL : Character renames ASCII.LF; + Text : constant String + := "Four score and seven years ago our fathers brought forth," & EOL & + "upon this continent, a new nation, conceived in liberty," & EOL & + "and dedicated to the proposition that `all men are created equal'."; + + Source : Stream_Element_Array (1 .. Text'Length); + for Source'Address use Text'Address; + + begin + Ada.Text_IO.Put (Text); + Ada.Text_IO.New_Line; + Ada.Text_IO.Put_Line + ("Uncompressed size : " & Positive'Image (Text'Length) & " bytes"); + + declare + Compressed_Data : Stream_Element_Array (1 .. Text'Length); + L : Stream_Element_Offset; + begin + Compress : declare + Compressor : Filter_Type; + I : Stream_Element_Offset; + begin + Deflate_Init (Compressor); + + -- Compress the whole of T at once. + + Translate (Compressor, Source, I, Compressed_Data, L, Finish); + pragma Assert (I = Source'Last); + + Close (Compressor); + + Ada.Text_IO.Put_Line + ("Compressed size : " + & Stream_Element_Offset'Image (L) & " bytes"); + end Compress; + + -- Now we decompress the data, passing short blocks of data to Zlib + -- (because this demonstrates the problem - the last block passed will + -- contain checksum information and there will be no output, only a + -- check inside Zlib that the checksum is correct). + + Decompress : declare + Decompressor : Filter_Type; + + Uncompressed_Data : Stream_Element_Array (1 .. Text'Length); + + Block_Size : constant := 4; + -- This makes sure that the last block contains + -- only Adler checksum data. + + P : Stream_Element_Offset := Compressed_Data'First - 1; + O : Stream_Element_Offset; + begin + Inflate_Init (Decompressor); + + loop + Translate + (Decompressor, + Compressed_Data + (P + 1 .. Stream_Element_Offset'Min (P + Block_Size, L)), + P, + Uncompressed_Data + (Total_Out (Decompressor) + 1 .. Uncompressed_Data'Last), + O, + No_Flush); + + Ada.Text_IO.Put_Line + ("Total in : " & Count'Image (Total_In (Decompressor)) & + ", out : " & Count'Image (Total_Out (Decompressor))); + + exit when P = L; + end loop; + + Ada.Text_IO.New_Line; + Ada.Text_IO.Put_Line + ("Decompressed text matches original text : " + & Boolean'Image (Uncompressed_Data = Source)); + end Decompress; + end; + end Buffer_Demo; diff -Nrcpad gcc-4.4.4/zlib/contrib/ada/mtest.adb gcc-4.4.5/zlib/contrib/ada/mtest.adb *** gcc-4.4.4/zlib/contrib/ada/mtest.adb Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/ada/mtest.adb Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,156 ---- + ---------------------------------------------------------------- + -- ZLib for Ada thick binding. -- + -- -- + -- Copyright (C) 2002-2003 Dmitriy Anisimkov -- + -- -- + -- Open source license information is in the zlib.ads file. -- + ---------------------------------------------------------------- + -- Continuous test for ZLib multithreading. If the test would fail + -- we should provide thread safe allocation routines for the Z_Stream. + -- + -- $Id: mtest.adb,v 1.4 2004/07/23 07:49:54 vagul Exp $ + + with ZLib; + with Ada.Streams; + with Ada.Numerics.Discrete_Random; + with Ada.Text_IO; + with Ada.Exceptions; + with Ada.Task_Identification; + + procedure MTest is + use Ada.Streams; + use ZLib; + + Stop : Boolean := False; + + pragma Atomic (Stop); + + subtype Visible_Symbols is Stream_Element range 16#20# .. 16#7E#; + + package Random_Elements is + new Ada.Numerics.Discrete_Random (Visible_Symbols); + + task type Test_Task; + + task body Test_Task is + Buffer : Stream_Element_Array (1 .. 100_000); + Gen : Random_Elements.Generator; + + Buffer_First : Stream_Element_Offset; + Compare_First : Stream_Element_Offset; + + Deflate : Filter_Type; + Inflate : Filter_Type; + + procedure Further (Item : in Stream_Element_Array); + + procedure Read_Buffer + (Item : out Ada.Streams.Stream_Element_Array; + Last : out Ada.Streams.Stream_Element_Offset); + + ------------- + -- Further -- + ------------- + + procedure Further (Item : in Stream_Element_Array) is + + procedure Compare (Item : in Stream_Element_Array); + + ------------- + -- Compare -- + ------------- + + procedure Compare (Item : in Stream_Element_Array) is + Next_First : Stream_Element_Offset := Compare_First + Item'Length; + begin + if Buffer (Compare_First .. Next_First - 1) /= Item then + raise Program_Error; + end if; + + Compare_First := Next_First; + end Compare; + + procedure Compare_Write is new ZLib.Write (Write => Compare); + begin + Compare_Write (Inflate, Item, No_Flush); + end Further; + + ----------------- + -- Read_Buffer -- + ----------------- + + procedure Read_Buffer + (Item : out Ada.Streams.Stream_Element_Array; + Last : out Ada.Streams.Stream_Element_Offset) + is + Buff_Diff : Stream_Element_Offset := Buffer'Last - Buffer_First; + Next_First : Stream_Element_Offset; + begin + if Item'Length <= Buff_Diff then + Last := Item'Last; + + Next_First := Buffer_First + Item'Length; + + Item := Buffer (Buffer_First .. Next_First - 1); + + Buffer_First := Next_First; + else + Last := Item'First + Buff_Diff; + Item (Item'First .. Last) := Buffer (Buffer_First .. Buffer'Last); + Buffer_First := Buffer'Last + 1; + end if; + end Read_Buffer; + + procedure Translate is new Generic_Translate + (Data_In => Read_Buffer, + Data_Out => Further); + + begin + Random_Elements.Reset (Gen); + + Buffer := (others => 20); + + Main : loop + for J in Buffer'Range loop + Buffer (J) := Random_Elements.Random (Gen); + + Deflate_Init (Deflate); + Inflate_Init (Inflate); + + Buffer_First := Buffer'First; + Compare_First := Buffer'First; + + Translate (Deflate); + + if Compare_First /= Buffer'Last + 1 then + raise Program_Error; + end if; + + Ada.Text_IO.Put_Line + (Ada.Task_Identification.Image + (Ada.Task_Identification.Current_Task) + & Stream_Element_Offset'Image (J) + & ZLib.Count'Image (Total_Out (Deflate))); + + Close (Deflate); + Close (Inflate); + + exit Main when Stop; + end loop; + end loop Main; + exception + when E : others => + Ada.Text_IO.Put_Line (Ada.Exceptions.Exception_Information (E)); + Stop := True; + end Test_Task; + + Test : array (1 .. 4) of Test_Task; + + pragma Unreferenced (Test); + + Dummy : Character; + + begin + Ada.Text_IO.Get_Immediate (Dummy); + Stop := True; + end MTest; diff -Nrcpad gcc-4.4.4/zlib/contrib/ada/read.adb gcc-4.4.5/zlib/contrib/ada/read.adb *** gcc-4.4.4/zlib/contrib/ada/read.adb Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/ada/read.adb Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,156 ---- + ---------------------------------------------------------------- + -- ZLib for Ada thick binding. -- + -- -- + -- Copyright (C) 2002-2003 Dmitriy Anisimkov -- + -- -- + -- Open source license information is in the zlib.ads file. -- + ---------------------------------------------------------------- + + -- $Id: read.adb,v 1.8 2004/05/31 10:53:40 vagul Exp $ + + -- Test/demo program for the generic read interface. + + with Ada.Numerics.Discrete_Random; + with Ada.Streams; + with Ada.Text_IO; + + with ZLib; + + procedure Read is + + use Ada.Streams; + + ------------------------------------ + -- Test configuration parameters -- + ------------------------------------ + + File_Size : Stream_Element_Offset := 100_000; + + Continuous : constant Boolean := False; + -- If this constant is True, the test would be repeated again and again, + -- with increment File_Size for every iteration. + + Header : constant ZLib.Header_Type := ZLib.Default; + -- Do not use Header other than Default in ZLib versions 1.1.4 and older. + + Init_Random : constant := 8; + -- We are using the same random sequence, in case of we catch bug, + -- so we would be able to reproduce it. + + -- End -- + + Pack_Size : Stream_Element_Offset; + Offset : Stream_Element_Offset; + + Filter : ZLib.Filter_Type; + + subtype Visible_Symbols + is Stream_Element range 16#20# .. 16#7E#; + + package Random_Elements is new + Ada.Numerics.Discrete_Random (Visible_Symbols); + + Gen : Random_Elements.Generator; + Period : constant Stream_Element_Offset := 200; + -- Period constant variable for random generator not to be very random. + -- Bigger period, harder random. + + Read_Buffer : Stream_Element_Array (1 .. 2048); + Read_First : Stream_Element_Offset; + Read_Last : Stream_Element_Offset; + + procedure Reset; + + procedure Read + (Item : out Stream_Element_Array; + Last : out Stream_Element_Offset); + -- this procedure is for generic instantiation of + -- ZLib.Read + -- reading data from the File_In. + + procedure Read is new ZLib.Read + (Read, + Read_Buffer, + Rest_First => Read_First, + Rest_Last => Read_Last); + + ---------- + -- Read -- + ---------- + + procedure Read + (Item : out Stream_Element_Array; + Last : out Stream_Element_Offset) is + begin + Last := Stream_Element_Offset'Min + (Item'Last, + Item'First + File_Size - Offset); + + for J in Item'First .. Last loop + if J < Item'First + Period then + Item (J) := Random_Elements.Random (Gen); + else + Item (J) := Item (J - Period); + end if; + + Offset := Offset + 1; + end loop; + end Read; + + ----------- + -- Reset -- + ----------- + + procedure Reset is + begin + Random_Elements.Reset (Gen, Init_Random); + Pack_Size := 0; + Offset := 1; + Read_First := Read_Buffer'Last + 1; + Read_Last := Read_Buffer'Last; + end Reset; + + begin + Ada.Text_IO.Put_Line ("ZLib " & ZLib.Version); + + loop + for Level in ZLib.Compression_Level'Range loop + + Ada.Text_IO.Put ("Level =" + & ZLib.Compression_Level'Image (Level)); + + -- Deflate using generic instantiation. + + ZLib.Deflate_Init + (Filter, + Level, + Header => Header); + + Reset; + + Ada.Text_IO.Put + (Stream_Element_Offset'Image (File_Size) & " ->"); + + loop + declare + Buffer : Stream_Element_Array (1 .. 1024); + Last : Stream_Element_Offset; + begin + Read (Filter, Buffer, Last); + + Pack_Size := Pack_Size + Last - Buffer'First + 1; + + exit when Last < Buffer'Last; + end; + end loop; + + Ada.Text_IO.Put_Line (Stream_Element_Offset'Image (Pack_Size)); + + ZLib.Close (Filter); + end loop; + + exit when not Continuous; + + File_Size := File_Size + 1; + end loop; + end Read; diff -Nrcpad gcc-4.4.4/zlib/contrib/ada/readme.txt gcc-4.4.5/zlib/contrib/ada/readme.txt *** gcc-4.4.4/zlib/contrib/ada/readme.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/ada/readme.txt Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,65 ---- + ZLib for Ada thick binding (ZLib.Ada) + Release 1.3 + + ZLib.Ada is a thick binding interface to the popular ZLib data + compression library, available at http://www.gzip.org/zlib/. + It provides Ada-style access to the ZLib C library. + + + Here are the main changes since ZLib.Ada 1.2: + + - Attension: ZLib.Read generic routine have a initialization requirement + for Read_Last parameter now. It is a bit incompartible with previous version, + but extends functionality, we could use new parameters Allow_Read_Some and + Flush now. + + - Added Is_Open routines to ZLib and ZLib.Streams packages. + + - Add pragma Assert to check Stream_Element is 8 bit. + + - Fix extraction to buffer with exact known decompressed size. Error reported by + Steve Sangwine. + + - Fix definition of ULong (changed to unsigned_long), fix regression on 64 bits + computers. Patch provided by Pascal Obry. + + - Add Status_Error exception definition. + + - Add pragma Assertion that Ada.Streams.Stream_Element size is 8 bit. + + + How to build ZLib.Ada under GNAT + + You should have the ZLib library already build on your computer, before + building ZLib.Ada. Make the directory of ZLib.Ada sources current and + issue the command: + + gnatmake test -largs -L -lz + + Or use the GNAT project file build for GNAT 3.15 or later: + + gnatmake -Pzlib.gpr -L + + + How to build ZLib.Ada under Aonix ObjectAda for Win32 7.2.2 + + 1. Make a project with all *.ads and *.adb files from the distribution. + 2. Build the libz.a library from the ZLib C sources. + 3. Rename libz.a to z.lib. + 4. Add the library z.lib to the project. + 5. Add the libc.lib library from the ObjectAda distribution to the project. + 6. Build the executable using test.adb as a main procedure. + + + How to use ZLib.Ada + + The source files test.adb and read.adb are small demo programs that show + the main functionality of ZLib.Ada. + + The routines from the package specifications are commented. + + + Homepage: http://zlib-ada.sourceforge.net/ + Author: Dmitriy Anisimkov + + Contributors: Pascal Obry , Steve Sangwine diff -Nrcpad gcc-4.4.4/zlib/contrib/ada/test.adb gcc-4.4.5/zlib/contrib/ada/test.adb *** gcc-4.4.4/zlib/contrib/ada/test.adb Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/ada/test.adb Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,463 ---- + ---------------------------------------------------------------- + -- ZLib for Ada thick binding. -- + -- -- + -- Copyright (C) 2002-2003 Dmitriy Anisimkov -- + -- -- + -- Open source license information is in the zlib.ads file. -- + ---------------------------------------------------------------- + + -- $Id: test.adb,v 1.17 2003/08/12 12:13:30 vagul Exp $ + + -- The program has a few aims. + -- 1. Test ZLib.Ada95 thick binding functionality. + -- 2. Show the example of use main functionality of the ZLib.Ada95 binding. + -- 3. Build this program automatically compile all ZLib.Ada95 packages under + -- GNAT Ada95 compiler. + + with ZLib.Streams; + with Ada.Streams.Stream_IO; + with Ada.Numerics.Discrete_Random; + + with Ada.Text_IO; + + with Ada.Calendar; + + procedure Test is + + use Ada.Streams; + use Stream_IO; + + ------------------------------------ + -- Test configuration parameters -- + ------------------------------------ + + File_Size : Count := 100_000; + Continuous : constant Boolean := False; + + Header : constant ZLib.Header_Type := ZLib.Default; + -- ZLib.None; + -- ZLib.Auto; + -- ZLib.GZip; + -- Do not use Header other then Default in ZLib versions 1.1.4 + -- and older. + + Strategy : constant ZLib.Strategy_Type := ZLib.Default_Strategy; + Init_Random : constant := 10; + + -- End -- + + In_File_Name : constant String := "testzlib.in"; + -- Name of the input file + + Z_File_Name : constant String := "testzlib.zlb"; + -- Name of the compressed file. + + Out_File_Name : constant String := "testzlib.out"; + -- Name of the decompressed file. + + File_In : File_Type; + File_Out : File_Type; + File_Back : File_Type; + File_Z : ZLib.Streams.Stream_Type; + + Filter : ZLib.Filter_Type; + + Time_Stamp : Ada.Calendar.Time; + + procedure Generate_File; + -- Generate file of spetsified size with some random data. + -- The random data is repeatable, for the good compression. + + procedure Compare_Streams + (Left, Right : in out Root_Stream_Type'Class); + -- The procedure compearing data in 2 streams. + -- It is for compare data before and after compression/decompression. + + procedure Compare_Files (Left, Right : String); + -- Compare files. Based on the Compare_Streams. + + procedure Copy_Streams + (Source, Target : in out Root_Stream_Type'Class; + Buffer_Size : in Stream_Element_Offset := 1024); + -- Copying data from one stream to another. It is for test stream + -- interface of the library. + + procedure Data_In + (Item : out Stream_Element_Array; + Last : out Stream_Element_Offset); + -- this procedure is for generic instantiation of + -- ZLib.Generic_Translate. + -- reading data from the File_In. + + procedure Data_Out (Item : in Stream_Element_Array); + -- this procedure is for generic instantiation of + -- ZLib.Generic_Translate. + -- writing data to the File_Out. + + procedure Stamp; + -- Store the timestamp to the local variable. + + procedure Print_Statistic (Msg : String; Data_Size : ZLib.Count); + -- Print the time statistic with the message. + + procedure Translate is new ZLib.Generic_Translate + (Data_In => Data_In, + Data_Out => Data_Out); + -- This procedure is moving data from File_In to File_Out + -- with compression or decompression, depend on initialization of + -- Filter parameter. + + ------------------- + -- Compare_Files -- + ------------------- + + procedure Compare_Files (Left, Right : String) is + Left_File, Right_File : File_Type; + begin + Open (Left_File, In_File, Left); + Open (Right_File, In_File, Right); + Compare_Streams (Stream (Left_File).all, Stream (Right_File).all); + Close (Left_File); + Close (Right_File); + end Compare_Files; + + --------------------- + -- Compare_Streams -- + --------------------- + + procedure Compare_Streams + (Left, Right : in out Ada.Streams.Root_Stream_Type'Class) + is + Left_Buffer, Right_Buffer : Stream_Element_Array (0 .. 16#FFF#); + Left_Last, Right_Last : Stream_Element_Offset; + begin + loop + Read (Left, Left_Buffer, Left_Last); + Read (Right, Right_Buffer, Right_Last); + + if Left_Last /= Right_Last then + Ada.Text_IO.Put_Line ("Compare error :" + & Stream_Element_Offset'Image (Left_Last) + & " /= " + & Stream_Element_Offset'Image (Right_Last)); + + raise Constraint_Error; + + elsif Left_Buffer (0 .. Left_Last) + /= Right_Buffer (0 .. Right_Last) + then + Ada.Text_IO.Put_Line ("ERROR: IN and OUT files is not equal."); + raise Constraint_Error; + + end if; + + exit when Left_Last < Left_Buffer'Last; + end loop; + end Compare_Streams; + + ------------------ + -- Copy_Streams -- + ------------------ + + procedure Copy_Streams + (Source, Target : in out Ada.Streams.Root_Stream_Type'Class; + Buffer_Size : in Stream_Element_Offset := 1024) + is + Buffer : Stream_Element_Array (1 .. Buffer_Size); + Last : Stream_Element_Offset; + begin + loop + Read (Source, Buffer, Last); + Write (Target, Buffer (1 .. Last)); + + exit when Last < Buffer'Last; + end loop; + end Copy_Streams; + + ------------- + -- Data_In -- + ------------- + + procedure Data_In + (Item : out Stream_Element_Array; + Last : out Stream_Element_Offset) is + begin + Read (File_In, Item, Last); + end Data_In; + + -------------- + -- Data_Out -- + -------------- + + procedure Data_Out (Item : in Stream_Element_Array) is + begin + Write (File_Out, Item); + end Data_Out; + + ------------------- + -- Generate_File -- + ------------------- + + procedure Generate_File is + subtype Visible_Symbols is Stream_Element range 16#20# .. 16#7E#; + + package Random_Elements is + new Ada.Numerics.Discrete_Random (Visible_Symbols); + + Gen : Random_Elements.Generator; + Buffer : Stream_Element_Array := (1 .. 77 => 16#20#) & 10; + + Buffer_Count : constant Count := File_Size / Buffer'Length; + -- Number of same buffers in the packet. + + Density : constant Count := 30; -- from 0 to Buffer'Length - 2; + + procedure Fill_Buffer (J, D : in Count); + -- Change the part of the buffer. + + ----------------- + -- Fill_Buffer -- + ----------------- + + procedure Fill_Buffer (J, D : in Count) is + begin + for K in 0 .. D loop + Buffer + (Stream_Element_Offset ((J + K) mod (Buffer'Length - 1) + 1)) + := Random_Elements.Random (Gen); + + end loop; + end Fill_Buffer; + + begin + Random_Elements.Reset (Gen, Init_Random); + + Create (File_In, Out_File, In_File_Name); + + Fill_Buffer (1, Buffer'Length - 2); + + for J in 1 .. Buffer_Count loop + Write (File_In, Buffer); + + Fill_Buffer (J, Density); + end loop; + + -- fill remain size. + + Write + (File_In, + Buffer + (1 .. Stream_Element_Offset + (File_Size - Buffer'Length * Buffer_Count))); + + Flush (File_In); + Close (File_In); + end Generate_File; + + --------------------- + -- Print_Statistic -- + --------------------- + + procedure Print_Statistic (Msg : String; Data_Size : ZLib.Count) is + use Ada.Calendar; + use Ada.Text_IO; + + package Count_IO is new Integer_IO (ZLib.Count); + + Curr_Dur : Duration := Clock - Time_Stamp; + begin + Put (Msg); + + Set_Col (20); + Ada.Text_IO.Put ("size ="); + + Count_IO.Put + (Data_Size, + Width => Stream_IO.Count'Image (File_Size)'Length); + + Put_Line (" duration =" & Duration'Image (Curr_Dur)); + end Print_Statistic; + + ----------- + -- Stamp -- + ----------- + + procedure Stamp is + begin + Time_Stamp := Ada.Calendar.Clock; + end Stamp; + + begin + Ada.Text_IO.Put_Line ("ZLib " & ZLib.Version); + + loop + Generate_File; + + for Level in ZLib.Compression_Level'Range loop + + Ada.Text_IO.Put_Line ("Level =" + & ZLib.Compression_Level'Image (Level)); + + -- Test generic interface. + Open (File_In, In_File, In_File_Name); + Create (File_Out, Out_File, Z_File_Name); + + Stamp; + + -- Deflate using generic instantiation. + + ZLib.Deflate_Init + (Filter => Filter, + Level => Level, + Strategy => Strategy, + Header => Header); + + Translate (Filter); + Print_Statistic ("Generic compress", ZLib.Total_Out (Filter)); + ZLib.Close (Filter); + + Close (File_In); + Close (File_Out); + + Open (File_In, In_File, Z_File_Name); + Create (File_Out, Out_File, Out_File_Name); + + Stamp; + + -- Inflate using generic instantiation. + + ZLib.Inflate_Init (Filter, Header => Header); + + Translate (Filter); + Print_Statistic ("Generic decompress", ZLib.Total_Out (Filter)); + + ZLib.Close (Filter); + + Close (File_In); + Close (File_Out); + + Compare_Files (In_File_Name, Out_File_Name); + + -- Test stream interface. + + -- Compress to the back stream. + + Open (File_In, In_File, In_File_Name); + Create (File_Back, Out_File, Z_File_Name); + + Stamp; + + ZLib.Streams.Create + (Stream => File_Z, + Mode => ZLib.Streams.Out_Stream, + Back => ZLib.Streams.Stream_Access + (Stream (File_Back)), + Back_Compressed => True, + Level => Level, + Strategy => Strategy, + Header => Header); + + Copy_Streams + (Source => Stream (File_In).all, + Target => File_Z); + + -- Flushing internal buffers to the back stream. + + ZLib.Streams.Flush (File_Z, ZLib.Finish); + + Print_Statistic ("Write compress", + ZLib.Streams.Write_Total_Out (File_Z)); + + ZLib.Streams.Close (File_Z); + + Close (File_In); + Close (File_Back); + + -- Compare reading from original file and from + -- decompression stream. + + Open (File_In, In_File, In_File_Name); + Open (File_Back, In_File, Z_File_Name); + + ZLib.Streams.Create + (Stream => File_Z, + Mode => ZLib.Streams.In_Stream, + Back => ZLib.Streams.Stream_Access + (Stream (File_Back)), + Back_Compressed => True, + Header => Header); + + Stamp; + Compare_Streams (Stream (File_In).all, File_Z); + + Print_Statistic ("Read decompress", + ZLib.Streams.Read_Total_Out (File_Z)); + + ZLib.Streams.Close (File_Z); + Close (File_In); + Close (File_Back); + + -- Compress by reading from compression stream. + + Open (File_Back, In_File, In_File_Name); + Create (File_Out, Out_File, Z_File_Name); + + ZLib.Streams.Create + (Stream => File_Z, + Mode => ZLib.Streams.In_Stream, + Back => ZLib.Streams.Stream_Access + (Stream (File_Back)), + Back_Compressed => False, + Level => Level, + Strategy => Strategy, + Header => Header); + + Stamp; + Copy_Streams + (Source => File_Z, + Target => Stream (File_Out).all); + + Print_Statistic ("Read compress", + ZLib.Streams.Read_Total_Out (File_Z)); + + ZLib.Streams.Close (File_Z); + + Close (File_Out); + Close (File_Back); + + -- Decompress to decompression stream. + + Open (File_In, In_File, Z_File_Name); + Create (File_Back, Out_File, Out_File_Name); + + ZLib.Streams.Create + (Stream => File_Z, + Mode => ZLib.Streams.Out_Stream, + Back => ZLib.Streams.Stream_Access + (Stream (File_Back)), + Back_Compressed => False, + Header => Header); + + Stamp; + + Copy_Streams + (Source => Stream (File_In).all, + Target => File_Z); + + Print_Statistic ("Write decompress", + ZLib.Streams.Write_Total_Out (File_Z)); + + ZLib.Streams.Close (File_Z); + Close (File_In); + Close (File_Back); + + Compare_Files (In_File_Name, Out_File_Name); + end loop; + + Ada.Text_IO.Put_Line (Count'Image (File_Size) & " Ok."); + + exit when not Continuous; + + File_Size := File_Size + 1; + end loop; + end Test; diff -Nrcpad gcc-4.4.4/zlib/contrib/ada/zlib-streams.adb gcc-4.4.5/zlib/contrib/ada/zlib-streams.adb *** gcc-4.4.4/zlib/contrib/ada/zlib-streams.adb Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/ada/zlib-streams.adb Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,225 ---- + ---------------------------------------------------------------- + -- ZLib for Ada thick binding. -- + -- -- + -- Copyright (C) 2002-2003 Dmitriy Anisimkov -- + -- -- + -- Open source license information is in the zlib.ads file. -- + ---------------------------------------------------------------- + + -- $Id: zlib-streams.adb,v 1.10 2004/05/31 10:53:40 vagul Exp $ + + with Ada.Unchecked_Deallocation; + + package body ZLib.Streams is + + ----------- + -- Close -- + ----------- + + procedure Close (Stream : in out Stream_Type) is + procedure Free is new Ada.Unchecked_Deallocation + (Stream_Element_Array, Buffer_Access); + begin + if Stream.Mode = Out_Stream or Stream.Mode = Duplex then + -- We should flush the data written by the writer. + + Flush (Stream, Finish); + + Close (Stream.Writer); + end if; + + if Stream.Mode = In_Stream or Stream.Mode = Duplex then + Close (Stream.Reader); + Free (Stream.Buffer); + end if; + end Close; + + ------------ + -- Create -- + ------------ + + procedure Create + (Stream : out Stream_Type; + Mode : in Stream_Mode; + Back : in Stream_Access; + Back_Compressed : in Boolean; + Level : in Compression_Level := Default_Compression; + Strategy : in Strategy_Type := Default_Strategy; + Header : in Header_Type := Default; + Read_Buffer_Size : in Ada.Streams.Stream_Element_Offset + := Default_Buffer_Size; + Write_Buffer_Size : in Ada.Streams.Stream_Element_Offset + := Default_Buffer_Size) + is + + subtype Buffer_Subtype is Stream_Element_Array (1 .. Read_Buffer_Size); + + procedure Init_Filter + (Filter : in out Filter_Type; + Compress : in Boolean); + + ----------------- + -- Init_Filter -- + ----------------- + + procedure Init_Filter + (Filter : in out Filter_Type; + Compress : in Boolean) is + begin + if Compress then + Deflate_Init + (Filter, Level, Strategy, Header => Header); + else + Inflate_Init (Filter, Header => Header); + end if; + end Init_Filter; + + begin + Stream.Back := Back; + Stream.Mode := Mode; + + if Mode = Out_Stream or Mode = Duplex then + Init_Filter (Stream.Writer, Back_Compressed); + Stream.Buffer_Size := Write_Buffer_Size; + else + Stream.Buffer_Size := 0; + end if; + + if Mode = In_Stream or Mode = Duplex then + Init_Filter (Stream.Reader, not Back_Compressed); + + Stream.Buffer := new Buffer_Subtype; + Stream.Rest_First := Stream.Buffer'Last + 1; + Stream.Rest_Last := Stream.Buffer'Last; + end if; + end Create; + + ----------- + -- Flush -- + ----------- + + procedure Flush + (Stream : in out Stream_Type; + Mode : in Flush_Mode := Sync_Flush) + is + Buffer : Stream_Element_Array (1 .. Stream.Buffer_Size); + Last : Stream_Element_Offset; + begin + loop + Flush (Stream.Writer, Buffer, Last, Mode); + + Ada.Streams.Write (Stream.Back.all, Buffer (1 .. Last)); + + exit when Last < Buffer'Last; + end loop; + end Flush; + + ------------- + -- Is_Open -- + ------------- + + function Is_Open (Stream : Stream_Type) return Boolean is + begin + return Is_Open (Stream.Reader) or else Is_Open (Stream.Writer); + end Is_Open; + + ---------- + -- Read -- + ---------- + + procedure Read + (Stream : in out Stream_Type; + Item : out Stream_Element_Array; + Last : out Stream_Element_Offset) + is + + procedure Read + (Item : out Stream_Element_Array; + Last : out Stream_Element_Offset); + + ---------- + -- Read -- + ---------- + + procedure Read + (Item : out Stream_Element_Array; + Last : out Stream_Element_Offset) is + begin + Ada.Streams.Read (Stream.Back.all, Item, Last); + end Read; + + procedure Read is new ZLib.Read + (Read => Read, + Buffer => Stream.Buffer.all, + Rest_First => Stream.Rest_First, + Rest_Last => Stream.Rest_Last); + + begin + Read (Stream.Reader, Item, Last); + end Read; + + ------------------- + -- Read_Total_In -- + ------------------- + + function Read_Total_In (Stream : in Stream_Type) return Count is + begin + return Total_In (Stream.Reader); + end Read_Total_In; + + -------------------- + -- Read_Total_Out -- + -------------------- + + function Read_Total_Out (Stream : in Stream_Type) return Count is + begin + return Total_Out (Stream.Reader); + end Read_Total_Out; + + ----------- + -- Write -- + ----------- + + procedure Write + (Stream : in out Stream_Type; + Item : in Stream_Element_Array) + is + + procedure Write (Item : in Stream_Element_Array); + + ----------- + -- Write -- + ----------- + + procedure Write (Item : in Stream_Element_Array) is + begin + Ada.Streams.Write (Stream.Back.all, Item); + end Write; + + procedure Write is new ZLib.Write + (Write => Write, + Buffer_Size => Stream.Buffer_Size); + + begin + Write (Stream.Writer, Item, No_Flush); + end Write; + + -------------------- + -- Write_Total_In -- + -------------------- + + function Write_Total_In (Stream : in Stream_Type) return Count is + begin + return Total_In (Stream.Writer); + end Write_Total_In; + + --------------------- + -- Write_Total_Out -- + --------------------- + + function Write_Total_Out (Stream : in Stream_Type) return Count is + begin + return Total_Out (Stream.Writer); + end Write_Total_Out; + + end ZLib.Streams; diff -Nrcpad gcc-4.4.4/zlib/contrib/ada/zlib-streams.ads gcc-4.4.5/zlib/contrib/ada/zlib-streams.ads *** gcc-4.4.4/zlib/contrib/ada/zlib-streams.ads Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/ada/zlib-streams.ads Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,114 ---- + ---------------------------------------------------------------- + -- ZLib for Ada thick binding. -- + -- -- + -- Copyright (C) 2002-2003 Dmitriy Anisimkov -- + -- -- + -- Open source license information is in the zlib.ads file. -- + ---------------------------------------------------------------- + + -- $Id: zlib-streams.ads,v 1.12 2004/05/31 10:53:40 vagul Exp $ + + package ZLib.Streams is + + type Stream_Mode is (In_Stream, Out_Stream, Duplex); + + type Stream_Access is access all Ada.Streams.Root_Stream_Type'Class; + + type Stream_Type is + new Ada.Streams.Root_Stream_Type with private; + + procedure Read + (Stream : in out Stream_Type; + Item : out Ada.Streams.Stream_Element_Array; + Last : out Ada.Streams.Stream_Element_Offset); + + procedure Write + (Stream : in out Stream_Type; + Item : in Ada.Streams.Stream_Element_Array); + + procedure Flush + (Stream : in out Stream_Type; + Mode : in Flush_Mode := Sync_Flush); + -- Flush the written data to the back stream, + -- all data placed to the compressor is flushing to the Back stream. + -- Should not be used untill necessary, becouse it is decreasing + -- compression. + + function Read_Total_In (Stream : in Stream_Type) return Count; + pragma Inline (Read_Total_In); + -- Return total number of bytes read from back stream so far. + + function Read_Total_Out (Stream : in Stream_Type) return Count; + pragma Inline (Read_Total_Out); + -- Return total number of bytes read so far. + + function Write_Total_In (Stream : in Stream_Type) return Count; + pragma Inline (Write_Total_In); + -- Return total number of bytes written so far. + + function Write_Total_Out (Stream : in Stream_Type) return Count; + pragma Inline (Write_Total_Out); + -- Return total number of bytes written to the back stream. + + procedure Create + (Stream : out Stream_Type; + Mode : in Stream_Mode; + Back : in Stream_Access; + Back_Compressed : in Boolean; + Level : in Compression_Level := Default_Compression; + Strategy : in Strategy_Type := Default_Strategy; + Header : in Header_Type := Default; + Read_Buffer_Size : in Ada.Streams.Stream_Element_Offset + := Default_Buffer_Size; + Write_Buffer_Size : in Ada.Streams.Stream_Element_Offset + := Default_Buffer_Size); + -- Create the Comression/Decompression stream. + -- If mode is In_Stream then Write operation is disabled. + -- If mode is Out_Stream then Read operation is disabled. + + -- If Back_Compressed is true then + -- Data written to the Stream is compressing to the Back stream + -- and data read from the Stream is decompressed data from the Back stream. + + -- If Back_Compressed is false then + -- Data written to the Stream is decompressing to the Back stream + -- and data read from the Stream is compressed data from the Back stream. + + -- !!! When the Need_Header is False ZLib-Ada is using undocumented + -- ZLib 1.1.4 functionality to do not create/wait for ZLib headers. + + function Is_Open (Stream : Stream_Type) return Boolean; + + procedure Close (Stream : in out Stream_Type); + + private + + use Ada.Streams; + + type Buffer_Access is access all Stream_Element_Array; + + type Stream_Type + is new Root_Stream_Type with + record + Mode : Stream_Mode; + + Buffer : Buffer_Access; + Rest_First : Stream_Element_Offset; + Rest_Last : Stream_Element_Offset; + -- Buffer for Read operation. + -- We need to have this buffer in the record + -- becouse not all read data from back stream + -- could be processed during the read operation. + + Buffer_Size : Stream_Element_Offset; + -- Buffer size for write operation. + -- We do not need to have this buffer + -- in the record becouse all data could be + -- processed in the write operation. + + Back : Stream_Access; + Reader : Filter_Type; + Writer : Filter_Type; + end record; + + end ZLib.Streams; diff -Nrcpad gcc-4.4.4/zlib/contrib/ada/zlib-thin.adb gcc-4.4.5/zlib/contrib/ada/zlib-thin.adb *** gcc-4.4.4/zlib/contrib/ada/zlib-thin.adb Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/ada/zlib-thin.adb Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,141 ---- + ---------------------------------------------------------------- + -- ZLib for Ada thick binding. -- + -- -- + -- Copyright (C) 2002-2003 Dmitriy Anisimkov -- + -- -- + -- Open source license information is in the zlib.ads file. -- + ---------------------------------------------------------------- + + -- $Id: zlib-thin.adb,v 1.8 2003/12/14 18:27:31 vagul Exp $ + + package body ZLib.Thin is + + ZLIB_VERSION : constant Chars_Ptr := zlibVersion; + + Z_Stream_Size : constant Int := Z_Stream'Size / System.Storage_Unit; + + -------------- + -- Avail_In -- + -------------- + + function Avail_In (Strm : in Z_Stream) return UInt is + begin + return Strm.Avail_In; + end Avail_In; + + --------------- + -- Avail_Out -- + --------------- + + function Avail_Out (Strm : in Z_Stream) return UInt is + begin + return Strm.Avail_Out; + end Avail_Out; + + ------------------ + -- Deflate_Init -- + ------------------ + + function Deflate_Init + (strm : Z_Streamp; + level : Int; + method : Int; + windowBits : Int; + memLevel : Int; + strategy : Int) + return Int is + begin + return deflateInit2 + (strm, + level, + method, + windowBits, + memLevel, + strategy, + ZLIB_VERSION, + Z_Stream_Size); + end Deflate_Init; + + ------------------ + -- Inflate_Init -- + ------------------ + + function Inflate_Init (strm : Z_Streamp; windowBits : Int) return Int is + begin + return inflateInit2 (strm, windowBits, ZLIB_VERSION, Z_Stream_Size); + end Inflate_Init; + + ------------------------ + -- Last_Error_Message -- + ------------------------ + + function Last_Error_Message (Strm : in Z_Stream) return String is + use Interfaces.C.Strings; + begin + if Strm.msg = Null_Ptr then + return ""; + else + return Value (Strm.msg); + end if; + end Last_Error_Message; + + ------------ + -- Set_In -- + ------------ + + procedure Set_In + (Strm : in out Z_Stream; + Buffer : in Voidp; + Size : in UInt) is + begin + Strm.Next_In := Buffer; + Strm.Avail_In := Size; + end Set_In; + + ------------------ + -- Set_Mem_Func -- + ------------------ + + procedure Set_Mem_Func + (Strm : in out Z_Stream; + Opaque : in Voidp; + Alloc : in alloc_func; + Free : in free_func) is + begin + Strm.opaque := Opaque; + Strm.zalloc := Alloc; + Strm.zfree := Free; + end Set_Mem_Func; + + ------------- + -- Set_Out -- + ------------- + + procedure Set_Out + (Strm : in out Z_Stream; + Buffer : in Voidp; + Size : in UInt) is + begin + Strm.Next_Out := Buffer; + Strm.Avail_Out := Size; + end Set_Out; + + -------------- + -- Total_In -- + -------------- + + function Total_In (Strm : in Z_Stream) return ULong is + begin + return Strm.Total_In; + end Total_In; + + --------------- + -- Total_Out -- + --------------- + + function Total_Out (Strm : in Z_Stream) return ULong is + begin + return Strm.Total_Out; + end Total_Out; + + end ZLib.Thin; diff -Nrcpad gcc-4.4.4/zlib/contrib/ada/zlib-thin.ads gcc-4.4.5/zlib/contrib/ada/zlib-thin.ads *** gcc-4.4.4/zlib/contrib/ada/zlib-thin.ads Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/ada/zlib-thin.ads Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,450 ---- + ---------------------------------------------------------------- + -- ZLib for Ada thick binding. -- + -- -- + -- Copyright (C) 2002-2003 Dmitriy Anisimkov -- + -- -- + -- Open source license information is in the zlib.ads file. -- + ---------------------------------------------------------------- + + -- $Id: zlib-thin.ads,v 1.11 2004/07/23 06:33:11 vagul Exp $ + + with Interfaces.C.Strings; + + with System; + + private package ZLib.Thin is + + -- From zconf.h + + MAX_MEM_LEVEL : constant := 9; -- zconf.h:105 + -- zconf.h:105 + MAX_WBITS : constant := 15; -- zconf.h:115 + -- 32K LZ77 window + -- zconf.h:115 + SEEK_SET : constant := 8#0000#; -- zconf.h:244 + -- Seek from beginning of file. + -- zconf.h:244 + SEEK_CUR : constant := 1; -- zconf.h:245 + -- Seek from current position. + -- zconf.h:245 + SEEK_END : constant := 2; -- zconf.h:246 + -- Set file pointer to EOF plus "offset" + -- zconf.h:246 + + type Byte is new Interfaces.C.unsigned_char; -- 8 bits + -- zconf.h:214 + type UInt is new Interfaces.C.unsigned; -- 16 bits or more + -- zconf.h:216 + type Int is new Interfaces.C.int; + + type ULong is new Interfaces.C.unsigned_long; -- 32 bits or more + -- zconf.h:217 + subtype Chars_Ptr is Interfaces.C.Strings.chars_ptr; + + type ULong_Access is access ULong; + type Int_Access is access Int; + + subtype Voidp is System.Address; -- zconf.h:232 + + subtype Byte_Access is Voidp; + + Nul : constant Voidp := System.Null_Address; + -- end from zconf + + Z_NO_FLUSH : constant := 8#0000#; -- zlib.h:125 + -- zlib.h:125 + Z_PARTIAL_FLUSH : constant := 1; -- zlib.h:126 + -- will be removed, use + -- Z_SYNC_FLUSH instead + -- zlib.h:126 + Z_SYNC_FLUSH : constant := 2; -- zlib.h:127 + -- zlib.h:127 + Z_FULL_FLUSH : constant := 3; -- zlib.h:128 + -- zlib.h:128 + Z_FINISH : constant := 4; -- zlib.h:129 + -- zlib.h:129 + Z_OK : constant := 8#0000#; -- zlib.h:132 + -- zlib.h:132 + Z_STREAM_END : constant := 1; -- zlib.h:133 + -- zlib.h:133 + Z_NEED_DICT : constant := 2; -- zlib.h:134 + -- zlib.h:134 + Z_ERRNO : constant := -1; -- zlib.h:135 + -- zlib.h:135 + Z_STREAM_ERROR : constant := -2; -- zlib.h:136 + -- zlib.h:136 + Z_DATA_ERROR : constant := -3; -- zlib.h:137 + -- zlib.h:137 + Z_MEM_ERROR : constant := -4; -- zlib.h:138 + -- zlib.h:138 + Z_BUF_ERROR : constant := -5; -- zlib.h:139 + -- zlib.h:139 + Z_VERSION_ERROR : constant := -6; -- zlib.h:140 + -- zlib.h:140 + Z_NO_COMPRESSION : constant := 8#0000#; -- zlib.h:145 + -- zlib.h:145 + Z_BEST_SPEED : constant := 1; -- zlib.h:146 + -- zlib.h:146 + Z_BEST_COMPRESSION : constant := 9; -- zlib.h:147 + -- zlib.h:147 + Z_DEFAULT_COMPRESSION : constant := -1; -- zlib.h:148 + -- zlib.h:148 + Z_FILTERED : constant := 1; -- zlib.h:151 + -- zlib.h:151 + Z_HUFFMAN_ONLY : constant := 2; -- zlib.h:152 + -- zlib.h:152 + Z_DEFAULT_STRATEGY : constant := 8#0000#; -- zlib.h:153 + -- zlib.h:153 + Z_BINARY : constant := 8#0000#; -- zlib.h:156 + -- zlib.h:156 + Z_ASCII : constant := 1; -- zlib.h:157 + -- zlib.h:157 + Z_UNKNOWN : constant := 2; -- zlib.h:158 + -- zlib.h:158 + Z_DEFLATED : constant := 8; -- zlib.h:161 + -- zlib.h:161 + Z_NULL : constant := 8#0000#; -- zlib.h:164 + -- for initializing zalloc, zfree, opaque + -- zlib.h:164 + type gzFile is new Voidp; -- zlib.h:646 + + type Z_Stream is private; + + type Z_Streamp is access all Z_Stream; -- zlib.h:89 + + type alloc_func is access function + (Opaque : Voidp; + Items : UInt; + Size : UInt) + return Voidp; -- zlib.h:63 + + type free_func is access procedure (opaque : Voidp; address : Voidp); + + function zlibVersion return Chars_Ptr; + + function Deflate (strm : Z_Streamp; flush : Int) return Int; + + function DeflateEnd (strm : Z_Streamp) return Int; + + function Inflate (strm : Z_Streamp; flush : Int) return Int; + + function InflateEnd (strm : Z_Streamp) return Int; + + function deflateSetDictionary + (strm : Z_Streamp; + dictionary : Byte_Access; + dictLength : UInt) + return Int; + + function deflateCopy (dest : Z_Streamp; source : Z_Streamp) return Int; + -- zlib.h:478 + + function deflateReset (strm : Z_Streamp) return Int; -- zlib.h:495 + + function deflateParams + (strm : Z_Streamp; + level : Int; + strategy : Int) + return Int; -- zlib.h:506 + + function inflateSetDictionary + (strm : Z_Streamp; + dictionary : Byte_Access; + dictLength : UInt) + return Int; -- zlib.h:548 + + function inflateSync (strm : Z_Streamp) return Int; -- zlib.h:565 + + function inflateReset (strm : Z_Streamp) return Int; -- zlib.h:580 + + function compress + (dest : Byte_Access; + destLen : ULong_Access; + source : Byte_Access; + sourceLen : ULong) + return Int; -- zlib.h:601 + + function compress2 + (dest : Byte_Access; + destLen : ULong_Access; + source : Byte_Access; + sourceLen : ULong; + level : Int) + return Int; -- zlib.h:615 + + function uncompress + (dest : Byte_Access; + destLen : ULong_Access; + source : Byte_Access; + sourceLen : ULong) + return Int; + + function gzopen (path : Chars_Ptr; mode : Chars_Ptr) return gzFile; + + function gzdopen (fd : Int; mode : Chars_Ptr) return gzFile; + + function gzsetparams + (file : gzFile; + level : Int; + strategy : Int) + return Int; + + function gzread + (file : gzFile; + buf : Voidp; + len : UInt) + return Int; + + function gzwrite + (file : in gzFile; + buf : in Voidp; + len : in UInt) + return Int; + + function gzprintf (file : in gzFile; format : in Chars_Ptr) return Int; + + function gzputs (file : in gzFile; s : in Chars_Ptr) return Int; + + function gzgets + (file : gzFile; + buf : Chars_Ptr; + len : Int) + return Chars_Ptr; + + function gzputc (file : gzFile; char : Int) return Int; + + function gzgetc (file : gzFile) return Int; + + function gzflush (file : gzFile; flush : Int) return Int; + + function gzseek + (file : gzFile; + offset : Int; + whence : Int) + return Int; + + function gzrewind (file : gzFile) return Int; + + function gztell (file : gzFile) return Int; + + function gzeof (file : gzFile) return Int; + + function gzclose (file : gzFile) return Int; + + function gzerror (file : gzFile; errnum : Int_Access) return Chars_Ptr; + + function adler32 + (adler : ULong; + buf : Byte_Access; + len : UInt) + return ULong; + + function crc32 + (crc : ULong; + buf : Byte_Access; + len : UInt) + return ULong; + + function deflateInit + (strm : Z_Streamp; + level : Int; + version : Chars_Ptr; + stream_size : Int) + return Int; + + function deflateInit2 + (strm : Z_Streamp; + level : Int; + method : Int; + windowBits : Int; + memLevel : Int; + strategy : Int; + version : Chars_Ptr; + stream_size : Int) + return Int; + + function Deflate_Init + (strm : Z_Streamp; + level : Int; + method : Int; + windowBits : Int; + memLevel : Int; + strategy : Int) + return Int; + pragma Inline (Deflate_Init); + + function inflateInit + (strm : Z_Streamp; + version : Chars_Ptr; + stream_size : Int) + return Int; + + function inflateInit2 + (strm : in Z_Streamp; + windowBits : in Int; + version : in Chars_Ptr; + stream_size : in Int) + return Int; + + function inflateBackInit + (strm : in Z_Streamp; + windowBits : in Int; + window : in Byte_Access; + version : in Chars_Ptr; + stream_size : in Int) + return Int; + -- Size of window have to be 2**windowBits. + + function Inflate_Init (strm : Z_Streamp; windowBits : Int) return Int; + pragma Inline (Inflate_Init); + + function zError (err : Int) return Chars_Ptr; + + function inflateSyncPoint (z : Z_Streamp) return Int; + + function get_crc_table return ULong_Access; + + -- Interface to the available fields of the z_stream structure. + -- The application must update next_in and avail_in when avail_in has + -- dropped to zero. It must update next_out and avail_out when avail_out + -- has dropped to zero. The application must initialize zalloc, zfree and + -- opaque before calling the init function. + + procedure Set_In + (Strm : in out Z_Stream; + Buffer : in Voidp; + Size : in UInt); + pragma Inline (Set_In); + + procedure Set_Out + (Strm : in out Z_Stream; + Buffer : in Voidp; + Size : in UInt); + pragma Inline (Set_Out); + + procedure Set_Mem_Func + (Strm : in out Z_Stream; + Opaque : in Voidp; + Alloc : in alloc_func; + Free : in free_func); + pragma Inline (Set_Mem_Func); + + function Last_Error_Message (Strm : in Z_Stream) return String; + pragma Inline (Last_Error_Message); + + function Avail_Out (Strm : in Z_Stream) return UInt; + pragma Inline (Avail_Out); + + function Avail_In (Strm : in Z_Stream) return UInt; + pragma Inline (Avail_In); + + function Total_In (Strm : in Z_Stream) return ULong; + pragma Inline (Total_In); + + function Total_Out (Strm : in Z_Stream) return ULong; + pragma Inline (Total_Out); + + function inflateCopy + (dest : in Z_Streamp; + Source : in Z_Streamp) + return Int; + + function compressBound (Source_Len : in ULong) return ULong; + + function deflateBound + (Strm : in Z_Streamp; + Source_Len : in ULong) + return ULong; + + function gzungetc (C : in Int; File : in gzFile) return Int; + + function zlibCompileFlags return ULong; + + private + + type Z_Stream is record -- zlib.h:68 + Next_In : Voidp := Nul; -- next input byte + Avail_In : UInt := 0; -- number of bytes available at next_in + Total_In : ULong := 0; -- total nb of input bytes read so far + Next_Out : Voidp := Nul; -- next output byte should be put there + Avail_Out : UInt := 0; -- remaining free space at next_out + Total_Out : ULong := 0; -- total nb of bytes output so far + msg : Chars_Ptr; -- last error message, NULL if no error + state : Voidp; -- not visible by applications + zalloc : alloc_func := null; -- used to allocate the internal state + zfree : free_func := null; -- used to free the internal state + opaque : Voidp; -- private data object passed to + -- zalloc and zfree + data_type : Int; -- best guess about the data type: + -- ascii or binary + adler : ULong; -- adler32 value of the uncompressed + -- data + reserved : ULong; -- reserved for future use + end record; + + pragma Convention (C, Z_Stream); + + pragma Import (C, zlibVersion, "zlibVersion"); + pragma Import (C, Deflate, "deflate"); + pragma Import (C, DeflateEnd, "deflateEnd"); + pragma Import (C, Inflate, "inflate"); + pragma Import (C, InflateEnd, "inflateEnd"); + pragma Import (C, deflateSetDictionary, "deflateSetDictionary"); + pragma Import (C, deflateCopy, "deflateCopy"); + pragma Import (C, deflateReset, "deflateReset"); + pragma Import (C, deflateParams, "deflateParams"); + pragma Import (C, inflateSetDictionary, "inflateSetDictionary"); + pragma Import (C, inflateSync, "inflateSync"); + pragma Import (C, inflateReset, "inflateReset"); + pragma Import (C, compress, "compress"); + pragma Import (C, compress2, "compress2"); + pragma Import (C, uncompress, "uncompress"); + pragma Import (C, gzopen, "gzopen"); + pragma Import (C, gzdopen, "gzdopen"); + pragma Import (C, gzsetparams, "gzsetparams"); + pragma Import (C, gzread, "gzread"); + pragma Import (C, gzwrite, "gzwrite"); + pragma Import (C, gzprintf, "gzprintf"); + pragma Import (C, gzputs, "gzputs"); + pragma Import (C, gzgets, "gzgets"); + pragma Import (C, gzputc, "gzputc"); + pragma Import (C, gzgetc, "gzgetc"); + pragma Import (C, gzflush, "gzflush"); + pragma Import (C, gzseek, "gzseek"); + pragma Import (C, gzrewind, "gzrewind"); + pragma Import (C, gztell, "gztell"); + pragma Import (C, gzeof, "gzeof"); + pragma Import (C, gzclose, "gzclose"); + pragma Import (C, gzerror, "gzerror"); + pragma Import (C, adler32, "adler32"); + pragma Import (C, crc32, "crc32"); + pragma Import (C, deflateInit, "deflateInit_"); + pragma Import (C, inflateInit, "inflateInit_"); + pragma Import (C, deflateInit2, "deflateInit2_"); + pragma Import (C, inflateInit2, "inflateInit2_"); + pragma Import (C, zError, "zError"); + pragma Import (C, inflateSyncPoint, "inflateSyncPoint"); + pragma Import (C, get_crc_table, "get_crc_table"); + + -- since zlib 1.2.0: + + pragma Import (C, inflateCopy, "inflateCopy"); + pragma Import (C, compressBound, "compressBound"); + pragma Import (C, deflateBound, "deflateBound"); + pragma Import (C, gzungetc, "gzungetc"); + pragma Import (C, zlibCompileFlags, "zlibCompileFlags"); + + pragma Import (C, inflateBackInit, "inflateBackInit_"); + + -- I stopped binding the inflateBack routines, becouse realize that + -- it does not support zlib and gzip headers for now, and have no + -- symmetric deflateBack routines. + -- ZLib-Ada is symmetric regarding deflate/inflate data transformation + -- and has a similar generic callback interface for the + -- deflate/inflate transformation based on the regular Deflate/Inflate + -- routines. + + -- pragma Import (C, inflateBack, "inflateBack"); + -- pragma Import (C, inflateBackEnd, "inflateBackEnd"); + + end ZLib.Thin; diff -Nrcpad gcc-4.4.4/zlib/contrib/ada/zlib.adb gcc-4.4.5/zlib/contrib/ada/zlib.adb *** gcc-4.4.4/zlib/contrib/ada/zlib.adb Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/ada/zlib.adb Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,701 ---- + ---------------------------------------------------------------- + -- ZLib for Ada thick binding. -- + -- -- + -- Copyright (C) 2002-2004 Dmitriy Anisimkov -- + -- -- + -- Open source license information is in the zlib.ads file. -- + ---------------------------------------------------------------- + + -- $Id: zlib.adb,v 1.31 2004/09/06 06:53:19 vagul Exp $ + + with Ada.Exceptions; + with Ada.Unchecked_Conversion; + with Ada.Unchecked_Deallocation; + + with Interfaces.C.Strings; + + with ZLib.Thin; + + package body ZLib is + + use type Thin.Int; + + type Z_Stream is new Thin.Z_Stream; + + type Return_Code_Enum is + (OK, + STREAM_END, + NEED_DICT, + ERRNO, + STREAM_ERROR, + DATA_ERROR, + MEM_ERROR, + BUF_ERROR, + VERSION_ERROR); + + type Flate_Step_Function is access + function (Strm : in Thin.Z_Streamp; Flush : in Thin.Int) return Thin.Int; + pragma Convention (C, Flate_Step_Function); + + type Flate_End_Function is access + function (Ctrm : in Thin.Z_Streamp) return Thin.Int; + pragma Convention (C, Flate_End_Function); + + type Flate_Type is record + Step : Flate_Step_Function; + Done : Flate_End_Function; + end record; + + subtype Footer_Array is Stream_Element_Array (1 .. 8); + + Simple_GZip_Header : constant Stream_Element_Array (1 .. 10) + := (16#1f#, 16#8b#, -- Magic header + 16#08#, -- Z_DEFLATED + 16#00#, -- Flags + 16#00#, 16#00#, 16#00#, 16#00#, -- Time + 16#00#, -- XFlags + 16#03# -- OS code + ); + -- The simplest gzip header is not for informational, but just for + -- gzip format compatibility. + -- Note that some code below is using assumption + -- Simple_GZip_Header'Last > Footer_Array'Last, so do not make + -- Simple_GZip_Header'Last <= Footer_Array'Last. + + Return_Code : constant array (Thin.Int range <>) of Return_Code_Enum + := (0 => OK, + 1 => STREAM_END, + 2 => NEED_DICT, + -1 => ERRNO, + -2 => STREAM_ERROR, + -3 => DATA_ERROR, + -4 => MEM_ERROR, + -5 => BUF_ERROR, + -6 => VERSION_ERROR); + + Flate : constant array (Boolean) of Flate_Type + := (True => (Step => Thin.Deflate'Access, + Done => Thin.DeflateEnd'Access), + False => (Step => Thin.Inflate'Access, + Done => Thin.InflateEnd'Access)); + + Flush_Finish : constant array (Boolean) of Flush_Mode + := (True => Finish, False => No_Flush); + + procedure Raise_Error (Stream : in Z_Stream); + pragma Inline (Raise_Error); + + procedure Raise_Error (Message : in String); + pragma Inline (Raise_Error); + + procedure Check_Error (Stream : in Z_Stream; Code : in Thin.Int); + + procedure Free is new Ada.Unchecked_Deallocation + (Z_Stream, Z_Stream_Access); + + function To_Thin_Access is new Ada.Unchecked_Conversion + (Z_Stream_Access, Thin.Z_Streamp); + + procedure Translate_GZip + (Filter : in out Filter_Type; + In_Data : in Ada.Streams.Stream_Element_Array; + In_Last : out Ada.Streams.Stream_Element_Offset; + Out_Data : out Ada.Streams.Stream_Element_Array; + Out_Last : out Ada.Streams.Stream_Element_Offset; + Flush : in Flush_Mode); + -- Separate translate routine for make gzip header. + + procedure Translate_Auto + (Filter : in out Filter_Type; + In_Data : in Ada.Streams.Stream_Element_Array; + In_Last : out Ada.Streams.Stream_Element_Offset; + Out_Data : out Ada.Streams.Stream_Element_Array; + Out_Last : out Ada.Streams.Stream_Element_Offset; + Flush : in Flush_Mode); + -- translate routine without additional headers. + + ----------------- + -- Check_Error -- + ----------------- + + procedure Check_Error (Stream : in Z_Stream; Code : in Thin.Int) is + use type Thin.Int; + begin + if Code /= Thin.Z_OK then + Raise_Error + (Return_Code_Enum'Image (Return_Code (Code)) + & ": " & Last_Error_Message (Stream)); + end if; + end Check_Error; + + ----------- + -- Close -- + ----------- + + procedure Close + (Filter : in out Filter_Type; + Ignore_Error : in Boolean := False) + is + Code : Thin.Int; + begin + if not Ignore_Error and then not Is_Open (Filter) then + raise Status_Error; + end if; + + Code := Flate (Filter.Compression).Done (To_Thin_Access (Filter.Strm)); + + if Ignore_Error or else Code = Thin.Z_OK then + Free (Filter.Strm); + else + declare + Error_Message : constant String + := Last_Error_Message (Filter.Strm.all); + begin + Free (Filter.Strm); + Ada.Exceptions.Raise_Exception + (ZLib_Error'Identity, + Return_Code_Enum'Image (Return_Code (Code)) + & ": " & Error_Message); + end; + end if; + end Close; + + ----------- + -- CRC32 -- + ----------- + + function CRC32 + (CRC : in Unsigned_32; + Data : in Ada.Streams.Stream_Element_Array) + return Unsigned_32 + is + use Thin; + begin + return Unsigned_32 (crc32 (ULong (CRC), + Data'Address, + Data'Length)); + end CRC32; + + procedure CRC32 + (CRC : in out Unsigned_32; + Data : in Ada.Streams.Stream_Element_Array) is + begin + CRC := CRC32 (CRC, Data); + end CRC32; + + ------------------ + -- Deflate_Init -- + ------------------ + + procedure Deflate_Init + (Filter : in out Filter_Type; + Level : in Compression_Level := Default_Compression; + Strategy : in Strategy_Type := Default_Strategy; + Method : in Compression_Method := Deflated; + Window_Bits : in Window_Bits_Type := Default_Window_Bits; + Memory_Level : in Memory_Level_Type := Default_Memory_Level; + Header : in Header_Type := Default) + is + use type Thin.Int; + Win_Bits : Thin.Int := Thin.Int (Window_Bits); + begin + if Is_Open (Filter) then + raise Status_Error; + end if; + + -- We allow ZLib to make header only in case of default header type. + -- Otherwise we would either do header by ourselfs, or do not do + -- header at all. + + if Header = None or else Header = GZip then + Win_Bits := -Win_Bits; + end if; + + -- For the GZip CRC calculation and make headers. + + if Header = GZip then + Filter.CRC := 0; + Filter.Offset := Simple_GZip_Header'First; + else + Filter.Offset := Simple_GZip_Header'Last + 1; + end if; + + Filter.Strm := new Z_Stream; + Filter.Compression := True; + Filter.Stream_End := False; + Filter.Header := Header; + + if Thin.Deflate_Init + (To_Thin_Access (Filter.Strm), + Level => Thin.Int (Level), + method => Thin.Int (Method), + windowBits => Win_Bits, + memLevel => Thin.Int (Memory_Level), + strategy => Thin.Int (Strategy)) /= Thin.Z_OK + then + Raise_Error (Filter.Strm.all); + end if; + end Deflate_Init; + + ----------- + -- Flush -- + ----------- + + procedure Flush + (Filter : in out Filter_Type; + Out_Data : out Ada.Streams.Stream_Element_Array; + Out_Last : out Ada.Streams.Stream_Element_Offset; + Flush : in Flush_Mode) + is + No_Data : Stream_Element_Array := (1 .. 0 => 0); + Last : Stream_Element_Offset; + begin + Translate (Filter, No_Data, Last, Out_Data, Out_Last, Flush); + end Flush; + + ----------------------- + -- Generic_Translate -- + ----------------------- + + procedure Generic_Translate + (Filter : in out ZLib.Filter_Type; + In_Buffer_Size : in Integer := Default_Buffer_Size; + Out_Buffer_Size : in Integer := Default_Buffer_Size) + is + In_Buffer : Stream_Element_Array + (1 .. Stream_Element_Offset (In_Buffer_Size)); + Out_Buffer : Stream_Element_Array + (1 .. Stream_Element_Offset (Out_Buffer_Size)); + Last : Stream_Element_Offset; + In_Last : Stream_Element_Offset; + In_First : Stream_Element_Offset; + Out_Last : Stream_Element_Offset; + begin + Main : loop + Data_In (In_Buffer, Last); + + In_First := In_Buffer'First; + + loop + Translate + (Filter => Filter, + In_Data => In_Buffer (In_First .. Last), + In_Last => In_Last, + Out_Data => Out_Buffer, + Out_Last => Out_Last, + Flush => Flush_Finish (Last < In_Buffer'First)); + + if Out_Buffer'First <= Out_Last then + Data_Out (Out_Buffer (Out_Buffer'First .. Out_Last)); + end if; + + exit Main when Stream_End (Filter); + + -- The end of in buffer. + + exit when In_Last = Last; + + In_First := In_Last + 1; + end loop; + end loop Main; + + end Generic_Translate; + + ------------------ + -- Inflate_Init -- + ------------------ + + procedure Inflate_Init + (Filter : in out Filter_Type; + Window_Bits : in Window_Bits_Type := Default_Window_Bits; + Header : in Header_Type := Default) + is + use type Thin.Int; + Win_Bits : Thin.Int := Thin.Int (Window_Bits); + + procedure Check_Version; + -- Check the latest header types compatibility. + + procedure Check_Version is + begin + if Version <= "1.1.4" then + Raise_Error + ("Inflate header type " & Header_Type'Image (Header) + & " incompatible with ZLib version " & Version); + end if; + end Check_Version; + + begin + if Is_Open (Filter) then + raise Status_Error; + end if; + + case Header is + when None => + Check_Version; + + -- Inflate data without headers determined + -- by negative Win_Bits. + + Win_Bits := -Win_Bits; + when GZip => + Check_Version; + + -- Inflate gzip data defined by flag 16. + + Win_Bits := Win_Bits + 16; + when Auto => + Check_Version; + + -- Inflate with automatic detection + -- of gzip or native header defined by flag 32. + + Win_Bits := Win_Bits + 32; + when Default => null; + end case; + + Filter.Strm := new Z_Stream; + Filter.Compression := False; + Filter.Stream_End := False; + Filter.Header := Header; + + if Thin.Inflate_Init + (To_Thin_Access (Filter.Strm), Win_Bits) /= Thin.Z_OK + then + Raise_Error (Filter.Strm.all); + end if; + end Inflate_Init; + + ------------- + -- Is_Open -- + ------------- + + function Is_Open (Filter : in Filter_Type) return Boolean is + begin + return Filter.Strm /= null; + end Is_Open; + + ----------------- + -- Raise_Error -- + ----------------- + + procedure Raise_Error (Message : in String) is + begin + Ada.Exceptions.Raise_Exception (ZLib_Error'Identity, Message); + end Raise_Error; + + procedure Raise_Error (Stream : in Z_Stream) is + begin + Raise_Error (Last_Error_Message (Stream)); + end Raise_Error; + + ---------- + -- Read -- + ---------- + + procedure Read + (Filter : in out Filter_Type; + Item : out Ada.Streams.Stream_Element_Array; + Last : out Ada.Streams.Stream_Element_Offset; + Flush : in Flush_Mode := No_Flush) + is + In_Last : Stream_Element_Offset; + Item_First : Ada.Streams.Stream_Element_Offset := Item'First; + V_Flush : Flush_Mode := Flush; + + begin + pragma Assert (Rest_First in Buffer'First .. Buffer'Last + 1); + pragma Assert (Rest_Last in Buffer'First - 1 .. Buffer'Last); + + loop + if Rest_Last = Buffer'First - 1 then + V_Flush := Finish; + + elsif Rest_First > Rest_Last then + Read (Buffer, Rest_Last); + Rest_First := Buffer'First; + + if Rest_Last < Buffer'First then + V_Flush := Finish; + end if; + end if; + + Translate + (Filter => Filter, + In_Data => Buffer (Rest_First .. Rest_Last), + In_Last => In_Last, + Out_Data => Item (Item_First .. Item'Last), + Out_Last => Last, + Flush => V_Flush); + + Rest_First := In_Last + 1; + + exit when Stream_End (Filter) + or else Last = Item'Last + or else (Last >= Item'First and then Allow_Read_Some); + + Item_First := Last + 1; + end loop; + end Read; + + ---------------- + -- Stream_End -- + ---------------- + + function Stream_End (Filter : in Filter_Type) return Boolean is + begin + if Filter.Header = GZip and Filter.Compression then + return Filter.Stream_End + and then Filter.Offset = Footer_Array'Last + 1; + else + return Filter.Stream_End; + end if; + end Stream_End; + + -------------- + -- Total_In -- + -------------- + + function Total_In (Filter : in Filter_Type) return Count is + begin + return Count (Thin.Total_In (To_Thin_Access (Filter.Strm).all)); + end Total_In; + + --------------- + -- Total_Out -- + --------------- + + function Total_Out (Filter : in Filter_Type) return Count is + begin + return Count (Thin.Total_Out (To_Thin_Access (Filter.Strm).all)); + end Total_Out; + + --------------- + -- Translate -- + --------------- + + procedure Translate + (Filter : in out Filter_Type; + In_Data : in Ada.Streams.Stream_Element_Array; + In_Last : out Ada.Streams.Stream_Element_Offset; + Out_Data : out Ada.Streams.Stream_Element_Array; + Out_Last : out Ada.Streams.Stream_Element_Offset; + Flush : in Flush_Mode) is + begin + if Filter.Header = GZip and then Filter.Compression then + Translate_GZip + (Filter => Filter, + In_Data => In_Data, + In_Last => In_Last, + Out_Data => Out_Data, + Out_Last => Out_Last, + Flush => Flush); + else + Translate_Auto + (Filter => Filter, + In_Data => In_Data, + In_Last => In_Last, + Out_Data => Out_Data, + Out_Last => Out_Last, + Flush => Flush); + end if; + end Translate; + + -------------------- + -- Translate_Auto -- + -------------------- + + procedure Translate_Auto + (Filter : in out Filter_Type; + In_Data : in Ada.Streams.Stream_Element_Array; + In_Last : out Ada.Streams.Stream_Element_Offset; + Out_Data : out Ada.Streams.Stream_Element_Array; + Out_Last : out Ada.Streams.Stream_Element_Offset; + Flush : in Flush_Mode) + is + use type Thin.Int; + Code : Thin.Int; + + begin + if not Is_Open (Filter) then + raise Status_Error; + end if; + + if Out_Data'Length = 0 and then In_Data'Length = 0 then + raise Constraint_Error; + end if; + + Set_Out (Filter.Strm.all, Out_Data'Address, Out_Data'Length); + Set_In (Filter.Strm.all, In_Data'Address, In_Data'Length); + + Code := Flate (Filter.Compression).Step + (To_Thin_Access (Filter.Strm), + Thin.Int (Flush)); + + if Code = Thin.Z_STREAM_END then + Filter.Stream_End := True; + else + Check_Error (Filter.Strm.all, Code); + end if; + + In_Last := In_Data'Last + - Stream_Element_Offset (Avail_In (Filter.Strm.all)); + Out_Last := Out_Data'Last + - Stream_Element_Offset (Avail_Out (Filter.Strm.all)); + end Translate_Auto; + + -------------------- + -- Translate_GZip -- + -------------------- + + procedure Translate_GZip + (Filter : in out Filter_Type; + In_Data : in Ada.Streams.Stream_Element_Array; + In_Last : out Ada.Streams.Stream_Element_Offset; + Out_Data : out Ada.Streams.Stream_Element_Array; + Out_Last : out Ada.Streams.Stream_Element_Offset; + Flush : in Flush_Mode) + is + Out_First : Stream_Element_Offset; + + procedure Add_Data (Data : in Stream_Element_Array); + -- Add data to stream from the Filter.Offset till necessary, + -- used for add gzip headr/footer. + + procedure Put_32 + (Item : in out Stream_Element_Array; + Data : in Unsigned_32); + pragma Inline (Put_32); + + -------------- + -- Add_Data -- + -------------- + + procedure Add_Data (Data : in Stream_Element_Array) is + Data_First : Stream_Element_Offset renames Filter.Offset; + Data_Last : Stream_Element_Offset; + Data_Len : Stream_Element_Offset; -- -1 + Out_Len : Stream_Element_Offset; -- -1 + begin + Out_First := Out_Last + 1; + + if Data_First > Data'Last then + return; + end if; + + Data_Len := Data'Last - Data_First; + Out_Len := Out_Data'Last - Out_First; + + if Data_Len <= Out_Len then + Out_Last := Out_First + Data_Len; + Data_Last := Data'Last; + else + Out_Last := Out_Data'Last; + Data_Last := Data_First + Out_Len; + end if; + + Out_Data (Out_First .. Out_Last) := Data (Data_First .. Data_Last); + + Data_First := Data_Last + 1; + Out_First := Out_Last + 1; + end Add_Data; + + ------------ + -- Put_32 -- + ------------ + + procedure Put_32 + (Item : in out Stream_Element_Array; + Data : in Unsigned_32) + is + D : Unsigned_32 := Data; + begin + for J in Item'First .. Item'First + 3 loop + Item (J) := Stream_Element (D and 16#FF#); + D := Shift_Right (D, 8); + end loop; + end Put_32; + + begin + Out_Last := Out_Data'First - 1; + + if not Filter.Stream_End then + Add_Data (Simple_GZip_Header); + + Translate_Auto + (Filter => Filter, + In_Data => In_Data, + In_Last => In_Last, + Out_Data => Out_Data (Out_First .. Out_Data'Last), + Out_Last => Out_Last, + Flush => Flush); + + CRC32 (Filter.CRC, In_Data (In_Data'First .. In_Last)); + end if; + + if Filter.Stream_End and then Out_Last <= Out_Data'Last then + -- This detection method would work only when + -- Simple_GZip_Header'Last > Footer_Array'Last + + if Filter.Offset = Simple_GZip_Header'Last + 1 then + Filter.Offset := Footer_Array'First; + end if; + + declare + Footer : Footer_Array; + begin + Put_32 (Footer, Filter.CRC); + Put_32 (Footer (Footer'First + 4 .. Footer'Last), + Unsigned_32 (Total_In (Filter))); + Add_Data (Footer); + end; + end if; + end Translate_GZip; + + ------------- + -- Version -- + ------------- + + function Version return String is + begin + return Interfaces.C.Strings.Value (Thin.zlibVersion); + end Version; + + ----------- + -- Write -- + ----------- + + procedure Write + (Filter : in out Filter_Type; + Item : in Ada.Streams.Stream_Element_Array; + Flush : in Flush_Mode := No_Flush) + is + Buffer : Stream_Element_Array (1 .. Buffer_Size); + In_Last : Stream_Element_Offset; + Out_Last : Stream_Element_Offset; + In_First : Stream_Element_Offset := Item'First; + begin + if Item'Length = 0 and Flush = No_Flush then + return; + end if; + + loop + Translate + (Filter => Filter, + In_Data => Item (In_First .. Item'Last), + In_Last => In_Last, + Out_Data => Buffer, + Out_Last => Out_Last, + Flush => Flush); + + if Out_Last >= Buffer'First then + Write (Buffer (1 .. Out_Last)); + end if; + + exit when In_Last = Item'Last or Stream_End (Filter); + + In_First := In_Last + 1; + end loop; + end Write; + + end ZLib; diff -Nrcpad gcc-4.4.4/zlib/contrib/ada/zlib.ads gcc-4.4.5/zlib/contrib/ada/zlib.ads *** gcc-4.4.4/zlib/contrib/ada/zlib.ads Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/ada/zlib.ads Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,328 ---- + ------------------------------------------------------------------------------ + -- ZLib for Ada thick binding. -- + -- -- + -- Copyright (C) 2002-2004 Dmitriy Anisimkov -- + -- -- + -- This library 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 library 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 library; if not, write to the Free Software Foundation, -- + -- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- + -- -- + -- As a special exception, if other files instantiate generics from this -- + -- unit, or you link this unit with other files to produce an executable, -- + -- this unit does not by itself cause the resulting executable to be -- + -- covered by the GNU General Public License. This exception does not -- + -- however invalidate any other reasons why the executable file might be -- + -- covered by the GNU Public License. -- + ------------------------------------------------------------------------------ + + -- $Id: zlib.ads,v 1.26 2004/09/06 06:53:19 vagul Exp $ + + with Ada.Streams; + + with Interfaces; + + package ZLib is + + ZLib_Error : exception; + Status_Error : exception; + + type Compression_Level is new Integer range -1 .. 9; + + type Flush_Mode is private; + + type Compression_Method is private; + + type Window_Bits_Type is new Integer range 8 .. 15; + + type Memory_Level_Type is new Integer range 1 .. 9; + + type Unsigned_32 is new Interfaces.Unsigned_32; + + type Strategy_Type is private; + + type Header_Type is (None, Auto, Default, GZip); + -- Header type usage have a some limitation for inflate. + -- See comment for Inflate_Init. + + subtype Count is Ada.Streams.Stream_Element_Count; + + Default_Memory_Level : constant Memory_Level_Type := 8; + Default_Window_Bits : constant Window_Bits_Type := 15; + + ---------------------------------- + -- Compression method constants -- + ---------------------------------- + + Deflated : constant Compression_Method; + -- Only one method allowed in this ZLib version + + --------------------------------- + -- Compression level constants -- + --------------------------------- + + No_Compression : constant Compression_Level := 0; + Best_Speed : constant Compression_Level := 1; + Best_Compression : constant Compression_Level := 9; + Default_Compression : constant Compression_Level := -1; + + -------------------------- + -- Flush mode constants -- + -------------------------- + + No_Flush : constant Flush_Mode; + -- Regular way for compression, no flush + + Partial_Flush : constant Flush_Mode; + -- Will be removed, use Z_SYNC_FLUSH instead + + Sync_Flush : constant Flush_Mode; + -- All pending output is flushed to the output buffer and the output + -- is aligned on a byte boundary, so that the decompressor can get all + -- input data available so far. (In particular avail_in is zero after the + -- call if enough output space has been provided before the call.) + -- Flushing may degrade compression for some compression algorithms and so + -- it should be used only when necessary. + + Block_Flush : constant Flush_Mode; + -- Z_BLOCK requests that inflate() stop + -- if and when it get to the next deflate block boundary. When decoding the + -- zlib or gzip format, this will cause inflate() to return immediately + -- after the header and before the first block. When doing a raw inflate, + -- inflate() will go ahead and process the first block, and will return + -- when it gets to the end of that block, or when it runs out of data. + + Full_Flush : constant Flush_Mode; + -- All output is flushed as with SYNC_FLUSH, and the compression state + -- is reset so that decompression can restart from this point if previous + -- compressed data has been damaged or if random access is desired. Using + -- Full_Flush too often can seriously degrade the compression. + + Finish : constant Flush_Mode; + -- Just for tell the compressor that input data is complete. + + ------------------------------------ + -- Compression strategy constants -- + ------------------------------------ + + -- RLE stategy could be used only in version 1.2.0 and later. + + Filtered : constant Strategy_Type; + Huffman_Only : constant Strategy_Type; + RLE : constant Strategy_Type; + Default_Strategy : constant Strategy_Type; + + Default_Buffer_Size : constant := 4096; + + type Filter_Type is tagged limited private; + -- The filter is for compression and for decompression. + -- The usage of the type is depend of its initialization. + + function Version return String; + pragma Inline (Version); + -- Return string representation of the ZLib version. + + procedure Deflate_Init + (Filter : in out Filter_Type; + Level : in Compression_Level := Default_Compression; + Strategy : in Strategy_Type := Default_Strategy; + Method : in Compression_Method := Deflated; + Window_Bits : in Window_Bits_Type := Default_Window_Bits; + Memory_Level : in Memory_Level_Type := Default_Memory_Level; + Header : in Header_Type := Default); + -- Compressor initialization. + -- When Header parameter is Auto or Default, then default zlib header + -- would be provided for compressed data. + -- When Header is GZip, then gzip header would be set instead of + -- default header. + -- When Header is None, no header would be set for compressed data. + + procedure Inflate_Init + (Filter : in out Filter_Type; + Window_Bits : in Window_Bits_Type := Default_Window_Bits; + Header : in Header_Type := Default); + -- Decompressor initialization. + -- Default header type mean that ZLib default header is expecting in the + -- input compressed stream. + -- Header type None mean that no header is expecting in the input stream. + -- GZip header type mean that GZip header is expecting in the + -- input compressed stream. + -- Auto header type mean that header type (GZip or Native) would be + -- detected automatically in the input stream. + -- Note that header types parameter values None, GZip and Auto are + -- supported for inflate routine only in ZLib versions 1.2.0.2 and later. + -- Deflate_Init is supporting all header types. + + function Is_Open (Filter : in Filter_Type) return Boolean; + pragma Inline (Is_Open); + -- Is the filter opened for compression or decompression. + + procedure Close + (Filter : in out Filter_Type; + Ignore_Error : in Boolean := False); + -- Closing the compression or decompressor. + -- If stream is closing before the complete and Ignore_Error is False, + -- The exception would be raised. + + generic + with procedure Data_In + (Item : out Ada.Streams.Stream_Element_Array; + Last : out Ada.Streams.Stream_Element_Offset); + with procedure Data_Out + (Item : in Ada.Streams.Stream_Element_Array); + procedure Generic_Translate + (Filter : in out Filter_Type; + In_Buffer_Size : in Integer := Default_Buffer_Size; + Out_Buffer_Size : in Integer := Default_Buffer_Size); + -- Compress/decompress data fetch from Data_In routine and pass the result + -- to the Data_Out routine. User should provide Data_In and Data_Out + -- for compression/decompression data flow. + -- Compression or decompression depend on Filter initialization. + + function Total_In (Filter : in Filter_Type) return Count; + pragma Inline (Total_In); + -- Returns total number of input bytes read so far + + function Total_Out (Filter : in Filter_Type) return Count; + pragma Inline (Total_Out); + -- Returns total number of bytes output so far + + function CRC32 + (CRC : in Unsigned_32; + Data : in Ada.Streams.Stream_Element_Array) + return Unsigned_32; + pragma Inline (CRC32); + -- Compute CRC32, it could be necessary for make gzip format + + procedure CRC32 + (CRC : in out Unsigned_32; + Data : in Ada.Streams.Stream_Element_Array); + pragma Inline (CRC32); + -- Compute CRC32, it could be necessary for make gzip format + + ------------------------------------------------- + -- Below is more complex low level routines. -- + ------------------------------------------------- + + procedure Translate + (Filter : in out Filter_Type; + In_Data : in Ada.Streams.Stream_Element_Array; + In_Last : out Ada.Streams.Stream_Element_Offset; + Out_Data : out Ada.Streams.Stream_Element_Array; + Out_Last : out Ada.Streams.Stream_Element_Offset; + Flush : in Flush_Mode); + -- Compress/decompress the In_Data buffer and place the result into + -- Out_Data. In_Last is the index of last element from In_Data accepted by + -- the Filter. Out_Last is the last element of the received data from + -- Filter. To tell the filter that incoming data are complete put the + -- Flush parameter to Finish. + + function Stream_End (Filter : in Filter_Type) return Boolean; + pragma Inline (Stream_End); + -- Return the true when the stream is complete. + + procedure Flush + (Filter : in out Filter_Type; + Out_Data : out Ada.Streams.Stream_Element_Array; + Out_Last : out Ada.Streams.Stream_Element_Offset; + Flush : in Flush_Mode); + pragma Inline (Flush); + -- Flushing the data from the compressor. + + generic + with procedure Write + (Item : in Ada.Streams.Stream_Element_Array); + -- User should provide this routine for accept + -- compressed/decompressed data. + + Buffer_Size : in Ada.Streams.Stream_Element_Offset + := Default_Buffer_Size; + -- Buffer size for Write user routine. + + procedure Write + (Filter : in out Filter_Type; + Item : in Ada.Streams.Stream_Element_Array; + Flush : in Flush_Mode := No_Flush); + -- Compress/Decompress data from Item to the generic parameter procedure + -- Write. Output buffer size could be set in Buffer_Size generic parameter. + + generic + with procedure Read + (Item : out Ada.Streams.Stream_Element_Array; + Last : out Ada.Streams.Stream_Element_Offset); + -- User should provide data for compression/decompression + -- thru this routine. + + Buffer : in out Ada.Streams.Stream_Element_Array; + -- Buffer for keep remaining data from the previous + -- back read. + + Rest_First, Rest_Last : in out Ada.Streams.Stream_Element_Offset; + -- Rest_First have to be initialized to Buffer'Last + 1 + -- Rest_Last have to be initialized to Buffer'Last + -- before usage. + + Allow_Read_Some : in Boolean := False; + -- Is it allowed to return Last < Item'Last before end of data. + + procedure Read + (Filter : in out Filter_Type; + Item : out Ada.Streams.Stream_Element_Array; + Last : out Ada.Streams.Stream_Element_Offset; + Flush : in Flush_Mode := No_Flush); + -- Compress/Decompress data from generic parameter procedure Read to the + -- Item. User should provide Buffer and initialized Rest_First, Rest_Last + -- indicators. If Allow_Read_Some is True, Read routines could return + -- Last < Item'Last only at end of stream. + + private + + use Ada.Streams; + + pragma Assert (Ada.Streams.Stream_Element'Size = 8); + pragma Assert (Ada.Streams.Stream_Element'Modulus = 2**8); + + type Flush_Mode is new Integer range 0 .. 5; + + type Compression_Method is new Integer range 8 .. 8; + + type Strategy_Type is new Integer range 0 .. 3; + + No_Flush : constant Flush_Mode := 0; + Partial_Flush : constant Flush_Mode := 1; + Sync_Flush : constant Flush_Mode := 2; + Full_Flush : constant Flush_Mode := 3; + Finish : constant Flush_Mode := 4; + Block_Flush : constant Flush_Mode := 5; + + Filtered : constant Strategy_Type := 1; + Huffman_Only : constant Strategy_Type := 2; + RLE : constant Strategy_Type := 3; + Default_Strategy : constant Strategy_Type := 0; + + Deflated : constant Compression_Method := 8; + + type Z_Stream; + + type Z_Stream_Access is access all Z_Stream; + + type Filter_Type is tagged limited record + Strm : Z_Stream_Access; + Compression : Boolean; + Stream_End : Boolean; + Header : Header_Type; + CRC : Unsigned_32; + Offset : Stream_Element_Offset; + -- Offset for gzip header/footer output. + end record; + + end ZLib; diff -Nrcpad gcc-4.4.4/zlib/contrib/ada/zlib.gpr gcc-4.4.5/zlib/contrib/ada/zlib.gpr *** gcc-4.4.4/zlib/contrib/ada/zlib.gpr Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/ada/zlib.gpr Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,20 ---- + project Zlib is + + for Languages use ("Ada"); + for Source_Dirs use ("."); + for Object_Dir use "."; + for Main use ("test.adb", "mtest.adb", "read.adb", "buffer_demo"); + + package Compiler is + for Default_Switches ("ada") use ("-gnatwcfilopru", "-gnatVcdfimorst", "-gnatyabcefhiklmnoprst"); + end Compiler; + + package Linker is + for Default_Switches ("ada") use ("-lz"); + end Linker; + + package Builder is + for Default_Switches ("ada") use ("-s", "-gnatQ"); + end Builder; + + end Zlib; diff -Nrcpad gcc-4.4.4/zlib/contrib/asm586/README.586 gcc-4.4.5/zlib/contrib/asm586/README.586 *** gcc-4.4.4/zlib/contrib/asm586/README.586 Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/asm586/README.586 Mon Oct 11 17:35:40 2004 *************** *** 0 **** --- 1,43 ---- + This is a patched version of zlib modified to use + Pentium-optimized assembly code in the deflation algorithm. The files + changed/added by this patch are: + + README.586 + match.S + + The effectiveness of these modifications is a bit marginal, as the the + program's bottleneck seems to be mostly L1-cache contention, for which + there is no real way to work around without rewriting the basic + algorithm. The speedup on average is around 5-10% (which is generally + less than the amount of variance between subsequent executions). + However, when used at level 9 compression, the cache contention can + drop enough for the assembly version to achieve 10-20% speedup (and + sometimes more, depending on the amount of overall redundancy in the + files). Even here, though, cache contention can still be the limiting + factor, depending on the nature of the program using the zlib library. + This may also mean that better improvements will be seen on a Pentium + with MMX, which suffers much less from L1-cache contention, but I have + not yet verified this. + + Note that this code has been tailored for the Pentium in particular, + and will not perform well on the Pentium Pro (due to the use of a + partial register in the inner loop). + + If you are using an assembler other than GNU as, you will have to + translate match.S to use your assembler's syntax. (Have fun.) + + Brian Raiter + breadbox@muppetlabs.com + April, 1998 + + + Added for zlib 1.1.3: + + The patches come from + http://www.muppetlabs.com/~breadbox/software/assembly.html + + To compile zlib with this asm file, copy match.S to the zlib directory + then do: + + CFLAGS="-O3 -DASMV" ./configure + make OBJA=match.o diff -Nrcpad gcc-4.4.4/zlib/contrib/asm586/match.S gcc-4.4.5/zlib/contrib/asm586/match.S *** gcc-4.4.4/zlib/contrib/asm586/match.S Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/asm586/match.S Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,364 ---- + /* match.s -- Pentium-optimized version of longest_match() + * Written for zlib 1.1.2 + * Copyright (C) 1998 Brian Raiter + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License. + */ + + #ifndef NO_UNDERLINE + #define match_init _match_init + #define longest_match _longest_match + #endif + + #define MAX_MATCH (258) + #define MIN_MATCH (3) + #define MIN_LOOKAHEAD (MAX_MATCH + MIN_MATCH + 1) + #define MAX_MATCH_8 ((MAX_MATCH + 7) & ~7) + + /* stack frame offsets */ + + #define wmask 0 /* local copy of s->wmask */ + #define window 4 /* local copy of s->window */ + #define windowbestlen 8 /* s->window + bestlen */ + #define chainlenscanend 12 /* high word: current chain len */ + /* low word: last bytes sought */ + #define scanstart 16 /* first two bytes of string */ + #define scanalign 20 /* dword-misalignment of string */ + #define nicematch 24 /* a good enough match size */ + #define bestlen 28 /* size of best match so far */ + #define scan 32 /* ptr to string wanting match */ + + #define LocalVarsSize (36) + /* saved ebx 36 */ + /* saved edi 40 */ + /* saved esi 44 */ + /* saved ebp 48 */ + /* return address 52 */ + #define deflatestate 56 /* the function arguments */ + #define curmatch 60 + + /* Offsets for fields in the deflate_state structure. These numbers + * are calculated from the definition of deflate_state, with the + * assumption that the compiler will dword-align the fields. (Thus, + * changing the definition of deflate_state could easily cause this + * program to crash horribly, without so much as a warning at + * compile time. Sigh.) + */ + + /* All the +zlib1222add offsets are due to the addition of fields + * in zlib in the deflate_state structure since the asm code was first written + * (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)"). + * (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0"). + * if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8"). + */ + + #define zlib1222add (8) + + #define dsWSize (36+zlib1222add) + #define dsWMask (44+zlib1222add) + #define dsWindow (48+zlib1222add) + #define dsPrev (56+zlib1222add) + #define dsMatchLen (88+zlib1222add) + #define dsPrevMatch (92+zlib1222add) + #define dsStrStart (100+zlib1222add) + #define dsMatchStart (104+zlib1222add) + #define dsLookahead (108+zlib1222add) + #define dsPrevLen (112+zlib1222add) + #define dsMaxChainLen (116+zlib1222add) + #define dsGoodMatch (132+zlib1222add) + #define dsNiceMatch (136+zlib1222add) + + + .file "match.S" + + .globl match_init, longest_match + + .text + + /* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */ + + longest_match: + + /* Save registers that the compiler may be using, and adjust %esp to */ + /* make room for our stack frame. */ + + pushl %ebp + pushl %edi + pushl %esi + pushl %ebx + subl $LocalVarsSize, %esp + + /* Retrieve the function arguments. %ecx will hold cur_match */ + /* throughout the entire function. %edx will hold the pointer to the */ + /* deflate_state structure during the function's setup (before */ + /* entering the main loop). */ + + movl deflatestate(%esp), %edx + movl curmatch(%esp), %ecx + + /* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; */ + + movl dsNiceMatch(%edx), %eax + movl dsLookahead(%edx), %ebx + cmpl %eax, %ebx + jl LookaheadLess + movl %eax, %ebx + LookaheadLess: movl %ebx, nicematch(%esp) + + /* register Bytef *scan = s->window + s->strstart; */ + + movl dsWindow(%edx), %esi + movl %esi, window(%esp) + movl dsStrStart(%edx), %ebp + lea (%esi,%ebp), %edi + movl %edi, scan(%esp) + + /* Determine how many bytes the scan ptr is off from being */ + /* dword-aligned. */ + + movl %edi, %eax + negl %eax + andl $3, %eax + movl %eax, scanalign(%esp) + + /* IPos limit = s->strstart > (IPos)MAX_DIST(s) ? */ + /* s->strstart - (IPos)MAX_DIST(s) : NIL; */ + + movl dsWSize(%edx), %eax + subl $MIN_LOOKAHEAD, %eax + subl %eax, %ebp + jg LimitPositive + xorl %ebp, %ebp + LimitPositive: + + /* unsigned chain_length = s->max_chain_length; */ + /* if (s->prev_length >= s->good_match) { */ + /* chain_length >>= 2; */ + /* } */ + + movl dsPrevLen(%edx), %eax + movl dsGoodMatch(%edx), %ebx + cmpl %ebx, %eax + movl dsMaxChainLen(%edx), %ebx + jl LastMatchGood + shrl $2, %ebx + LastMatchGood: + + /* chainlen is decremented once beforehand so that the function can */ + /* use the sign flag instead of the zero flag for the exit test. */ + /* It is then shifted into the high word, to make room for the scanend */ + /* scanend value, which it will always accompany. */ + + decl %ebx + shll $16, %ebx + + /* int best_len = s->prev_length; */ + + movl dsPrevLen(%edx), %eax + movl %eax, bestlen(%esp) + + /* Store the sum of s->window + best_len in %esi locally, and in %esi. */ + + addl %eax, %esi + movl %esi, windowbestlen(%esp) + + /* register ush scan_start = *(ushf*)scan; */ + /* register ush scan_end = *(ushf*)(scan+best_len-1); */ + + movw (%edi), %bx + movw %bx, scanstart(%esp) + movw -1(%edi,%eax), %bx + movl %ebx, chainlenscanend(%esp) + + /* Posf *prev = s->prev; */ + /* uInt wmask = s->w_mask; */ + + movl dsPrev(%edx), %edi + movl dsWMask(%edx), %edx + mov %edx, wmask(%esp) + + /* Jump into the main loop. */ + + jmp LoopEntry + + .balign 16 + + /* do { + * match = s->window + cur_match; + * if (*(ushf*)(match+best_len-1) != scan_end || + * *(ushf*)match != scan_start) continue; + * [...] + * } while ((cur_match = prev[cur_match & wmask]) > limit + * && --chain_length != 0); + * + * Here is the inner loop of the function. The function will spend the + * majority of its time in this loop, and majority of that time will + * be spent in the first ten instructions. + * + * Within this loop: + * %ebx = chainlenscanend - i.e., ((chainlen << 16) | scanend) + * %ecx = curmatch + * %edx = curmatch & wmask + * %esi = windowbestlen - i.e., (window + bestlen) + * %edi = prev + * %ebp = limit + * + * Two optimization notes on the choice of instructions: + * + * The first instruction uses a 16-bit address, which costs an extra, + * unpairable cycle. This is cheaper than doing a 32-bit access and + * zeroing the high word, due to the 3-cycle misalignment penalty which + * would occur half the time. This also turns out to be cheaper than + * doing two separate 8-bit accesses, as the memory is so rarely in the + * L1 cache. + * + * The window buffer, however, apparently spends a lot of time in the + * cache, and so it is faster to retrieve the word at the end of the + * match string with two 8-bit loads. The instructions that test the + * word at the beginning of the match string, however, are executed + * much less frequently, and there it was cheaper to use 16-bit + * instructions, which avoided the necessity of saving off and + * subsequently reloading one of the other registers. + */ + LookupLoop: + /* 1 U & V */ + movw (%edi,%edx,2), %cx /* 2 U pipe */ + movl wmask(%esp), %edx /* 2 V pipe */ + cmpl %ebp, %ecx /* 3 U pipe */ + jbe LeaveNow /* 3 V pipe */ + subl $0x00010000, %ebx /* 4 U pipe */ + js LeaveNow /* 4 V pipe */ + LoopEntry: movb -1(%esi,%ecx), %al /* 5 U pipe */ + andl %ecx, %edx /* 5 V pipe */ + cmpb %bl, %al /* 6 U pipe */ + jnz LookupLoop /* 6 V pipe */ + movb (%esi,%ecx), %ah + cmpb %bh, %ah + jnz LookupLoop + movl window(%esp), %eax + movw (%eax,%ecx), %ax + cmpw scanstart(%esp), %ax + jnz LookupLoop + + /* Store the current value of chainlen. */ + + movl %ebx, chainlenscanend(%esp) + + /* Point %edi to the string under scrutiny, and %esi to the string we */ + /* are hoping to match it up with. In actuality, %esi and %edi are */ + /* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is */ + /* initialized to -(MAX_MATCH_8 - scanalign). */ + + movl window(%esp), %esi + movl scan(%esp), %edi + addl %ecx, %esi + movl scanalign(%esp), %eax + movl $(-MAX_MATCH_8), %edx + lea MAX_MATCH_8(%edi,%eax), %edi + lea MAX_MATCH_8(%esi,%eax), %esi + + /* Test the strings for equality, 8 bytes at a time. At the end, + * adjust %edx so that it is offset to the exact byte that mismatched. + * + * We already know at this point that the first three bytes of the + * strings match each other, and they can be safely passed over before + * starting the compare loop. So what this code does is skip over 0-3 + * bytes, as much as necessary in order to dword-align the %edi + * pointer. (%esi will still be misaligned three times out of four.) + * + * It should be confessed that this loop usually does not represent + * much of the total running time. Replacing it with a more + * straightforward "rep cmpsb" would not drastically degrade + * performance. + */ + LoopCmps: + movl (%esi,%edx), %eax + movl (%edi,%edx), %ebx + xorl %ebx, %eax + jnz LeaveLoopCmps + movl 4(%esi,%edx), %eax + movl 4(%edi,%edx), %ebx + xorl %ebx, %eax + jnz LeaveLoopCmps4 + addl $8, %edx + jnz LoopCmps + jmp LenMaximum + LeaveLoopCmps4: addl $4, %edx + LeaveLoopCmps: testl $0x0000FFFF, %eax + jnz LenLower + addl $2, %edx + shrl $16, %eax + LenLower: subb $1, %al + adcl $0, %edx + + /* Calculate the length of the match. If it is longer than MAX_MATCH, */ + /* then automatically accept it as the best possible match and leave. */ + + lea (%edi,%edx), %eax + movl scan(%esp), %edi + subl %edi, %eax + cmpl $MAX_MATCH, %eax + jge LenMaximum + + /* If the length of the match is not longer than the best match we */ + /* have so far, then forget it and return to the lookup loop. */ + + movl deflatestate(%esp), %edx + movl bestlen(%esp), %ebx + cmpl %ebx, %eax + jg LongerMatch + movl chainlenscanend(%esp), %ebx + movl windowbestlen(%esp), %esi + movl dsPrev(%edx), %edi + movl wmask(%esp), %edx + andl %ecx, %edx + jmp LookupLoop + + /* s->match_start = cur_match; */ + /* best_len = len; */ + /* if (len >= nice_match) break; */ + /* scan_end = *(ushf*)(scan+best_len-1); */ + + LongerMatch: movl nicematch(%esp), %ebx + movl %eax, bestlen(%esp) + movl %ecx, dsMatchStart(%edx) + cmpl %ebx, %eax + jge LeaveNow + movl window(%esp), %esi + addl %eax, %esi + movl %esi, windowbestlen(%esp) + movl chainlenscanend(%esp), %ebx + movw -1(%edi,%eax), %bx + movl dsPrev(%edx), %edi + movl %ebx, chainlenscanend(%esp) + movl wmask(%esp), %edx + andl %ecx, %edx + jmp LookupLoop + + /* Accept the current string, with the maximum possible length. */ + + LenMaximum: movl deflatestate(%esp), %edx + movl $MAX_MATCH, bestlen(%esp) + movl %ecx, dsMatchStart(%edx) + + /* if ((uInt)best_len <= s->lookahead) return (uInt)best_len; */ + /* return s->lookahead; */ + + LeaveNow: + movl deflatestate(%esp), %edx + movl bestlen(%esp), %ebx + movl dsLookahead(%edx), %eax + cmpl %eax, %ebx + jg LookaheadRet + movl %ebx, %eax + LookaheadRet: + + /* Restore the stack and return from whence we came. */ + + addl $LocalVarsSize, %esp + popl %ebx + popl %esi + popl %edi + popl %ebp + match_init: ret diff -Nrcpad gcc-4.4.4/zlib/contrib/asm686/README.686 gcc-4.4.5/zlib/contrib/asm686/README.686 *** gcc-4.4.4/zlib/contrib/asm686/README.686 Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/asm686/README.686 Mon Oct 11 17:35:40 2004 *************** *** 0 **** --- 1,34 ---- + This is a patched version of zlib, modified to use + Pentium-Pro-optimized assembly code in the deflation algorithm. The + files changed/added by this patch are: + + README.686 + match.S + + The speedup that this patch provides varies, depending on whether the + compiler used to build the original version of zlib falls afoul of the + PPro's speed traps. My own tests show a speedup of around 10-20% at + the default compression level, and 20-30% using -9, against a version + compiled using gcc 2.7.2.3. Your mileage may vary. + + Note that this code has been tailored for the PPro/PII in particular, + and will not perform particuarly well on a Pentium. + + If you are using an assembler other than GNU as, you will have to + translate match.S to use your assembler's syntax. (Have fun.) + + Brian Raiter + breadbox@muppetlabs.com + April, 1998 + + + Added for zlib 1.1.3: + + The patches come from + http://www.muppetlabs.com/~breadbox/software/assembly.html + + To compile zlib with this asm file, copy match.S to the zlib directory + then do: + + CFLAGS="-O3 -DASMV" ./configure + make OBJA=match.o diff -Nrcpad gcc-4.4.4/zlib/contrib/asm686/match.S gcc-4.4.5/zlib/contrib/asm686/match.S *** gcc-4.4.4/zlib/contrib/asm686/match.S Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/asm686/match.S Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,329 ---- + /* match.s -- Pentium-Pro-optimized version of longest_match() + * Written for zlib 1.1.2 + * Copyright (C) 1998 Brian Raiter + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License. + */ + + #ifndef NO_UNDERLINE + #define match_init _match_init + #define longest_match _longest_match + #endif + + #define MAX_MATCH (258) + #define MIN_MATCH (3) + #define MIN_LOOKAHEAD (MAX_MATCH + MIN_MATCH + 1) + #define MAX_MATCH_8 ((MAX_MATCH + 7) & ~7) + + /* stack frame offsets */ + + #define chainlenwmask 0 /* high word: current chain len */ + /* low word: s->wmask */ + #define window 4 /* local copy of s->window */ + #define windowbestlen 8 /* s->window + bestlen */ + #define scanstart 16 /* first two bytes of string */ + #define scanend 12 /* last two bytes of string */ + #define scanalign 20 /* dword-misalignment of string */ + #define nicematch 24 /* a good enough match size */ + #define bestlen 28 /* size of best match so far */ + #define scan 32 /* ptr to string wanting match */ + + #define LocalVarsSize (36) + /* saved ebx 36 */ + /* saved edi 40 */ + /* saved esi 44 */ + /* saved ebp 48 */ + /* return address 52 */ + #define deflatestate 56 /* the function arguments */ + #define curmatch 60 + + /* All the +zlib1222add offsets are due to the addition of fields + * in zlib in the deflate_state structure since the asm code was first written + * (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)"). + * (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0"). + * if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8"). + */ + + #define zlib1222add (8) + + #define dsWSize (36+zlib1222add) + #define dsWMask (44+zlib1222add) + #define dsWindow (48+zlib1222add) + #define dsPrev (56+zlib1222add) + #define dsMatchLen (88+zlib1222add) + #define dsPrevMatch (92+zlib1222add) + #define dsStrStart (100+zlib1222add) + #define dsMatchStart (104+zlib1222add) + #define dsLookahead (108+zlib1222add) + #define dsPrevLen (112+zlib1222add) + #define dsMaxChainLen (116+zlib1222add) + #define dsGoodMatch (132+zlib1222add) + #define dsNiceMatch (136+zlib1222add) + + + .file "match.S" + + .globl match_init, longest_match + + .text + + /* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */ + + longest_match: + + /* Save registers that the compiler may be using, and adjust %esp to */ + /* make room for our stack frame. */ + + pushl %ebp + pushl %edi + pushl %esi + pushl %ebx + subl $LocalVarsSize, %esp + + /* Retrieve the function arguments. %ecx will hold cur_match */ + /* throughout the entire function. %edx will hold the pointer to the */ + /* deflate_state structure during the function's setup (before */ + /* entering the main loop). */ + + movl deflatestate(%esp), %edx + movl curmatch(%esp), %ecx + + /* uInt wmask = s->w_mask; */ + /* unsigned chain_length = s->max_chain_length; */ + /* if (s->prev_length >= s->good_match) { */ + /* chain_length >>= 2; */ + /* } */ + + movl dsPrevLen(%edx), %eax + movl dsGoodMatch(%edx), %ebx + cmpl %ebx, %eax + movl dsWMask(%edx), %eax + movl dsMaxChainLen(%edx), %ebx + jl LastMatchGood + shrl $2, %ebx + LastMatchGood: + + /* chainlen is decremented once beforehand so that the function can */ + /* use the sign flag instead of the zero flag for the exit test. */ + /* It is then shifted into the high word, to make room for the wmask */ + /* value, which it will always accompany. */ + + decl %ebx + shll $16, %ebx + orl %eax, %ebx + movl %ebx, chainlenwmask(%esp) + + /* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; */ + + movl dsNiceMatch(%edx), %eax + movl dsLookahead(%edx), %ebx + cmpl %eax, %ebx + jl LookaheadLess + movl %eax, %ebx + LookaheadLess: movl %ebx, nicematch(%esp) + + /* register Bytef *scan = s->window + s->strstart; */ + + movl dsWindow(%edx), %esi + movl %esi, window(%esp) + movl dsStrStart(%edx), %ebp + lea (%esi,%ebp), %edi + movl %edi, scan(%esp) + + /* Determine how many bytes the scan ptr is off from being */ + /* dword-aligned. */ + + movl %edi, %eax + negl %eax + andl $3, %eax + movl %eax, scanalign(%esp) + + /* IPos limit = s->strstart > (IPos)MAX_DIST(s) ? */ + /* s->strstart - (IPos)MAX_DIST(s) : NIL; */ + + movl dsWSize(%edx), %eax + subl $MIN_LOOKAHEAD, %eax + subl %eax, %ebp + jg LimitPositive + xorl %ebp, %ebp + LimitPositive: + + /* int best_len = s->prev_length; */ + + movl dsPrevLen(%edx), %eax + movl %eax, bestlen(%esp) + + /* Store the sum of s->window + best_len in %esi locally, and in %esi. */ + + addl %eax, %esi + movl %esi, windowbestlen(%esp) + + /* register ush scan_start = *(ushf*)scan; */ + /* register ush scan_end = *(ushf*)(scan+best_len-1); */ + /* Posf *prev = s->prev; */ + + movzwl (%edi), %ebx + movl %ebx, scanstart(%esp) + movzwl -1(%edi,%eax), %ebx + movl %ebx, scanend(%esp) + movl dsPrev(%edx), %edi + + /* Jump into the main loop. */ + + movl chainlenwmask(%esp), %edx + jmp LoopEntry + + .balign 16 + + /* do { + * match = s->window + cur_match; + * if (*(ushf*)(match+best_len-1) != scan_end || + * *(ushf*)match != scan_start) continue; + * [...] + * } while ((cur_match = prev[cur_match & wmask]) > limit + * && --chain_length != 0); + * + * Here is the inner loop of the function. The function will spend the + * majority of its time in this loop, and majority of that time will + * be spent in the first ten instructions. + * + * Within this loop: + * %ebx = scanend + * %ecx = curmatch + * %edx = chainlenwmask - i.e., ((chainlen << 16) | wmask) + * %esi = windowbestlen - i.e., (window + bestlen) + * %edi = prev + * %ebp = limit + */ + LookupLoop: + andl %edx, %ecx + movzwl (%edi,%ecx,2), %ecx + cmpl %ebp, %ecx + jbe LeaveNow + subl $0x00010000, %edx + js LeaveNow + LoopEntry: movzwl -1(%esi,%ecx), %eax + cmpl %ebx, %eax + jnz LookupLoop + movl window(%esp), %eax + movzwl (%eax,%ecx), %eax + cmpl scanstart(%esp), %eax + jnz LookupLoop + + /* Store the current value of chainlen. */ + + movl %edx, chainlenwmask(%esp) + + /* Point %edi to the string under scrutiny, and %esi to the string we */ + /* are hoping to match it up with. In actuality, %esi and %edi are */ + /* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is */ + /* initialized to -(MAX_MATCH_8 - scanalign). */ + + movl window(%esp), %esi + movl scan(%esp), %edi + addl %ecx, %esi + movl scanalign(%esp), %eax + movl $(-MAX_MATCH_8), %edx + lea MAX_MATCH_8(%edi,%eax), %edi + lea MAX_MATCH_8(%esi,%eax), %esi + + /* Test the strings for equality, 8 bytes at a time. At the end, + * adjust %edx so that it is offset to the exact byte that mismatched. + * + * We already know at this point that the first three bytes of the + * strings match each other, and they can be safely passed over before + * starting the compare loop. So what this code does is skip over 0-3 + * bytes, as much as necessary in order to dword-align the %edi + * pointer. (%esi will still be misaligned three times out of four.) + * + * It should be confessed that this loop usually does not represent + * much of the total running time. Replacing it with a more + * straightforward "rep cmpsb" would not drastically degrade + * performance. + */ + LoopCmps: + movl (%esi,%edx), %eax + xorl (%edi,%edx), %eax + jnz LeaveLoopCmps + movl 4(%esi,%edx), %eax + xorl 4(%edi,%edx), %eax + jnz LeaveLoopCmps4 + addl $8, %edx + jnz LoopCmps + jmp LenMaximum + LeaveLoopCmps4: addl $4, %edx + LeaveLoopCmps: testl $0x0000FFFF, %eax + jnz LenLower + addl $2, %edx + shrl $16, %eax + LenLower: subb $1, %al + adcl $0, %edx + + /* Calculate the length of the match. If it is longer than MAX_MATCH, */ + /* then automatically accept it as the best possible match and leave. */ + + lea (%edi,%edx), %eax + movl scan(%esp), %edi + subl %edi, %eax + cmpl $MAX_MATCH, %eax + jge LenMaximum + + /* If the length of the match is not longer than the best match we */ + /* have so far, then forget it and return to the lookup loop. */ + + movl deflatestate(%esp), %edx + movl bestlen(%esp), %ebx + cmpl %ebx, %eax + jg LongerMatch + movl windowbestlen(%esp), %esi + movl dsPrev(%edx), %edi + movl scanend(%esp), %ebx + movl chainlenwmask(%esp), %edx + jmp LookupLoop + + /* s->match_start = cur_match; */ + /* best_len = len; */ + /* if (len >= nice_match) break; */ + /* scan_end = *(ushf*)(scan+best_len-1); */ + + LongerMatch: movl nicematch(%esp), %ebx + movl %eax, bestlen(%esp) + movl %ecx, dsMatchStart(%edx) + cmpl %ebx, %eax + jge LeaveNow + movl window(%esp), %esi + addl %eax, %esi + movl %esi, windowbestlen(%esp) + movzwl -1(%edi,%eax), %ebx + movl dsPrev(%edx), %edi + movl %ebx, scanend(%esp) + movl chainlenwmask(%esp), %edx + jmp LookupLoop + + /* Accept the current string, with the maximum possible length. */ + + LenMaximum: movl deflatestate(%esp), %edx + movl $MAX_MATCH, bestlen(%esp) + movl %ecx, dsMatchStart(%edx) + + /* if ((uInt)best_len <= s->lookahead) return (uInt)best_len; */ + /* return s->lookahead; */ + + LeaveNow: + movl deflatestate(%esp), %edx + movl bestlen(%esp), %ebx + movl dsLookahead(%edx), %eax + cmpl %eax, %ebx + jg LookaheadRet + movl %ebx, %eax + LookaheadRet: + + /* Restore the stack and return from whence we came. */ + + addl $LocalVarsSize, %esp + popl %ebx + popl %esi + popl %edi + popl %ebp + match_init: ret diff -Nrcpad gcc-4.4.4/zlib/contrib/blast/Makefile gcc-4.4.5/zlib/contrib/blast/Makefile *** gcc-4.4.4/zlib/contrib/blast/Makefile Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/blast/Makefile Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,8 ---- + blast: blast.c blast.h + cc -DTEST -o blast blast.c + + test: blast + blast < test.pk | cmp - test.txt + + clean: + rm -f blast blast.o diff -Nrcpad gcc-4.4.4/zlib/contrib/blast/README gcc-4.4.5/zlib/contrib/blast/README *** gcc-4.4.4/zlib/contrib/blast/README Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/blast/README Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,4 ---- + Read blast.h for purpose and usage. + + Mark Adler + madler@alumni.caltech.edu diff -Nrcpad gcc-4.4.4/zlib/contrib/blast/blast.c gcc-4.4.5/zlib/contrib/blast/blast.c *** gcc-4.4.4/zlib/contrib/blast/blast.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/blast/blast.c Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,444 ---- + /* blast.c + * Copyright (C) 2003 Mark Adler + * For conditions of distribution and use, see copyright notice in blast.h + * version 1.1, 16 Feb 2003 + * + * blast.c decompresses data compressed by the PKWare Compression Library. + * This function provides functionality similar to the explode() function of + * the PKWare library, hence the name "blast". + * + * This decompressor is based on the excellent format description provided by + * Ben Rudiak-Gould in comp.compression on August 13, 2001. Interestingly, the + * example Ben provided in the post is incorrect. The distance 110001 should + * instead be 111000. When corrected, the example byte stream becomes: + * + * 00 04 82 24 25 8f 80 7f + * + * which decompresses to "AIAIAIAIAIAIA" (without the quotes). + */ + + /* + * Change history: + * + * 1.0 12 Feb 2003 - First version + * 1.1 16 Feb 2003 - Fixed distance check for > 4 GB uncompressed data + */ + + #include /* for setjmp(), longjmp(), and jmp_buf */ + #include "blast.h" /* prototype for blast() */ + + #define local static /* for local function definitions */ + #define MAXBITS 13 /* maximum code length */ + #define MAXWIN 4096 /* maximum window size */ + + /* input and output state */ + struct state { + /* input state */ + blast_in infun; /* input function provided by user */ + void *inhow; /* opaque information passed to infun() */ + unsigned char *in; /* next input location */ + unsigned left; /* available input at in */ + int bitbuf; /* bit buffer */ + int bitcnt; /* number of bits in bit buffer */ + + /* input limit error return state for bits() and decode() */ + jmp_buf env; + + /* output state */ + blast_out outfun; /* output function provided by user */ + void *outhow; /* opaque information passed to outfun() */ + unsigned next; /* index of next write location in out[] */ + int first; /* true to check distances (for first 4K) */ + unsigned char out[MAXWIN]; /* output buffer and sliding window */ + }; + + /* + * Return need bits from the input stream. This always leaves less than + * eight bits in the buffer. bits() works properly for need == 0. + * + * Format notes: + * + * - Bits are stored in bytes from the least significant bit to the most + * significant bit. Therefore bits are dropped from the bottom of the bit + * buffer, using shift right, and new bytes are appended to the top of the + * bit buffer, using shift left. + */ + local int bits(struct state *s, int need) + { + int val; /* bit accumulator */ + + /* load at least need bits into val */ + val = s->bitbuf; + while (s->bitcnt < need) { + if (s->left == 0) { + s->left = s->infun(s->inhow, &(s->in)); + if (s->left == 0) longjmp(s->env, 1); /* out of input */ + } + val |= (int)(*(s->in)++) << s->bitcnt; /* load eight bits */ + s->left--; + s->bitcnt += 8; + } + + /* drop need bits and update buffer, always zero to seven bits left */ + s->bitbuf = val >> need; + s->bitcnt -= need; + + /* return need bits, zeroing the bits above that */ + return val & ((1 << need) - 1); + } + + /* + * Huffman code decoding tables. count[1..MAXBITS] is the number of symbols of + * each length, which for a canonical code are stepped through in order. + * symbol[] are the symbol values in canonical order, where the number of + * entries is the sum of the counts in count[]. The decoding process can be + * seen in the function decode() below. + */ + struct huffman { + short *count; /* number of symbols of each length */ + short *symbol; /* canonically ordered symbols */ + }; + + /* + * Decode a code from the stream s using huffman table h. Return the symbol or + * a negative value if there is an error. If all of the lengths are zero, i.e. + * an empty code, or if the code is incomplete and an invalid code is received, + * then -9 is returned after reading MAXBITS bits. + * + * Format notes: + * + * - The codes as stored in the compressed data are bit-reversed relative to + * a simple integer ordering of codes of the same lengths. Hence below the + * bits are pulled from the compressed data one at a time and used to + * build the code value reversed from what is in the stream in order to + * permit simple integer comparisons for decoding. + * + * - The first code for the shortest length is all ones. Subsequent codes of + * the same length are simply integer decrements of the previous code. When + * moving up a length, a one bit is appended to the code. For a complete + * code, the last code of the longest length will be all zeros. To support + * this ordering, the bits pulled during decoding are inverted to apply the + * more "natural" ordering starting with all zeros and incrementing. + */ + local int decode(struct state *s, struct huffman *h) + { + int len; /* current number of bits in code */ + int code; /* len bits being decoded */ + int first; /* first code of length len */ + int count; /* number of codes of length len */ + int index; /* index of first code of length len in symbol table */ + int bitbuf; /* bits from stream */ + int left; /* bits left in next or left to process */ + short *next; /* next number of codes */ + + bitbuf = s->bitbuf; + left = s->bitcnt; + code = first = index = 0; + len = 1; + next = h->count + 1; + while (1) { + while (left--) { + code |= (bitbuf & 1) ^ 1; /* invert code */ + bitbuf >>= 1; + count = *next++; + if (code < first + count) { /* if length len, return symbol */ + s->bitbuf = bitbuf; + s->bitcnt = (s->bitcnt - len) & 7; + return h->symbol[index + (code - first)]; + } + index += count; /* else update for next length */ + first += count; + first <<= 1; + code <<= 1; + len++; + } + left = (MAXBITS+1) - len; + if (left == 0) break; + if (s->left == 0) { + s->left = s->infun(s->inhow, &(s->in)); + if (s->left == 0) longjmp(s->env, 1); /* out of input */ + } + bitbuf = *(s->in)++; + s->left--; + if (left > 8) left = 8; + } + return -9; /* ran out of codes */ + } + + /* + * Given a list of repeated code lengths rep[0..n-1], where each byte is a + * count (high four bits + 1) and a code length (low four bits), generate the + * list of code lengths. This compaction reduces the size of the object code. + * Then given the list of code lengths length[0..n-1] representing a canonical + * Huffman code for n symbols, construct the tables required to decode those + * codes. Those tables are the number of codes of each length, and the symbols + * sorted by length, retaining their original order within each length. The + * return value is zero for a complete code set, negative for an over- + * subscribed code set, and positive for an incomplete code set. The tables + * can be used if the return value is zero or positive, but they cannot be used + * if the return value is negative. If the return value is zero, it is not + * possible for decode() using that table to return an error--any stream of + * enough bits will resolve to a symbol. If the return value is positive, then + * it is possible for decode() using that table to return an error for received + * codes past the end of the incomplete lengths. + */ + local int construct(struct huffman *h, const unsigned char *rep, int n) + { + int symbol; /* current symbol when stepping through length[] */ + int len; /* current length when stepping through h->count[] */ + int left; /* number of possible codes left of current length */ + short offs[MAXBITS+1]; /* offsets in symbol table for each length */ + short length[256]; /* code lengths */ + + /* convert compact repeat counts into symbol bit length list */ + symbol = 0; + do { + len = *rep++; + left = (len >> 4) + 1; + len &= 15; + do { + length[symbol++] = len; + } while (--left); + } while (--n); + n = symbol; + + /* count number of codes of each length */ + for (len = 0; len <= MAXBITS; len++) + h->count[len] = 0; + for (symbol = 0; symbol < n; symbol++) + (h->count[length[symbol]])++; /* assumes lengths are within bounds */ + if (h->count[0] == n) /* no codes! */ + return 0; /* complete, but decode() will fail */ + + /* check for an over-subscribed or incomplete set of lengths */ + left = 1; /* one possible code of zero length */ + for (len = 1; len <= MAXBITS; len++) { + left <<= 1; /* one more bit, double codes left */ + left -= h->count[len]; /* deduct count from possible codes */ + if (left < 0) return left; /* over-subscribed--return negative */ + } /* left > 0 means incomplete */ + + /* generate offsets into symbol table for each length for sorting */ + offs[1] = 0; + for (len = 1; len < MAXBITS; len++) + offs[len + 1] = offs[len] + h->count[len]; + + /* + * put symbols in table sorted by length, by symbol order within each + * length + */ + for (symbol = 0; symbol < n; symbol++) + if (length[symbol] != 0) + h->symbol[offs[length[symbol]]++] = symbol; + + /* return zero for complete set, positive for incomplete set */ + return left; + } + + /* + * Decode PKWare Compression Library stream. + * + * Format notes: + * + * - First byte is 0 if literals are uncoded or 1 if they are coded. Second + * byte is 4, 5, or 6 for the number of extra bits in the distance code. + * This is the base-2 logarithm of the dictionary size minus six. + * + * - Compressed data is a combination of literals and length/distance pairs + * terminated by an end code. Literals are either Huffman coded or + * uncoded bytes. A length/distance pair is a coded length followed by a + * coded distance to represent a string that occurs earlier in the + * uncompressed data that occurs again at the current location. + * + * - A bit preceding a literal or length/distance pair indicates which comes + * next, 0 for literals, 1 for length/distance. + * + * - If literals are uncoded, then the next eight bits are the literal, in the + * normal bit order in th stream, i.e. no bit-reversal is needed. Similarly, + * no bit reversal is needed for either the length extra bits or the distance + * extra bits. + * + * - Literal bytes are simply written to the output. A length/distance pair is + * an instruction to copy previously uncompressed bytes to the output. The + * copy is from distance bytes back in the output stream, copying for length + * bytes. + * + * - Distances pointing before the beginning of the output data are not + * permitted. + * + * - Overlapped copies, where the length is greater than the distance, are + * allowed and common. For example, a distance of one and a length of 518 + * simply copies the last byte 518 times. A distance of four and a length of + * twelve copies the last four bytes three times. A simple forward copy + * ignoring whether the length is greater than the distance or not implements + * this correctly. + */ + local int decomp(struct state *s) + { + int lit; /* true if literals are coded */ + int dict; /* log2(dictionary size) - 6 */ + int symbol; /* decoded symbol, extra bits for distance */ + int len; /* length for copy */ + int dist; /* distance for copy */ + int copy; /* copy counter */ + unsigned char *from, *to; /* copy pointers */ + static int virgin = 1; /* build tables once */ + static short litcnt[MAXBITS+1], litsym[256]; /* litcode memory */ + static short lencnt[MAXBITS+1], lensym[16]; /* lencode memory */ + static short distcnt[MAXBITS+1], distsym[64]; /* distcode memory */ + static struct huffman litcode = {litcnt, litsym}; /* length code */ + static struct huffman lencode = {lencnt, lensym}; /* length code */ + static struct huffman distcode = {distcnt, distsym};/* distance code */ + /* bit lengths of literal codes */ + static const unsigned char litlen[] = { + 11, 124, 8, 7, 28, 7, 188, 13, 76, 4, 10, 8, 12, 10, 12, 10, 8, 23, 8, + 9, 7, 6, 7, 8, 7, 6, 55, 8, 23, 24, 12, 11, 7, 9, 11, 12, 6, 7, 22, 5, + 7, 24, 6, 11, 9, 6, 7, 22, 7, 11, 38, 7, 9, 8, 25, 11, 8, 11, 9, 12, + 8, 12, 5, 38, 5, 38, 5, 11, 7, 5, 6, 21, 6, 10, 53, 8, 7, 24, 10, 27, + 44, 253, 253, 253, 252, 252, 252, 13, 12, 45, 12, 45, 12, 61, 12, 45, + 44, 173}; + /* bit lengths of length codes 0..15 */ + static const unsigned char lenlen[] = {2, 35, 36, 53, 38, 23}; + /* bit lengths of distance codes 0..63 */ + static const unsigned char distlen[] = {2, 20, 53, 230, 247, 151, 248}; + static const short base[16] = { /* base for length codes */ + 3, 2, 4, 5, 6, 7, 8, 9, 10, 12, 16, 24, 40, 72, 136, 264}; + static const char extra[16] = { /* extra bits for length codes */ + 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8}; + + /* set up decoding tables (once--might not be thread-safe) */ + if (virgin) { + construct(&litcode, litlen, sizeof(litlen)); + construct(&lencode, lenlen, sizeof(lenlen)); + construct(&distcode, distlen, sizeof(distlen)); + virgin = 0; + } + + /* read header */ + lit = bits(s, 8); + if (lit > 1) return -1; + dict = bits(s, 8); + if (dict < 4 || dict > 6) return -2; + + /* decode literals and length/distance pairs */ + do { + if (bits(s, 1)) { + /* get length */ + symbol = decode(s, &lencode); + len = base[symbol] + bits(s, extra[symbol]); + if (len == 519) break; /* end code */ + + /* get distance */ + symbol = len == 2 ? 2 : dict; + dist = decode(s, &distcode) << symbol; + dist += bits(s, symbol); + dist++; + if (s->first && dist > s->next) + return -3; /* distance too far back */ + + /* copy length bytes from distance bytes back */ + do { + to = s->out + s->next; + from = to - dist; + copy = MAXWIN; + if (s->next < dist) { + from += copy; + copy = dist; + } + copy -= s->next; + if (copy > len) copy = len; + len -= copy; + s->next += copy; + do { + *to++ = *from++; + } while (--copy); + if (s->next == MAXWIN) { + if (s->outfun(s->outhow, s->out, s->next)) return 1; + s->next = 0; + s->first = 0; + } + } while (len != 0); + } + else { + /* get literal and write it */ + symbol = lit ? decode(s, &litcode) : bits(s, 8); + s->out[s->next++] = symbol; + if (s->next == MAXWIN) { + if (s->outfun(s->outhow, s->out, s->next)) return 1; + s->next = 0; + s->first = 0; + } + } + } while (1); + return 0; + } + + /* See comments in blast.h */ + int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow) + { + struct state s; /* input/output state */ + int err; /* return value */ + + /* initialize input state */ + s.infun = infun; + s.inhow = inhow; + s.left = 0; + s.bitbuf = 0; + s.bitcnt = 0; + + /* initialize output state */ + s.outfun = outfun; + s.outhow = outhow; + s.next = 0; + s.first = 1; + + /* return if bits() or decode() tries to read past available input */ + if (setjmp(s.env) != 0) /* if came back here via longjmp(), */ + err = 2; /* then skip decomp(), return error */ + else + err = decomp(&s); /* decompress */ + + /* write any leftover output and update the error code if needed */ + if (err != 1 && s.next && s.outfun(s.outhow, s.out, s.next) && err == 0) + err = 1; + return err; + } + + #ifdef TEST + /* Example of how to use blast() */ + #include + #include + + #define CHUNK 16384 + + local unsigned inf(void *how, unsigned char **buf) + { + static unsigned char hold[CHUNK]; + + *buf = hold; + return fread(hold, 1, CHUNK, (FILE *)how); + } + + local int outf(void *how, unsigned char *buf, unsigned len) + { + return fwrite(buf, 1, len, (FILE *)how) != len; + } + + /* Decompress a PKWare Compression Library stream from stdin to stdout */ + int main(void) + { + int ret, n; + + /* decompress to stdout */ + ret = blast(inf, stdin, outf, stdout); + if (ret != 0) fprintf(stderr, "blast error: %d\n", ret); + + /* see if there are any leftover bytes */ + n = 0; + while (getchar() != EOF) n++; + if (n) fprintf(stderr, "blast warning: %d unused bytes of input\n", n); + + /* return blast() error code */ + return ret; + } + #endif diff -Nrcpad gcc-4.4.4/zlib/contrib/blast/blast.h gcc-4.4.5/zlib/contrib/blast/blast.h *** gcc-4.4.4/zlib/contrib/blast/blast.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/blast/blast.h Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,71 ---- + /* blast.h -- interface for blast.c + Copyright (C) 2003 Mark Adler + version 1.1, 16 Feb 2003 + + This software is provided 'as-is', without any express or implied + warranty. In no event will the author be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Mark Adler madler@alumni.caltech.edu + */ + + + /* + * blast() decompresses the PKWare Data Compression Library (DCL) compressed + * format. It provides the same functionality as the explode() function in + * that library. (Note: PKWare overused the "implode" verb, and the format + * used by their library implode() function is completely different and + * incompatible with the implode compression method supported by PKZIP.) + */ + + + typedef unsigned (*blast_in)(void *how, unsigned char **buf); + typedef int (*blast_out)(void *how, unsigned char *buf, unsigned len); + /* Definitions for input/output functions passed to blast(). See below for + * what the provided functions need to do. + */ + + + int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow); + /* Decompress input to output using the provided infun() and outfun() calls. + * On success, the return value of blast() is zero. If there is an error in + * the source data, i.e. it is not in the proper format, then a negative value + * is returned. If there is not enough input available or there is not enough + * output space, then a positive error is returned. + * + * The input function is invoked: len = infun(how, &buf), where buf is set by + * infun() to point to the input buffer, and infun() returns the number of + * available bytes there. If infun() returns zero, then blast() returns with + * an input error. (blast() only asks for input if it needs it.) inhow is for + * use by the application to pass an input descriptor to infun(), if desired. + * + * The output function is invoked: err = outfun(how, buf, len), where the bytes + * to be written are buf[0..len-1]. If err is not zero, then blast() returns + * with an output error. outfun() is always called with len <= 4096. outhow + * is for use by the application to pass an output descriptor to outfun(), if + * desired. + * + * The return codes are: + * + * 2: ran out of input before completing decompression + * 1: output error before completing decompression + * 0: successful decompression + * -1: literal flag not zero or one + * -2: dictionary size not in 4..6 + * -3: distance is too far back + * + * At the bottom of blast.c is an example program that uses blast() that can be + * compiled to produce a command-line decompression filter by defining TEST. + */ diff -Nrcpad gcc-4.4.4/zlib/contrib/blast/test.pk gcc-4.4.5/zlib/contrib/blast/test.pk *** gcc-4.4.4/zlib/contrib/blast/test.pk Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/blast/test.pk Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1 ---- + ‚$%€ \ No newline at end of file diff -Nrcpad gcc-4.4.4/zlib/contrib/blast/test.txt gcc-4.4.5/zlib/contrib/blast/test.txt *** gcc-4.4.4/zlib/contrib/blast/test.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/blast/test.txt Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1 ---- + AIAIAIAIAIAIA \ No newline at end of file diff -Nrcpad gcc-4.4.4/zlib/contrib/delphi/ZLib.pas gcc-4.4.5/zlib/contrib/delphi/ZLib.pas *** gcc-4.4.4/zlib/contrib/delphi/ZLib.pas Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/delphi/ZLib.pas Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,557 ---- + {*******************************************************} + { } + { Borland Delphi Supplemental Components } + { ZLIB Data Compression Interface Unit } + { } + { Copyright (c) 1997,99 Borland Corporation } + { } + {*******************************************************} + + { Updated for zlib 1.2.x by Cosmin Truta } + + unit ZLib; + + interface + + uses SysUtils, Classes; + + type + TAlloc = function (AppData: Pointer; Items, Size: Integer): Pointer; cdecl; + TFree = procedure (AppData, Block: Pointer); cdecl; + + // Internal structure. Ignore. + TZStreamRec = packed record + next_in: PChar; // next input byte + avail_in: Integer; // number of bytes available at next_in + total_in: Longint; // total nb of input bytes read so far + + next_out: PChar; // next output byte should be put here + avail_out: Integer; // remaining free space at next_out + total_out: Longint; // total nb of bytes output so far + + msg: PChar; // last error message, NULL if no error + internal: Pointer; // not visible by applications + + zalloc: TAlloc; // used to allocate the internal state + zfree: TFree; // used to free the internal state + AppData: Pointer; // private data object passed to zalloc and zfree + + data_type: Integer; // best guess about the data type: ascii or binary + adler: Longint; // adler32 value of the uncompressed data + reserved: Longint; // reserved for future use + end; + + // Abstract ancestor class + TCustomZlibStream = class(TStream) + private + FStrm: TStream; + FStrmPos: Integer; + FOnProgress: TNotifyEvent; + FZRec: TZStreamRec; + FBuffer: array [Word] of Char; + protected + procedure Progress(Sender: TObject); dynamic; + property OnProgress: TNotifyEvent read FOnProgress write FOnProgress; + constructor Create(Strm: TStream); + end; + + { TCompressionStream compresses data on the fly as data is written to it, and + stores the compressed data to another stream. + + TCompressionStream is write-only and strictly sequential. Reading from the + stream will raise an exception. Using Seek to move the stream pointer + will raise an exception. + + Output data is cached internally, written to the output stream only when + the internal output buffer is full. All pending output data is flushed + when the stream is destroyed. + + The Position property returns the number of uncompressed bytes of + data that have been written to the stream so far. + + CompressionRate returns the on-the-fly percentage by which the original + data has been compressed: (1 - (CompressedBytes / UncompressedBytes)) * 100 + If raw data size = 100 and compressed data size = 25, the CompressionRate + is 75% + + The OnProgress event is called each time the output buffer is filled and + written to the output stream. This is useful for updating a progress + indicator when you are writing a large chunk of data to the compression + stream in a single call.} + + + TCompressionLevel = (clNone, clFastest, clDefault, clMax); + + TCompressionStream = class(TCustomZlibStream) + private + function GetCompressionRate: Single; + public + constructor Create(CompressionLevel: TCompressionLevel; Dest: TStream); + destructor Destroy; override; + function Read(var Buffer; Count: Longint): Longint; override; + function Write(const Buffer; Count: Longint): Longint; override; + function Seek(Offset: Longint; Origin: Word): Longint; override; + property CompressionRate: Single read GetCompressionRate; + property OnProgress; + end; + + { TDecompressionStream decompresses data on the fly as data is read from it. + + Compressed data comes from a separate source stream. TDecompressionStream + is read-only and unidirectional; you can seek forward in the stream, but not + backwards. The special case of setting the stream position to zero is + allowed. Seeking forward decompresses data until the requested position in + the uncompressed data has been reached. Seeking backwards, seeking relative + to the end of the stream, requesting the size of the stream, and writing to + the stream will raise an exception. + + The Position property returns the number of bytes of uncompressed data that + have been read from the stream so far. + + The OnProgress event is called each time the internal input buffer of + compressed data is exhausted and the next block is read from the input stream. + This is useful for updating a progress indicator when you are reading a + large chunk of data from the decompression stream in a single call.} + + TDecompressionStream = class(TCustomZlibStream) + public + constructor Create(Source: TStream); + destructor Destroy; override; + function Read(var Buffer; Count: Longint): Longint; override; + function Write(const Buffer; Count: Longint): Longint; override; + function Seek(Offset: Longint; Origin: Word): Longint; override; + property OnProgress; + end; + + + + { CompressBuf compresses data, buffer to buffer, in one call. + In: InBuf = ptr to compressed data + InBytes = number of bytes in InBuf + Out: OutBuf = ptr to newly allocated buffer containing decompressed data + OutBytes = number of bytes in OutBuf } + procedure CompressBuf(const InBuf: Pointer; InBytes: Integer; + out OutBuf: Pointer; out OutBytes: Integer); + + + { DecompressBuf decompresses data, buffer to buffer, in one call. + In: InBuf = ptr to compressed data + InBytes = number of bytes in InBuf + OutEstimate = zero, or est. size of the decompressed data + Out: OutBuf = ptr to newly allocated buffer containing decompressed data + OutBytes = number of bytes in OutBuf } + procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer; + OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer); + + { DecompressToUserBuf decompresses data, buffer to buffer, in one call. + In: InBuf = ptr to compressed data + InBytes = number of bytes in InBuf + Out: OutBuf = ptr to user-allocated buffer to contain decompressed data + BufSize = number of bytes in OutBuf } + procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer; + const OutBuf: Pointer; BufSize: Integer); + + const + zlib_version = '1.2.3'; + + type + EZlibError = class(Exception); + ECompressionError = class(EZlibError); + EDecompressionError = class(EZlibError); + + implementation + + uses ZLibConst; + + const + Z_NO_FLUSH = 0; + Z_PARTIAL_FLUSH = 1; + Z_SYNC_FLUSH = 2; + Z_FULL_FLUSH = 3; + Z_FINISH = 4; + + Z_OK = 0; + Z_STREAM_END = 1; + Z_NEED_DICT = 2; + Z_ERRNO = (-1); + Z_STREAM_ERROR = (-2); + Z_DATA_ERROR = (-3); + Z_MEM_ERROR = (-4); + Z_BUF_ERROR = (-5); + Z_VERSION_ERROR = (-6); + + Z_NO_COMPRESSION = 0; + Z_BEST_SPEED = 1; + Z_BEST_COMPRESSION = 9; + Z_DEFAULT_COMPRESSION = (-1); + + Z_FILTERED = 1; + Z_HUFFMAN_ONLY = 2; + Z_RLE = 3; + Z_DEFAULT_STRATEGY = 0; + + Z_BINARY = 0; + Z_ASCII = 1; + Z_UNKNOWN = 2; + + Z_DEFLATED = 8; + + + {$L adler32.obj} + {$L compress.obj} + {$L crc32.obj} + {$L deflate.obj} + {$L infback.obj} + {$L inffast.obj} + {$L inflate.obj} + {$L inftrees.obj} + {$L trees.obj} + {$L uncompr.obj} + {$L zutil.obj} + + procedure adler32; external; + procedure compressBound; external; + procedure crc32; external; + procedure deflateInit2_; external; + procedure deflateParams; external; + + function _malloc(Size: Integer): Pointer; cdecl; + begin + Result := AllocMem(Size); + end; + + procedure _free(Block: Pointer); cdecl; + begin + FreeMem(Block); + end; + + procedure _memset(P: Pointer; B: Byte; count: Integer); cdecl; + begin + FillChar(P^, count, B); + end; + + procedure _memcpy(dest, source: Pointer; count: Integer); cdecl; + begin + Move(source^, dest^, count); + end; + + + + // deflate compresses data + function deflateInit_(var strm: TZStreamRec; level: Integer; version: PChar; + recsize: Integer): Integer; external; + function deflate(var strm: TZStreamRec; flush: Integer): Integer; external; + function deflateEnd(var strm: TZStreamRec): Integer; external; + + // inflate decompresses data + function inflateInit_(var strm: TZStreamRec; version: PChar; + recsize: Integer): Integer; external; + function inflate(var strm: TZStreamRec; flush: Integer): Integer; external; + function inflateEnd(var strm: TZStreamRec): Integer; external; + function inflateReset(var strm: TZStreamRec): Integer; external; + + + function zlibAllocMem(AppData: Pointer; Items, Size: Integer): Pointer; cdecl; + begin + // GetMem(Result, Items*Size); + Result := AllocMem(Items * Size); + end; + + procedure zlibFreeMem(AppData, Block: Pointer); cdecl; + begin + FreeMem(Block); + end; + + {function zlibCheck(code: Integer): Integer; + begin + Result := code; + if code < 0 then + raise EZlibError.Create('error'); //!! + end;} + + function CCheck(code: Integer): Integer; + begin + Result := code; + if code < 0 then + raise ECompressionError.Create('error'); //!! + end; + + function DCheck(code: Integer): Integer; + begin + Result := code; + if code < 0 then + raise EDecompressionError.Create('error'); //!! + end; + + procedure CompressBuf(const InBuf: Pointer; InBytes: Integer; + out OutBuf: Pointer; out OutBytes: Integer); + var + strm: TZStreamRec; + P: Pointer; + begin + FillChar(strm, sizeof(strm), 0); + strm.zalloc := zlibAllocMem; + strm.zfree := zlibFreeMem; + OutBytes := ((InBytes + (InBytes div 10) + 12) + 255) and not 255; + GetMem(OutBuf, OutBytes); + try + strm.next_in := InBuf; + strm.avail_in := InBytes; + strm.next_out := OutBuf; + strm.avail_out := OutBytes; + CCheck(deflateInit_(strm, Z_BEST_COMPRESSION, zlib_version, sizeof(strm))); + try + while CCheck(deflate(strm, Z_FINISH)) <> Z_STREAM_END do + begin + P := OutBuf; + Inc(OutBytes, 256); + ReallocMem(OutBuf, OutBytes); + strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P))); + strm.avail_out := 256; + end; + finally + CCheck(deflateEnd(strm)); + end; + ReallocMem(OutBuf, strm.total_out); + OutBytes := strm.total_out; + except + FreeMem(OutBuf); + raise + end; + end; + + + procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer; + OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer); + var + strm: TZStreamRec; + P: Pointer; + BufInc: Integer; + begin + FillChar(strm, sizeof(strm), 0); + strm.zalloc := zlibAllocMem; + strm.zfree := zlibFreeMem; + BufInc := (InBytes + 255) and not 255; + if OutEstimate = 0 then + OutBytes := BufInc + else + OutBytes := OutEstimate; + GetMem(OutBuf, OutBytes); + try + strm.next_in := InBuf; + strm.avail_in := InBytes; + strm.next_out := OutBuf; + strm.avail_out := OutBytes; + DCheck(inflateInit_(strm, zlib_version, sizeof(strm))); + try + while DCheck(inflate(strm, Z_NO_FLUSH)) <> Z_STREAM_END do + begin + P := OutBuf; + Inc(OutBytes, BufInc); + ReallocMem(OutBuf, OutBytes); + strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P))); + strm.avail_out := BufInc; + end; + finally + DCheck(inflateEnd(strm)); + end; + ReallocMem(OutBuf, strm.total_out); + OutBytes := strm.total_out; + except + FreeMem(OutBuf); + raise + end; + end; + + procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer; + const OutBuf: Pointer; BufSize: Integer); + var + strm: TZStreamRec; + begin + FillChar(strm, sizeof(strm), 0); + strm.zalloc := zlibAllocMem; + strm.zfree := zlibFreeMem; + strm.next_in := InBuf; + strm.avail_in := InBytes; + strm.next_out := OutBuf; + strm.avail_out := BufSize; + DCheck(inflateInit_(strm, zlib_version, sizeof(strm))); + try + if DCheck(inflate(strm, Z_FINISH)) <> Z_STREAM_END then + raise EZlibError.CreateRes(@sTargetBufferTooSmall); + finally + DCheck(inflateEnd(strm)); + end; + end; + + // TCustomZlibStream + + constructor TCustomZLibStream.Create(Strm: TStream); + begin + inherited Create; + FStrm := Strm; + FStrmPos := Strm.Position; + FZRec.zalloc := zlibAllocMem; + FZRec.zfree := zlibFreeMem; + end; + + procedure TCustomZLibStream.Progress(Sender: TObject); + begin + if Assigned(FOnProgress) then FOnProgress(Sender); + end; + + + // TCompressionStream + + constructor TCompressionStream.Create(CompressionLevel: TCompressionLevel; + Dest: TStream); + const + Levels: array [TCompressionLevel] of ShortInt = + (Z_NO_COMPRESSION, Z_BEST_SPEED, Z_DEFAULT_COMPRESSION, Z_BEST_COMPRESSION); + begin + inherited Create(Dest); + FZRec.next_out := FBuffer; + FZRec.avail_out := sizeof(FBuffer); + CCheck(deflateInit_(FZRec, Levels[CompressionLevel], zlib_version, sizeof(FZRec))); + end; + + destructor TCompressionStream.Destroy; + begin + FZRec.next_in := nil; + FZRec.avail_in := 0; + try + if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos; + while (CCheck(deflate(FZRec, Z_FINISH)) <> Z_STREAM_END) + and (FZRec.avail_out = 0) do + begin + FStrm.WriteBuffer(FBuffer, sizeof(FBuffer)); + FZRec.next_out := FBuffer; + FZRec.avail_out := sizeof(FBuffer); + end; + if FZRec.avail_out < sizeof(FBuffer) then + FStrm.WriteBuffer(FBuffer, sizeof(FBuffer) - FZRec.avail_out); + finally + deflateEnd(FZRec); + end; + inherited Destroy; + end; + + function TCompressionStream.Read(var Buffer; Count: Longint): Longint; + begin + raise ECompressionError.CreateRes(@sInvalidStreamOp); + end; + + function TCompressionStream.Write(const Buffer; Count: Longint): Longint; + begin + FZRec.next_in := @Buffer; + FZRec.avail_in := Count; + if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos; + while (FZRec.avail_in > 0) do + begin + CCheck(deflate(FZRec, 0)); + if FZRec.avail_out = 0 then + begin + FStrm.WriteBuffer(FBuffer, sizeof(FBuffer)); + FZRec.next_out := FBuffer; + FZRec.avail_out := sizeof(FBuffer); + FStrmPos := FStrm.Position; + Progress(Self); + end; + end; + Result := Count; + end; + + function TCompressionStream.Seek(Offset: Longint; Origin: Word): Longint; + begin + if (Offset = 0) and (Origin = soFromCurrent) then + Result := FZRec.total_in + else + raise ECompressionError.CreateRes(@sInvalidStreamOp); + end; + + function TCompressionStream.GetCompressionRate: Single; + begin + if FZRec.total_in = 0 then + Result := 0 + else + Result := (1.0 - (FZRec.total_out / FZRec.total_in)) * 100.0; + end; + + + // TDecompressionStream + + constructor TDecompressionStream.Create(Source: TStream); + begin + inherited Create(Source); + FZRec.next_in := FBuffer; + FZRec.avail_in := 0; + DCheck(inflateInit_(FZRec, zlib_version, sizeof(FZRec))); + end; + + destructor TDecompressionStream.Destroy; + begin + FStrm.Seek(-FZRec.avail_in, 1); + inflateEnd(FZRec); + inherited Destroy; + end; + + function TDecompressionStream.Read(var Buffer; Count: Longint): Longint; + begin + FZRec.next_out := @Buffer; + FZRec.avail_out := Count; + if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos; + while (FZRec.avail_out > 0) do + begin + if FZRec.avail_in = 0 then + begin + FZRec.avail_in := FStrm.Read(FBuffer, sizeof(FBuffer)); + if FZRec.avail_in = 0 then + begin + Result := Count - FZRec.avail_out; + Exit; + end; + FZRec.next_in := FBuffer; + FStrmPos := FStrm.Position; + Progress(Self); + end; + CCheck(inflate(FZRec, 0)); + end; + Result := Count; + end; + + function TDecompressionStream.Write(const Buffer; Count: Longint): Longint; + begin + raise EDecompressionError.CreateRes(@sInvalidStreamOp); + end; + + function TDecompressionStream.Seek(Offset: Longint; Origin: Word): Longint; + var + I: Integer; + Buf: array [0..4095] of Char; + begin + if (Offset = 0) and (Origin = soFromBeginning) then + begin + DCheck(inflateReset(FZRec)); + FZRec.next_in := FBuffer; + FZRec.avail_in := 0; + FStrm.Position := 0; + FStrmPos := 0; + end + else if ( (Offset >= 0) and (Origin = soFromCurrent)) or + ( ((Offset - FZRec.total_out) > 0) and (Origin = soFromBeginning)) then + begin + if Origin = soFromBeginning then Dec(Offset, FZRec.total_out); + if Offset > 0 then + begin + for I := 1 to Offset div sizeof(Buf) do + ReadBuffer(Buf, sizeof(Buf)); + ReadBuffer(Buf, Offset mod sizeof(Buf)); + end; + end + else + raise EDecompressionError.CreateRes(@sInvalidStreamOp); + Result := FZRec.total_out; + end; + + + end. diff -Nrcpad gcc-4.4.4/zlib/contrib/delphi/ZLibConst.pas gcc-4.4.5/zlib/contrib/delphi/ZLibConst.pas *** gcc-4.4.4/zlib/contrib/delphi/ZLibConst.pas Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/delphi/ZLibConst.pas Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,11 ---- + unit ZLibConst; + + interface + + resourcestring + sTargetBufferTooSmall = 'ZLib error: target buffer may be too small'; + sInvalidStreamOp = 'Invalid stream operation'; + + implementation + + end. diff -Nrcpad gcc-4.4.4/zlib/contrib/delphi/readme.txt gcc-4.4.5/zlib/contrib/delphi/readme.txt *** gcc-4.4.4/zlib/contrib/delphi/readme.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/delphi/readme.txt Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,76 ---- + + Overview + ======== + + This directory contains an update to the ZLib interface unit, + distributed by Borland as a Delphi supplemental component. + + The original ZLib unit is Copyright (c) 1997,99 Borland Corp., + and is based on zlib version 1.0.4. There are a series of bugs + and security problems associated with that old zlib version, and + we recommend the users to update their ZLib unit. + + + Summary of modifications + ======================== + + - Improved makefile, adapted to zlib version 1.2.1. + + - Some field types from TZStreamRec are changed from Integer to + Longint, for consistency with the zlib.h header, and for 64-bit + readiness. + + - The zlib_version constant is updated. + + - The new Z_RLE strategy has its corresponding symbolic constant. + + - The allocation and deallocation functions and function types + (TAlloc, TFree, zlibAllocMem and zlibFreeMem) are now cdecl, + and _malloc and _free are added as C RTL stubs. As a result, + the original C sources of zlib can be compiled out of the box, + and linked to the ZLib unit. + + + Suggestions for improvements + ============================ + + Currently, the ZLib unit provides only a limited wrapper around + the zlib library, and much of the original zlib functionality is + missing. Handling compressed file formats like ZIP/GZIP or PNG + cannot be implemented without having this functionality. + Applications that handle these formats are either using their own, + duplicated code, or not using the ZLib unit at all. + + Here are a few suggestions: + + - Checksum class wrappers around adler32() and crc32(), similar + to the Java classes that implement the java.util.zip.Checksum + interface. + + - The ability to read and write raw deflate streams, without the + zlib stream header and trailer. Raw deflate streams are used + in the ZIP file format. + + - The ability to read and write gzip streams, used in the GZIP + file format, and normally produced by the gzip program. + + - The ability to select a different compression strategy, useful + to PNG and MNG image compression, and to multimedia compression + in general. Besides the compression level + + TCompressionLevel = (clNone, clFastest, clDefault, clMax); + + which, in fact, could have used the 'z' prefix and avoided + TColor-like symbols + + TCompressionLevel = (zcNone, zcFastest, zcDefault, zcMax); + + there could be a compression strategy + + TCompressionStrategy = (zsDefault, zsFiltered, zsHuffmanOnly, zsRle); + + - ZIP and GZIP stream handling via TStreams. + + + -- + Cosmin Truta diff -Nrcpad gcc-4.4.4/zlib/contrib/delphi/zlibd32.mak gcc-4.4.5/zlib/contrib/delphi/zlibd32.mak *** gcc-4.4.4/zlib/contrib/delphi/zlibd32.mak Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/delphi/zlibd32.mak Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,93 ---- + # Makefile for zlib + # For use with Delphi and C++ Builder under Win32 + # Updated for zlib 1.2.x by Cosmin Truta + + # ------------ Borland C++ ------------ + + # This project uses the Delphi (fastcall/register) calling convention: + LOC = -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl + + CC = bcc32 + LD = bcc32 + AR = tlib + # do not use "-pr" in CFLAGS + CFLAGS = -a -d -k- -O2 $(LOC) + LDFLAGS = + + + # variables + ZLIB_LIB = zlib.lib + + OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj + OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj + OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj + OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj + + + # targets + all: $(ZLIB_LIB) example.exe minigzip.exe + + .c.obj: + $(CC) -c $(CFLAGS) $*.c + + adler32.obj: adler32.c zlib.h zconf.h + + compress.obj: compress.c zlib.h zconf.h + + crc32.obj: crc32.c zlib.h zconf.h crc32.h + + deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h + + gzio.obj: gzio.c zutil.h zlib.h zconf.h + + infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + + inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h + + inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + + inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h + + trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h + + uncompr.obj: uncompr.c zlib.h zconf.h + + zutil.obj: zutil.c zutil.h zlib.h zconf.h + + example.obj: example.c zlib.h zconf.h + + minigzip.obj: minigzip.c zlib.h zconf.h + + + # For the sake of the old Borland make, + # the command line is cut to fit in the MS-DOS 128 byte limit: + $(ZLIB_LIB): $(OBJ1) $(OBJ2) + -del $(ZLIB_LIB) + $(AR) $(ZLIB_LIB) $(OBJP1) + $(AR) $(ZLIB_LIB) $(OBJP2) + + + # testing + test: example.exe minigzip.exe + example + echo hello world | minigzip | minigzip -d + + example.exe: example.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) example.obj $(ZLIB_LIB) + + minigzip.exe: minigzip.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB) + + + # cleanup + clean: + -del *.obj + -del *.exe + -del *.lib + -del *.tds + -del zlib.bak + -del foo.gz + diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs *** gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,58 ---- + using System.Reflection; + using System.Runtime.CompilerServices; + + // + // General Information about an assembly is controlled through the following + // set of attributes. Change these attribute values to modify the information + // associated with an assembly. + // + [assembly: AssemblyTitle("DotZLib")] + [assembly: AssemblyDescription(".Net bindings for ZLib compression dll 1.2.x")] + [assembly: AssemblyConfiguration("")] + [assembly: AssemblyCompany("Henrik Ravn")] + [assembly: AssemblyProduct("")] + [assembly: AssemblyCopyright("(c) 2004 by Henrik Ravn")] + [assembly: AssemblyTrademark("")] + [assembly: AssemblyCulture("")] + + // + // Version information for an assembly consists of the following four values: + // + // Major Version + // Minor Version + // Build Number + // Revision + // + // You can specify all the values or you can default the Revision and Build Numbers + // by using the '*' as shown below: + + [assembly: AssemblyVersion("1.0.*")] + + // + // In order to sign your assembly you must specify a key to use. Refer to the + // Microsoft .NET Framework documentation for more information on assembly signing. + // + // Use the attributes below to control which key is used for signing. + // + // Notes: + // (*) If no key is specified, the assembly is not signed. + // (*) KeyName refers to a key that has been installed in the Crypto Service + // Provider (CSP) on your machine. KeyFile refers to a file which contains + // a key. + // (*) If the KeyFile and the KeyName values are both specified, the + // following processing occurs: + // (1) If the KeyName can be found in the CSP, that key is used. + // (2) If the KeyName does not exist and the KeyFile does exist, the key + // in the KeyFile is installed into the CSP and used. + // (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility. + // When specifying the KeyFile, the location of the KeyFile should be + // relative to the project output directory which is + // %Project Directory%\obj\. For example, if your KeyFile is + // located in the project directory, you would specify the AssemblyKeyFile + // attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")] + // (*) Delay Signing is an advanced option - see the Microsoft .NET Framework + // documentation for more information on this. + // + [assembly: AssemblyDelaySign(false)] + [assembly: AssemblyKeyFile("")] + [assembly: AssemblyKeyName("")] diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs *** gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,202 ---- + // + // © Copyright Henrik Ravn 2004 + // + // Use, modification and distribution are subject to the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + // + + using System; + using System.Runtime.InteropServices; + using System.Text; + + + namespace DotZLib + { + #region ChecksumGeneratorBase + /// + /// Implements the common functionality needed for all s + /// + /// + public abstract class ChecksumGeneratorBase : ChecksumGenerator + { + /// + /// The value of the current checksum + /// + protected uint _current; + + /// + /// Initializes a new instance of the checksum generator base - the current checksum is + /// set to zero + /// + public ChecksumGeneratorBase() + { + _current = 0; + } + + /// + /// Initializes a new instance of the checksum generator basewith a specified value + /// + /// The value to set the current checksum to + public ChecksumGeneratorBase(uint initialValue) + { + _current = initialValue; + } + + /// + /// Resets the current checksum to zero + /// + public void Reset() { _current = 0; } + + /// + /// Gets the current checksum value + /// + public uint Value { get { return _current; } } + + /// + /// Updates the current checksum with part of an array of bytes + /// + /// The data to update the checksum with + /// Where in data to start updating + /// The number of bytes from data to use + /// The sum of offset and count is larger than the length of data + /// data is a null reference + /// Offset or count is negative. + /// All the other Update methods are implmeneted in terms of this one. + /// This is therefore the only method a derived class has to implement + public abstract void Update(byte[] data, int offset, int count); + + /// + /// Updates the current checksum with an array of bytes. + /// + /// The data to update the checksum with + public void Update(byte[] data) + { + Update(data, 0, data.Length); + } + + /// + /// Updates the current checksum with the data from a string + /// + /// The string to update the checksum with + /// The characters in the string are converted by the UTF-8 encoding + public void Update(string data) + { + Update(Encoding.UTF8.GetBytes(data)); + } + + /// + /// Updates the current checksum with the data from a string, using a specific encoding + /// + /// The string to update the checksum with + /// The encoding to use + public void Update(string data, Encoding encoding) + { + Update(encoding.GetBytes(data)); + } + + } + #endregion + + #region CRC32 + /// + /// Implements a CRC32 checksum generator + /// + public sealed class CRC32Checksum : ChecksumGeneratorBase + { + #region DLL imports + + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern uint crc32(uint crc, int data, uint length); + + #endregion + + /// + /// Initializes a new instance of the CRC32 checksum generator + /// + public CRC32Checksum() : base() {} + + /// + /// Initializes a new instance of the CRC32 checksum generator with a specified value + /// + /// The value to set the current checksum to + public CRC32Checksum(uint initialValue) : base(initialValue) {} + + /// + /// Updates the current checksum with part of an array of bytes + /// + /// The data to update the checksum with + /// Where in data to start updating + /// The number of bytes from data to use + /// The sum of offset and count is larger than the length of data + /// data is a null reference + /// Offset or count is negative. + public override void Update(byte[] data, int offset, int count) + { + if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException(); + if ((offset+count) > data.Length) throw new ArgumentException(); + GCHandle hData = GCHandle.Alloc(data, GCHandleType.Pinned); + try + { + _current = crc32(_current, hData.AddrOfPinnedObject().ToInt32()+offset, (uint)count); + } + finally + { + hData.Free(); + } + } + + } + #endregion + + #region Adler + /// + /// Implements a checksum generator that computes the Adler checksum on data + /// + public sealed class AdlerChecksum : ChecksumGeneratorBase + { + #region DLL imports + + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern uint adler32(uint adler, int data, uint length); + + #endregion + + /// + /// Initializes a new instance of the Adler checksum generator + /// + public AdlerChecksum() : base() {} + + /// + /// Initializes a new instance of the Adler checksum generator with a specified value + /// + /// The value to set the current checksum to + public AdlerChecksum(uint initialValue) : base(initialValue) {} + + /// + /// Updates the current checksum with part of an array of bytes + /// + /// The data to update the checksum with + /// Where in data to start updating + /// The number of bytes from data to use + /// The sum of offset and count is larger than the length of data + /// data is a null reference + /// Offset or count is negative. + public override void Update(byte[] data, int offset, int count) + { + if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException(); + if ((offset+count) > data.Length) throw new ArgumentException(); + GCHandle hData = GCHandle.Alloc(data, GCHandleType.Pinned); + try + { + _current = adler32(_current, hData.AddrOfPinnedObject().ToInt32()+offset, (uint)count); + } + finally + { + hData.Free(); + } + } + + } + #endregion + + } \ No newline at end of file diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs *** gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,83 ---- + // + // © Copyright Henrik Ravn 2004 + // + // Use, modification and distribution are subject to the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + // + + using System; + using System.Diagnostics; + + namespace DotZLib + { + + /// + /// This class implements a circular buffer + /// + internal class CircularBuffer + { + #region Private data + private int _capacity; + private int _head; + private int _tail; + private int _size; + private byte[] _buffer; + #endregion + + public CircularBuffer(int capacity) + { + Debug.Assert( capacity > 0 ); + _buffer = new byte[capacity]; + _capacity = capacity; + _head = 0; + _tail = 0; + _size = 0; + } + + public int Size { get { return _size; } } + + public int Put(byte[] source, int offset, int count) + { + Debug.Assert( count > 0 ); + int trueCount = Math.Min(count, _capacity - Size); + for (int i = 0; i < trueCount; ++i) + _buffer[(_tail+i) % _capacity] = source[offset+i]; + _tail += trueCount; + _tail %= _capacity; + _size += trueCount; + return trueCount; + } + + public bool Put(byte b) + { + if (Size == _capacity) // no room + return false; + _buffer[_tail++] = b; + _tail %= _capacity; + ++_size; + return true; + } + + public int Get(byte[] destination, int offset, int count) + { + int trueCount = Math.Min(count,Size); + for (int i = 0; i < trueCount; ++i) + destination[offset + i] = _buffer[(_head+i) % _capacity]; + _head += trueCount; + _head %= _capacity; + _size -= trueCount; + return trueCount; + } + + public int Get() + { + if (Size == 0) + return -1; + + int result = (int)_buffer[_head++ % _capacity]; + --_size; + return result; + } + + } + } diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/CodecBase.cs gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/CodecBase.cs *** gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/CodecBase.cs Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/CodecBase.cs Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,198 ---- + // + // © Copyright Henrik Ravn 2004 + // + // Use, modification and distribution are subject to the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + // + + using System; + using System.Runtime.InteropServices; + + namespace DotZLib + { + /// + /// Implements the common functionality needed for all s + /// + public abstract class CodecBase : Codec, IDisposable + { + + #region Data members + + /// + /// Instance of the internal zlib buffer structure that is + /// passed to all functions in the zlib dll + /// + internal ZStream _ztream = new ZStream(); + + /// + /// True if the object instance has been disposed, false otherwise + /// + protected bool _isDisposed = false; + + /// + /// The size of the internal buffers + /// + protected const int kBufferSize = 16384; + + private byte[] _outBuffer = new byte[kBufferSize]; + private byte[] _inBuffer = new byte[kBufferSize]; + + private GCHandle _hInput; + private GCHandle _hOutput; + + private uint _checksum = 0; + + #endregion + + /// + /// Initializes a new instance of the CodeBase class. + /// + public CodecBase() + { + try + { + _hInput = GCHandle.Alloc(_inBuffer, GCHandleType.Pinned); + _hOutput = GCHandle.Alloc(_outBuffer, GCHandleType.Pinned); + } + catch (Exception) + { + CleanUp(false); + throw; + } + } + + + #region Codec Members + + /// + /// Occurs when more processed data are available. + /// + public event DataAvailableHandler DataAvailable; + + /// + /// Fires the event + /// + protected void OnDataAvailable() + { + if (_ztream.total_out > 0) + { + if (DataAvailable != null) + DataAvailable( _outBuffer, 0, (int)_ztream.total_out); + resetOutput(); + } + } + + /// + /// Adds more data to the codec to be processed. + /// + /// Byte array containing the data to be added to the codec + /// Adding data may, or may not, raise the DataAvailable event + public void Add(byte[] data) + { + Add(data,0,data.Length); + } + + /// + /// Adds more data to the codec to be processed. + /// + /// Byte array containing the data to be added to the codec + /// The index of the first byte to add from data + /// The number of bytes to add + /// Adding data may, or may not, raise the DataAvailable event + /// This must be implemented by a derived class + public abstract void Add(byte[] data, int offset, int count); + + /// + /// Finishes up any pending data that needs to be processed and handled. + /// + /// This must be implemented by a derived class + public abstract void Finish(); + + /// + /// Gets the checksum of the data that has been added so far + /// + public uint Checksum { get { return _checksum; } } + + #endregion + + #region Destructor & IDisposable stuff + + /// + /// Destroys this instance + /// + ~CodecBase() + { + CleanUp(false); + } + + /// + /// Releases any unmanaged resources and calls the method of the derived class + /// + public void Dispose() + { + CleanUp(true); + } + + /// + /// Performs any codec specific cleanup + /// + /// This must be implemented by a derived class + protected abstract void CleanUp(); + + // performs the release of the handles and calls the dereived CleanUp() + private void CleanUp(bool isDisposing) + { + if (!_isDisposed) + { + CleanUp(); + if (_hInput.IsAllocated) + _hInput.Free(); + if (_hOutput.IsAllocated) + _hOutput.Free(); + + _isDisposed = true; + } + } + + + #endregion + + #region Helper methods + + /// + /// Copies a number of bytes to the internal codec buffer - ready for proccesing + /// + /// The byte array that contains the data to copy + /// The index of the first byte to copy + /// The number of bytes to copy from data + protected void copyInput(byte[] data, int startIndex, int count) + { + Array.Copy(data, startIndex, _inBuffer,0, count); + _ztream.next_in = _hInput.AddrOfPinnedObject(); + _ztream.total_in = 0; + _ztream.avail_in = (uint)count; + + } + + /// + /// Resets the internal output buffers to a known state - ready for processing + /// + protected void resetOutput() + { + _ztream.total_out = 0; + _ztream.avail_out = kBufferSize; + _ztream.next_out = _hOutput.AddrOfPinnedObject(); + } + + /// + /// Updates the running checksum property + /// + /// The new checksum value + protected void setChecksum(uint newSum) + { + _checksum = newSum; + } + #endregion + + } + } diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/Deflater.cs gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/Deflater.cs *** gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/Deflater.cs Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/Deflater.cs Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,106 ---- + // + // © Copyright Henrik Ravn 2004 + // + // Use, modification and distribution are subject to the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + // + + using System; + using System.Diagnostics; + using System.Runtime.InteropServices; + + namespace DotZLib + { + + /// + /// Implements a data compressor, using the deflate algorithm in the ZLib dll + /// + public sealed class Deflater : CodecBase + { + #region Dll imports + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)] + private static extern int deflateInit_(ref ZStream sz, int level, string vs, int size); + + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern int deflate(ref ZStream sz, int flush); + + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern int deflateReset(ref ZStream sz); + + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern int deflateEnd(ref ZStream sz); + #endregion + + /// + /// Constructs an new instance of the Deflater + /// + /// The compression level to use for this Deflater + public Deflater(CompressLevel level) : base() + { + int retval = deflateInit_(ref _ztream, (int)level, Info.Version, Marshal.SizeOf(_ztream)); + if (retval != 0) + throw new ZLibException(retval, "Could not initialize deflater"); + + resetOutput(); + } + + /// + /// Adds more data to the codec to be processed. + /// + /// Byte array containing the data to be added to the codec + /// The index of the first byte to add from data + /// The number of bytes to add + /// Adding data may, or may not, raise the DataAvailable event + public override void Add(byte[] data, int offset, int count) + { + if (data == null) throw new ArgumentNullException(); + if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException(); + if ((offset+count) > data.Length) throw new ArgumentException(); + + int total = count; + int inputIndex = offset; + int err = 0; + + while (err >= 0 && inputIndex < total) + { + copyInput(data, inputIndex, Math.Min(total - inputIndex, kBufferSize)); + while (err >= 0 && _ztream.avail_in > 0) + { + err = deflate(ref _ztream, (int)FlushTypes.None); + if (err == 0) + while (_ztream.avail_out == 0) + { + OnDataAvailable(); + err = deflate(ref _ztream, (int)FlushTypes.None); + } + inputIndex += (int)_ztream.total_in; + } + } + setChecksum( _ztream.adler ); + } + + + /// + /// Finishes up any pending data that needs to be processed and handled. + /// + public override void Finish() + { + int err; + do + { + err = deflate(ref _ztream, (int)FlushTypes.Finish); + OnDataAvailable(); + } + while (err == 0); + setChecksum( _ztream.adler ); + deflateReset(ref _ztream); + resetOutput(); + } + + /// + /// Closes the internal zlib deflate stream + /// + protected override void CleanUp() { deflateEnd(ref _ztream); } + + } + } diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/DotZLib.cs gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/DotZLib.cs *** gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/DotZLib.cs Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/DotZLib.cs Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,288 ---- + // + // © Copyright Henrik Ravn 2004 + // + // Use, modification and distribution are subject to the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + // + + using System; + using System.IO; + using System.Runtime.InteropServices; + using System.Text; + + + namespace DotZLib + { + + #region Internal types + + /// + /// Defines constants for the various flush types used with zlib + /// + internal enum FlushTypes + { + None, Partial, Sync, Full, Finish, Block + } + + #region ZStream structure + // internal mapping of the zlib zstream structure for marshalling + [StructLayoutAttribute(LayoutKind.Sequential, Pack=4, Size=0, CharSet=CharSet.Ansi)] + internal struct ZStream + { + public IntPtr next_in; + public uint avail_in; + public uint total_in; + + public IntPtr next_out; + public uint avail_out; + public uint total_out; + + [MarshalAs(UnmanagedType.LPStr)] + string msg; + uint state; + + uint zalloc; + uint zfree; + uint opaque; + + int data_type; + public uint adler; + uint reserved; + } + + #endregion + + #endregion + + #region Public enums + /// + /// Defines constants for the available compression levels in zlib + /// + public enum CompressLevel : int + { + /// + /// The default compression level with a reasonable compromise between compression and speed + /// + Default = -1, + /// + /// No compression at all. The data are passed straight through. + /// + None = 0, + /// + /// The maximum compression rate available. + /// + Best = 9, + /// + /// The fastest available compression level. + /// + Fastest = 1 + } + #endregion + + #region Exception classes + /// + /// The exception that is thrown when an error occurs on the zlib dll + /// + public class ZLibException : ApplicationException + { + /// + /// Initializes a new instance of the class with a specified + /// error message and error code + /// + /// The zlib error code that caused the exception + /// A message that (hopefully) describes the error + public ZLibException(int errorCode, string msg) : base(String.Format("ZLib error {0} {1}", errorCode, msg)) + { + } + + /// + /// Initializes a new instance of the class with a specified + /// error code + /// + /// The zlib error code that caused the exception + public ZLibException(int errorCode) : base(String.Format("ZLib error {0}", errorCode)) + { + } + } + #endregion + + #region Interfaces + + /// + /// Declares methods and properties that enables a running checksum to be calculated + /// + public interface ChecksumGenerator + { + /// + /// Gets the current value of the checksum + /// + uint Value { get; } + + /// + /// Clears the current checksum to 0 + /// + void Reset(); + + /// + /// Updates the current checksum with an array of bytes + /// + /// The data to update the checksum with + void Update(byte[] data); + + /// + /// Updates the current checksum with part of an array of bytes + /// + /// The data to update the checksum with + /// Where in data to start updating + /// The number of bytes from data to use + /// The sum of offset and count is larger than the length of data + /// data is a null reference + /// Offset or count is negative. + void Update(byte[] data, int offset, int count); + + /// + /// Updates the current checksum with the data from a string + /// + /// The string to update the checksum with + /// The characters in the string are converted by the UTF-8 encoding + void Update(string data); + + /// + /// Updates the current checksum with the data from a string, using a specific encoding + /// + /// The string to update the checksum with + /// The encoding to use + void Update(string data, Encoding encoding); + } + + + /// + /// Represents the method that will be called from a codec when new data + /// are available. + /// + /// The byte array containing the processed data + /// The index of the first processed byte in data + /// The number of processed bytes available + /// On return from this method, the data may be overwritten, so grab it while you can. + /// You cannot assume that startIndex will be zero. + /// + public delegate void DataAvailableHandler(byte[] data, int startIndex, int count); + + /// + /// Declares methods and events for implementing compressors/decompressors + /// + public interface Codec + { + /// + /// Occurs when more processed data are available. + /// + event DataAvailableHandler DataAvailable; + + /// + /// Adds more data to the codec to be processed. + /// + /// Byte array containing the data to be added to the codec + /// Adding data may, or may not, raise the DataAvailable event + void Add(byte[] data); + + /// + /// Adds more data to the codec to be processed. + /// + /// Byte array containing the data to be added to the codec + /// The index of the first byte to add from data + /// The number of bytes to add + /// Adding data may, or may not, raise the DataAvailable event + void Add(byte[] data, int offset, int count); + + /// + /// Finishes up any pending data that needs to be processed and handled. + /// + void Finish(); + + /// + /// Gets the checksum of the data that has been added so far + /// + uint Checksum { get; } + + + } + + #endregion + + #region Classes + /// + /// Encapsulates general information about the ZLib library + /// + public class Info + { + #region DLL imports + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern uint zlibCompileFlags(); + + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern string zlibVersion(); + #endregion + + #region Private stuff + private uint _flags; + + // helper function that unpacks a bitsize mask + private static int bitSize(uint bits) + { + switch (bits) + { + case 0: return 16; + case 1: return 32; + case 2: return 64; + } + return -1; + } + #endregion + + /// + /// Constructs an instance of the Info class. + /// + public Info() + { + _flags = zlibCompileFlags(); + } + + /// + /// True if the library is compiled with debug info + /// + public bool HasDebugInfo { get { return 0 != (_flags & 0x100); } } + + /// + /// True if the library is compiled with assembly optimizations + /// + public bool UsesAssemblyCode { get { return 0 != (_flags & 0x200); } } + + /// + /// Gets the size of the unsigned int that was compiled into Zlib + /// + public int SizeOfUInt { get { return bitSize(_flags & 3); } } + + /// + /// Gets the size of the unsigned long that was compiled into Zlib + /// + public int SizeOfULong { get { return bitSize((_flags >> 2) & 3); } } + + /// + /// Gets the size of the pointers that were compiled into Zlib + /// + public int SizeOfPointer { get { return bitSize((_flags >> 4) & 3); } } + + /// + /// Gets the size of the z_off_t type that was compiled into Zlib + /// + public int SizeOfOffset { get { return bitSize((_flags >> 6) & 3); } } + + /// + /// Gets the version of ZLib as a string, e.g. "1.2.1" + /// + public static string Version { get { return zlibVersion(); } } + } + + #endregion + + } diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj *** gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,141 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/GZipStream.cs gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/GZipStream.cs *** gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/GZipStream.cs Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/GZipStream.cs Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,301 ---- + // + // © Copyright Henrik Ravn 2004 + // + // Use, modification and distribution are subject to the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + // + + using System; + using System.IO; + using System.Runtime.InteropServices; + + namespace DotZLib + { + /// + /// Implements a compressed , in GZip (.gz) format. + /// + public class GZipStream : Stream, IDisposable + { + #region Dll Imports + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)] + private static extern IntPtr gzopen(string name, string mode); + + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern int gzclose(IntPtr gzFile); + + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern int gzwrite(IntPtr gzFile, int data, int length); + + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern int gzread(IntPtr gzFile, int data, int length); + + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern int gzgetc(IntPtr gzFile); + + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern int gzputc(IntPtr gzFile, int c); + + #endregion + + #region Private data + private IntPtr _gzFile; + private bool _isDisposed = false; + private bool _isWriting; + #endregion + + #region Constructors + /// + /// Creates a new file as a writeable GZipStream + /// + /// The name of the compressed file to create + /// The compression level to use when adding data + /// If an error occurred in the internal zlib function + public GZipStream(string fileName, CompressLevel level) + { + _isWriting = true; + _gzFile = gzopen(fileName, String.Format("wb{0}", (int)level)); + if (_gzFile == IntPtr.Zero) + throw new ZLibException(-1, "Could not open " + fileName); + } + + /// + /// Opens an existing file as a readable GZipStream + /// + /// The name of the file to open + /// If an error occurred in the internal zlib function + public GZipStream(string fileName) + { + _isWriting = false; + _gzFile = gzopen(fileName, "rb"); + if (_gzFile == IntPtr.Zero) + throw new ZLibException(-1, "Could not open " + fileName); + + } + #endregion + + #region Access properties + /// + /// Returns true of this stream can be read from, false otherwise + /// + public override bool CanRead + { + get + { + return !_isWriting; + } + } + + + /// + /// Returns false. + /// + public override bool CanSeek + { + get + { + return false; + } + } + + /// + /// Returns true if this tsream is writeable, false otherwise + /// + public override bool CanWrite + { + get + { + return _isWriting; + } + } + #endregion + + #region Destructor & IDispose stuff + + /// + /// Destroys this instance + /// + ~GZipStream() + { + cleanUp(false); + } + + /// + /// Closes the external file handle + /// + public void Dispose() + { + cleanUp(true); + } + + // Does the actual closing of the file handle. + private void cleanUp(bool isDisposing) + { + if (!_isDisposed) + { + gzclose(_gzFile); + _isDisposed = true; + } + } + #endregion + + #region Basic reading and writing + /// + /// Attempts to read a number of bytes from the stream. + /// + /// The destination data buffer + /// The index of the first destination byte in buffer + /// The number of bytes requested + /// The number of bytes read + /// If buffer is null + /// If count or offset are negative + /// If offset + count is > buffer.Length + /// If this stream is not readable. + /// If this stream has been disposed. + public override int Read(byte[] buffer, int offset, int count) + { + if (!CanRead) throw new NotSupportedException(); + if (buffer == null) throw new ArgumentNullException(); + if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException(); + if ((offset+count) > buffer.Length) throw new ArgumentException(); + if (_isDisposed) throw new ObjectDisposedException("GZipStream"); + + GCHandle h = GCHandle.Alloc(buffer, GCHandleType.Pinned); + int result; + try + { + result = gzread(_gzFile, h.AddrOfPinnedObject().ToInt32() + offset, count); + if (result < 0) + throw new IOException(); + } + finally + { + h.Free(); + } + return result; + } + + /// + /// Attempts to read a single byte from the stream. + /// + /// The byte that was read, or -1 in case of error or End-Of-File + public override int ReadByte() + { + if (!CanRead) throw new NotSupportedException(); + if (_isDisposed) throw new ObjectDisposedException("GZipStream"); + return gzgetc(_gzFile); + } + + /// + /// Writes a number of bytes to the stream + /// + /// + /// + /// + /// If buffer is null + /// If count or offset are negative + /// If offset + count is > buffer.Length + /// If this stream is not writeable. + /// If this stream has been disposed. + public override void Write(byte[] buffer, int offset, int count) + { + if (!CanWrite) throw new NotSupportedException(); + if (buffer == null) throw new ArgumentNullException(); + if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException(); + if ((offset+count) > buffer.Length) throw new ArgumentException(); + if (_isDisposed) throw new ObjectDisposedException("GZipStream"); + + GCHandle h = GCHandle.Alloc(buffer, GCHandleType.Pinned); + try + { + int result = gzwrite(_gzFile, h.AddrOfPinnedObject().ToInt32() + offset, count); + if (result < 0) + throw new IOException(); + } + finally + { + h.Free(); + } + } + + /// + /// Writes a single byte to the stream + /// + /// The byte to add to the stream. + /// If this stream is not writeable. + /// If this stream has been disposed. + public override void WriteByte(byte value) + { + if (!CanWrite) throw new NotSupportedException(); + if (_isDisposed) throw new ObjectDisposedException("GZipStream"); + + int result = gzputc(_gzFile, (int)value); + if (result < 0) + throw new IOException(); + } + #endregion + + #region Position & length stuff + /// + /// Not supported. + /// + /// + /// Always thrown + public override void SetLength(long value) + { + throw new NotSupportedException(); + } + + /// + /// Not suppported. + /// + /// + /// + /// + /// Always thrown + public override long Seek(long offset, SeekOrigin origin) + { + throw new NotSupportedException(); + } + + /// + /// Flushes the GZipStream. + /// + /// In this implementation, this method does nothing. This is because excessive + /// flushing may degrade the achievable compression rates. + public override void Flush() + { + // left empty on purpose + } + + /// + /// Gets/sets the current position in the GZipStream. Not suppported. + /// + /// In this implementation this property is not supported + /// Always thrown + public override long Position + { + get + { + throw new NotSupportedException(); + } + set + { + throw new NotSupportedException(); + } + } + + /// + /// Gets the size of the stream. Not suppported. + /// + /// In this implementation this property is not supported + /// Always thrown + public override long Length + { + get + { + throw new NotSupportedException(); + } + } + #endregion + } + } diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/Inflater.cs gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/Inflater.cs *** gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/Inflater.cs Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/Inflater.cs Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,105 ---- + // + // © Copyright Henrik Ravn 2004 + // + // Use, modification and distribution are subject to the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + // + + using System; + using System.Diagnostics; + using System.Runtime.InteropServices; + + namespace DotZLib + { + + /// + /// Implements a data decompressor, using the inflate algorithm in the ZLib dll + /// + public class Inflater : CodecBase + { + #region Dll imports + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)] + private static extern int inflateInit_(ref ZStream sz, string vs, int size); + + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern int inflate(ref ZStream sz, int flush); + + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern int inflateReset(ref ZStream sz); + + [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] + private static extern int inflateEnd(ref ZStream sz); + #endregion + + /// + /// Constructs an new instance of the Inflater + /// + public Inflater() : base() + { + int retval = inflateInit_(ref _ztream, Info.Version, Marshal.SizeOf(_ztream)); + if (retval != 0) + throw new ZLibException(retval, "Could not initialize inflater"); + + resetOutput(); + } + + + /// + /// Adds more data to the codec to be processed. + /// + /// Byte array containing the data to be added to the codec + /// The index of the first byte to add from data + /// The number of bytes to add + /// Adding data may, or may not, raise the DataAvailable event + public override void Add(byte[] data, int offset, int count) + { + if (data == null) throw new ArgumentNullException(); + if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException(); + if ((offset+count) > data.Length) throw new ArgumentException(); + + int total = count; + int inputIndex = offset; + int err = 0; + + while (err >= 0 && inputIndex < total) + { + copyInput(data, inputIndex, Math.Min(total - inputIndex, kBufferSize)); + err = inflate(ref _ztream, (int)FlushTypes.None); + if (err == 0) + while (_ztream.avail_out == 0) + { + OnDataAvailable(); + err = inflate(ref _ztream, (int)FlushTypes.None); + } + + inputIndex += (int)_ztream.total_in; + } + setChecksum( _ztream.adler ); + } + + + /// + /// Finishes up any pending data that needs to be processed and handled. + /// + public override void Finish() + { + int err; + do + { + err = inflate(ref _ztream, (int)FlushTypes.Finish); + OnDataAvailable(); + } + while (err == 0); + setChecksum( _ztream.adler ); + inflateReset(ref _ztream); + resetOutput(); + } + + /// + /// Closes the internal zlib inflate stream + /// + protected override void CleanUp() { inflateEnd(ref _ztream); } + + + } + } diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/UnitTests.cs gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/UnitTests.cs *** gcc-4.4.4/zlib/contrib/dotzlib/DotZLib/UnitTests.cs Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/DotZLib/UnitTests.cs Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,274 ---- + // + // © Copyright Henrik Ravn 2004 + // + // Use, modification and distribution are subject to the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + // + + using System; + using System.Collections; + using System.IO; + + // uncomment the define below to include unit tests + //#define nunit + #if nunit + using NUnit.Framework; + + // Unit tests for the DotZLib class library + // ---------------------------------------- + // + // Use this with NUnit 2 from http://www.nunit.org + // + + namespace DotZLibTests + { + using DotZLib; + + // helper methods + internal class Utils + { + public static bool byteArrEqual( byte[] lhs, byte[] rhs ) + { + if (lhs.Length != rhs.Length) + return false; + for (int i = lhs.Length-1; i >= 0; --i) + if (lhs[i] != rhs[i]) + return false; + return true; + } + + } + + + [TestFixture] + public class CircBufferTests + { + #region Circular buffer tests + [Test] + public void SinglePutGet() + { + CircularBuffer buf = new CircularBuffer(10); + Assert.AreEqual( 0, buf.Size ); + Assert.AreEqual( -1, buf.Get() ); + + Assert.IsTrue(buf.Put( 1 )); + Assert.AreEqual( 1, buf.Size ); + Assert.AreEqual( 1, buf.Get() ); + Assert.AreEqual( 0, buf.Size ); + Assert.AreEqual( -1, buf.Get() ); + } + + [Test] + public void BlockPutGet() + { + CircularBuffer buf = new CircularBuffer(10); + byte[] arr = {1,2,3,4,5,6,7,8,9,10}; + Assert.AreEqual( 10, buf.Put(arr,0,10) ); + Assert.AreEqual( 10, buf.Size ); + Assert.IsFalse( buf.Put(11) ); + Assert.AreEqual( 1, buf.Get() ); + Assert.IsTrue( buf.Put(11) ); + + byte[] arr2 = (byte[])arr.Clone(); + Assert.AreEqual( 9, buf.Get(arr2,1,9) ); + Assert.IsTrue( Utils.byteArrEqual(arr,arr2) ); + } + + #endregion + } + + [TestFixture] + public class ChecksumTests + { + #region CRC32 Tests + [Test] + public void CRC32_Null() + { + CRC32Checksum crc32 = new CRC32Checksum(); + Assert.AreEqual( 0, crc32.Value ); + + crc32 = new CRC32Checksum(1); + Assert.AreEqual( 1, crc32.Value ); + + crc32 = new CRC32Checksum(556); + Assert.AreEqual( 556, crc32.Value ); + } + + [Test] + public void CRC32_Data() + { + CRC32Checksum crc32 = new CRC32Checksum(); + byte[] data = { 1,2,3,4,5,6,7 }; + crc32.Update(data); + Assert.AreEqual( 0x70e46888, crc32.Value ); + + crc32 = new CRC32Checksum(); + crc32.Update("penguin"); + Assert.AreEqual( 0x0e5c1a120, crc32.Value ); + + crc32 = new CRC32Checksum(1); + crc32.Update("penguin"); + Assert.AreEqual(0x43b6aa94, crc32.Value); + + } + #endregion + + #region Adler tests + + [Test] + public void Adler_Null() + { + AdlerChecksum adler = new AdlerChecksum(); + Assert.AreEqual(0, adler.Value); + + adler = new AdlerChecksum(1); + Assert.AreEqual( 1, adler.Value ); + + adler = new AdlerChecksum(556); + Assert.AreEqual( 556, adler.Value ); + } + + [Test] + public void Adler_Data() + { + AdlerChecksum adler = new AdlerChecksum(1); + byte[] data = { 1,2,3,4,5,6,7 }; + adler.Update(data); + Assert.AreEqual( 0x5b001d, adler.Value ); + + adler = new AdlerChecksum(); + adler.Update("penguin"); + Assert.AreEqual(0x0bcf02f6, adler.Value ); + + adler = new AdlerChecksum(1); + adler.Update("penguin"); + Assert.AreEqual(0x0bd602f7, adler.Value); + + } + #endregion + } + + [TestFixture] + public class InfoTests + { + #region Info tests + [Test] + public void Info_Version() + { + Info info = new Info(); + Assert.AreEqual("1.2.3", Info.Version); + Assert.AreEqual(32, info.SizeOfUInt); + Assert.AreEqual(32, info.SizeOfULong); + Assert.AreEqual(32, info.SizeOfPointer); + Assert.AreEqual(32, info.SizeOfOffset); + } + #endregion + } + + [TestFixture] + public class DeflateInflateTests + { + #region Deflate tests + [Test] + public void Deflate_Init() + { + using (Deflater def = new Deflater(CompressLevel.Default)) + { + } + } + + private ArrayList compressedData = new ArrayList(); + private uint adler1; + + private ArrayList uncompressedData = new ArrayList(); + private uint adler2; + + public void CDataAvail(byte[] data, int startIndex, int count) + { + for (int i = 0; i < count; ++i) + compressedData.Add(data[i+startIndex]); + } + + [Test] + public void Deflate_Compress() + { + compressedData.Clear(); + + byte[] testData = new byte[35000]; + for (int i = 0; i < testData.Length; ++i) + testData[i] = 5; + + using (Deflater def = new Deflater((CompressLevel)5)) + { + def.DataAvailable += new DataAvailableHandler(CDataAvail); + def.Add(testData); + def.Finish(); + adler1 = def.Checksum; + } + } + #endregion + + #region Inflate tests + [Test] + public void Inflate_Init() + { + using (Inflater inf = new Inflater()) + { + } + } + + private void DDataAvail(byte[] data, int startIndex, int count) + { + for (int i = 0; i < count; ++i) + uncompressedData.Add(data[i+startIndex]); + } + + [Test] + public void Inflate_Expand() + { + uncompressedData.Clear(); + + using (Inflater inf = new Inflater()) + { + inf.DataAvailable += new DataAvailableHandler(DDataAvail); + inf.Add((byte[])compressedData.ToArray(typeof(byte))); + inf.Finish(); + adler2 = inf.Checksum; + } + Assert.AreEqual( adler1, adler2 ); + } + #endregion + } + + [TestFixture] + public class GZipStreamTests + { + #region GZipStream test + [Test] + public void GZipStream_WriteRead() + { + using (GZipStream gzOut = new GZipStream("gzstream.gz", CompressLevel.Best)) + { + BinaryWriter writer = new BinaryWriter(gzOut); + writer.Write("hi there"); + writer.Write(Math.PI); + writer.Write(42); + } + + using (GZipStream gzIn = new GZipStream("gzstream.gz")) + { + BinaryReader reader = new BinaryReader(gzIn); + string s = reader.ReadString(); + Assert.AreEqual("hi there",s); + double d = reader.ReadDouble(); + Assert.AreEqual(Math.PI, d); + int i = reader.ReadInt32(); + Assert.AreEqual(42,i); + } + + } + #endregion + } + } + + #endif \ No newline at end of file diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/DotZLib.build gcc-4.4.5/zlib/contrib/dotzlib/DotZLib.build *** gcc-4.4.4/zlib/contrib/dotzlib/DotZLib.build Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/DotZLib.build Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,33 ---- +  + + A .Net wrapper library around ZLib1.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/DotZLib.chm gcc-4.4.5/zlib/contrib/dotzlib/DotZLib.chm *** gcc-4.4.4/zlib/contrib/dotzlib/DotZLib.chm Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/DotZLib.chm Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,213 ---- + ITSF`LÚZ¢ý|ª{О  É"æìý|ª{О  É"æì`xT0Ì0þITSPT + ÿÿÿÿ j’].!Ðù É"æìTÿÿÿÿÿÿÿÿÿÿÿÿPMGLAÿÿÿÿ//#IDXHDR˜áy /#ITBITS /#STRINGS™Ësœ/#SYSTEM‚¡,/#TOPICS™y`/#URLSTR™Ÿ!¬R/#URLTBL™’YŒH /#WINDOWS”Ú"L /$FIftiMain–¹i‚¨ /$OBJINST–¤*•?/$WWAssociativeLinks//$WWAssociativeLinks/Property–¤&/$WWKeywordLinks//$WWKeywordLinks/BTree”Ûn°L/$WWKeywordLinks/Data–Œ:–z/$WWKeywordLinks/Map–£4R/$WWKeywordLinks/Property–¤ /Documentation.hhc’¹E§x/Documentation.hhk“á=A/DotZLib.AdlerChecksum.htmlÊBŒ-/DotZLib.AdlerChecksum.Update_overload_3.html‚Õy–U,/DotZLib.AdlerChecksum.Update_overloads.html‚ÆzŽ&/DotZLib.AdlerChecksumConstructor.html‚ƒ‹ '/DotZLib.AdlerChecksumConstructor1.html‚Ž?ˆS'/DotZLib.AdlerChecksumConstructor2.html‚—Šm"/DotZLib.AdlerChecksumMembers.htmlÖX¬G"/DotZLib.AdlerChecksumMethods.html‚¡¤{/DotZLib.ChecksumGenerator.html‚ìNŠL%/DotZLib.ChecksumGenerator.Reset.htmlƒ§Jˆ:1/DotZLib.ChecksumGenerator.Update_overload_1.htmlƒì1/DotZLib.ChecksumGenerator.Update_overload_2.htmlƒßvŒ1/DotZLib.ChecksumGenerator.Update_overload_3.htmlƒÊ•_1/DotZLib.ChecksumGenerator.Update_overload_4.htmlƒ¾l‹+0/DotZLib.ChecksumGenerator.Update_overloads.htmlƒ°Žh%/DotZLib.ChecksumGenerator.Value.htmlƒ‘<ˆV,/DotZLib.ChecksumGeneratorBase._current.html„Ü0ˆd#/DotZLib.ChecksumGeneratorBase.htmlƒù)ŒL)/DotZLib.ChecksumGeneratorBase.Reset.html… ‰B5/DotZLib.ChecksumGeneratorBase.Update_overload_1.html…è<Ž55/DotZLib.ChecksumGeneratorBase.Update_overload_2.html…Û + 25/DotZLib.ChecksumGeneratorBase.Update_overload_3.html…ÂA˜I5/DotZLib.ChecksumGeneratorBase.Update_overload_4.html…µ{ŒF4/DotZLib.ChecksumGeneratorBase.Update_overloads.html…¦O,)/DotZLib.ChecksumGeneratorBase.Value.html„ðX‰T./DotZLib.ChecksumGeneratorBaseConstructor.html„¯NŒD//DotZLib.ChecksumGeneratorBaseConstructor1.html„¼‰>//DotZLib.ChecksumGeneratorBaseConstructor2.html„ÅP‹#)/DotZLib.ChecksumGeneratorBaseFields.html„Ðs‹=*/DotZLib.ChecksumGeneratorBaseMembers.html„…u©Y*/DotZLib.ChecksumGeneratorBaseMethods.html„ú,¢a-/DotZLib.ChecksumGeneratorBaseProperties.html„å‹D&/DotZLib.ChecksumGeneratorMembers.html‚÷Žo&/DotZLib.ChecksumGeneratorMethods.htmlƒš8)/DotZLib.ChecksumGeneratorProperties.htmlƒ† ‹3"/DotZLib.Codec.Add_overload_1.html†ÇŽb"/DotZLib.Codec.Add_overload_2.html†»J‹K!/DotZLib.Codec.Add_overloads.html†±!Š)/DotZLib.Codec.Checksum.html†œ'ˆA!/DotZLib.Codec.DataAvailable.html†ètˆ&/DotZLib.Codec.Finish.html†Õwˆ1/DotZLib.Codec.html…öq‰m#/DotZLib.CodecBase._isDisposed.html‡ÉIˆ[&/DotZLib.CodecBase.Add_overload_1.htmlˆ°z&/DotZLib.CodecBase.Add_overload_2.htmlˆ¤3ŒG%/DotZLib.CodecBase.Add_overloads.htmlˆ™`ŠS /DotZLib.CodecBase.Checksum.html‡å\‰4/DotZLib.CodecBase.CleanUp.htmlˆÁ ‰!/DotZLib.CodecBase.copyInput.htmlˆÊJ%/DotZLib.CodecBase.DataAvailable.html‰ša‰#/DotZLib.CodecBase.Dispose.htmlˆ×ZŠ# /DotZLib.CodecBase.Finalize.htmlˆá}ˆ*/DotZLib.CodecBase.Finish.htmlˆê'‰y/DotZLib.CodecBase.html†ñ‹1#/DotZLib.CodecBase.kBufferSize.html‡Ò$ˆA'/DotZLib.CodecBase.OnDataAvailable.htmlˆô ˆo#/DotZLib.CodecBase.resetOutput.htmlˆýˆ]#/DotZLib.CodecBase.setChecksum.html‰…lŠ"/DotZLib.CodecBaseConstructor.html‡´‡a/DotZLib.CodecBaseEvents.html‰}Šd/DotZLib.CodecBaseFields.html‡»uT/DotZLib.CodecBaseMembers.html†üK·I/DotZLib.CodecBaseMethods.html‡ïªP!/DotZLib.CodecBaseProperties.html‡ÚeŠw/DotZLib.CodecEvents.html†Þ(ŠL/DotZLib.CodecMembers.html†€^j/DotZLib.CodecMethods.html†¤hŒ9/DotZLib.CodecProperties.html†‘HŠ_/DotZLib.CompressLevel.html‰¤/DotZLib.CRC32Checksum.html‰³‹s-/DotZLib.CRC32Checksum.Update_overload_3.htmlо3–U,/DotZLib.CRC32Checksum.Update_overloads.htmlН4Ž&/DotZLib.CRC32ChecksumConstructor.html‰ëY‹ '/DotZLib.CRC32ChecksumConstructor1.html‰öyˆS'/DotZLib.CRC32ChecksumConstructor2.html‰ÿLŠm"/DotZLib.CRC32ChecksumMembers.html‰¿¬G"/DotZLib.CRC32ChecksumMethods.htmlŠŠ9¤{"/DotZLib.DataAvailableHandler.htmlŠÕ<%/DotZLib.Deflater.Add_overload_1.html‹éb$/DotZLib.Deflater.Add_overloads.html‹ÞLŠD/DotZLib.Deflater.CleanUp.html‹ørˆ4/DotZLib.Deflater.Finish.htmlŒ&‰&b  ö @ q · + ê + fwuVaJx” Ž>fPMGL,ÿÿÿÿ/DotZLib.Deflater.htmlŠâD‹K!/DotZLib.DeflaterConstructor.html‹§‰/DotZLib.DeflaterMembers.htmlŠî¹/DotZLib.DeflaterMethods.html‹°/® /DotZLib.GZipStream.CanRead.htmlž3ˆf /DotZLib.GZipStream.CanSeek.html§ˆ7!/DotZLib.GZipStream.CanWrite.html¯Pˆe /DotZLib.GZipStream.Dispose.htmlŽ“|‰G!/DotZLib.GZipStream.Finalize.htmlŽCˆ./DotZLib.GZipStream.Flush.htmlŽ¥q‰c/DotZLib.GZipStream.htmlŒŠLZ/DotZLib.GZipStream.Length.html¸5Œ6!/DotZLib.GZipStream.Position.htmlÄkŒd/DotZLib.GZipStream.Read.htmlޝT˜7!/DotZLib.GZipStream.ReadByte.htmlŽÈ ‰*/DotZLib.GZipStream.Seek.htmlŽÑ5Ž5"/DotZLib.GZipStream.SetLength.htmlŽßjŒs/DotZLib.GZipStream.Write.htmlŽì]–w"/DotZLib.GZipStream.WriteByte.htmlƒT#/DotZLib.GZipStreamConstructor.htmlŒå{Š`$/DotZLib.GZipStreamConstructor1.htmlŒð[ŽP$/DotZLib.GZipStreamConstructor2.htmlŒÿ+/DotZLib.GZipStreamMembers.htmlŒ˜&ÍU/DotZLib.GZipStreamMethods.htmlÑOÂ-"/DotZLib.GZipStreamProperties.htmlŒ9‘z /DotZLib.html¨9¢ %/DotZLib.Inflater.Add_overload_1.html—`b$/DotZLib.Inflater.Add_overloads.htmlŠD/DotZLib.Inflater.CleanUp.html§Bˆ4/DotZLib.Inflater.Finish.html¯v‰&/DotZLib.Inflater.html’n‹E!/DotZLib.InflaterConstructor.html×9‡F/DotZLib.InflaterMembers.htmlž3¹/DotZLib.InflaterMethods.htmlÞ®/DotZLib.Info.HasDebugInfo.html‘4ˆE/DotZLib.Info.html¹ŠG/DotZLib.Info.SizeOfOffset.html‘˜yˆP /DotZLib.Info.SizeOfPointer.html‘¡IˆP/DotZLib.Info.SizeOfUInt.html‘ªˆJ/DotZLib.Info.SizeOfULong.html‘²cˆN#/DotZLib.Info.UsesAssemblyCode.html‘»1ˆ]/DotZLib.Info.Version.html‘ĈB/DotZLib.InfoConstructor.htmlò‡?/DotZLib.InfoMembers.htmlÃc®;/DotZLib.InfoProperties.htmlù]–W/DotZLib.ZLibException.html‘ÌP8&/DotZLib.ZLibExceptionConstructor.html’” '/DotZLib.ZLibExceptionConstructor1.html’¡$'/DotZLib.ZLibExceptionConstructor2.html’®&‹"/DotZLib.ZLibExceptionMembers.html‘Ú¹| /MSDN.css”š+¿w/privmethod.gif”Œ‡ /protfield.gif“ït‡/protmethod.gif“÷‡ /protproperty.gif”“‡ /pubevent.gif“þ†e/pubmethod.gif“á~†y/pubproperty.gif“èw†} /static.gif”„w‡ ::DataSpace/NameList<(::DataSpace/Storage/MSCompressed/Content£Bƒ³ + ,::DataSpace/Storage/MSCompressed/ControlDataj)::DataSpace/Storage/MSCompressed/SpanInfob/::DataSpace/Storage/MSCompressed/Transform/List<&_::DataSpace/Storage/MSCompressed/Transform/{7FC28940-9D31-11D0-9B27-00A0C91E9C7C}/InstanceData/i::DataSpace/Storage/MSCompressed/Transform/{7FC28940-9D31-11D0-9B27-00A0C91E9C7C}/InstanceData/ResetTableotZLib.CodecBase.Add_overload_2.htmlˆ¤3ŒG%/DotZLib.CodecBase.Add_overloads.htmlˆ™`ŠS /DotZLib.CodecBase.Checksum.html‡å\‰4/DotZLib.CodecBase.CleanUp.htmlˆÁ ‰!/DotZLib.CodecBase.copyInput.htmlˆÊJ%/DotZLib.CodecBase.DataAvailable.html‰ša‰#/DotZLib.CodecBase.Dispose.htmlˆ×ZŠ# /DotZLib.CodecBase.Finalize.htmlˆá}ˆ*/DotZLib.CodecBase.Finish.htmlˆê'‰y/DotZLib.CodecBase.html†ñ‹1#/DotZLib.CodecBase.kBufferSize.html‡Ò$ˆA'/DotZLib.CodecBase.OnDataAvailable.htmlˆô ˆo#/DotZLib.CodecBase.resetOutput.htmlˆýˆ]#/DotZLib.CodecBase.setChecksum.html‰…lŠ"/DotZLib.CodecBaseConstructor.html‡´‡a/DotZLib.CodecBaseEvents.html‰}Šd/DotZLib.CodecBaseFields.html‡»uT/DotZLib.CodecBaseMembers.html†üK·I/DotZLib.CodecBaseMethods.html‡ïªP!/DotZLib.CodecBaseProperties.html‡ÚeŠw/DotZLib.CodecEvents.html†Þ(ŠL/DotZLib.CodecMembers.html†€^j/DotZLib.CodecMethods.html†¤hŒ9/DotZLib.CodecProperties.html†‘HŠ_/DotZLib.CompressLevel.html‰¤/DotZLib.CRC32Checksum.html‰³‹s-/DotZLib.CRC32Checksum.Update_overload_3.htmlо3–U,/DotZLib.CRC32Checksum.Update_overloads.htmlН4Ž&/DotZLib.CRC32ChecksumConstructor.html‰ëY‹ '/DotZLib.CRC32ChecksumConstructor1.html‰öyˆS'/DotZLib.CRC32ChecksumConstructor2.html‰ÿLŠm"/DotZLib.CRC32ChecksumMembers.html‰¿¬G"/DotZLib.CRC32ChecksumMethods.htmlŠŠ9¤{"/DotZLib.DataAvailableHandler.htmlŠÕ<%/DotZLib.Deflater.Add_overload_1.html‹éb$/DotZLib.Deflater.Add_overloads.html‹ÞLŠD/DotZLib.Deflater.CleanUp.html‹ørˆ4/DotZLib.Deflater.Finish.htmlŒ&‰&b  ö @ q · + Q /Å\ˆÖ'tÀõ0w´BPMGIÝ//DotZLib.Deflater.html Uncompressed MSCompressed{7FC28940-9D31-11D0ûsLZXC (ûsŠÙ€ rz$Î1È64CðHŠVˆ_”vT¿ + ¶eLA HHA Version 4.74.8702$ °ËW¢žÄ DotZLib.htmlDocumentationdocumentation MsdnHelp¯c¬  T#SM©"´†ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ3@3U˜ i?Ê eM0’qC²`ÛY©-,1²"4¶oí¶+ûì¶¶’XGûˆò÷0¬#2`EIž%²e²NVB$KK—FøI–,y –'Kƒ((…[óÙ ½Êζsî½—.¹²ûÙ£_Å(lÎtã)\`ÀvÊø„úEᦢô€U AUô¥§n ’ø]K353`o@Û{mÚöµÚš$¬’²Ûº9²·v[{ºlYX’Ó6inýZ¶±ìš4®à4âÆH"|lcBhI!1€‹@@&@$\„#º@ºDÄÅû õØpÉiLâqZK!±A“•–Ž™'KpŒuã¥öI þÒËåÄ„vc¸`w'Í”œF³%,`ˆšÎ³˜Ñ%©–ÕÜòâ3Ä”Z¾geöçdÝ2Æ>Ù ò $º%¬ìT𘙎åfÄ—Yqƒ£ù5ì÷¡|;M‚98VR¼¨ÒÁ:¹¡TõTzxM~®{kUÀI‰upr[ c>'WÀ& s´%5aÀ{Vè 8Ÿ@Ÿà´ŽÙüØ…ÆZµ¢Ð ó ¼ÃOñA6 ¹ + ŸH\óü:»Œ˜&@œ×jòÏÔ!Žñ¤KžjaŸû?Í"îpj\âÕ—“UU&Œ¡À¿Á¦MeÌoŸû + wß6v›RP'B‰8 îVà» ‰rˆÎ¶[b3Öñ‘oX"B6“ïòFÒÐn›²@ m ð¸BDì t—­=:¤ªå£OQ7E…h5è]_7<@ªJƒŽh¯=³oä#á ±O¶}Èë|éÉ ùm…¶Ê’tÄóÁ®e’U×)²ìwÁX#Ì`ˆÛ¢¤ŠO—¾Ì3ÕrdRÛ¬Ÿñ^8Q//”xl†§KãË%R4§á¶ã„!Ih€©æV"9%­5.K*2­õMo5 >­?{>œéÛaý¿æÂŸfþó`Ïàâ…ëè?ü>`;z('1‡ûÅ÷¶Á‡Źr + ÒnÓŵñ\Ý…ÁNo³:%ý¬·Þ¨úaôY)Ÿ`ÕóO”¨É2Ë%U·ÍÇMMo)õHdKç Ó… + «ÅZ)àŠ|=IãIdГߙÀ¦Ä@­'ª:! ´íÍ’°Ä¶÷±ÍgðV¢%Ò0]Æ)ó“Ù + ­˜™š1ZÓ1Zº;jMR±\û:èDªé¿d’¥O™»NõÚÑxcBëcüëU.Èœl© jâÀÈXA¾ˆøÛéƒÅG&|‚†ýFþ€;)ú%úóo$M¾Ȳ„³šž õì3¥²¢Íp@«º‰Á­å|év€Aõ¬+ðùæP9Ö6@¨°}äÐìu€Õ¯È2X(¶§âÝ=)Åç³Å-]Z R-¬èÖGmò7‚z¥Ùôr¨ý«œøów"&Xí,Ì ˜XêM_´Ö¾˜on^ + $““šâÄŸ´Úø°îšæ§õ×m‡¨J»MÇšÒ¶+ªZl6ƪÕo[½^ÞöοÝÛ±·—"‡åÌe1Ñ¥Nn•×X¯ž0GJ½,z…£¥û7t§U`}VžžµSÚ "á§Ç¢Q †æyèÇN/,îD‹X‡/. FârQ›† 4hfD°‹_Nÿæöسd‚åÄŸCjo!EÛ‚0|Núhp´«VáÚ,‘ZpxàY”ZHÆ + ‘á›Ó /À[øÊ/‹ 0bXÃ_4|SiÊêFº¥ÅHV'ÏÊMøDœ4#©Þm½ÈƒÚI‰’_çC0Ö)À“å¤ÄPîôÈâå`›rR·°RP.ûLbƒnÿÐ/ºô»m€çŠnê<, + 1Ò~n¹›Uµëà7w¨«Œ;½aîýÒî*ò…‚Šb#z¯…E:J P°êE…Âú„FK+²á¶Ó︧햺ž×³‰µn ·åŽz·]ŸCìmF:£Þm—Õܤ°ÍzÒÖ}h§jΔ‰ÆÐH”f,ŒM‘V‹ xK¡d ÖÎ$¶ãÖQÌ€xuÏ2§f”ÑWò—øÆà!xÝÇ^‡ ã=QÍ(‰jq×[‘Ï‚ú¦' yÙ{‘Sö¦ Híë€Ù2ÃH§!QX s$yãpÁ½¡ä„ÎkÁ¿×ä§'®]+”+CZ§8)1]ªqIÞŠUO n%ð€e§ø†IÂK5ŠÈð·ƒgöwoÙñ¯ žË@ði â½ÿ´<;æc4e&Ú>¾†­uõòF'b> + £[jôÑͧB:D¦€@)gZM`ß§øÉ¿¶..#º$çú¬&ž|8¾Ì-¬t•äpTvÄI¤ æÿXˆÍi£[ ž5Wì%i¸çŒ0V»ð‹^ßl¡psPû´òdäõ›´ûroL/¡íš¬vZIGY½t/§XHoÈL\œcæ£:ò‹ê´´ÀH{…ðXÏ^àPU¬þO1>§n?—–Ö1éôŽ÷H([fWvržò‹éØL¹¬z¦ê—ý + +D]+1ý²/×_)Ú]ÁÒ\ÎÍ—ŽYÒ,Ê—¢ÅòYó\ €‹ ¹ú³„V[4 E­ìE1X[ÁÇmðIPú¨.Ë“ï‹Ú5-Š[®ÔF³ïeØþX¯XBáìúðÕ ÐK×EhÄs̸+ÛÝ:îöeöúUó³r–Žfró#{HK¾AnìßÑFl«`¶g-äŽÁÿµŸ‰=Fxrâ×g7¨&@ü«×[œ:gÄ‘–äb2óT¹2&Q•u”7:Ϭ眊q+ëÂÿ°¹Zµš~ràP––œOýïÇ ò0—$\öXŠæ±H¼"sù½ùã›xÞzo°IÖ,v;Ý¥žæo•å=T'-K]©wvy­©ïÝz)b°GËÐi¹ñ˜V îRÜ:èÕ ¬õ“ØY°Om-YòÊWˆÒxgu!ßÃ]0`¼$Ú±~í‡çÎæ]¶ƒòêÛ ¦öLMWsdßê) Uv_Ñ”õr~7¥ÜwÂM§…©{΋vóªrj‘vâ’6@h’ä]v öÓtÇHçÕáÄ OJ³uÙšðÌÄÞ1Þ°qÞjÓò±˜³áÒ¨÷7`7?ö)$¨HU-È£g÷­Ably_ E7¸^ÆÅgò&9¿òämNf þe`CNÕpåuƒÖxú¨ÄçgàV«ÂÒÂ%Ô7¹|›b¼³¨DÆ9Ëô;Œ3œ¿ÒÍËÝ ÖÁÕ  «ÊÉDü + UÄWs.Ÿ,ƒÊ¹ù7Ôñ¨î&ÀQ\RbOeV׌½¥J&ݘ Ü°Ê 6Nr¨À|GJ¦"ðEžTIG¦Kás8=6lÇÂ"ߢv Ý + 1î,;šµ•Kf/D®÷~¬ÑfôÛ–ºÔ+䤿:œ5 øH/Õ{}x'±#"- ¼x>¢Cµž]ÈNr¡7Ñ«°D¥¥"šOÏ- Uò·Û=Sªð×à K+´q¾ŸÚEôˆŒ + ¡}¸<¯ÀÊPõšŒ ·~Fâ1ªcêßåóS×—vÀeáQl>’AížÏ{Oµ@r©0Ì÷ËHDΑ.ä\æö¡Ç*¸S¿tVÀEæbCø0P|ÄÒp2Æ'{š]æ>Ã)-gª8ñ.Øi/r qT¿Âœ.nòÕD)'fÿÉùÛxc_rú÷{¿2*‰ã±¼g¨á"u·ŒÂa`{þå™i¥`óï-×µJˆ»Óà³2;ïHû ‰þáU;ee¾£µÛýŒkT]K¿$„šŽÝÎ%š™ýþEÑ’ò”ü(ÚÀXì¸[zoizºº,€ñÐ`Ô))ö7²âWÓ²gÊí-÷«õ<ðMNŸÝz¼8©’WÒ/‹€« + ”boø™ÓYϤ ~æuò“툵“êÛA ¯•mÊÉM>Ä´ÇnYêëµÏæÅ¨Å-œ:W—ÖÞ÷u— |Aý½—µ±æ%ô 4üt;Wôå÷÷Á¥è>*{ιÜ´¦ Á+ù5Ú>²ó,º„6=ŒBPRØ‹ÛMËÃG-Mûˈ$/˜Z+xá6aë°‘ù  {€ìº/„Ë=ìfUôr¢g„ Ó| w·›Uú¾{‡‹ÉOþ9£µ·bBâ¸_øRãEnpwIšdjÿ]+T1Œ{·½ÍíX%ä3¡kÓTþþôPg6í¡Þè4»Ó:~\ 7بêd7õûýÁ7¬ó¯ä’½A|ÄQ—‹]¤r>=¥²?ÑOã)•œ‰À'¨ÈšÃµ+ T‡Ù4Rü(£ììã WÇYÈ®ÿöÛ@GB¯°C}õ m’ëO† M;^‚xXdûºÍTn–­1Zì8ŒPË_a£ÆéÓ=«2neÁrGÑC’w*Ê f‚ãïÛ"¼\ï(‹«÷ ªãWòõêF˜=ÿŠ2òûŒEžà™;ôNŠŒpâa+ïJÊOÀ˜£‰-Ðß;¶@ɪ¬]G…[v{¦ÙŽï´Yú|.³%uü1ÐA\o!QA³p™ò!hÒØËÕJ×J¢ Ýä]¢tÁø0£Ó°–ÞysJBäcŸH´æ“-q å½óNp‰t ÄH3I5ƒ3®»GïŸ~r“´Î"‚î‹—‰ÈBC)sÌù) "m’ÁˆÉi2û¸ÖnfF 6…:™§‚5b6<áLc#rÎ}7X‚îõÍ_¸1@§….ÜUžèÀ×ãí:dŒ°÷ó Ÿ{ð + Ñm7ÄÁ [³Øl·†ðÁTÑïaéÙ›Òfõ@ûýˆ”z + Óc¤PPFíØd@{í±%mRM+êû|ôPƒ¥ŒäPºž0áj#TÖ+»•?e­¬Ù؃zÊúXÛ(q[âÀa.{³œóÉiNíæé€*ýWb)`:&ª0õá#6 Ð + Ã8“±ƒ© + ‰V>ˆŒTÏŠ’½ÄèL*•¶^›u'¨?ÈNQ€n£ œ!A:šbL°gR”ˆ + J|Šö΢Q÷d—€¨TÈÓ|ÊèöY|™É[²ùJô®qZošžÁùI`-ÛÙ>§Â“²qD|Ù¶@ôãiÈ¡ž$z™:«£ã‹ÐÕ‰0f^:º[Dlù¶Ô + ‰ÚЛ«Œ Q¿É,LÜ€ÈT(LªÂsˆ[…G¹ÎËŽ-ßÍm¿Ø½~{Œ…_®ѼÁÑQ(ãÕÇÐÁÐÿ€šaÿ¿»ž/ÿ"pÆ1XÂt˃‡O*4öI)Șð€HÞ‘àýˆ¸¢Rø>BDÊÝ>z܃®ô*ý¸íÌô©Ax\ÑèZ­PA-ÁØ Þ• ƒ_Aƒ2¬¿åRQ ‡¼ª§È:ó­./8¾‘<ÃY¤ï ?*#áÇÅ5P(6 + D”oÚN¥ÓF˶ÖQ8<"¸Û•ÿ"‰å^Œhž…# Gø˜ 4.½„ ˆ7Âñeâ&\Ò‡ƒ aßLà>`€D±µ÷(a ¶Yv芮“š(³}D&6^û×ÿàÅÕÄõ&æØevš/ô™Z²‘èE„¢-<Ÿ¤K£?öþ@7$äÑKš.¼»ŒH>" Û–³v®€ø¨ò%‚fâ–Õ‡À§‰~Ã@èy@CÝÙÞ9`)îÐx@Þ ÞU(p!ËRÅhÌ68ü3@3oeLÚAq²nØÆ¸1YèŽ-~A¶„ƈÛvܶۦî’fGóˆâ×Ö¸¢èH`´š+>À¯ÂrCo€]ë´ÍÂví®¯XÕv®»w‹jmk÷¾­­íݻڭµññ‘—ªÚŽñ·Çª»ÆŠ/<ÒçZmx‰WgnŒ…¾ð±‡@ âû!1£0€¾?ÞûîöÝîÿÝS·ÝŒeY³ßn¶ÕkíÖiT¤”M3-[›tf¨*4L¢”žxž ‚€‚¤Š2 €?€ƒò? ‹œ ¥ÈŸ ²‰ñs)ÛB–5Í›4”†£cv¨7øâ'êÙŽ‘‰×fnjó&äQ3Ê.±YS«ÂŽgf@?A»C=y›†-y£Zzß E­º4ejŠƒ™Ê ²"Ë’ZÊEÉ–½…~ÜóÂtMPåàv@¡el—”½ s›É;îÖ §ý®;\…{˜#Dù + ”R¹åébµ¥mº‹Á¿ÚÑ½ŠžïÜCžÓ:,^MÀî¤JðÓ«×öÝ:ºœ—_ë{š M ' mîvZ Z›O£Ú9˜›02{òÊÙ.-ÂÂ@œgT·öê"é¬ýðœïëëJÁÅÿ + [ùK9YvŸ«<'…;(×c¹Ô–­cxv˜Ï[ÓOIÁþÖ«:Ã×Kàå–)Þ èí‚ÞŽÀ + ¥¢N¯ègt'µ »Šã÷ZîðøvvòXæž3tb¿¸²àh¼TöVÔŠëš%œæè@·¾ + h“†8»h>$µ½Ü-Ðïf¶åM`'1±Uèò)“+çf픂vbÃQâ‘!–MÀü_Übc\€sóv“¾÷øú ¾D´27àg~y5/ÆG3vÚ#ÆÈS×Ú»k7¥¥=F£jŒ *Šˆ~¨qþï-#¢½z‰fÛV6ûú;gÂÃAýòÍðáZ±°h+3gé9«èí©3'ÞÙAÏä]¼8F[Â;Kie×®¾­˜Ù… Â¿Ç `ˆ´s Ù1KÐ×M„ÐÀïì?ÁÜÐj!¬@F€‹*±,Žý1Ű =B´E7dÈÅ#Øt÷½2Øã:3='$L_à¿MÇÕãÀãäëη“ýv™Ò;é£j_ úê?¡žQ² Ò·1I.Ü<¯Q"¢WµM:ÿ Óê5O8ê”gj÷3d èk|ÏO^ø Àáçe‘NÚ·éC¬ÌŠUN%‡òl¹¯Ú(ÏSƒ )©¡pùûhÛ‡ìçÿ + ÝDÿ€ž}ãVŠj/æqŽÓÒ÷4A£u6FÍ\A‚çÔÄ/mç|c–„w 9/ù^ÍÕäÄŸ®Æ[Ÿ/˳ + âñŠ<¡2Yi;lÿ€ò&³Ð"†]Ÿø»±¿ÞãA¢9Ûú¨¶Q°ðÛi1<ãÙ‡®ÑIhÈ2ÔîÒsô¹þ[®‡?1’°;,„§üÔÆî˼ª™ Χïÿ~¶GÎa£ä;Òh‚ÚL$^OÊ»äöûÐç­E³q£"6e÷Ì-'F‰ûÙ=៱gGw˜°[P1Ï›áïæñRøbïÀ¢šG¼ú†‹<ñQ»ó…%s8ÄcŽbÁ‰Kh¶-ð¢é 8H¯ÈëÇm/ômÇ Å‚aXZÜ騖F…¹”À͘K÷c×f$Ôç»V!Eú'¡$ç)8–u½àóR©9Ró0¥|˜‡1YîˆgÀQŒä[C„UÇÃò"zŽ^·a5™bNè#ÑÔWyÑÃ\/^TFä’bV¼Æw5$þ€ö*"ã'c“êˆj>¨?"0=¤Úòa3MP£ÁÃà Ú~EpœÃô ¢,p‚TÒ"'ËP«å )¶Fz©@¾ = oÇ‹P7âGF”‰úFX}{¾üa ‚½$𥾏’ð_ÔˆÚÏY=!x=hWý‰ÀvåG¦žmiIf{ºê5¾¤&,æLYc¯2Ç—YQ‡‹1Š­T‘4fnYOopŽL5“O`Ä}eÊPkñS!&꘦†.e%%\-i2(9sÇö@†ð%óè?¯Ë¬1„Ü$¼“1àÔ+à*“ȲޗÌï$Óø`“ð!lÇæ‚ßsøB5ø²Ë_BôjÙ£8å!ïµÍE½ØÎL1Áá‰Æ"Phõà¾äµÇÆ g4B î“¤û¿Â­‡¼—Œ¸Ó $/yᤖRä®!–«¸ìü7 y6‰.¡×ÜÑBŸ]ö¬ô¹bK¶KKÇùÆ"—¯ðXB|bÐâøžŸÊ ¨Ç˜¯v|‹–Üzçm-*¼e:‰x9÷†lÌtt¢¨~Ì ÊÀeD„ NH:¤hŒÇ­¨–"ÿÇôƒi# ŒògãK¹åÌ‚W»‘£Šã?=JGSîÛûéÜ·ýEß§˜†;ùhŒ©Œ1<áµ¢´€-M“ë dx ­à%cDR5*ûK”/( t@ €êc*ꤰ@ÆúøS„ü.ÀNƒFðnA$u/Þ»E.}3ní/RjQ>öÜ1Ócäâ§ [Uw¬0¿ ƒWðR!O`ÒÕ"Ûp.j¸Ðª§5÷¹œL³8ÅŸP&„¡#»”L ·8L¹ef›}”Úv†„\—r»^…g]ßö-CàÒŠ‘•ˆ + '2¯ð}c­òE¡pîtýȰÕA½cÄ%5é¥#ÐAxhÑ + ‰H=I#'ß Bܯ& tŒ‡/ëÅgkÂâPzˆAd£ ¬ŒáêT¬43óÞrbzýzB•Eå˜#žåyZðÂûûfi ÞÚ7z·tnÏ=g8~Nñc·b&:‡€õ‹†?‰o¿}Þ¹0ð³MJâoBþRÈðÌ-OÛF?²À¶§ïÁ@8)&·wœ0R4w€„ƒ%’ÏòÕz{ ’‚1—ôéå~kª6ʹﲜ¿·TÊ*/wÇ¿nÅ$ª\S¶W}±Ð&íØD’|Dý‚C´Žè¥4ø7§È¨ú’ úi˜r -ܨ*P± P1†6 ¡}}S,ˆOÿÒÒ‘n¤yå—ë· ‚Ï®" Ì96¨çHùä œ*·‹¾î¨ñK°áVWdwÞÿ/ÅYE;¿LIÝ + ‚µ¶›ú’…| + òOoòˆ71NQ,^q·xD[s+eiæÝVÙ=é`;Œ³V¦bïaΫ¬µþ€Í |Õ¡è°e»êN{] #(G+ýàW›ÎýwU£‡¼"o&Uù³…÷[ç £×æ3Œqþb\OQ2•µ­ÁœÛ©XÈœ"«ƒ7ÊU‹‡Ñ vž V`ÕHúk`‡a®`)ÕÙøÅ¨[òå€Þ4û7Úóñ6¾BãsEû›Qf5æ0nµÐ'5G±­íGµBÏåžAÖËC';Á:pˆrÚQƒÚÏÀ|R[s,´¢9¨Gf[DüS}GÇCØÚ,çl#Û8ŠRtl bQkdê °Ñ|µ‹z+!B•[ؽ%ª[R‰|* + *¿#ï=é,ÂØ ‡<ŠÊâÐF>qJ«ñ¶ñ¯z’S”puµUE®¿Ð¹¢Ëjÿ A + —ЍYåÕâG¤Ìˆ "|û®PYU*R0ÞŠø¨7n…mŠ*gÜŠJ‰é ªçû¿U‡Q~=&ï¿€MÎX™Ö_•¡ƒ˜•¾é¬á[†UbP#GM˜'™É´2:­HLqWYìü—Q Ôï1Ò¹Ží¢CzœCk‹Ú«ÑK¶]‰~qÀ'n„tA/ñWäBõók%%­á(Ù–àæ¨FòÁET—˜H`‚æÍª†mïDW`Té0è5_~þ!$tªzÓºBdC& + “ .Ÿw¾&°JEbxÚ,Ed<ÄxL« ò¿÷­’áä,ÄwU-egzi `&gäM‚‰ú ®KZr˜·ÚO¦_¸.Îcü}Bù`+9ÎôïÙî5Nþ¯+G8éøÞ Þ£s$Ìž*Kü´ŒU0-@b@4{'"gp^œl¡©åB%ïÍfoˆ—(Pÿ«æ9š3º….?ÆxLjÚ/§÷O"XX«Ç¶vu­©¹+Hó`·ƒ'usèÄ8å« Eòû>Ï«‹Ö—P³˜omlÂTzßFøÍL·ERþ{÷„ c1[°QY¢·2l °ÒxLæÈdhbí‚®šT¾-„T᪄÷8FÃ;ˆ~Á¾H…`‘·-EäÕ&Ôôj}Žne½ ߲ݯ7Ö/ß„‹:?…à×vÝ¡§ùúÛ›«þɺ~lÞoh‘…×®jÃã3Ðæ2l7é œ<å#ßnÛÖ|â‡,oËq£è¯›È}²•)ðO©ÓE«Ñß4`(ØÈàÖxªÔJ ܺ¢`Q8<€*̰ÂÈ + üƒù“üšèy‹‡¤˜8ƒ4ì•LÊxMª[$Dì™ÇË1‘Ä + 21Nmó#.E,þ“·&RN4ηìBþ-Êgh›5ÿE†‡òÆ„y¤²GÝ<Òw§Ø8ȘÑý!apÄ{HªiÔL6v<8JMHj£æ†w®9b€=.VEq.ÎÛ%jƒô{¿“ó¼&Âܵ ì0`’C¾Æ#7,T :û-#ÞéPÏBûÝ7­a\í䨝ÿ!õ….µ’äGACÎQOR×þت‘Km Efý€¦Q]O¥ EnqÙ9`ÜF¦Zzöj¤œ ò"ë0WQrÙÃðbÚJä$¤Xê¸IŠ|ßHR`yÿg€õ$zÞÜÇ>•‘'ÅÉ+&nZkÒÒ­û8ŒaÁ«akÄËÕL½²^«IÁ%`Á¡œ01¥ûø0}`¤é¸3` m’‚iÃ+$b8 ›iÆD°¥V¶ÙÔ’QçSå¿~†Š`Ç8œTÐ@UzÞ + `Lñš-bá/¸3ß´äÑdU‡…)˜’C@Ia”êb%ž’·GL~ˆfB2 /”Úv ÆV/ÙPå´òB¬Êc˜[¢òz§þ¤çU*À(¯¸6°’dŠÎO$:J $À P€vú@3c@3eùÐÿƒ(N° Ö,ÛHG ]±%)È…%4¶„4¶C¶Ý;åÏvº»˜Ùá¼¢øÅõ„ýdæ®hìài„B ðø[¬4$@¶UËÅzv·ù-g7ÞúnΚݻÛo-×rÛ=}.ʲÜññ­'–²¦ß·mÎÆÇ·¼ýk.­â†¯Ï¶ø…“¼[,;Kñ@hfà  {ïí½öîÝî³Ý{¦[‘Í©îzÛë×µ­mÕÍ(CÚÄ]JAÔÛ¼´­KF I Bô§$ˆXE%~€q,~!ó+ˆ€š~³1©yãù‰;PSv†]í;iYíYˆ*Ls˵WÒÅl1sxÙQl.3©éÖxƒ#ß;;¥˜™]¦¢ʺ+l¨vV‡–Sî×ãçc7XÓü ­Dj"ë)ˆ+•Ì‚­ÿ3Â2 + d}YÜ›\å2­zo35‡ñº`Ÿ·°zÂYt&ñ%ÇŠòæ¿[ê5|y¸þÂÎÆ¨oh€ûô¿ + ¯bœĶAÁ¾,Ï^Òís‰‹¿›IUŠ`Xñk³ª7rf ¾È«­ë|ï4i„±Û}9¼Y‚¶¶£! [ú’E,oxÂ${J£q´çôFb!ÛÕ4'§RÉúøì¥_Ù-{æº#)\Þ ÛrÐ44èXUb*0±Ïe,=¶çe„=“4 + /A<çnÞÿÂWêÅä„+µaçÒñàgLð#W2´%zœ Ðë Ìóò¯4îrmÝ?t¦¶:¥ú±"‹n>ÂæïÓ#¹ïuÖÇîK/Ãë•6Þj³Ì=·\$ÆLò owßïuìú¤U™W¼«Ì ¦eɦèÔª¸-.¬:éò£-Ò=Šš”Keï^ÇùºÃ~ú$Ucº¬þ}ÛÄ®½;Ú8ñœžDÍìT ]„Íùüõµþšêaça­ü­ÄBz²Ð`Žõý!iné–HjO¡'SÚhýo¾j õ îGÒïònÕÇe)/ø“5Ø*ÅÆœ‹‹Åüìµ<Ç;¶Ê}lýÐÖ¸jþ) Ðý€l.‚ã>¶ë‡á1‹jµ`†ÚmÙwF.±#ˆÕ@ˆÉDZÞ|3[$tH²H qÊF‚¾Ï:Ô³F}McNAä(GH¨zˆµÐÊLøMü¬ÚɱÞUÔ ÷ÕO€†8§3ÆÍ(%0j#r ‰Äš(,¶±iR~6~–tÕ´àYñ¹‚évj¹í´É³ªš¥ßÖIýL¥Ûü|€÷Q“¤O…ó0µK¼q&0ó8¨özQ*Úž‚€{Û¦ðíµ4Ncùñß¼þþ œ½™ã¸8_–x‰ÆúïíÊk^³6ˆnƒ¡à½Ù™v þ9Q«‰Ñ)'§úÊÑÚê¶ö{wœ¿îÿSñ—Iþíª#àSéå&©'­;Ì»SQP˜êßl7Êkßu*BƒŽÂðŸMBt0™\,ãØ]lÜ«ÝÆ¦‘Æ2»ýÞÀ{ígwå*癢ºÕÂ[E-0³ ­·|T/\‹vÔjçafdEì¬Bl‘'LªAìÆ6#eŽjâ,³} ‚izž=#ÚþU‡à•ª‹àCwÖÅï-ì]¾×lhaòFvÔk˜¡¥®ÌªÒÛÿryq‹GèåfN(ŽJµ‡­­é¯ë’„wµàLQ‰E÷ + =‹å„^²T«Þ‘Ø£J¸]~2pŽuJyf¦`A%·B§‹¸Âƒþ¹Ú‹ôïƒlƒÂîc/±÷4½:i/d®?Ò0ò<&~ó í»<—ž»uãÜíÙ›ÉW£ã9GTC‘`jÄÿø½Û“°6Í^¬7€àм%JuÓQÃaCÝ`÷àÔÔ̆Ü×¥öÎÞÆž»}`.2#ùÒÛÆ³7™¯º;oÛéqµðfÿø¿1÷µ¯a+Èw‚Ç«@[ðXQ NIÛ^ÈwhJª"$¾EÕz&ñ[òpú@‹Ü7ÐÛÚ¡$¹h`‚[^<¤€ÕI{‰)‰ïœ!ŽyB_yÐÄk-æ:JŠx„í‡'¹ŸUCµ¹Æ÷)vX6ן˖+ÈT ѳŸ3XTºùÿ}ýxD / + ÇQ`/ã?îEï­¯w'Ô—C°iµÈòW[Í‘JÞ ð²ÜÊ·ø‰qi’Ô°Ùå ¶bÑÓÓÁ8q=$8_Bª:Ì‚‚´Àyl”’Kÿ¾Ñ + ë¡+þ ÅÂîÉõˆ '‚9A“Èu¦Ù Þà + Äê4A†;r_Be °& Ëù<] o§Ú´7¤¶f³¤L­ÃcÆ„Õk8ÓZ†nŸYعŒgÝu¹}A勨¿Â&»\­oÍ~&³î­_³')ùæC±õ÷rSÛ}nSÜ[ÛMv‹i#"DZ6oäqÇmÅ"P3ÿHåÐ;º`‰üd@ü(£Ð]ÏkÕÎkè®úM(ûã CG5ø‚q >9!  1T" çf`ƒ¬P}qõÉÎ.Þ[~z µn’Xj_$ùº'g ñÉeC9û$ÇÁ& )‰d/ËÚ0“ïÎ ¤€Ðó»³íè0P~]&B E•Ïì`>= ¢\Á³ + •«)©†m¯ç力¥dô ÷+ŠûtÎgêϹ%TF|жÜÑÂ6lM€Åkh›Œ[Þxß>¢¦$ÂÜÀþº’%uò`¾<’ߊó±|}ƒo—óµA1! ã&;o }\B qîFoTÇŠ dJ_ ÛM%™¦Ç)Y¤hÅ'6("Î6ò”´îEq•:¯!DJÿµ@¢nÀ@Djdr&˜¯\*ˆ-ä-Dû@Òÿ¦i ·7“ aª^efð2΂08øåê 0@0D˜*=¥!9à7BÛɹ·Ù´Æ™´¦%ÏiêY_f8¸†¯i|q2Ó{AŠ&£(!Ä8¢ ñƒcƒî¹=7’Ãáù 5äÒ9»ÃVfÄô°=™a§°…':ü5R40ÔÁûëE‰¢Õq sÂô_†ŒŠµÜåóžÓQ|û^ân'D9ƒáM•`mW’‹Å\Ùd‹æ:žw§ò6½ÌŽH”4ó½_/4 \®ä¹ÀbÛ¡ëÜXý³ªÍ²kKñë¦Ó‘’l/9žÇvCÉö•­¾™<“« + ÑB‡¨½ðÁ¨Œ0O#óþ·.MäU䙋9éÂðìfvƒv1ŸÙÓikv|×7óýUë ˆ`ktɦ¡>¬ÜEÍÏÖÔ= QêüæQ ø¹jò2?Rú¬ÿ‹'RïÕû,O›ˆ?v¶ì­<¼ ÕˆõyWý§?ñ}Æi{‚D½tRúd‡ì.ÏñÔ§åDByEŽê<5Ö´H›©Æ£Aõ 17rÛmÍÓõ3ã_tv±2èMR’þžÆZ7ñ<ÕêÒXeõ£P—Wþj)¾ßIp[(==;9Ò&ëkÖöKÔª[$×|qFö¦÷0óŒ/SÎË$"ƒ °:}óÓ$@†Ï<ç®G Ü^W Ò㈥ãeGççÆq¨”°Qî·„ý´ÉJ›¹JöÿÍ„ Ð&DI9_Î2Š}îm´»5?ZÉC(°Ø<þÏ_?AœÏlµm·Êƒðí±¾æa\8vöêöS/DU;nî>!Ú)+sÕ]ÿÎUÙ ²§ä$od%9M® #ùs nV ,º.zØØÑgY5Óï_Ç3äµ¼áL?xêâêIçÕt÷LmÈ¿¨Ñ#ÍWhån—,ÜÀ=T^BO?TƒüA±·ð·Öñ²îã,²âÎ÷t>té‡vUjµ6ФŸVbTÏÓ•øÊ£˜Ø»Ezx£ršOFt¿«¯_¤7U4 ­Ñ&Wbr:ç—ãuŒÃn ÁRê'†')~ÑY8ºJÊ1Ñü±Õ­,~4.^ér×593ò3 †>¤ãQFÓDŽxïäµÿ×™­ž zÚŒ½¦ÿ W…-?Âÿe–·mÀ3`^+Ä ú홯·$¼¾b¬.ù7©³$­v<.®ª”HNò¸¢Þ]Ñè1^J>+-cû!|ü gÍ&Þý[š^š–ä + +PWºJòrFà}ð  Œ€ž {þàݑӎî½TºÓ×;ª–uú~öá2+~ (¦(XJV×ÑÝ…¨ã¡Õ e¿°åX¸×q)ôèÔ"·Ab…Ò¡õtËx²›ž~/¼yò/ʪ„P?àì(Ëpaã!KÓ6¶Jaé;7Úš‹î&Û¿¶¨#ôË· ±LL´ñnhìÑÓ. ÙhwW>g0¬¬ëîõo¯éÛ]UÝz¹Y?­±ìi,ãy i*œ«+ÿØ\Ï+Ö’.YTæ u•äuجZOâ™4`•• + ›ªêOˆ5« Õ!VT73v!;=ËuNšØMeÃãço ñà.ù†’ÀˆóÈck¾¡!ÀÙí«¹õtëw Äm2ªÜHGi1hàãzØÁ#ã0¨‚~XáB “¬ä {ŸŒÝ •ý°—BteJÍÖ^Üþ»É‚œ8myɺ“ʘ‹ ¥sU eÎ*„°w¡ÑDÆ@hDèÄ‘®S4Wîù³Íjò@ëîæ + ½ø‘°àN½t©‚+kúzf÷*U÷;ÛØñ¡PsÕ˜V/*º¹„³Å’Q\!ÿß0¾Lê€9«†YŒš}³¨s($$r]ۡ̈WW<—Z{±á^±MÉ×5Õµ[’«;0b[Óú¿Š¸Õ èêáW€Ñ‚ÄAðåˆÌà¢jHô«kºî£+Ûyþñç.Û’ô÷°µ…Z!MôSÚø¯B|½»#ʼ®PÛȬìy—ºý¿ + £yCˆ'"Õœ‹žÄbèï¢Õáªæô.¾¶zë.ød òýÕ×nV·c½„†õ貫h§å´AI%†œS· ~ + V+ú»á‚¤fÇ”*§b9ËÚ6WÞë7oe[H” ý{牡û/­È>”Ry~xelïô”ËÆõ©“ÔFÓ%ñ‰¢Go‹ø1¬œœYøüNýD›‡]ƒÓ ¡Æ/Š“Ú­QJù¢@ 3|RâLÐòÇÜÂ_6¯@ZXÄ–N¬ƒPFÀw 7ç ° ð‰¿Õ>¾e£Z,5¦geb3 ¾Dä, ÿàŸõ>V  bIú4dÅØfp£<3EÚh*¡I–†`~>'R(Ýîb{€ÖR±—¾EøL(†Èx  ¥Ï¨ß®¿\ÆÏ½ÄT“l4Ó†Ê>¾ì tkç™c(é&½”õÁÈ‚>!tË黹¾¬±dC®¨y—µdÌtic®oYä©¥Mxº¢¤˜Ü‘TÆåvé=©qçä-Ó&©uJü›±`RKÇ288I-„ò"y¢4%Tb?I)9!@rèèöîÕ ¯ËÈbpBJy‰‡ZaîÒr²¥´dÓe‘Ë›H_M[ÎI‚ + ¬ |@À 9°w˜ €öôL%7ƹ}f6QÕªe1¨;Ã*ÔJ´™Ì…¢ûIbš®W«™?­EêÀì¸à¬xÛÊxªÊsõ*ª80 ,¸À Ô*ú(²âµ Q†‡!70ƒÎIþ¾>dŒ~ Ë¥òÍKáL.4èA¸ D­@304U˜ i? ˆ + ²^5ä,PǶ¬(–ØÖš{ w·7eÏmÖnÒÊh_Qþâþ„õd®húÀ‡ íÌ,cÂ7ßFÖ€&À°m+;ͳ^Y¤Õ­Üì­Ýµ­Ù²»îÚsÍÙîövËßdÇŒ¯q±vÎeüñ­m³•ñ—ï–V+>ñbËYÁop“ €q)Ī4½Gïù¾w¶÷½ÛÕª­™v%wWµmÛ];U˜gYTÕ¡DM$ÿ[…N!QQ~D¾p8ð9ÀœÃ‡ùŸ ÿ#ý“’i²$±“hÉ ‹G“ î’åE´WS$æ.yTK¥0Ùê§&PV`UÄjc>ÇÍV;ë½È~a³.E[=›ÚN@·Šæ³Ó±p±XØ|¬´ÈûõKÄÖÇŠ ÝjŽM¶È·~û¾ßh{ìk”Íw™[^cˆ>ÎgÙf¯yïûºXEǵ*Õª¬‡ðµ;.ÀØOy^Kmky:¯ÊJ„ø+X¶ã¢ø&‚Õ'ÊãiðúµUãÇ¿/ŸdðÊQ5œÞG†»¶:vKç‰õè®[Ê©¶›é(«aâq0Å92¤ÐÃ[æeN™“–ÊÒúäqܬ—Ä›ÖÇž«ÇOc\õX¥ÙZÚ‰˜ôåvO7j¦dù-ȉrMº} r˜»f¼ÀG_¤<'d¥!1®¹ßZ†#kXDjT§³«vÑÒ'ñ"\9³3< […A‘8ü½uM³÷Ú±#d˜Sò(zª»fjóä + âø/˜yŽHRÖÓ[*léÇC²éÛD&R-ïîd€Åƒ¬ÍÊCÕ´¾°yy¥€c´"Êr0§YŒ™›ÐmW½xË5O4Œ:˜¿>üÓ3ø›½½*Ÿ’kZ íˆkõåÓZt-šý„|Zǽ÷jr‡²“=íd!Ô¢+]‰S–ÏÛ•žj?§ð–òaZ‰,úœDm)½ ÝE•©òüÒ)j¶hs˜›PÜÜ1ûxw9óÕAvß¿‘#æ;àeO›û\øF`±3>ìëwG†žZ¸! + ë¼!› ?äC¹d.èXîoÍ•ôÚJœÓDº™‰7V)•7¼"ÀV¾.‚Wˆ.JÕ§‘®Ço;¸df’2o²ˆcäíe%\;«Æcʽ;8_bÙ?¾ã"}‚ á[-ý2ÃðBš\ªÜ:×QWT§=/N½XO˵‹X« ø^mö}‡§ßØ=à×/á<fË×Q».¼=žªÄ¹Tù%³ù”Ì]>FüÀ,*]v>5M.R—­¸¡³Jjv­Mu ¥‘À»bKþ“jÙ›eìæ>æ š¹Aº6†ˆ”Úc󶘣õm´uÎ/›ÙQþ¾P”maUÆ»]pïìXõ†¦>p/Ô™øøt¹æð¶}ïeI%F/s-sóñÍ¥ÏÚÃ2Áwãš‹Ÿg3YGõÇ[»µ=2QÏßÓ]°3qY»Þ¥þ°cö;™•d…à¦À¢!]gþÝjMH´U9ú$A¹Ú›üé{‘-Úy½¿£Ü]„iÇ}‰$cö½$ï€dMïЕ¾Ûk%Ig/~n/a!Ñet$=¹)ö ÝùÏÏ’0Ê ô£Ðàû¬ç”ªÝ¨ðþ½FÝ–ÓƒŒïª)¤«³x ÅÊÏ¢›W~*ÖçÑÚ½fž2¸´|±#“ÃDÖüQà˜í9µÈß꩞”(]{ܾ2].UqZêçjþ/¬˜,‚ožÍÏŠzÚ°iŸŽ«Î;ÜmaÃõ`4µxmŸ[j9Óôï4†i`É.íÒ!éTuÃô†ötôÀ b‡$ô2í_Ô‡¡äg» + †!w /N f)h„YWM¹›Ô©Vß’O‡¸™°ŠÌŠl‡ôWxßßÂ{Íöþ3Æ ó]…Jú=‘Ú£¶I7F÷^ßgÐ=¼ÁI+p[ƒ-jÆ¿Ýû£C4бë§Ó @<“¿öô + Ûúý(jVím‹ÇˆÊ†jÞh4=lZOJ“%ëš! O€¨åø•ìýò ¨ë„ŒC‚ÈëP©oks•4–|ßÚM|6a17Š4¤'M"—Yëò²§½ék‹uÅ! ?sèzËa:'#8l .ÍÄ­›Ò¹†å¡¤îÀäÓ«ãç5·ç’žƒ ¡„*ÎÛZ›Æ¸I„nEÙÿ%1³–kä~ZsxF;qYÊfŽï—?íÑÁnã£!Ž/ ˜íSájóºß÷ÏêaøÍAÏ”PAà¸;¨Þ!çû©:[p…¬v!±¤·DŒeÓI¤Á ’…­·1+Œ —gápcÍ¿ä¹îÔ ˆ¹+™l¤¬qi¥vS¢±ô2@«Þq發_oðyrÆÐ«»$»BÓ’iC]pÓwð™¾2I~}ŒïG‚jÊß=¬(ÞýaeúÏ(µå׃¶À™Îb/4wÍ¿DÑ5Á:SÃƾŽ-q xBCçh Oi:ÝQÂu€Ó“æwN/Z}«ŸÆ]*­¿æ>Lr¶ž>sËÊÑ©n¨§‚éwMX›†‘ + ˜}ep]àqT¹s•a]G½¡BbGdØ Ôaí?”b3¡H^×g;¥$¹©©½å,d(¢81Êè JèpnJU©u(•Ä‹ÍÕÑ`~%j ÔâÍù³T½Ä2:é±vX™s|ŠmWÉ~j’õƒ@:4Æ ìО¸\]¨â;æÌ˜ŽÌ¿ó;¬î:<ñ¼àÈÆ>õW6ss±ö1½Ö#±^názÚ`ÂÉwX0Ž4R9Niº5?YíÉáˆ3{vt²6¯'ý¥ÛØœHÔàF#½(!tƒHÈŒa»“ßüx„Y&æ:ŸÔåÐ2‹/sð?ó¡ «›.Þ*Õ Í"6{8¦uZˆ»õøª)Gü‰ƒ½«tï>Ö¹9·×‘Á(¬Ü0f3nÞ¼b˜¸€W «tâŽK¡vûjÍÍG”G4r °¼z¾Î°4ðЉj$‹2Ão1~[«tÃæ:«%“½á1CÈî~UéØÖÂ`¨ï¿¤È’ DWHEÑ0ÑzšÃ¤@£)›õ £öè¥ÉX$D»Í}ÂPH;ÏcñÝãùÔœ¼eB¢<_¤l¬ \×O“Ã{CyßPä\Ýù¯ÑáÀüë£Z‚­ásÓNr + „P©`„•·D øÎÛ°p HØ@°z(?`ÈáMíÑ!Ô:ë([_Q€Þ€‰.®JkÜyšM/*Üídí~ö˜ß0Xr AWéؽ + D×~(fyH†Ãæ:çVšox‡5!p’3îOn„üÁtAX”ЦNcűà[oë§Š + O„ü®¡»êÁ¥x߉9…—üÿ³°KgÓÔ$L9ÔNãÿ×K>Õ˜1O´•µƒ*Jê2–NÖ ë'匒>18öDˆ¿ÁŽñ`?G$½”Ëh`”L¢D€Í4þvP)¿yÚõ KJ â?‚¿…õAÿCÆà;ʘ4@;û €d„à  `ÁCŠ[ ºƒÖ&âŸ%ÑKyýÔcA­ê¤^¾$ĸW˜˜>ßIh´ñ7¸ºÄ2„ÃA:í Áo €ï”–¨m3ä^E¾æ…†}fÜ@‚÷`ܱAIBáÁ\l“”›Ô¡«k^€í¼—í¥­¡—Õô + •¥ÓëÕØjéR8$â$yßRŒMV¸ÍWû‰NÙ“ñÒ9ô‰`Oæ ÿ–¹ìFò¿D‹~íw¡&©R`ÞñͧµükGÑ¿]dž Ìu5¦“¼Æ`^5Ø£èE`J#ú–oŤJ=l¶Çž‘ƒù eïÌ`2ǔ‚…§öì]"oí¿•Ÿ½³st¤Ûä2GV-KÊŽ@ŽÉÆžÐVo|Y£  Û¿“j0¬$k=A• ¶-Y*Ìø—tj+6ާˆ,<À¦??UÈ / `ëškÁÐQÇfÿÿ(”ú'3<èÍ1è@¯ŽG£~´ÓXãÅŽý Ø„ ”¯õ)DOÁüëmQåP="ña²ƒ(Ç‚yê: +#T…È|Údƒ + ƒ@GQ2³ÅŒ“bZ_傺®u˧KPyÄ\;½êØÜ}g©¯½%àäÏSó?Ï+Q?£YøÚ!©¢9€3”Àÿ'ÿŠD§-ÙHb>|°o]FÞ_Fþ²u3lfÏi’«Ÿ|Õ»qí¡ nЈü,‘Þd´×‘”¶¤Í28£É„ŒÀnGbG˜%h‹aþM #ÃÃgLÎjÕ…å>ø²Øßû`k…3Š~•¬ €IÖáɧ«ƒÑçÀÁÏ–bDñÁ_Ì8‰¨"‹‹¾˜ÍkJÓºaÄ´IãGõ"]‡°WžåÄØ·‰¸)s¶êS˜ + ˜9\cÑò‰ÝEðÊdšçþ+iŸÿš)ÏxRâמïMÒT#´‹V¶¾ëŒí’f‡‘b¥„sÈ¡³”=ÔÿHLšÅx>ŠhëBB¤Q¢°\EQÞ + ÝŒHëÚWwÜnPuB'+c¶Uê?JÞ&“»Va6ë*7~NÔ„}©QÁþ šÈëf”?–ðñ »ªá¼íÕH{@œ³A¸öD?£ ?à1TÀ¯KɆÖÍ•Ä0¬Žm”R?HŠM9û¢6i‘©*²de»¼>áWÌìÕîÒ"}QE,—œ6œªwHõ1È6ÒºìVöt,HæÐtø*ñaB튙b"·¿UЉ¬¢×€Gµß@+†JJ ýÞI&q©bžð߇ۉž 4á0%üwV XY¤-C2º´ØØäË#=ÐùQw„zëŽßjCúÐ%ø)Ú.ûéá'þÇjÈ!½ýœƒ¯ü1hX‚b”š×| 娠݇ËßÐQ³Ç\Ý/N«Êêhéêu}Þ‚¯˜·@«iÀ¥f¢*É—p7ûAÕ±Zh¹+7Mye¼IcîÙ^óë$zSò™IÛ=ðÉD/ìÊ3ašz"’â(Mùù6ÁÄ •Pjž^h ŸÃKÉ‘Q Ö@;‘¸ iT]¯èYT·AU¾¢ñ©q”´HAœ  + `Úx*((Ö44#`5}p»Ûõº¥ãu¼§ÕÒaú؉½›u»ê×Þûlwv»mç­º×TÞÛoûozï{}½½÷j·4°,e0–ØFˆfŠ…1¡AZzå±6 $ÀjUˆ  ˜™°¢Q§&²Ù%Å$EÏHXñI4êÄÚO[JwÝ£M½÷BnmÛînVÜl÷;]6¶Ô¾9FmmzrJÛÚ)~y`×­||´*®V¾NÁEA92¹Ã(Hܲi’@8fÌh ç ùžnïÛî]»™-¶¶]·šî^»Ûíw×®-[Ö·îýwº¶þܤ’JQ2€9’Hb)12Q€B$‡ùáøâAé€=}–L;ÿ% rÈIH…õÏ@,…ú„dŽ úÄ…Ž9 + †0zJ¤€*Jadb©9Ÿ†&«KB‡”@)9U¨’+C‰r"lÐ3Fgæ 9Q‡å!´gÑ + ¬•Î;õ@)T^ƒ%©F”üŒtc?gÖ½|6 …Øôº …@d úÊ`\•ÚÐÉ¢“<¥RiÑaˆ$Ê{œìëiT„Ìv4)9UÕ*,HY_Ø•¸8~úü'yûB›_&ë%‘’ a‘)ÈŦú¦ND„ñɨ¢‹×.•å4Q`ŽZHÖž×(‰eL':ÌM3Àɪ#¡¬Ó@Æ’KyyÂ¥JHÅòsªtDˆ3Á£¬0†ã>k'JÙE° + ‰£ÊR°P§°EÏxDa+»…v#ñTɉˆªÊ!Áéz•… ¬\Uý§Å’LÚsBµñt¶”P³ ²÷²AT ¤PÉSMIxui[A¹–+‹¯Ê‘µuù÷U—žÉQXô•?™aÎOƒÒG'PÑQ„¯ý–v’h§êJ=‚gþù¯ñ"—¦g›Î‰n™•¡žÕbËíõú„¯->#{YC$h + CT¨@Åš‘Ä·$ ´¬¬åÎ"µ½8¿´R€¿›³',€Ð…dpO‡2jUgVu„ˆUËkmU z²~ÒúÄvIdŒ ÖV,'èÂÄp F•°:úÛé¿‘¸Zi2_êÔøCŸô|ú5%ð*ÇÄ=FNTºØ*n:%25@L¢|tu¯§³…çŒÒ.Ó3yC¤°ÏÔ4ÆÎêØ—:[ONKšŒ»Z¶a‰Wœ\¨ÔÒYò:§ŒàêAãnucc¨ÐˆµžÓN’,Šc‘¿í$"[W'ø3u|j¼ÚtÏG…z¨^d?në䟑°ÿ®D-¥Q½/»ÖáÔu–¯VjªûÎ\‘Zùzbba£rK3ú?,_v‘:ü"~胣ÅÁýÂÝDw/t";AY’›Û„l~–ßøŸP¢‰ÈRM·…o®×¸Fmâ§ðzLKDêÒû\ÿ~\ʽA9ƒÌÂ$J–%u޶c§¬ǯ¬ŸwNMçô+“£ÒVtû&e‡1à–ÅÝ…qjÏÇ39ô¦)ªNË1½,›ôÖ¡í-OÁa#Bƒ×nÇ?•a6ËsyñõðÉœÏ4•‹‘`•!¢²N—µéËKßD¥H’äOõ&T + [RV¤ô\(§áž¨±Í|s`5\ÈÏÚ 6¨é¬rÍŠJņÕäaÖeïcù>ïÑÞÕ¼„Ÿ½~@ ë1ûA 1m¬0.š¾¨T\Æô²j£èjÔu°ððPé=%7þŠìÕf·5=\7;êâV¸4‹“Ó@GzJ–´è3ÝìÂsݬ?9¥È ê]ÅY7PZ±ž¤¡úƒ s%ôüWùޱ æyZ£¸5«’…º’Uxü*<*qS¯¼g‘ipÚ‰Û˜R߬EŸ“Ò@& J³TÕ–•²ŠÕ—Ω¹¡Ôaw:d4êP>-Æý´Ã#綪²ÿÉ×¾…$(+î‚ícÏþ•ÞªýJýÚ¸¹°¹r=àª[ h£t%D´>ª!MD].:`†$E^‹ò­£.Åtø®Ë­eªoì+p–¹Æw%æé/ütMÓ‚×žÈÆ—âé­9bâ •¿/Ï•œ‰â¥h’Á°K~ /ðùù“#Ñ7ÒÔ$~¥OªŸ[Ìýµ®l¸í#¢Ê]®‘n4m2ÒnäÜ’Ÿœƒ/h{÷Š4?à¶&ðª!ü¨6<¢iÐ-:Ùš@i­‚ q'f„€`µc|ÿúhƒt¢¥öo:5WÓÄfKô‰ÖQèTj4f¬¨[( ;à$KýNa! æ Î23Øað‡ ÌκÐ"Tˆ÷ ‹odÏö"D*ಀ†ãœ­«F;Ý‹k¶)VÑbëü6¦â»Rïœ Xq%Ú±Z»Ô5ؾœ.%ÒÎÆ¾18>÷ภ’|™=ÕÛή¶«þÖO·:ëÃ".ã’o(Cc€?MA­+v'ö³‘,ÒKùgõ.Þõý;¼«ÝþâCÊb^ w$íì©€õc9í‰j™QT²ö,­­cÉ#ÙðXß(.³ÆGjáVÏ»œ~eÓ2\yÇtAAÃħ:'bÀáŸÀ·De7ŠçfZÇÅb%^ß°28çó+îs΀É?i]ø@-';§m¹ƒÀ `žÀŽŸŽb®Z0s­ D5Ôo+¬[€Š𔉛ÛÐÿN6RMòŸDüœ:¥Š™6Ü}ð˜}\¥Ká¨Ù:ðJ”ç̵ú:‡Bž"°MÐZ“¢$#Ls“ÛÿÚÒ$gx×"Møu¦–~%ûÍyÞSŸgor1~Q±/¨è[QÑhŸðî•äl{âŠëXí3^]ÁÖ¬ä3H†Å_D«ߎÐ;gš$"taø?ññÌ*këÊ>(q˜Uš³ø8D‘°“„¶:#"·¶ZEûñŸœò´¯†ÝI”l§ôè0¢Å»-1øÀzÓ=/*²cs!0D¹QçD7›w[nèÊí]Fµ¶®¼ ²hùº{Št‡áVhÎ-TöˆÛ^æ.98éô[.Wš„êÿ• ò#:.‡”tÔnµ³Åгr-N»ë!Y–Åï›&ÁdS|ž¢dw:Hª®®ã”So0 1¯«m:)qË|Ì›º1›Ç7û>Qj”!²3…úImørv³Q 7FsÆ»VÛNÊµæØ»@Ó´ãÉÃÂÝèrºÌÒÎÇ[—ÀeΖéDíä% + Ä<Œ›™Wÿñ‰ƒ^4³[Úçûâû®gÛô]Ð’Y­œªœò‚RŽpíz×gI…í¨o"«ŠÌÍÞ'MÓJ²†ás÷±°›v!³ÞÛ¼»r›‚fï ñjª@/];­®­‡Xo‘Ô + —êLY{²­aö6`*l5ÙþïWº + µÔ0'B!°2hKàçÕI&îZuã{eâ˜J!4'Å`±„cÓÇÛ¿`p~¹Í±×”×BgïeÜ©2ÒæÇüð€šØëágøò»QÅ,|R7«ÐH¾ù"qP-ºâtØÜ}OÄc‡C‚C9äC˜ïÈZËøçˆ…0—A¶­úWf¿ìöfQåÛ7eÀ´ ¶oQ¥*—êÕ—úŸ>P}€·ý7^ØÕ‘xßÌçÇbÂå">¨&¢¡ /ʱ·¼ü”õ‡Œøx?¦åo£’²vw 6І!EqýñóP„ÅøcDË­ñÕ¨ë8Ôy™ÑD¬øƒ¿x{yùA쓊šò°ŸÄG0Õ¨€qZ§XùÜ\&ËgJEÀùñãwø+ÓŠ*Ø\9ÓGo"<‘„ÕËÇ‹´MX,´"ø.YɆP´À“:Mß$×|$qº9Šéƒ *Ù€ÅUžM-œ?Ùîò{Ž èšH×÷ª*ç>b&”Û†¦kˆi¬«ä?£”+ŠF´iu¯JWIu]RöYσ;ÍWÎTcºWÑT«q®áÊ_JÅ´g]²Y¢|ÇK‹Z\9m4 kÒuKOí1€hš¡¹œüÊ;ßþ­„]µk«Bæ¿öæ`Á¨^˧߆NEÿœ‚Ê\i9!O’Öè&XV3Q÷¶°"½nNÀIÜE݃{h÷8Ï nóuY¢b°ZOMÄF»”s´;³C¯w`g7Dܲ]M(IIÔ]2ˆp­ðÖžÇ÷ôû<ý?u˜—Ô+‹cB^A±¾Î‡³‘³˜®<´\´Ì~:=#7< ùó JLõgšÞ»ÜnÈnÕñka‡°>LG#U½nH ¸Ÿ‰k¾òtL¤ô¼ra$yg#5×n£K + ŸÍ™þŽaÍÍaSÛT%üÕQÏM·_Óœ)}MYáã1ñ¼Òñ³<Û¤…Q„ŽEÝ%;2P{fóÂ;¶6 _¡É®SDÑZÝË:`¢ýæ²'Ù‚»BæE2DÆÿT™äÍoþ—LPÿE¬ÚÓš{¾ I#¨çÍßqKƒuÓ?’¥ø)Ì»eÞõKD¨5­1ÀŒ"ãšèžš›a?‡²o¶}ph6…Ýtq¶Í° Ù€Rqb"6ŸFßvÙS?>àBõM¶ó9)Íõ)«5:ÚµžÎJø“E¶Í6:1þÇümz$uͤñÚ[]“u†¢ä°9ã¶ß0#¹¶¢‹‡åŽtú0Ár¸áxÍ¥ ê9{@wMù%h¢Ö ÝpŸý›œùaÛ³öŠã½CtqŽn‘N1áž!ÃX»ò7Ä~Å;1îˇÜ|މêYx‡(ñú‡šá/ndW)&2Ê‘jlˆ‰U•û@#PëΨ 0ïŽ>;Ï:ÍhïF¿9QYžõv“ŒèdЮÞÿ€Z*×x + mzÐŽ5 ôi‚ërá9mÐélè$K‘¹½H‹ôav ‰ñâ³{æ÷du1…ð‘e|ûû…@ úîZÀöýŸ#>j|%Åf<ÔÒËn/G‚W\Eê¹5œ¡ êåÔ:«o鯻e*fMâ#Qg1¸x·?„†Žƒ ¶!:v¼’s[o Ê׳)Œ4 ªžûâIJXó¨ÃþÑ_»tëÌEø ×é1Ý! áÝ^reƒÒ°œxÊÃ,€+á$X ^ú£Èñ“<_«‘ä\KùP¤ÏÏ@㦢ÒSZk¾ÿгiÁC + œ/Ñ;Òh—‚+jÖ˜¦oiÆ!”•Ó¤JÙsÀÙ¼Êò _KgN5 ÉBjõ]#!iºÚfÂäCR.Ž + 1û‚™%]d¥97dÊÀƒ!žAGEuˆÀUWCôq9¦=O™ + é<åŽìÒŽ²Þo<“xÐðÑ¢nAâê‡z>q%P^:¿ÅŠç¾¹Í‚Tm¤f^f­JJÕìbªÛ{Öv˾)¦k­–·®x­Yïk5¼QäÓr¾oㄆɈc£©]HL‰’‡•Ç-&®Îc¬ÒN`;eŒÙzæ¦o™5_÷aÌ“3cž1ŒFŒ˜~SýŒêðLñbõwLÛ3W‹g‚5´èlݤ IÆ«pÓ~Ϥî,cÅÛUé ˜í^¼/?“B:ݧ<ŠñÝ…;–}=É„ŸM÷’õN-¥³€léº ¨¥zpçè*¬¿köwV0èˆô†‡h$m‘B + ØÙRÒRóW^ˆöBé†O³mR1Y1}ÀxŒTËÖc§ÚÒo“œ‹%|šg¡)ßR]”J¸ÆKeÌø kú"‘ dFŽ2ö%æ¢ áOæØFgÄ>ndš´‹é};å ØJgæ/Möú5Qæo$Œ?½»ÊŽ&'CLÓm׌¶Öä·mCÂèÌCý!h´Æ"bf»äKYkZ_$ìQ7.’\}Iÿ÷†ÐÙrºÜ¶û  A´Âߥ7¶^Ò´˜Îß1¿¿ÁÂI#†lH4)l¹E©›ýÑu1#‘ÂEž"„„ŒëïZ.ZÈQL¨z&ŠrRŒPG0íu”žª…¢T1êt£˜™RyOÔÙU`ˉ’aD¸ãudxïŠt¸?1|—áq´3\ÿ<,Vtód·0Ðæ/’§ŸŒ=ÿsB(êIf¤e8Ãl  gR@봛Lj>cîØâüqùºÃÜÆÄkZ2ñ¹ï²p¬ù‡ ÿ!OÏ·üäëåÔáó‹Üà@OrÜ”™¿y0áØœœ—ÂðÂ^\'Sü®ßžá¯øÍy!óýcÿeË ùð7 koì7¼÷/d¹|“Çõ{§ýdë¸raÿ‹†¯ýƒ~ôÞïýã—<ú'_û³þñòË~`Õ/ðÖÞЮæ2^½]ÆA']Úúßð%½¯â\30X[>ˆðæ!¯^Ç—ž—ß#½eîÇ¿û~_0ä^îo>yÙwœpü…s®Á–AH¢ßÏ=Š·0æÜ{çcüæ÷§~pãf|0æßœyº¡àg?KÚ”û§?Ù0ÿwÜêÏ_G¸ + ”Ûè¸?äÚôø ¿¾‚üpDÌçßk<X0f¼öSRÕ™çƒræï¸`©Öýy•qÀgŠ þ ¬ÿòÂß_°ð‹~ƒ_ýìßCï5ó>Pòïÿ8íWÙïOë1¼oþm–góà'0ÞN\ãMžûÏž×:÷^óŸÖ}þóú(qEfÙYèÉ%î3t9ÛŸrhˆ/œc˜Â|(á'?%ó{yîÁŠÐó3»žÂ ráÏØzpðoøóRø”“8µÞýæáÃ} ÈôkyXè+ÞñØ×<~Úþ­†ùýç3¶ýøÇ«#/áwÜ1=óÍÏ¼Š¦[ûÎô÷S=¦ÿµ°ð3°¾8;‚àÙœ8¶„ þ/< v{#2`4_nïëÚm­ÚÖÕÖ?µ[jkùºÏµ‹–¶w>êÛZVuˆînsÛn{»×ºµ[­Q­DXW‘à%IŒ€„@…„éQžÀú…àCˆdBOI (@JffÀŠ î|’î½jó{÷Ý6@º§“jâÅ ˆ«µd{„U[kknn¤£muoIÖ¹ö}GÙÚk/{«Ö¶ÚÙäêÖÅ‹ÛSmd‹‹›odG/^ÒŽ>x`† ð@€~!¡!Dš+ë={ý÷ºëý~Ö,ÛË–“»Öf»±WJ7²›5 s Ä3ø ~Dü0õшûäá”pî£}ßC¥mŠÍøž·šYâì54Öx08{JZehlh»«$öŠô±Îî¶¼ÍñJZuª‰·upÌÝögó]¶Üí·ŒìpFuÛøâi?øè«jA–,mËî7b>#VUvœ/±’/ÄGÔ6àÁ·À=!Ø#­Î{OLÇY¿‰qˆ¶àêØ#˜Þ¤j¦jáÂñT;,p‡æÿž9¤ÂnùVÕ}¡Ýµ¢à^Â,`íï!{ƪÛêiFñÙL/yQEYÀÚÚ¶LbX‡!û‹‹a›M=å/Y5U³E›Lãì5{»_t§ûsõ1qfÎài÷š\W ¸JÓ5B+î5 |D†o°ÐÎ~UÈç æôù@üÁ£ä…Þ¸Ò#r71ò ~§6ˆ›y6ül?&·¼òø5lHØ¿Î75òløØýH7Áòø5lLØ‹nkäØð°!;’ë‘vÌ7d¤ÍÕID)'#¨œ'Ph§Œ ¿!(AM‹rÆ8… ˆ…!( + AQÀ“,’ïÊ™qVIØÈ"öùG‚4GÈCNÒˆ–hŒN!("Ä–ŒN!Q2£DÃQQ~‚šÝ|³bD1봜Ҕ,+ßCF–DM‘ÄEG+Qšé$d©ód + â‚"… CM"¦3áµ¼&>My¢Ù12[•%+#¹HVÙ“=?"ŒÈ90¢Ö™3ó³ùäñ& –{ç?Í¢ÏiŒÖ쯹§ûÑ#š8$32‹ÎÛË#—¼páO2¬Ñ8E¸jÁÕ†Û ·Œ¹2ö¦!ðQpy£¼QÞÀox7L­Ù†îüÂSàáÕÆµ®d¥à9Ï<­~?ri¹‰5;®õb˜ê½›P6‹“¦Ûà‘‹vöMß.¢ly9F>Sÿo²ëToA´5´ÝñŒ€;…¾Æ¡½Å.y‚9â…µn7ò¯—¾A÷Ø'yÈÌ?¿;¿1›ñÉ>xÓ',àŽWú3ùÛÃ/Û/»µ™êÖ«ÍŽáîx¼špq¼/Ĩ!z’´yª,Ð…ÝÁÿÎEÌ×˸TN÷Ö0ÚÚ¼)*´—}˜qx7Ç”ÚÝÇøq†•úÛbÒÁpŒËsò–§f'•ñmJ­V`ÊÞÄkøª e«ðÀ?œß¨îZ£·/¼;»ñk]»Í_hús/ƒ^ß‚éf ;¹×ñ{úž•ı—ðýû³*»~õïþ˜Úšâš;éÙÛ µàáö¯nѧò‹†´ßzDó~‡ŒÂÓ£À!†S{ùù†È‘z2ÿ6Ñ ¯‡¡RH‚Ó)¡÷O‹þêÙÄÞL'1hãŸØ¿qÅ‚€¬ë˜lÑé:ŸåU9]|x†DhÚ±ù^ »ä¸ + q& ×Än3¶ÕÁ‘ÛìôñÈv¥‰VÑŠ·ˆî´ùëäÁ¥Ÿw9Á‘_ïIDê?@ž»mƱ·µ—Ê|½œ3zY0ê Þ/¡ä{¸U‘ ¡ñÕëê\ì<]ÿ¬Ú™™‘7³(m"ÎÒV¢°jÚºkçz™†XK_ Å›’E¯8Lõ096§am¡1ÄP¬'“Ö;½¢Óˆ…&Ù˜0›9H9YXÛ2þâ5?¿¤F­d,¶2ªw9Ëm5‹ š +W&þçËŒUj¹ëÕ&eB{»0­ŸW.¬oU1 òU‡dÄ^›W£Läã±¢ }ö0èF=±¤ÛÎ Á•ÛpXR‡2L”~_É\Mz“\¬Øß–'vÖœP~!n©L¸]DÆâø4r'83íqlíèå.Ñó­{60YÇèœ@—8?ì#\lÑaj%Ï·ÌØéŸ†˜ + ÜW£¨v[Ä^Ç•¤}øõñ…$ñfHÓ®\ö!,˜÷ŒSÎïðìt ¹ÓgS]Ê,x΃/À^ŽÞ|õ¤¬Ö4íÏ[AŒ£³é¤­»uXEœš`§*èé›7)·À÷Cx¥7+Ö­°{ º˜,Ò$B.å~\ê•> #Tð:n‹ùÒ1Hô€—v_¿Ð;­4~fʵ­•M®ÝêÄsǺ Û:ô¹ª×uý<¯&´ž®Ì;Q;(‹Þ4êÐpϡʗۃ®‡zP€—"¬*æ€ô¯Ü¤ /N©/h¨ÈZR2ìÄesÒ:uA Ây§tÔƒ°h|GêèŒó¹œ.ÓÏ}™\;ƒ£‡•ê:|Ûæ€NcNZv‹zZó8¹=I$”îJ†O3‡íD¢¡ÞPoÈdÔfZžû%‹/á´ÒPj ÕÈó€¬öò‰´ÐMÞP`êÍaÔøìBÎr+衉Þ¨0÷×õU>Œ~;;~P?´.«Ó`XÜ€ EBI}¢P‹™òSâ)³ëƒ`¦QgvÞj"âíw“¤G˜®y;ÓV£'tiÐu'óaÓÄaßiñ•9,_tz$¿w°dÔ½YÌÅè—@vPzÒêK¥¤þšLkŠÙÐçã6Kœk‡£ý‘â¥g«fÉëÖÝÝŽ>㽘ûh÷ÏfœØ$Ò-f„X5ö†¥_ + j°o¤úKñn+T×ÅrÒ–Cy«uàŸžÈví¹««ž½jݪ]Êei*]ÙbìÝ`뢕?eÒßУ¦Ãƒ—3K°©¸æèC–õñ·ï›ÜGÕ$E’Bl–è"êÞ4:pCD¹½kÉdã‚Z¸÷ô_ž™æ&`‡œ¡òx•ê"Ûj;2’–¶Èé9•™¤™œëðæ£ð’}îYî©Õå¯Õ sƒP„–¸twòf˜šÄ:±{Àƒ}{ãÑAP,ÝŒw˜•Ÿ<è΋zèLwÒž?ŒšÇÚ3g¤kGïBQ\û]Úñ¼ïáÁÏè(ÛßR·ÏDD¡Ä t“‹Hs5¯y|Œý€Í_–éhÁÔ{Ǭeå&˜ø’26ÿÈa¯ò‡-|Hùoï6=KŽþøîs7´íÎú$XÈ5V]AZQáöa³ÕJ˜d…A¥ö‡˜š5(&HÏ+H°o&õæ”͵9´d’îœ!Ó}}Qœ‰ž‚½‹a‚jFUv£¥¯ìpîXE²HÇÞ»‡9\ëì‡õ”ÙSÔ(MÚ;W6Æ›{ˆÉOf‚ö·‰‹ÕMÑ,À¯×çûBåùÅV ƒÖ?O‡-8¡¿êP™Y´ Ý+ùWŸ×–¿d÷x¢)ÁÇàŠ˜.§Å°l«˜ÍêÎüüm×”5Ëɽ¶¬ÊQ{¼UmEôsí¬Kræ8–é¿ÊÈhM¢gݹ>RKü´ mé¡dauJÂáæ‹( + "ÖôÊ/d‚‡Sd;¾È웫ö¶e1áa;„… —ðsáÝÞ_×|Š©{÷K¶ PQÚ9¬³Ø%ÎÁîXS„2Hde!ž›b ñ …îÜOeÍ(@µ¹'žjZ¸oWÓWïl5pG†b½Ì'öÑîn¬n±ªë^-ç3äS$ÒFkó> ö­ ™XïC°w¹ºlpˆßWô£ *è}ä¶ö±ß¢žX2øµûî|x)I[Æ$u:1Ö + ôÔ⬎¾2îCÝdÃ_' Œ#c:¹ŸsÞZóÐDrxzËqœ†_H÷"ÇŽý›jŒS)A5JÝä` ÚáCƒí•È[S?´VFnx=×õôÙ"]>v¼ä + fü׸ÁîÄpz]Š`÷ºi+„££²³£\¿øi(γço粆i.¦{³ß4;Ï+ÁßW¯§ÈBi»rª0tµU’Þî*~¬Lˆ5­¥îXC×ßO,679D5;g¥ˆ 9äÂ÷§Æ‘6­…µ—Øv Ñ)ë+Æ@ Œ£‡é’¬¯¥w¥íøÃêóG{Õ&Eø¯MurOu0 ÊlXjZPiŠýd_gý «mßõΉÄS:Ù¥²eÏ;Cø$˜"œIí’[iíIlil©n9o‚ʈ‰oŒVabŽâãÅ?Èd{„Ü=L–Øu§1fW”­W{ˆùl#.JA.#̧Ã×/ì÷Í£‰irOë* ¬ê˜uÙµøæÑʶðì4:+ÖRR…ÝÌ*xHA̹€1;•Ý«+=Û Â!.>”Çøç¸¾½'–æmõ$ŬxíùaÌÿ0ÅÐÈ"Ì„T ¶ û£O§+ÈPÃG × ¬áhû…0$`Í%ÀųfæqüS¤‹’ÅùQoЭCý@¶ÚˆKŽCžè  3C + GFæÀWx€yp÷!˜f[«»'j']F údªÕ‚E?qݹÇáå±e€x°y ¤rýó„½ãǸùaKÉ“-ƒÄ…ÔXBªÙƒeéÓÃ|cÖq¶u;þfìa»a°ü]Q*2_€PqB1.Pš¶êPiç´¨Ýc™ø8ß°çfÀu$VÉ>V0å:s^yZûTËû=—0Yu\cmƒµBñÖˆÛv>ðƒkñ4u¡5íEÚË‘Âå¾<Ù0ʃ#[)ªgTÔ’èÜ…¶«„{ Ôš àÀ.e/9÷؆|Ávõ_µ8!ªY}ÅÑü; \bí‚*Ù0¨µ#Lïœ/{઒ýfÚD•…q µløäÀäKZãa­ƒÌR")øàÅe[’8[=~zaThB»ÒZ¤]à ¿Á0XEÀæJwþ3eW\”–ЕÈ*åo-`#(ª,Þæâ_;ÙÅ>c^úQUý*èéµÇ2X<_´‚&¹c™ŽØ¹¯týòF…47°ÕdYõ6Ä n̪±¿#Áà,mǘ´¢vÌzQHí[œ}p§Ól¼ÂÉ€5j%7àà‘Î4Xu‰ÍÅä„îe™?c…Ç´.èÊz1ÅôS“Þ¤F"ËŽÁ_(?ëãó + à ‚âcF”râ!;—·:¤B+Nôà“£PŠ*Эø˜Ar³jìý€–¡{ŽÉpäs+0˜í£m_؆s + ï@æ±'v+á*µM¦¦ZƒÐÓóeÖ5€N®0+ à×û¬Ûb  cŽ‚³À;°1¡T Yx™/d¹šPw,Ö¶]PÚÈõ]!€éŽ,€†YëHÆùtÂWÖ„ñDMP#5U¬‡»¶|_Ð‰Çø…¸M :‹ñs Ïüz§«$]_ý ‡áÅe\œ²^Y`–¸~E쯕¤Ñ {EõzŒHNLþßOÌÌ3mvgùÂSã9a£¢†È10œ—Æ£·G~q±Á’.´¤æ‡Y@ÌÍpNöž'Wz ãqÜ¢‚]n¼õ€1ãÄDÛë«ê¿‹X`#Õ˜šíË‚éQx<ñm”C·°¯ + X€£¨Q9sA‡ Xa”͵­c¿Ýò ËD…­º}Ø,—ÃÓÐú60Øà-£É[^¹`¶ÕYΘ¤×£ù æÑ”ì>¶vƒ„¤“5XøØc/§É["›m7°îÀîrøp€^I.5ßîõ¸ÂŸÖ|SÚ’öAÃô­àaMΈÛ0`!°_3O»ô9Ÿ±Ý‚G ‚ Qëë‡ó—óÕú)ƒ¿:ù'«jGäTÞøïA£ºj'5 ü5><ÁˆTSWÆ»£Æ€²ýX¯Èé)õýiHk*€äZp'eMù–S¬‹3aø§'I [3 ^†uÁó:Lµ + † ~¸2Ïÿž¥ãÚ;_„8jò ôÛànÞóØK“.xþn¡^Ï |¾²ÆƒÉé™óN´_ YoÞò ÁcÐv1Üoâ@oêòF•ÕÐý*ØTL(sFO5ûJø– &kŸP3ÊëRNý@×H¨b–ƒýúQˆ0e>JéDz3–˜Í‹Uð2chäu + *ªƒe£mÀ2ÛN äóÌ9F!·f™HæŽ@>­õeÿK$ €XöÙ›yI 7qüým ùýÊ6!Ò7’t}jw .d½¼'pñQ£wô N%*S¨¢7X™–çf ÍŸb;×ïÒG=dpï"™6{C™QâiPTcz‘Š”`Á¦õ)˜•á›LeóÇ mµ ^YìÕ…Áb,×1³#†ç.c;õfÄ{>è ³¥ª€Ù½Òµ4'©[%ðõhóyª<VYöCÉ + ‰gŠI5ãV-p~Œ  ÒÞ9ª°o«°î>¦¨O•é7Ü.ñãtæí/»!˜|™¯`Ü_2†HXÌ W'5Ôø1ÓýVòªÇ ÖŸ¶IñgÖ—|Ô:¯^眖,w‚w •4ŒDÓÏgT¸¤¾o1O 炞ž¼Ñ$„Z"•,ÁQCRê°–fÎÍs ©†båªøçBå•~Ö.<êôé¿Hú\Lùÿ4coÈûûŸùÀ 'ÅåÍÀŸ‰û£f@M~4¤ÃEÕDò¶TDÖèÿ"C„+˜B:'Üá‡;ÿp¬Ö]ÝòáŽ;Üp‡î¸ÃwÜáì?ÎÌd·³ÿ3gyÕ}¹á÷šÎéßÿ¯˜ïÕÊßÏŽÍTëAðfFÍdïVwå ²üò¬¹þ×êzÂSÏòQa7Û8›þü2V¿©ùú¹—Ç š•æùÊ´‡M—²ª!Jвb)²!)ÑåBP‘6›¤ulˆ + µ¹P( "b-"–-”rn.b3ibª|f›PlJSB§È*ÕÔ„+ÆÿMŒQ …R©„Q55Cã{ÉKŸ5¶X(©Jg)Ÿ†(TÍ…RÆ u6¡ + Rf'šP°DATÖ YØ(¥OXAn]"…ß­%¨ ðJ¢•¡„"#,ÜœQ(+?«õˆi_ØáªRSĦ®ëÆ ZT(Ê?­n©¨W©þ/36h=®MpÜ…ôFžÐI&³ކiˆ76š¾reê6ÅÝ0¹Œ%&—!Ä4Fï]¿u™OLf˜À$ŸÙe<1A1±386ñĆ”2à$%þŽ#Ș˜X)# + ÒïoQ`˜iÊRÂoÉmà‰³ž&ôvMæ‘»‡ÿ2gõ#Ó{-'ÒØÒv;AI;Që¹½´ÈÚÖ&ùÒ l»›ëKÁ´¿¶ŸN§ðv¤šãoyšà[P'ˆ´Î[¿'È´ÕÜ¿'4Ú¸¡Oi¿¹€Mª=¸óM©iÌ]‚‘šÝÂ'$µºˆOj yM”«W±­ï½W‚Ä‹|TAä´?|ÕÈÜ'ÝjäîM„àÉð<¡›pD¡?ið„cå + ¯©Yy¿‚È›7VÂL+BM’(“DI˜”J¢¤$Å%Q(&‰’1)”DII$ŠJ¢QL%bR(‰“’I”D¢˜$JŤQ&%’(<¡›¸DÁ¡ù©/â‰ÞÄSDç“Þç¿„'&…O Ç¿/ü+?¦ûØ}›÷ÞÈ„2’p5wSãXCc MöDônØ=ž›cw6°ØÐŒîòp߆dǸÛMîHÚW+ŸÑJlV±ÐHñ¶V‘>,Jñ[E‰Ã×á®]¬ÙXÒËÕHÉ“!þÞïÞð²^[ˆ¼¤=H"´Ó¼€?^ø¸×ù¯óæË–ðnÂi[›™rDMUìôêõôú»ÅO¼sEïnÑ;ù«ðíÝçå¢Pù*ë|ﺠ)¹)Ç»J }ᾟ0½´û + ª¹çÞìRoÖß¾õÈR?WûÏA]§Aú·Þì°¦<¤0ºáŒ…kXÑ<†ƒˆ¡IWqú¡¶êGzêÖ˜Xa.\!C·¨9ŠŽ¼‘¬°6wæŒ8ž¸mVÐC§SÈ‘“»öÁ–XÓEçqb?áW¬X°W¢õ¬Ý{ÎKWqú ½›®?¦k$®ˆ§Ÿ{{bÔc…‘1ZQ`Œn¬À7¨îQW9Ô깩ÜÝÙ£äàSÀ«®×ªpv¬´;ŠËÞõ™¸¬?&ø®T««€€ºÔ??Jj<<]jCSYGM¹»ÜÓ Jë²¾í´;ßöb] 9-çÇoufERF@”Ó ›‘–#ü#m³–a~,?#Àl£5rÞ™Ú`Ýå€BcNñˆXÖÈÚé:3>r0æ¹]-¬ -9í2p‰H³»‡ZLž¾ÎaVâŽL°(­°õˆ–sk5_å'H¨t¶Óí)ûÔ>él`{…î@qmŽ’HQy¨i!ÿÁmó!êr¶ÍLip´0‡(˜¹Ò‰—Ìá¯Zé÷M ‚¬sæŽGödiƒ鬲ZÙ¯†{Ô"‰/s´¤wq(¾]°dø1¹`[P^ #©8Ö†…ϹŸ6.P2æaíà^ز“Ž ã1ld€Å-ª34ó\­°sDÊ~j ©£¸Î*eÏ¢diÙv¶‡ÅÙ…eˆÂï¨ ¡ý«8iI†*ÿúr]ãxv…·MËqÞõ„'þ§m)¿FÉ–vI 7þ<¶iMßw?ÌÛßfì¸åM;ÁÆ—ý΃ÚÐHaƒØå§<¹ŠÑ â„FÐQ#8Ë%%™Õ- –uÍa[š + Zd³Ì¥©DÄ¿k*ÄW":à~NÛÝL—&ÀËTRÐó\ƒë $E$ûC_.:&Ä(3!þÃgcEq!1"YÚÂGQP  Ä䉹$ üãTKUõ!K’n.dp±Jyê²èBÖ—aK“R¹^îFV)­ÇËÁl¬f)0Iã•L–%Z™œÉ:Û»ÈágÉe)a¿bLjܤ1¿Ž[°×28._’¡'¡ÄRzYÛ…LÑN• ©ZÎ’æ–Ô)­wpÅ3©:­oœÒ™Õê”D¡¹/Ó¨\”Ã`‹Yçí?žË‹ó‘úNßU6p:t'Ét;и’GÄ5–®±®Xùí€L}é…o“'èµTÿ¦v™ÒS× 83/kmæ›,™ÄšÙ£6tQÔ9Š¸ë®‡›øþ€TÕʺ0Úþ¸®*矼{1vó5NRnã×¢ø3 %1ø-ïl·èñ^¤ùÕXT a¾:*T{d°S + †÷Š’÷˜/³¼ÙO©û;Ôé]Á«Ó¶Î×nl-àŸÕFÔÛ ”ºá·Cǯ'R›ºëÝÝ »ƒ$Luòí’μM2䌕<ÁB›öùF`¦åyŠH!¡© BñÎHX[ + GA¶ + 1¤ ñŠlt@HÌ#Ɇiç8A¡3†îÑtr•¨Kš/ÿ=²Ü°)öX­Â°¿7LJAºp$ðo]–P…°£®ô^ÈUÁ– #Ô~;$b‚"­ãÀÒ¤ÌbbÙi"1’«Ÿ)µÚ3WóOܨ~ ¡*Ò{ùÚ<"ùéB_4I"Ø’˜a\=-uëzÀ~[¯ºGò<ƒ¡ºƒbàé0¥ÒšJgÝãÁÈG˜VWE¢Ìáù>ÐŽ„k•/[z1Ùà²PèÈ'슡¬´c¡×c¿±™—:ƒª’55w—€²+µLª]ŒÒy!úaýâ `ßù>X2/Õ¥xhmÞ¨:Ï\¯Íï‡úQ’4¨ÚKHBz"µ¯èz¼¶Íbk¡‘$ìxPTuŠ‚›´Ma·ï¿Åù“AP˜I 3.•mÚ ÙÍÇæ¼'9­êÐ*á(½Q•jíŽk>C‘Vc» Qì0³pÒÚˆS``­£K:"PáxóªØ6PlUe¤Oß³|"épªü•³d%|t¦bëí"fS‡òqýęڠùÚTá†ùùº_EA‘'p× + íXo°I |†sÀØùCž5ŒFyÌd÷2’]ß?¹GY3ÏûïíuûA„’tõë2½=Á·©IZ2)+§g:óÔžVZ‡Z$'¾hðxËûÒ—0<¤t5ök€2:®ƒš8‡õI AÞO0[sd’vÓ|4èxðÈÝm9î-rKùðn/É)膥Wu¾³œü9vàƒÿGð¼D©Ñ-ü†@¸7í•Wj“yÌé‚rñÿäÍçÍŽ’ ‰ôSô´8†2 =sƒ"i¡²íä×"ÑB{ôŠ;“ËÈÀÜ(bÊÓ + ž>+G>”¼u%f˜F¨B܈S„&H[•\MžºN¼3è>Iú|úQC#Ѱ5‚ªGºk²¶p~ Ÿœ{®Í+µ õð.Ð^˜MÌ,%#p7VŒQÍh–J|ÁyÁäõ&u„&¸¯îy7ϲ;²ò5=yâ LIœa¦^Ðúû=ds¶…(ëxÊÛ ,w\e}gÈxBQuu´Ö‚¸¸’>»ÿ=Ó!¹‹59ôi5u—„H`:bš#4³àíEõ%_ȹ…=ZäM=„ µ„•õƃÆÊP¦­áD ½+®¦¶Ó»HÜÍc WÇ&V2$¾É—?ŸË@ÛëÇ™ÓuE\Á/O0ºŽý:×¶jç7NïÕì4ªd3²Ú´`½Žœ†žs]Ö Æ¿ýo±^¸\ÊJW,7 VÂÎ:ÏÄÿ'H(Rƒ8~Ï÷PÎdì'”ŽÊ‡W­ëë#ËhfXfçffgØx«™U!û_üÙVeÕ>Š12ŒgNÅ/ãa³®BjÈ£dްߤâ¥ãjšsp¶ÇT9'i†Èؘ¯F˜¨@YêÁz”—°z¤PW=þj$Õ° ¬ø; ¸áæ£6ŒÏ5ÛÓÃö|˜r'z2/”‘ŽñôùBÖ⑲&4§pð¡}¯^::y>’÷á`ÏÛNÉÓÿqãñÍÑ'qyкè0äJèWû΋9¡cÝI‘M¿‡ßÂß´K_ÂÏã3ít2ua…ËÆæ²¥4óó "Ì‹_&¿à° JK¼Üm(Få<C›¥ßë®®2·AM‰˜ÙlƒG Z›ƒ_/pÇ ò¼.àÃξԴ,A¬ÒÃw´-ýœ C=…G˜1RqCåõHÖúü¿IY‰ ÃÉ€V?CqSyH_mª¤ÌmÓ°ôõz¡4ñ“ãŠVjJ:Cœ†u®æñB!dx-¹¬3ÑR#ÄzÍnáØÌ£¼àϲƅ`.†~¶ì';ËezdhãZM1¨ó1í¢(J<ùæ²¹cU÷&Ë¥rá|dsª×÷€î.ìƒ Û3FD܉úç'ÿ¹¢›c‘#w–¶È‚Q‰‰ó°±tܧúá@ôf}GØÌ•ñr¿’~Ä[Õ¨qƈ¶vqƒ›÷¡kp͘\.¿9@æ2äf + ˜ªiÁ¨Ÿùßy,¥ìX¿³ÍÏÐö~Æ£D-öÀñ²/¢gkòóév^m´ËÌù¦ge ‚‰‚Š’ã©NA.ÌÁ+SbÈyN [‰ÓØÁœikqÝW(Á •?\?Òî¦$”æD^àÑ#ÍÇh`Üjì waÊ‚FoQÌOº&öyÀÄ[®èç¡:Î×?b§Dªr™%Ì@¾,£œ}\ªÅ«Ö>hN]6ü>l¾oYa<8><8,;\™ã8w9LÓ|œû ·;ɪ£>™[M*º*KsÓÊÊõ.þ²Îc}|[+Ž–g¼AÎ!‰¢×&ÿè òâ˜ÖÁÌÆ‰7Ì H²‹œ%ÌôF#‘¬¿*äMqCüujô¶*ü›×(§W “÷n$X!…`Ü¥­3˜M?5ùGþê­¼tB}Nh±¦ºý5ÛõíN÷U4Ýÿg>ƒo×Sõl¦âœºR–h„ûs ã{cµ¸3ê»› ៭¯|ý}ÿÅêQOý€x<‚ + Œß÷ì*ÚQË8x¾Øñú½ëeÚ³ú +  ß/÷g6b?ãÔûSÕ¶Ô…²Ã`Àé|’y>…ܤçkuqVmn$_ Ƚî©É›c pdÆÞ&áqRí:`It ²m“Y‚SÚðMr××ü€…Öˆƒ¦Mözžbëõ@4Cb¯—@¶É’ûq·ÄÍÍŠÌJWœyÃPg¨LÛ©QxTâV¦Œy)ÙÙÖv§¬ŒócN1ñT°® ÆF{çør·k†ÿAMÁ׆q1‰Sy”»ïRxKÇœ©ùó?ùà3ïÖ¼æµaPÝŸ3Ï90(£ÄeF+Oe];Ûèô‘aî¼u€!I)Èw•OHx‰ %Vüö"†™Ý}‚÷v;p@c~øÌᣅtÔ’ËäöÁTÅ\(Òô².W8«®µ84à‚Ë|òÐGЏeFIÍZDè­17fJ0ãòÓ.?#!™+Mµ¬š¾{_NH‰•è(LQÿòؤŸŠLM·ã‡EÒÝ ïù¹úÇ?Œ™¶wë§ü¢ÜùÌØ}Õù #ºýÿ—ypô|Ó5£¨z˜,5ýz0B ð`uŠÍUDHošMÈ»¹É1…¤¶²?Ý|8šJ0Û:ÙnAMÚ¦oá "ôzr;U·ÙÙàÆÂÇÚI®yÙ:³­‰[B ·éÓèàªÝø–«SRÞélÞìñ£)I`Vø{ýP­×Úhf„’Á9‚·#WMQHälÊC¬üîŒ,õ½Ú‹®“5ÿ¯Ìy΋c6êÙaÑÐJ²ÀYìé•©æ>JÞM 5~Úë–?×Ùm©QA¬Û;y¨*·´xý•pê—äÔhÝÖæñCÊßû]Ä«« ÖÒ’m¹©Ï­mG©Ç5´s‡ZvÈÞû£†®.U¬HJYðŽNøb_ÓˆÜ!ó/”X¼-/.·-œp–qÛÔ4õYè‚6oÞÒ¥‹&‘xú?=Eššny¹œŠf·Ã!LÙ jp©‡7Rsù( Tè#м\¾õ# xÉÕ Éó‚bÇVešèz7Åð§WÄþ—Ö½«èö}ª"¦Qô ÍG† ¨[ØI¤âUŒ2Ñ ˆµöÌÔß + &&é wè ÕpíC3¯ö©& ¬Ê‰a~òþU;L㉎ÉÂb‹€è‘’?<—VL ÝéÀe^ô~¥ú •×'AK •‰-T:TD<ÚEsØ=B¸rxÁ!§å3„#ÑÄeÛjÁ7³¥yiü + h%mØ ¯A“2_W¬™О@Ö­°jŒvšSFM°HUœ–—ŸnñÐÄ,Uã<æm—¢ý5 ‹EïŽàbè +J ´Ê[ÌãŠkÃÞR B°Hë˜ÒCTªHإϜ˜0·ƒˆ9ŒµuTúËøÙ&£[+Ûf»'?šJìêÅ{ Ç(Òþä¹éηy”LƒHZ—QuìÔCœaS9—R€ PäºÑo ˆª«Çpt¹]0n¥UOk‰|=r0VdMÏ1ºð3´`œÞ¹—/@P=Í'âÉÞKZð7J+ÿ23>5ä”V*’.ÌÏo'‘Å,záì¨T1‘ ’çñ_‰ jbCjž£<ïZ`å:2ëx»ŠA‹yE¬¸²|OÀ,ª‡Fë¶G‹ÿýó}4®Ÿ±k¥ó›èª¬°°_¸`:ã:CÜytò(‹/Ê:³F3õßÝû33vD×Mˆà¦à>°”ð­Uý?FcN`ú”êpù'i€# Ü í4|¡ï#¯kß{w$Ì,nŽcmß=+ý c?.é0Jßý^÷Ê¿XÄø·Öñz喝'ó|¹KçðÖ†§ýÎ+šGî›Ã²õB×áxÀm©ð“áü—ãæIœ~Èg׸í÷ên¹³‰Ñý~ þü+Ášø’þÃó?õ+F©ö8çæ„_x‘ˉ%=ȱ U,n·Ÿ—èÖsìV™%!WaFôÊKµRbÕo֤Ȍm“Ÿ‘0†Îó¯þâ‘ë¹=å°L¨xiÛ42r/™K“/T¸ë)Î@ô["ŒJ='¯£]ô×%Å¢â‡D•à篱‡=œ%RÏ”ksuõ÷™R;ãbFÝfÙ,ÎÛ…¦ðŽ[¬¿‡g„&üRÏ‘æ­ø päJûú“³²éb†ú£ŒøÝ.¿MÓ+ å‘3W x”šýP7±) AÓAC_’ºY$xç¶Ú® + qç¨OT>Ëÿ†ÙØ + ¹£%Z¿IoR q‡â—5+,4§”~H2´b0qI*bG —W%î b$: gK”¬{8ÙsFö¿™åŒ'•2ûS39d5ó?Y˜+ û'í-˜(½Ã,dpôÕцý!ò¬¡L™þxݹò8ÏW¤iÕ2’ØÊtµý'-_jŠmó§y‘äí 24wÛ‚ËwDÅŸ¬r+¾¡²ÔWÏYwÐ]ªÙÂÖ±+£Y6[ gô©ÁÜë–‡ås]¿Š:„q­ + 0Åu‡=ôËû8OPÜàDvÅ&Âÿ›ÖÔ4í[¿Î0¦ù2ýësAA/—JL][ Ü°l`BØe¯æz€„ÐHcDƒk Ù§y½÷»g0QÆHèéÆÑÁGÁÇŠtrÑÔëöÅÓ€ÛamAÜ ïU&XzBçZjÊ.ëk@€˜‡\…<Æb®ˆÿ+fš¨ýÐO¯9†ÎîSùBÀFøÀz ظ‰Æ  P™ÒÑ`™w"x\£‘ý«ågÌóÂv@Ÿ•h¦WL  ×Nä{T­PóÎjT…µª¤*<…v÷ + tšª\ + é ]Îa;TžÊ³˜ÀN»´fmõü+_uw7BÑ + ŤãÉ”«è:;tô­…}áxr虄ƒXñ‹y¹`Å-³ó\©Z®¶í4Á˜~ ÖgL3¶®-Û^äÜÌO¢.Y±í×ßsòP÷ŅЦ=^ûÍ’ì ’åßIÓÔN†ð8¾`ûü'—ÜNJ³M0²_ Ø¤¶ƒYrAÁ‹s'ª&1Ó4úÂ&î„*uõõKÛ¶= ÔIÜL»>“B‚¡ü'“¡Ò¨NBÉbçØ˜lm{ÖcMÌì«ÓiLÈžôÊ$˜ cðŸ²)­mów¸Àå„Ûð“4ò­¾8.‚„Œ=‹¬W°lPIt¤“zËÀÝ'à3vÏ™Â]É@mVðZ<)÷DÏP¸«‹J¦r•„1öÙ³¥ÎÚ¨x}y:_=]h!_ìÞhÿZ…§&¢‰V‹˜ýÃwÚÂwøSu†˜-~Ú’ÇÆBïäMç¢hVîØZ¿˜; >4‹]¹ }6jب®žéÁF×Å´‘¯³‘ÚÛAüfðmè©0ˆn² + PÏ q¿{¡v„t"ìmz.Ý~dz“ + OÚ^PºÈJ‘çUܦGü%•F²‹SOO¶LF…4bÖÉèæ›'â%%ÑOF+g}òcNó°ûWÊh¶¸"Î0g£lD…sGÑ(vº·‡x'´+øX6ħmq76íY 1O@¤ qº`Ì)O¡-þÆÅg#–4¶×ÏÌ›þë m¯ ç“ùV cë­êýz–ÛµîÐ&õ Ç,€d[Ý´ºýõ…ª÷28©®UÆÖ{‚°a<1µU‚ÖZsw©6‰Iòì6•O«Ðø=’Šàn©±’ž + Çe<]\÷SÑ™BÐ%¹£,Õ ®±ß¢?óz&|ãiû¯²SJ_Üû„¼ë\Í¿âñ‚. Žà$g¥ˆÜÞ÷ ³€ß¤˜6ÑŸ$|O9[1ú˜¶/Íjvu¢HúüÊévÍ¢Ý(ŸÙø}/2AO$휇–ìüÔ,‰Mu6¶%ù EÄ=SžÚb + Ý[šÜËR¥“72Ñçÿ†÷©H}¬­3“s±B­dž¾ÿ wŒÉ‘ÙÂóÛPEOÔ*)™hÙ@ªïx (ä=€·ã“• ó Ò$(S!g¬<ú\)tCŒ±å;æ + |&)îœÓ+ódœûÞ™¿ûQ}élnB%EKþäi ˆ*"›Â>\*âr'ùN¡Ü¯Å’$Aq5 ‘_ôÿ¡ Å›ïûðÌ,¸½€Õ'6©™>ŽþÄrŠ)è©XÕ+í)ž¼Ð$«ojúX>uÆÒðÇ‘7›± IÞË©ÆÏ’²”x-èÆ¡K§R·—™¢|½(ÝðJ£Õ®Ýj©œÊf´xkëí&¶³„/ý¡t4Ò®st¼âÔøõ1q¡u±Š$Ÿÿ½œ&Ùàáp¿ 3èâ¦'-tìË•f.æ—~˜¸IJ Gs/35×¢“éaÉ&lI¾ksYµ…ü=,è]Ê[bæ€iqWÿ¬i(M÷KH1“3nð°9’=´Ù× ô†*«­A¾ü¾mö³ðy1…{7˜„FœøO*i&Žßä)ß®,gŸ;ö¼ì÷¨ìlÆ‘Q.¢»¦u’óíT9¢Ë”̓èum×}ÁÈrÐôÍI¹hL)Cu‚Ÿ~4æ¼yàT½Z•MF"*&Ú“Ó>1s­ + åÿÜŠŽ¯÷OU4bL†}êéh­Pê¨è*Êj—TÕ²3æï«U»‘M$%팤ܖ£gtçS6uQ®µZ`Xë?š4ð%ž¤]•§žKÌï’1¯Ëÿzz€´¿TNøÓLg»^@Ü[á–†òuÖÜrWÀASh깿—¢c‘ÏE:¼3ZPÜBþ²ê%Íë Ö–MèÓž®³TÒ¼Þsâ¹3j"?³¥Ø@Õh= [¦F-0XÛ‚íÒš¼;…töLä3ÒQªúꚊh'$)òŒË‘·ÿ6´e±—–c>£9‡Ié¾ZîÌæçÚmU‰ýFœ>5©û±t… + ÚÄͤë0¢¦ÈçžkO‹öÞ_ЙTìÒhš}²Ï¡ÿ¤’)7ÐÉæ.…“z-òÕŸñDSìsçÂKGµJàLß(qC¨Åþäºö¦)꘢åØë™ÆÆ0&®UqR þ2ý‹»úd¶m̉ô”²rC¨‘¬š´’*¸ÑGdðÜ)ù)Sh]T [üϾJÙã‘DÍ{ù_ÉÂU›,_µྚ]Š“’•ŠÆ‡_©éq?_»¥}dõ®…n[­·Ž/§ÅLy¼¿<§Æ‹›ÏúüwaŸOWöÝ2MVÛ¤æ“&¦fnit#UòtK‡´°Lõ»ê#Ín-I÷‚‚²ø8#ï~òÙ,F§ $¥·Îäz´ÊŸ”Hák]¢·Oм8iŸÒìÙ&Ãö…«ô4ÅÚ-yˆ½»½›ÆhÔ?ÐúGí•zÚÏg|„KÙÙ‘å‡ÎVŠÑë<âf­†ã×Ójó(t}5Ÿ`_Â$ÈÛdšÔmòÓÎÀÀyh=Q€{h³²«¢‹Ýèœ@Gª’ô“×YÒØèúÊÞ~ÝÄZÿéÿQ%k£^†xÕ®O•:ªÕ11À_æS'¸Þí¯6Û_ëå;Ýó¤ïÏÝãë@dzŒB±Ê¥9}.Ú‘v+­È׿qÔ³‰t_¬jw©ìÐ?íJOÄÒŸµ§í¡+Ïá+lׄ§&\Σ*¼¯¬¿S øƒL—§R¢¼…‘~Ë ×ÒŒ÷a¶Ñ€Ê4ÿ¡¿)œo›æ&yƒã¥_’Óè’ZÂ@í9¨çÅ÷¶Y[µö¦‚*jèÉü6lø—ʦ°áx•€ØéhëKÑËll‹24cãã?VfÒéõ›ÉéHþù&Æ# + £NÛ?¡é’'cür*:U›~†æÒnJMR¡FÅ„b«ûù,í†bLôiFÎ)ÝÛU£‘@mÚÓSODfB•?âÃG“'K'’mˆ=%$›ùN§M n.ͺÇ;*Ôyâ©•å(±#5!kÏ—ô•H¹nH­xÞoƒ“<½C¾Ó|œhòÇÑÑÈà»”?›üS׈¾ZRf>¤J”5=ùv?ý*"y|«Aì}€E«k OÞ±fñöôÐY$@ˆ,¤méE·°¶¶Pî3=Z Šb¼­Ç¸Í\EÏRÃë^ =O3&53IDÇØ g%·Ês*Ã~²®€ ;®Ø8“°ÁÞg õ  KŒ .“qfÀ Ë–V°«K…#“zn“Î1ÿ¤§_­? “Äuüc$f»iéÝo3NøyZޝ¦oÐðMÉ’€ÿB9Ì#æv@â`8^Ƭ¨6Òó/7·ÅõîðçXP-ŽÕôÕ£D+é¨q°ÞÂ7Ò6]=o˜Ã zªàØ-6+rö$x¦=XË'¡Äëxx,9²uþ’03Ár-æ`s%C›iKlÄ’{ˆKªãW9Ì£ÊݼP>â+D £w)ó\Ϻ·‹Ö!ÂÁ›Ïû´;0³Qý¥L‚ ÛW>è¸æ]jZVp;N³‡ÐÌÙÜF¡Ë­àtíwÔ‰YV‚gÐý! + wˆë¥=!à†½ÖyÚyÀ H(#"'…¸œ7&;Àx[vÆ ö29=êñÖ¶­a;ÈÉú—p49orTñ}n8HÈ`»vØ«šßÚOT÷Îû 5]^½ù×Muï2€ÿ#´ÑÌN—ŽÑù•72}jçÌôzÚ¶:›ðÉÎËV­Âà¾Æ®¢šÍ‚D¡ÉKÊwÑæh3û¿§þ{¸‰'ð9±†¬ˆ ¤hŽ{ðn_‘™¹ i•eû®ª¡ß·p¨åpœnO<µ8 8'Æ3¢û94œY椱KzCgHð.äŸLú€ ^ŒR­cëåÕ_Çó&0ý„ÐØ¾õ¦[89Ÿ,<ÿÄ~ —‚Ô'ý°­ÿÚåAÒ˜µ+´ ÜeI¹0ͨf+„Nㆸ‚¬…A}4ÐãÄ: ¨¡“ôØpÿê¸Ñx' œ&,5ZóÆ+fIèé3•ßx(Y$ŽYÝ[‘¬ ßcFO2ëõØMk§ý½Ü¾ŒlO't™µýÐVtçæ­ƒbͺËÀÒ\M¬ièÜ›ÿÌU“™Ù®z¦µ—lmˆðÖlt;D1[Í^6/k\¿_³Ñz42Þ~Ýs)K?´††v¯û&dÖ>*u­¿\òjø3¦# écdWï¬r,:3q†è¯–úÍ‹®y[¸‘j =1aLµFšF§‰Ðd¾r]›FÛ0'cgZ;á çà!òÙÁÇUAÙPŠ•'J6Cd[#»²a^첩ÑŸ˜ùI÷û2`«~Q4n öÌÕ-œa+7‚ï~xé8›úÍÑ@AF\ºJótC†q”wjpqÁ|ú¬Ç7àè¬Sf¨/B±#Ó{2§gG9ÁÑGÐëñ„14ÇÓJÔß O#T_X¿‡>¾y=x%«jkŒjU í2qt&¯^ˆ…|/ZwÂkþ¤÷ê` + ¸Ö]Þ½SÎ]Å™>QI°ñ¹.GQ {Öh‡ãŽoÕÉu5$7¾€ñ¸} [õ:ò¹Ðk“`\Ùt–µk&jò(ŠE œáëV#‰ÊR å)Œp‰[ôY…yj{.ÓµYúc9û5Ù^†Ã¯¾-òž±íawQÙ`ê^ú¬ÿ0lÐú™"€¼Âé1wo™¥hf¢à”‚¸†^ šìcÂË|’•…yÕ%ʹܯAðùêžž(CäS˜´¼VÕ£*3޳FŒËtSD ª(º€;›gŠ/´Ú€|ÚÚÝм¢ôFüW±#v(F¼ëƒ4ÄâD~ݜ۩"™æáU"W„»‘XiÀDýóáúx‰MȪÈO‹ƒ|¢O†z´^V9ð^:dwb³®´ºˆ÷Õ‚LXLfµË‡3çlš„Ö œ Ç¥ßÄh2xb׊œpÌ=¸À™WÎûearPéSÆpör¬|¦©_‰h椇C~ºÀ£ÇšÐÀžÕÆÎu0,©ÃÏÂOk·Ê‡êG÷¹[/÷‰ÄFEUn ¦¥ÎÖ™ó¸~îO2C= ñÉX#Ái5$XâÂTH„•ïN[šµ³`®¶ ¦(gSôå+ŲõúçÙ ¨,Ý ll¾õ¼ñ·X¿Ê­~lÝ'í\$@1¼àã1ºÜ{ð’­˜%n.ce̯èhÞ{”ßõ»·eUNP´è臱ÙTšò{4GfQ–løJx‰bŒ—*Æò ´¯!l]:yÔ®&Š+Òkªð¬ñOÞUUÜáe zýjᅵ’Ë#j©x¶2 kIlý…Iº‚Wt`øfAM|QÐà¦ÍÏmþ„}ƒÂ¢~ÚÞ€—;T¾•;ð¥“lŠ¿]„ºYüë¶} PQœõ’€lðM|©ê²OëÏ=ÃÌK¸ñŽ‹õûí´ˆM-[5ˆ*@æ ¢wv"‰ž¤Í{TBÒè’îSYDl«BJ‰Ñb¬ãu°ã@éÞv|VÂ" —±raî2[VÐ*‚£,ÔÕYBa_U,âmƒ16ir•w»nTÚlˆÉóK%f6l^jêÿ%¤Ûõg}f+ÔÒˆ³>48wÀÏ_Pm 5뛺Sô–«Dås*Q¸Z™[û=žžæ x×g,y5½»äÆv:¿SdBV‘þ›¢’¼o‚q³ OøèŽßüàÈ}Ö”´`R×QŠ(nJ+l`ăÅź{L ’cE¹ßx<Ìoôû{¥‰ ^ò„ !OÈ%8Å?þS¹òÌg&"¥ãð'Òõ^¶h+ñ3èõ©>³\pÀÜuc4ºeD×QßBÀšQz~·<æq‹>æ=—b’ôÖ7­#6s§§è Kdm<ÑiŒª{q¤X뤦Z¢ æ^¦b1² ¦œˆÃE(N G€;Ò{šôÇ—‹fN)‡(Äy388 ‘xlÞõŸ¡`y²ªežÕÍÈnQzÚ-U$rDÉ¢L8rHš)~Ä'õ?{÷ߣë€% c1qI÷Ò•C ].ˆÐ5 + *ã÷s/Þ6HÉÐ ½É„€ofÖƒ\Ù«Uš¼f©1ë#=ZÀðOH‹Sú»ÀVYËg‚·Ê·€W¹¼­o|Iü + ðvÅw÷'5#ôƒ+”ã±áx^‹gs+ÁqŠíòY%ÝóÊÞ%²À2­2ð™[YÖ mê½aÙzSï3SWÞØëô¦\ Ö‰íÁ’Æ;Á¢gz)'«&wÙ€qÀDô} ¿OòTpŽAFG8XÆNÊeELy©h5EzÄÈCDFü{¹ÿ.ر’Ž—J4 àu + -È;wæDè(X¹ g-FCý=M áw¸i»•"Œ/‹®—äß FÃLsÔÒç&{òè™åÔ—„ëø³£ú»CNTì^¯îIïÁ <=M9W!¸ ¹¬¿&#Ž–~ÖÞ´OGZÂU1ì¡awbó‚—ÿ/Ül¹MÖÖÜÔbSØ(v&|ïÑ_ÊI÷Öoµ5‰Ú¾Âö¯"à~¿Ù^œ^H¦¦`„¥\'Ÿ9BèióóÀÒ%Ú}¥9C²ŒF·Ïa>\%ƒÁ"Öp¬Œ¬~JÏÝ^!j}hèÿøÏ~½{˜ÃûÁ_üß:¤4„²•ÖÝ_ 4ÐâûÚ1íJuÚ‹|¹ÿ\ÿQ [šTûQäVÿ uû€Hk›ís]¨(Ñ“2WrÈ%óa3åÁ âÛ:ìUži~CÙbˆWQUP¤õ)bJ”»®÷ß—©‰‚ úØpª¤Ã¢¡,µ+¨Õ(ÉsÄOí@8KŒOˆH*ã[åDk…÷Êež¬3Ó¬û¡Ž—¹ÏB[°+%°ÇÃUÚfΊN‚îÌø¦µ¶Ùç`]@51ø/GÑE²ñ>Ûwr._U#ö¼ÙAö#ùØ òŒõ§mñý5Ì«9cèöPâP,l¾8Gã%,›£jmKa†•wV¸ËIâñfAÄ«à¼8ƒ ‡}d-ç€÷Í—ÓsRÿq£Ò£4°< _vÉkGPž£2N“Ë>m‡s·ž¥àãcð<–¤ÂÄ1/s£º/qTÓéétç€$ë­pØ¥ãйf-ÇÖ4UúÖhÆ¥Kü¼z· + ôE“%iþFÿ´šª"ç P-Î*甑åç<HW­ˆáiç¼´­~klZ–äv^y¦óXBupRGì7§‹§d%c¯3>p0ÌóæZëÎÓÊØ>\œÒàÚ=ÕŠjøÎÉ¥°1Ÿ, <ªÖ ›þ×ÎÅcïÅáܤ÷¡Z½!|:ûØ`Ý$²¸6!×Dv1Ú±ä"Ö±ò ¦äIûäF²@Úlã«r]™|U!ŽBE¹WJj–O2€¡*mUl5[-“–Ê~9ƒš"Ðjòè©Ö«‹úÄk8!µ~¯dny÷Ó-2(à)a æáF¸$Ì®žs!˜Òf2Š$ë¶<ÍI²˜•9c‚TÖ4G9 ç„ù ÌåP#/ h + _&$¶Èf`ó@ ‘õf/’‘B\/~ŒdoCÝnHŸß(Ž*’ + ª)U–,^AØh!L72€n»†¡B þ!f$ºì ݰ{XZxÒ5øý*3uƒ-„ºpsÁœÈ¥ ôê„“äÇ>?¹î([ðw¥‘–ßÉû¹ŠWÔD;öèÙž4ñ,Nþi]¥Ì¥Áhœ†õéÚQà$×<ºù™G¡À¸¦ûªË±ÇIœ‹»LW \DŽ=h°žYñK| ¹ü ŠU¨–©=ÁнÆ+…B[´XÖ2Ðõ¬9ôþE«Ÿ›q™"0ðÐÕ*½<‘V~qm†‚5%!ÂO+hûŠU õpn½<~H5›Ç'ñø› Õ šÉÎ?=—0VÝ·öT„ùhÇWX5˜.ü›†Ç”*G`õ°bŒçÎéÝòý5k¨J¦íBú×¼ + £¶›kh/!L¶»‰ï@e•0½§{„SsÚkjæ%·åò%C6­E'ŸÕæÇòóBëÎàý¨ïœ!öEQéþÇæfgĶ$Û½™•† L¤š; ]¶ÃÑñΊá%'£S唋÷°Ó¥“³~lãîØ‚%“tšCL3Mì‡ï(™ä–-œÒ Ý&³Ûo­êC‘Ü/ÃÙúXò¦ÄO§†%´Øm’ žtz]ˆfÂÒÂΙ7õ>m›v÷\O0ÖÔ¡®ýÍN;ø<®'—‘”^Öt£Z®!nЋ–å²&å´`—ïÏÐ#²e‡~†I•iFÍ",ö"bÕZìxµX·,}CÏL2Y«œl+ýÐ' ©ÿÓœ%eðr‹¡(Ñi¹Bç;H C…ÚrúEBㄌبrÞuþ"÷ɨ}²cÞ ÉÁùG@Â^ª"[g‰ÖíÌeÕÔIèÙIöÅ'Ø#$ÛWL÷±ˆbþâ¿ + ”t‹|2j­iâÏÝt#”Ûêƒzq°+bwX~9:Ëþ„_k“ºdÓ*DG>åêBsÂA•ÈÄQ Bt3_[²eÿG²â·:ÁÄGRMQM¥¥d z=¸[­GòeéÞÃ4"Ì1>úS(@±'¡r%*Ó/nn¸‡‰ž,!ù- é˜ÿ0Eî±´ßmúsü ™5šÊöV’YòÐ`+h÷É«ióHéˆ׆È9…ȸìQ_Ç ÄóUôÕrÜlèf´B•=>ê~¸Çfõ\ƒ1&«ÄâäâšÝµ¢Yãך!Æ· ¹£Ö½1ϱ»6¥Í Œz!Ã…Ç3Ãô|`(®óh©kŠõùËÑb´-ÚèæÌØ®M~¬°ii›$ŽØìúetöÏkæI1¨Ô:­²,¤rp{[˜š¯¼¶.iË#8£aú + ÕÚ#ô/ÞOõ*±£H´eç,yqqgk>w,õ,R§BØä¥#ãwÖÂiÄ_­b;›^—C„| Tb•¼‚¸aï~ïÝÞ.™ch‹ó"]ñr¬Ð­å3E E„tº£A½°0Iä|0&|yûÓïæJí(ض˜<‰Ø-ÚiNMÙb^·[þy„X®!PŸÒ”i}ŒžŠ(\)¼È7§PQ.ëðª üo‚4ÆŽÊ…‡'8 Eð½?x;ëʲA±ü˜^ŸôF¢¦aŠàáœ3›aÄ:Å$p¾à2ÜöѾÃYuAÕ×ï=è¶£Uì,Wùî'÷…»6Þfô¾Ú¶ðHM@–0Gm£®žb´"¶e]Âíc椫¶vliUjæê ¶È²\7}-<™‰ßUâ‹Ç@W=W#òU.]ÊÍéÓȱ¯£i[ܘþú6ÍÓ€úb3ª:ëb²MR@Ï 1Û”)ØÀ è‡Dw%?P¼“TgÒS 3é­Y˺ûºO+èæ837ªæäf5@É®&DñÚÅ}ÅÃ%ùF;÷š^¤”tyªêé\z©šRæ.izÚ—€KºÒ¦k)M·#9ð˜G­À¯o¨?—¼Wç.ZåÀ]ˆtðjŽ++è«>扪gÔž¨ªÊnÀ£ZŽÀ{]æ)êƒ5ó x]B­ùõÒÝ`¯5¿^˜°—Ÿ¡t¡•ÍØŸõ­¡ÏYÀë¸^Lµ¥^þßèoÚÅh¨åð™1d=¦)V#Û‰~iyò-‡ÊƶNñxë†Õ¢rsÇO†± t£,é+ƒóÇ%ä¡í©Ùÿ}jn!LÄNuBM ßu+–ÁÀ–\Xì”*/ïWú•JÍèáÞÉ€s¯ŽùØ/JƒŸŸØË,^Åü®®B°VŽM‰“BŒnO†MEw^ºv0™Ÿ $ñšC•¹|õ7™GLÀ*Q¾³m%Â¾Þø“ÉÕÜË`M„ˆ¯;ü(n棻Ìo~Ýl®¹–Æ”‡EŠÊâó…bÓÒ:Šü\µ‹*3GøëWlê6ÑîÍ÷ýuX€¿vd[(øØïª0uã|Ø÷IGâ Ÿ«ªsþÍëµþc¹G“éKoËÏ^>8¦éž²Ã- }°4•Ýžëœø‰R_&€[ + r¿ø›O@'«âļLªEsŠÞbÝ@d׃òêc“ 7V'Ä…l§MÁ—«Î¬¿`ù´BôôMË ²ž•_q¨¾TÛTôÉ[»ãûtíâ@kœ§ñĪk“˜Ý4Z4æ³èR`]?.¸À ¡6z¹]Å‘£Çs?'¬3â<™ÙÐ~w½ê]ø›äñ®&ÿƒÚåob†ç¸^[ Lj޽ì…viu,mAùÿ¾Å«.kO ]Á'|:Ã"À|mÅüOÃ]HÖàÇÄ;ÕÒ€¸/Þ,‚7ûIÏõãuÊQÓE@KáJ‰Ø-E€SC¶›G÷K1.!þ]ç?è.§3Iôôà9šãPÏ-6uW‡‰fphô‡9·º5 “·I¶‹¼ØÏ/5å&œöÌØ½Na‹u-™œ0ÅÆ4…¾'Ä„Æ+]þ”…Ö,zuç 5á»Ün½ía3vU ©ìVÞþ°Ô…It±÷ ÄM*£'ð—Y]’„¶ˆï¡§R¾è†8ey1‚ B“lâÊÒeAr`D}D^œ“†àTðRE hí—ràP† æ>EÛ¦A~p¶¢±·¯3i2pDÏ£b¢ñ%z†b¥ó5F™õŒFx¶æ®œAÁú?± S*ÕÄGïìVŒì°©&Û¥àBrªjJ‚bØ}Uš¼xÄŽõºÞœ®ø—ÍÕØ…±/9ñW?ÿIëÈGÃàéL‘1ÏšsÒ]dU사üÿ ¦¸•g†Oµ²&ôñÇmÛTÀ:í³°ï’ÖûôÛgÛÄÑ^íµ–˜€) oåV]VCÔkþÆòæpjêí|Óo{Tµ&¾ÙO¤÷¯?g“~+WqI¿“j’ŒeØ6zÀ»I¬H\é´/J6Û(|‡—I*† 8Ú*оõ禌É)‘ÎõpÔUÒ6.\ËEí2¢ 5=$-TRrõ–§ + É·€'ÙŒ—«|hkFÊWE&MéôÍcZú?j!¯ıQ + 4Lÿ¬ÒŠ%¿Æ&]Ûô‹o…å~ª¤~ªýùvó9 ÚÄ?P!cüЄ†ŠzYìÞÖ‹Š¡$˜ª·è^q#.Òí•ä@ÝÔ3è OtIH§ò+Jœ‡¶À"6qø³Sµ´§$¹!i·JvùOzûYt½ÎŽÚŸŠMËŸŸ.’~^¨g“ÜR{{›x´›ÞC-…x*¿3Çöí¸–ÙîÙàŸô-ÙövVClªï¨Þ€s¤\ ·aO>¾­‹‰±;µŠÀÅ4x3è ân«?¾ô®$®ÿ++RóêTöUÆuÖc¸ê¶ŒmÇBøÇ/qsÑËÓÈ´:ãº(ž°–H·cüNë¬sê½]Wð^åù½nœ„£=ôÒ£“bó¿ƒä!±¹>C¼ÌÜŽ.÷ÿF©Þ±Àޤ®ÕÚbï^hJ:m£µám.ñ÷™<™”ÿßüÌo¯ ¬p¨w†ù‰§ôö'‹Ç®}+¶µzã{®éLXw†0õÔBVf¹”þªÙn¿)6ÉÕxB.¨ÁñW£HÉÑ»KÎQœç£FÛ~¤oÀüı¢&¢Cñ´ä;égm Û½×é⿤áIë ²žìý¥F[¾Í3™ªn^¾M‰úgâ䪤B?ÌLߘ4ÊtÍj˜¦ï’&â÷[xÞ¨z/ÿ„·-lÂ"~‘M‹¥Ü_¯Å!ü±ŒJɤs/Ö¿Åßü»»¡ôÎ@êêò}îë½é[çÉ Ô.wKw‚ÌÃwPÎÛ@ç q°t5!pÿoï}f{æÙoøÐ£Rã² A»Ã~&|`L-ý½›½ÛÓóÞÛÛÕ1§wå'“ûÊ;wÑ­ºÔÑIïV¬Ò¹²· + ÓE£%!!K[YC34#fPý OÛZ¯nkÐM6M4Ѐ„Dq᩾V¶ Ò: ëu/· + ×¶i!±ÒÛ%¤îÚ&ÊŽ¶¶jdR…NTA§2F£¦øJ‰T“øG‚P¦Iö›#4"D×SÅ0ÀEçÆØÇËh›i÷’ä´Þ¼ryËï?¥ÎXÆRà:Þ˜ä(fåòJV 5@L#¹{§bšB/uÁcJ Ù´Ð4YY³ÆR—Îd4œ!7¥äêâá”Îe.! Äw!Š"i•q8ß6gŒð#Çü$ÄXØP¦X«ôþ8e ¾…é%éVÉO?+]Øø%!%…lp!T£æ/1 + -˜ö Ýû“±R›B#PÊ$ÊoßáíÞh†/!xÌ›_Xß4ò²Q_ÆÒUÃébÊuGŽün‹åBÓBñŸª‰·€gÿb/Mï ý<ÂIÄtŽZ9O + ×KÃKaryºGM: + šÌtªÍN°“žÜc&4Å7ÒØ¼:T„•J©4'S¯=‹!ãf¦à¦¢ƒM “‘sïB¬ ÇX *¤T†Ò;5¹¨knLu£l:B%wCWJ6‚5RrÖ´ÏBãõC;”t 1 å + zuäÌP#r‰Õæ$‰<¹€2d¡Évõç6.D!yqÑ”tÆ&¡žëpR ²Q‹I¦ÑGš¶ÿÊøRF"FÂBʖ؇2/¾šæPUP¹#­0Å®2‘12óXz²F\•ŠÑ,ná7ÄlÒx}ߞɄð©Þ!0—ä¹'n!ðF¸¥ª|¨ÈST›*I"0l>¡,APÅT‘ì Q‚·$}úÊßÒ…?d’åPSЃaâˆùAl‘Çn\*]²z,\;n¦&¹•è—£&þ ±F– ™œ\¥®o«åfœ7ÕÞåT + ½ßá[âùèC¿Ë`”Þ§l»†©sVѰ~ÒŒñ¿ ¸Škë„2÷å.ðtó™XŽ‚ßhÎʘ—Ðó»…þZÁTLÂÇ3#~!ÀW“Tvd¯Š7Q£-¿FáMA”!Mh;9B’RæeM.$#%]yPÎyå¥7xQ… £¾EjJÞ§ˆ’p³B·H‹ê5”¾{”)–¨ 7qÚ׿QôO2U¯§:ô_÷ + ŸJ!Üxäašôž„‰èíÉThPÐBáŸí fSÜHv8 ž×ñ½~jŸw**ã2oq Ó¿¢è›”»²qEš9-þþaáéÜ埚¹ S}›ï34)S­ÒwO—TP™£¦…{½øÅS)ɤ9™æd§z¶âMŠhM¤êûGOÑ!|¤Vƒʸü󯿓yÀd}–ãÎr>Ñs41ÒtHæé[_ Ò2þš‡˜©}/‰íbªn݉ÜÊ|ö«ÅKúçÃ"(ÃI³ + + !ž¥ú5ºÓTº©gGµ%;“:ÕèYÇb³€ï®ð*ij€ÛÁ"ÃkpÜPÉÌ'`5†Íºñ‹IIÌÛ.ŠÐBZf±õñ–N;œØËG¿3þCœ ð¡\€Ò0G$ô›Ù‹ + ·†¢ñŽJOé G^iÌÑçÔIîîIêàˆÞ•$ì#Xǧó>¬»CzÝ?”P¡´xR­’^žÕ 8“óçv¤"&Ù¥}*1 + K?%d¢ƒÀ ¥'ÂÛxDl!…û\/ÜøÙÇñNßïžáéQ¹Ãå£Teô_[j~î'à=þ‹¶ÖäUüHFGæíœÎ[‹› + ï@ò _®•I³áNÎóÅHŠ,qåÄïiNª¶½U+UòßøPáÈ2š“JdKšªŸ¬?è òÛÚ0#ÃÎüUÒX³O$ƒ!sù ¿KÆû¦,(:[“7~¬ˆ7‹ü ]stÐ ý R>7ÑÇ^}âôaz§G^Tc&‡ÂººX„N]?áMFñ­+ȪãX¡?ñYë²CýNm÷‘õ/J4·Œ¹V~Å¿„þnÞDZ-Ã^e#ôkËäªÂkw•A¶Ø4Ío¥¿Ø¾>`±…L/©hD(^oQÐxv¨b”g?™$s³‚Ì‹‘-'°šBy/ö )}zªdZ(“Æ4¨»`ž:ÿ¦`šƒÃ‚d8!aeï6q· O‚#¹ü åsÍ4%’HºÂ£<×Y$[Œ©ÎŒÂƳRüšº + ™q…ÔãW³¿Lµ1…Ç“öÍè’À)‡]²Õgëô¼úvÔùšåøþ€·´o¹ð¯†w}ŽqÈ|¡és6¦ TBËAÅòÁ2–«'µõÍïç•å«UTˆtâ¦éþ‘Ü*ñÓŸLv“M2¸« + >UÍñ޵WÕ4 êd±ç7ÈàÇmˤÆö×㑞¬È}íd"lîÖÖ ?j1{°ö7¦¥ÙÍ­!³¯-ô=]±ìY$"ö}í“Ånƒð.ÙäÆòÇdÎv7•3'Wا51:ƒ<aÔÔ/œ¦…g1Æ0Z¼þär8­ÇX¥®‹ Ö½{ØÅÂÝÿ×°‰î6þd¹1„Û°_X¬…ŒÀÓ«›>‡äÄíÑßót7ÅvvéèËÓ{³öf†ó º…Üæ.Ù_p+ÒP—ék®út(ÇÔçpqŒ]6¢Ñ¹ðIö7ö¦_ôæñ°];&@ßAÏ®ZÚ6±ìb<§£g ?*Ÿe$3êpª #4 …‚› ËR¬Â‚‹cßP’9LR© Ιp´Ù&hØÜÿŠ”BÇsöweöÞZŒq.nË~¤x + iÂþ¥žT‘Ä + ²ÃX)¦NC¾xÆýŸìBZ®¦ æÈ±µie$)‹VÜÜåqn<ŒÐ¨Ñ<’‹lƒ*AljÆ¿Þ3Ë.€`À0 À€¼¬Ô^ˆÑÍ) Pîüg»s5+)Å + u²w6e7 ° €`À0 À€0` ùUT/‰xØÍ£PWö‰¬¶ü/GS¦¹Ip À€0` € Köº'|û“' ñ«Wc8\ËݱCƒIlë8à4 [»—ða‡}Áîòƒ ÅÕÎòÈ “ç1„OXæ&]qh•xH‹Yîþ ^ ðOf àÌwÅÌî¥á­W>Ç}™h·ÂíÖÝø‰ô² ¼# ßü ç«€/zPo8,í¤*ä¿\œÀð›’5¾×ñ;3%~š¿±/¢`Ó‚ƒ¥v‹ÏAP`ã¡€á8l>0.ìAÂŒW9 ËKÝ1_æ§&Àùo„ò@¡`ÿ≄ê@VK Uñ§×ö©^À‰žM>mèy)Ù;Vi78õ !ÞVøøÄÀ®½;L¶k^î^bt + æ’7 †ÏMü˜Ep4Fœ²øÞ{† Ú^C9ÜE,¥ÍŽòègÇ‹íO&¸œ$|×ò žbŒß6`1ø†pÀŠf€[ÐpØZã¸4U¾ °ï &11V“ÿ eîp7€¶÷á' xNïC°Žnü—~òi;jù2“ã²;@~ÍŸéáˆ'€Þc‚N ®†w`4{mŽkÛÂã[ iþwO­° åõè~w@0Õq|C¢Þƒ¬ëâCñ€hHƒ¹«ü >_ôÁ=Ü (€,ש£ø˜o ÷A=}ð#*¤¹* —Óë| µä㌠߹†÷øŠŽP‡^UÀ¬ãz€©$îÂϤ®â‡ + p¸–xHÕð(ð8zp,P¿9°(}Ü`â@¸ô°|3S5øü½1ßzF:/œˆÅ`¸ ðrúñ³àÀAq‚Ô¥…äÅšúŒtœý8½¯ø/Ôôùã¦ìNÚ)ŸK †žKA•ÊjŠA.0³ Xj?]y¦`@À€;õEMx>g4žeþü´øÑ=º]Bí%®™ÝH·ôѹ@±«£ã«©üàM{p‹ZXâ~v Ã|uÙÐé ÷wºÕ¨‡¢â ³çÀìf~öÈpfBñï5‚‡œo(x–Úg(xþ^(š)^dÀƒ{飹=ῪàÞÐéÒÁ ÓÂä#UK×Þ\ €à½WGò«0Õ·%|ÌóÍÜþckîÒb«×n¦²¿úç|UFMLRÅb„¤ü2B*C—Ì5·åmkxfª,*>S ñšç‰uAÖÖï¨j{ûŒ%×)¢ + Û–Mõm}$|NB®žíå`„z®Ú$]n¿XÎ-sÀê + 'ˆù`dî¿Js&˜bñá³f vôbô&çj•8Ó‚¼ÇïΜ@VíU¯_ÏG§Ì}È«¬Ïo`öLµUü±jVþ>%]}à÷^¤·š‹ÝW@ÁL=ñ,ŸOWÑñ¨É‹s + «ùÇàøgK®„?š­ ó¸{+ïG¶C>¦rMøÖPßü·Ý*20´T¯¹¢¿É3ÃÚ™Vá‘©èâàŽ Wø¢Š+ê]ív«YµóhÚ®}æ*H¢í`Ôs°÷[žÀ‘Ø + lmŽwt I0•ûÉÆ;mò´Ö˜M.#'¦O{NÃúS!*¸e5/gþp{j) È O,*â½+ç%þ¥B¶ùªôº K¶Øò§dU̦—â@㢵±«o½ù/ b¢Ô*r „ ØøŠE\½­hç’ÁL0“aÊù/»ËMrŸB¨ˆRøg±C_)ˆAðLKæÀib•¾œG£þ²ÈÏͨü°çØmUæå#ÈEÊñK`Rî kö¶MéèÝ­`ÕÈòš2ÿ=½:µbíÕÁäJ°Áä|j‰©°“áæqUjÐúr,ÖBÊ + Ú©™„ˆ¬ÕÞòÐt@1ؤNÜôÓHô¹±K3”š¸AdE-Ä®ÝíiÌŒ')ȫع`#÷ÞlMwG¡BSÀ­÷èã¨z{.UzÑÓ†3ZŽ•6LÚal¾©Ë¯±>NŽvêfyµÝ#ÆO°ÅˆÙ£‚µ£»ûŸ½Ãµ!R}ïÓâäJG‚ÃZ° æIþ+î#¼7›¡þk •‹w³42Š_¨ý£U7pË•oYÃîË« é‡ÉÙŽÜË *âàÄÅÛ-qx{š«½"‡åVÓd˜•fCßr²Š Í ŠÖÉŽ‘Yñ¼ƒ”(öÊ©WþÆU? #¨£¡.SçªQåÛhÄèÌ.â=2ÇóW,ÿn9³œ%ÓŽ+ + ,röæuÜ0z}•M*N-…œþˆøX&ÇþÁíæÓ¼<,C¡¬Wp½‚½€Öé+ü‚sÕÿ@$mÞ¹ Y‰½'_½iAMM}ʽz{(·¨Ëd×1u¹dЊQÁtïYPãS:±_µ kC¬Ò$ÀŸYß„v‹7e_¿`iÜû|Éçü™jqûÛÎ,ü%LÍ´çµÑ°Á,ÉOê'`?~;²“oFû{¨«Ò­üê—ž”«Ž¯ƒ‹‚NÅ _&7œKBø±ÌMÉ„ï¼ïÀÿêïJ˜Âs ÿò=:m|¶¸Z¦±àáÈ“§&¤S°Z“ô'ÿêÑ Ü–ônZÐL·éj(‹h¹ wm¥C';\ ̦s›kÝb&ä<—àd5ÒI~¢®&y;Å ¿eêö½’ŒÄ¹u¸€G%ÍlþæUoÔXJ„ý“”(­1eYä,´ì† + –r„ôÆzc0Rdu¹^vy³Sý’Tjÿ£Ù¥µìÂt¬cæ+Ð?R²ë¥É{ ßÔG{Kø%Д2ÎhÙÔT[ 9+ÁpBxåºÍÌ:iÐ:Þ*ëßš0/þ„^Võˆ·GÚÆÒÙQ¿H[â_ÞKXé^õó=#« + €û‰'ün"Sÿ;HTVûú¯Gþ0Þáе9ù€W`•Ií½ÚMXçÿB’nS…ö„h¥oO‡+0½c¹š úoÔvF‰ÂN²nžißèµMø^Ïñž<ÓùùNIÝUÊöWyÝ÷å)”}ò”Ê¿wJ%g…ÿ,Ï¿ Gk’U"I÷MãuâV—bÃdm*ü[ nü¦ ÙG05’¹ íd¶”k­Ì-ßoíH Búre1µ“›ZUØ›™ž2R°J¥ï·þb¿$¤^²´jí¼*Å^‘¦dý ÑYo­T¥† |j'þ ¯•àÓ´µ}a±±š%±©â¬Wó4Z;åΩåOIO”éª1;ÕûÎU3Rñ¬sÄâÑ£ÔÓMvQõŽ÷V„¯”ˆmFFðr¶60Æ$¥T+,ÌøÓ˳ϙ[(NhZ ‡‡+=O%>Õ3ÒIÕX}jHÒí¡ã!Á™…#L$á‘ZE¢Sµ-¿‘(…mPN°;ŽØï„Lj$œª®~/ËÖFõS„’˜¥ÖiR”OšMa“£@ݾÎc‡—ífÌj'ÆŒ)â縆}hÜmaSéä6Fü´f ˆ¿>µLÜ—v÷ßÍäKÿ!Ü<7Qžë'ä3K.þ®’v½ Ø{k2³ewE¯ÜöûÐŒ°?$Ÿ“ŸN@Û5£ºçŸz¬yEä§ZJÊ¢™D;éÚ#;ä_.%DûàÝ=Ρû$ì0 + „×{‚ù;ô f=º+ÚsSêŸ'b”½¬¿ú !,Ó-´ñЋøb\b=¼};ªu¿™Öêu!Ý Ç„#÷>ZÃÚAN€Þߢoi/‹^Fú ؽ÷y1.w†-[¯~ƒ„wS„xDÉ —‰üS*zB#»j.jÔ»¥1äËþÌ>ü…K 4Þv„¿tD8–u2¯21V‰­ñGÚ¼{pÛmg6Ú²§nˆöø›/‚GÖ;DÔÿîÜÑ®7"Ïh ׿ä9Ú"®ŒUÛ‰§EM5Ú¢2ég‰PÚoi2Í“¦¶ŽöZD´-r\—÷}‘ÞRï²­Çûžš\Í%*è°·Y¢îþ÷Ÿ““·OõÛ•4a1re³ª=­')›N4Õ¾‰ ڻўý;¹©û¢X›½ÝbìÕi"¾ãvѰÍ&"ÿ‹vw¶H½|›¨ ºj/ödžu5{Ýk¶£ÿÈX³Šföÿd‚²Nhuý˜9 &À͈íw‘ý½\M\j☿ކÎO“êyû¤”@Ä:§k[×B®݇­OøGßFð‰D]|É,ÞWάmºoÚ{qéï$¶io¨fïÆè¢w’‘Ó«DÓP=%~6®„³§÷ø—”iû¿ À€0` ü \ No newline at end of file diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/DotZLib.sln gcc-4.4.5/zlib/contrib/dotzlib/DotZLib.sln *** gcc-4.4.4/zlib/contrib/dotzlib/DotZLib.sln Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/DotZLib.sln Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,21 ---- + Microsoft Visual Studio Solution File, Format Version 8.00 + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotZLib", "DotZLib\DotZLib.csproj", "{BB1EE0B1-1808-46CB-B786-949D91117FC5}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection + EndProject + Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.ActiveCfg = Debug|.NET + {BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.Build.0 = Debug|.NET + {BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.ActiveCfg = Release|.NET + {BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.Build.0 = Release|.NET + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection + EndGlobal diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/LICENSE_1_0.txt gcc-4.4.5/zlib/contrib/dotzlib/LICENSE_1_0.txt *** gcc-4.4.4/zlib/contrib/dotzlib/LICENSE_1_0.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/LICENSE_1_0.txt Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,23 ---- + Boost Software License - Version 1.0 - August 17th, 2003 + + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. \ No newline at end of file diff -Nrcpad gcc-4.4.4/zlib/contrib/dotzlib/readme.txt gcc-4.4.5/zlib/contrib/dotzlib/readme.txt *** gcc-4.4.4/zlib/contrib/dotzlib/readme.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/dotzlib/readme.txt Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,58 ---- + This directory contains a .Net wrapper class library for the ZLib1.dll + + The wrapper includes support for inflating/deflating memory buffers, + .Net streaming wrappers for the gz streams part of zlib, and wrappers + for the checksum parts of zlib. See DotZLib/UnitTests.cs for examples. + + Directory structure: + -------------------- + + LICENSE_1_0.txt - License file. + readme.txt - This file. + DotZLib.chm - Class library documentation + DotZLib.build - NAnt build file + DotZLib.sln - Microsoft Visual Studio 2003 solution file + + DotZLib\*.cs - Source files for the class library + + Unit tests: + ----------- + The file DotZLib/UnitTests.cs contains unit tests for use with NUnit 2.1 or higher. + To include unit tests in the build, define nunit before building. + + + Build instructions: + ------------------- + + 1. Using Visual Studio.Net 2003: + Open DotZLib.sln in VS.Net and build from there. Output file (DotZLib.dll) + will be found ./DotZLib/bin/release or ./DotZLib/bin/debug, depending on + you are building the release or debug version of the library. Check + DotZLib/UnitTests.cs for instructions on how to include unit tests in the + build. + + 2. Using NAnt: + Open a command prompt with access to the build environment and run nant + in the same directory as the DotZLib.build file. + You can define 2 properties on the nant command-line to control the build: + debug={true|false} to toggle between release/debug builds (default=true). + nunit={true|false} to include or esclude unit tests (default=true). + Also the target clean will remove binaries. + Output file (DotZLib.dll) will be found in either ./DotZLib/bin/release + or ./DotZLib/bin/debug, depending on whether you are building the release + or debug version of the library. + + Examples: + nant -D:debug=false -D:nunit=false + will build a release mode version of the library without unit tests. + nant + will build a debug version of the library with unit tests + nant clean + will remove all previously built files. + + + --------------------------------- + Copyright (c) Henrik Ravn 2004 + + Use, modification and distribution are subject to the Boost Software License, Version 1.0. + (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff -Nrcpad gcc-4.4.4/zlib/contrib/infback9/README gcc-4.4.5/zlib/contrib/infback9/README *** gcc-4.4.4/zlib/contrib/infback9/README Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/infback9/README Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1 ---- + See infback9.h for what this is and how to use it. diff -Nrcpad gcc-4.4.4/zlib/contrib/infback9/infback9.c gcc-4.4.5/zlib/contrib/infback9/infback9.c *** gcc-4.4.4/zlib/contrib/infback9/infback9.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/infback9/infback9.c Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,608 ---- + /* infback9.c -- inflate deflate64 data using a call-back interface + * Copyright (C) 1995-2003 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + #include "zutil.h" + #include "infback9.h" + #include "inftree9.h" + #include "inflate9.h" + + #define WSIZE 65536UL + + /* + strm provides memory allocation functions in zalloc and zfree, or + Z_NULL to use the library memory allocation functions. + + window is a user-supplied window and output buffer that is 64K bytes. + */ + int ZEXPORT inflateBack9Init_(strm, window, version, stream_size) + z_stream FAR *strm; + unsigned char FAR *window; + const char *version; + int stream_size; + { + struct inflate_state FAR *state; + + if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || + stream_size != (int)(sizeof(z_stream))) + return Z_VERSION_ERROR; + if (strm == Z_NULL || window == Z_NULL) + return Z_STREAM_ERROR; + strm->msg = Z_NULL; /* in case we return an error */ + if (strm->zalloc == (alloc_func)0) { + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; + } + if (strm->zfree == (free_func)0) strm->zfree = zcfree; + state = (struct inflate_state FAR *)ZALLOC(strm, 1, + sizeof(struct inflate_state)); + if (state == Z_NULL) return Z_MEM_ERROR; + Tracev((stderr, "inflate: allocated\n")); + strm->state = (voidpf)state; + state->window = window; + return Z_OK; + } + + /* + Build and output length and distance decoding tables for fixed code + decoding. + */ + #ifdef MAKEFIXED + #include + + void makefixed9(void) + { + unsigned sym, bits, low, size; + code *next, *lenfix, *distfix; + struct inflate_state state; + code fixed[544]; + + /* literal/length table */ + sym = 0; + while (sym < 144) state.lens[sym++] = 8; + while (sym < 256) state.lens[sym++] = 9; + while (sym < 280) state.lens[sym++] = 7; + while (sym < 288) state.lens[sym++] = 8; + next = fixed; + lenfix = next; + bits = 9; + inflate_table9(LENS, state.lens, 288, &(next), &(bits), state.work); + + /* distance table */ + sym = 0; + while (sym < 32) state.lens[sym++] = 5; + distfix = next; + bits = 5; + inflate_table9(DISTS, state.lens, 32, &(next), &(bits), state.work); + + /* write tables */ + puts(" /* inffix9.h -- table for decoding deflate64 fixed codes"); + puts(" * Generated automatically by makefixed9()."); + puts(" */"); + puts(""); + puts(" /* WARNING: this file should *not* be used by applications."); + puts(" It is part of the implementation of this library and is"); + puts(" subject to change. Applications should only use zlib.h."); + puts(" */"); + puts(""); + size = 1U << 9; + printf(" static const code lenfix[%u] = {", size); + low = 0; + for (;;) { + if ((low % 6) == 0) printf("\n "); + printf("{%u,%u,%d}", lenfix[low].op, lenfix[low].bits, + lenfix[low].val); + if (++low == size) break; + putchar(','); + } + puts("\n };"); + size = 1U << 5; + printf("\n static const code distfix[%u] = {", size); + low = 0; + for (;;) { + if ((low % 5) == 0) printf("\n "); + printf("{%u,%u,%d}", distfix[low].op, distfix[low].bits, + distfix[low].val); + if (++low == size) break; + putchar(','); + } + puts("\n };"); + } + #endif /* MAKEFIXED */ + + /* Macros for inflateBack(): */ + + /* Clear the input bit accumulator */ + #define INITBITS() \ + do { \ + hold = 0; \ + bits = 0; \ + } while (0) + + /* Assure that some input is available. If input is requested, but denied, + then return a Z_BUF_ERROR from inflateBack(). */ + #define PULL() \ + do { \ + if (have == 0) { \ + have = in(in_desc, &next); \ + if (have == 0) { \ + next = Z_NULL; \ + ret = Z_BUF_ERROR; \ + goto inf_leave; \ + } \ + } \ + } while (0) + + /* Get a byte of input into the bit accumulator, or return from inflateBack() + with an error if there is no input available. */ + #define PULLBYTE() \ + do { \ + PULL(); \ + have--; \ + hold += (unsigned long)(*next++) << bits; \ + bits += 8; \ + } while (0) + + /* Assure that there are at least n bits in the bit accumulator. If there is + not enough available input to do that, then return from inflateBack() with + an error. */ + #define NEEDBITS(n) \ + do { \ + while (bits < (unsigned)(n)) \ + PULLBYTE(); \ + } while (0) + + /* Return the low n bits of the bit accumulator (n <= 16) */ + #define BITS(n) \ + ((unsigned)hold & ((1U << (n)) - 1)) + + /* Remove n bits from the bit accumulator */ + #define DROPBITS(n) \ + do { \ + hold >>= (n); \ + bits -= (unsigned)(n); \ + } while (0) + + /* Remove zero to seven bits as needed to go to a byte boundary */ + #define BYTEBITS() \ + do { \ + hold >>= bits & 7; \ + bits -= bits & 7; \ + } while (0) + + /* Assure that some output space is available, by writing out the window + if it's full. If the write fails, return from inflateBack() with a + Z_BUF_ERROR. */ + #define ROOM() \ + do { \ + if (left == 0) { \ + put = window; \ + left = WSIZE; \ + wrap = 1; \ + if (out(out_desc, put, (unsigned)left)) { \ + ret = Z_BUF_ERROR; \ + goto inf_leave; \ + } \ + } \ + } while (0) + + /* + strm provides the memory allocation functions and window buffer on input, + and provides information on the unused input on return. For Z_DATA_ERROR + returns, strm will also provide an error message. + + in() and out() are the call-back input and output functions. When + inflateBack() needs more input, it calls in(). When inflateBack() has + filled the window with output, or when it completes with data in the + window, it calls out() to write out the data. The application must not + change the provided input until in() is called again or inflateBack() + returns. The application must not change the window/output buffer until + inflateBack() returns. + + in() and out() are called with a descriptor parameter provided in the + inflateBack() call. This parameter can be a structure that provides the + information required to do the read or write, as well as accumulated + information on the input and output such as totals and check values. + + in() should return zero on failure. out() should return non-zero on + failure. If either in() or out() fails, than inflateBack() returns a + Z_BUF_ERROR. strm->next_in can be checked for Z_NULL to see whether it + was in() or out() that caused in the error. Otherwise, inflateBack() + returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format + error, or Z_MEM_ERROR if it could not allocate memory for the state. + inflateBack() can also return Z_STREAM_ERROR if the input parameters + are not correct, i.e. strm is Z_NULL or the state was not initialized. + */ + int ZEXPORT inflateBack9(strm, in, in_desc, out, out_desc) + z_stream FAR *strm; + in_func in; + void FAR *in_desc; + out_func out; + void FAR *out_desc; + { + struct inflate_state FAR *state; + unsigned char FAR *next; /* next input */ + unsigned char FAR *put; /* next output */ + unsigned have; /* available input */ + unsigned long left; /* available output */ + inflate_mode mode; /* current inflate mode */ + int lastblock; /* true if processing last block */ + int wrap; /* true if the window has wrapped */ + unsigned long write; /* window write index */ + unsigned char FAR *window; /* allocated sliding window, if needed */ + unsigned long hold; /* bit buffer */ + unsigned bits; /* bits in bit buffer */ + unsigned extra; /* extra bits needed */ + unsigned long length; /* literal or length of data to copy */ + unsigned long offset; /* distance back to copy string from */ + unsigned long copy; /* number of stored or match bytes to copy */ + unsigned char FAR *from; /* where to copy match bytes from */ + code const FAR *lencode; /* starting table for length/literal codes */ + code const FAR *distcode; /* starting table for distance codes */ + unsigned lenbits; /* index bits for lencode */ + unsigned distbits; /* index bits for distcode */ + code this; /* current decoding table entry */ + code last; /* parent table entry */ + unsigned len; /* length to copy for repeats, bits to drop */ + int ret; /* return code */ + static const unsigned short order[19] = /* permutation of code lengths */ + {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; + #include "inffix9.h" + + /* Check that the strm exists and that the state was initialized */ + if (strm == Z_NULL || strm->state == Z_NULL) + return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + + /* Reset the state */ + strm->msg = Z_NULL; + mode = TYPE; + lastblock = 0; + write = 0; + wrap = 0; + window = state->window; + next = strm->next_in; + have = next != Z_NULL ? strm->avail_in : 0; + hold = 0; + bits = 0; + put = window; + left = WSIZE; + lencode = Z_NULL; + distcode = Z_NULL; + + /* Inflate until end of block marked as last */ + for (;;) + switch (mode) { + case TYPE: + /* determine and dispatch block type */ + if (lastblock) { + BYTEBITS(); + mode = DONE; + break; + } + NEEDBITS(3); + lastblock = BITS(1); + DROPBITS(1); + switch (BITS(2)) { + case 0: /* stored block */ + Tracev((stderr, "inflate: stored block%s\n", + lastblock ? " (last)" : "")); + mode = STORED; + break; + case 1: /* fixed block */ + lencode = lenfix; + lenbits = 9; + distcode = distfix; + distbits = 5; + Tracev((stderr, "inflate: fixed codes block%s\n", + lastblock ? " (last)" : "")); + mode = LEN; /* decode codes */ + break; + case 2: /* dynamic block */ + Tracev((stderr, "inflate: dynamic codes block%s\n", + lastblock ? " (last)" : "")); + mode = TABLE; + break; + case 3: + strm->msg = (char *)"invalid block type"; + mode = BAD; + } + DROPBITS(2); + break; + + case STORED: + /* get and verify stored block length */ + BYTEBITS(); /* go to byte boundary */ + NEEDBITS(32); + if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { + strm->msg = (char *)"invalid stored block lengths"; + mode = BAD; + break; + } + length = (unsigned)hold & 0xffff; + Tracev((stderr, "inflate: stored length %lu\n", + length)); + INITBITS(); + + /* copy stored block from input to output */ + while (length != 0) { + copy = length; + PULL(); + ROOM(); + if (copy > have) copy = have; + if (copy > left) copy = left; + zmemcpy(put, next, copy); + have -= copy; + next += copy; + left -= copy; + put += copy; + length -= copy; + } + Tracev((stderr, "inflate: stored end\n")); + mode = TYPE; + break; + + case TABLE: + /* get dynamic table entries descriptor */ + NEEDBITS(14); + state->nlen = BITS(5) + 257; + DROPBITS(5); + state->ndist = BITS(5) + 1; + DROPBITS(5); + state->ncode = BITS(4) + 4; + DROPBITS(4); + if (state->nlen > 286) { + strm->msg = (char *)"too many length symbols"; + mode = BAD; + break; + } + Tracev((stderr, "inflate: table sizes ok\n")); + + /* get code length code lengths (not a typo) */ + state->have = 0; + while (state->have < state->ncode) { + NEEDBITS(3); + state->lens[order[state->have++]] = (unsigned short)BITS(3); + DROPBITS(3); + } + while (state->have < 19) + state->lens[order[state->have++]] = 0; + state->next = state->codes; + lencode = (code const FAR *)(state->next); + lenbits = 7; + ret = inflate_table9(CODES, state->lens, 19, &(state->next), + &(lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid code lengths set"; + mode = BAD; + break; + } + Tracev((stderr, "inflate: code lengths ok\n")); + + /* get length and distance code code lengths */ + state->have = 0; + while (state->have < state->nlen + state->ndist) { + for (;;) { + this = lencode[BITS(lenbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if (this.val < 16) { + NEEDBITS(this.bits); + DROPBITS(this.bits); + state->lens[state->have++] = this.val; + } + else { + if (this.val == 16) { + NEEDBITS(this.bits + 2); + DROPBITS(this.bits); + if (state->have == 0) { + strm->msg = (char *)"invalid bit length repeat"; + mode = BAD; + break; + } + len = (unsigned)(state->lens[state->have - 1]); + copy = 3 + BITS(2); + DROPBITS(2); + } + else if (this.val == 17) { + NEEDBITS(this.bits + 3); + DROPBITS(this.bits); + len = 0; + copy = 3 + BITS(3); + DROPBITS(3); + } + else { + NEEDBITS(this.bits + 7); + DROPBITS(this.bits); + len = 0; + copy = 11 + BITS(7); + DROPBITS(7); + } + if (state->have + copy > state->nlen + state->ndist) { + strm->msg = (char *)"invalid bit length repeat"; + mode = BAD; + break; + } + while (copy--) + state->lens[state->have++] = (unsigned short)len; + } + } + + /* handle error breaks in while */ + if (mode == BAD) break; + + /* build code tables */ + state->next = state->codes; + lencode = (code const FAR *)(state->next); + lenbits = 9; + ret = inflate_table9(LENS, state->lens, state->nlen, + &(state->next), &(lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid literal/lengths set"; + mode = BAD; + break; + } + distcode = (code const FAR *)(state->next); + distbits = 6; + ret = inflate_table9(DISTS, state->lens + state->nlen, + state->ndist, &(state->next), &(distbits), + state->work); + if (ret) { + strm->msg = (char *)"invalid distances set"; + mode = BAD; + break; + } + Tracev((stderr, "inflate: codes ok\n")); + mode = LEN; + + case LEN: + /* get a literal, length, or end-of-block code */ + for (;;) { + this = lencode[BITS(lenbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if (this.op && (this.op & 0xf0) == 0) { + last = this; + for (;;) { + this = lencode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + this.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } + DROPBITS(this.bits); + length = (unsigned)this.val; + + /* process literal */ + if (this.op == 0) { + Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? + "inflate: literal '%c'\n" : + "inflate: literal 0x%02x\n", this.val)); + ROOM(); + *put++ = (unsigned char)(length); + left--; + mode = LEN; + break; + } + + /* process end of block */ + if (this.op & 32) { + Tracevv((stderr, "inflate: end of block\n")); + mode = TYPE; + break; + } + + /* invalid code */ + if (this.op & 64) { + strm->msg = (char *)"invalid literal/length code"; + mode = BAD; + break; + } + + /* length code -- get extra bits, if any */ + extra = (unsigned)(this.op) & 31; + if (extra != 0) { + NEEDBITS(extra); + length += BITS(extra); + DROPBITS(extra); + } + Tracevv((stderr, "inflate: length %lu\n", length)); + + /* get distance code */ + for (;;) { + this = distcode[BITS(distbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if ((this.op & 0xf0) == 0) { + last = this; + for (;;) { + this = distcode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + this.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } + DROPBITS(this.bits); + if (this.op & 64) { + strm->msg = (char *)"invalid distance code"; + mode = BAD; + break; + } + offset = (unsigned)this.val; + + /* get distance extra bits, if any */ + extra = (unsigned)(this.op) & 15; + if (extra != 0) { + NEEDBITS(extra); + offset += BITS(extra); + DROPBITS(extra); + } + if (offset > WSIZE - (wrap ? 0: left)) { + strm->msg = (char *)"invalid distance too far back"; + mode = BAD; + break; + } + Tracevv((stderr, "inflate: distance %lu\n", offset)); + + /* copy match from window to output */ + do { + ROOM(); + copy = WSIZE - offset; + if (copy < left) { + from = put + copy; + copy = left - copy; + } + else { + from = put - offset; + copy = left; + } + if (copy > length) copy = length; + length -= copy; + left -= copy; + do { + *put++ = *from++; + } while (--copy); + } while (length != 0); + break; + + case DONE: + /* inflate stream terminated properly -- write leftover output */ + ret = Z_STREAM_END; + if (left < WSIZE) { + if (out(out_desc, window, (unsigned)(WSIZE - left))) + ret = Z_BUF_ERROR; + } + goto inf_leave; + + case BAD: + ret = Z_DATA_ERROR; + goto inf_leave; + + default: /* can't happen, but makes compilers happy */ + ret = Z_STREAM_ERROR; + goto inf_leave; + } + + /* Return unused input */ + inf_leave: + strm->next_in = next; + strm->avail_in = have; + return ret; + } + + int ZEXPORT inflateBack9End(strm) + z_stream FAR *strm; + { + if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) + return Z_STREAM_ERROR; + ZFREE(strm, strm->state); + strm->state = Z_NULL; + Tracev((stderr, "inflate: end\n")); + return Z_OK; + } diff -Nrcpad gcc-4.4.4/zlib/contrib/infback9/infback9.h gcc-4.4.5/zlib/contrib/infback9/infback9.h *** gcc-4.4.4/zlib/contrib/infback9/infback9.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/infback9/infback9.h Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,37 ---- + /* infback9.h -- header for using inflateBack9 functions + * Copyright (C) 2003 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* + * This header file and associated patches provide a decoder for PKWare's + * undocumented deflate64 compression method (method 9). Use with infback9.c, + * inftree9.h, inftree9.c, and inffix9.h. These patches are not supported. + * This should be compiled with zlib, since it uses zutil.h and zutil.o. + * This code has not yet been tested on 16-bit architectures. See the + * comments in zlib.h for inflateBack() usage. These functions are used + * identically, except that there is no windowBits parameter, and a 64K + * window must be provided. Also if int's are 16 bits, then a zero for + * the third parameter of the "out" function actually means 65536UL. + * zlib.h must be included before this header file. + */ + + #ifdef __cplusplus + extern "C" { + #endif + + ZEXTERN int ZEXPORT inflateBack9 OF((z_stream FAR *strm, + in_func in, void FAR *in_desc, + out_func out, void FAR *out_desc)); + ZEXTERN int ZEXPORT inflateBack9End OF((z_stream FAR *strm)); + ZEXTERN int ZEXPORT inflateBack9Init_ OF((z_stream FAR *strm, + unsigned char FAR *window, + const char *version, + int stream_size)); + #define inflateBack9Init(strm, window) \ + inflateBack9Init_((strm), (window), \ + ZLIB_VERSION, sizeof(z_stream)) + + #ifdef __cplusplus + } + #endif diff -Nrcpad gcc-4.4.4/zlib/contrib/infback9/inffix9.h gcc-4.4.5/zlib/contrib/infback9/inffix9.h *** gcc-4.4.4/zlib/contrib/infback9/inffix9.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/infback9/inffix9.h Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,107 ---- + /* inffix9.h -- table for decoding deflate64 fixed codes + * Generated automatically by makefixed9(). + */ + + /* WARNING: this file should *not* be used by applications. + It is part of the implementation of this library and is + subject to change. Applications should only use zlib.h. + */ + + static const code lenfix[512] = { + {96,7,0},{0,8,80},{0,8,16},{132,8,115},{130,7,31},{0,8,112}, + {0,8,48},{0,9,192},{128,7,10},{0,8,96},{0,8,32},{0,9,160}, + {0,8,0},{0,8,128},{0,8,64},{0,9,224},{128,7,6},{0,8,88}, + {0,8,24},{0,9,144},{131,7,59},{0,8,120},{0,8,56},{0,9,208}, + {129,7,17},{0,8,104},{0,8,40},{0,9,176},{0,8,8},{0,8,136}, + {0,8,72},{0,9,240},{128,7,4},{0,8,84},{0,8,20},{133,8,227}, + {131,7,43},{0,8,116},{0,8,52},{0,9,200},{129,7,13},{0,8,100}, + {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232}, + {128,7,8},{0,8,92},{0,8,28},{0,9,152},{132,7,83},{0,8,124}, + {0,8,60},{0,9,216},{130,7,23},{0,8,108},{0,8,44},{0,9,184}, + {0,8,12},{0,8,140},{0,8,76},{0,9,248},{128,7,3},{0,8,82}, + {0,8,18},{133,8,163},{131,7,35},{0,8,114},{0,8,50},{0,9,196}, + {129,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},{0,8,130}, + {0,8,66},{0,9,228},{128,7,7},{0,8,90},{0,8,26},{0,9,148}, + {132,7,67},{0,8,122},{0,8,58},{0,9,212},{130,7,19},{0,8,106}, + {0,8,42},{0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244}, + {128,7,5},{0,8,86},{0,8,22},{65,8,0},{131,7,51},{0,8,118}, + {0,8,54},{0,9,204},{129,7,15},{0,8,102},{0,8,38},{0,9,172}, + {0,8,6},{0,8,134},{0,8,70},{0,9,236},{128,7,9},{0,8,94}, + {0,8,30},{0,9,156},{132,7,99},{0,8,126},{0,8,62},{0,9,220}, + {130,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142}, + {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{133,8,131}, + {130,7,31},{0,8,113},{0,8,49},{0,9,194},{128,7,10},{0,8,97}, + {0,8,33},{0,9,162},{0,8,1},{0,8,129},{0,8,65},{0,9,226}, + {128,7,6},{0,8,89},{0,8,25},{0,9,146},{131,7,59},{0,8,121}, + {0,8,57},{0,9,210},{129,7,17},{0,8,105},{0,8,41},{0,9,178}, + {0,8,9},{0,8,137},{0,8,73},{0,9,242},{128,7,4},{0,8,85}, + {0,8,21},{144,8,3},{131,7,43},{0,8,117},{0,8,53},{0,9,202}, + {129,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133}, + {0,8,69},{0,9,234},{128,7,8},{0,8,93},{0,8,29},{0,9,154}, + {132,7,83},{0,8,125},{0,8,61},{0,9,218},{130,7,23},{0,8,109}, + {0,8,45},{0,9,186},{0,8,13},{0,8,141},{0,8,77},{0,9,250}, + {128,7,3},{0,8,83},{0,8,19},{133,8,195},{131,7,35},{0,8,115}, + {0,8,51},{0,9,198},{129,7,11},{0,8,99},{0,8,35},{0,9,166}, + {0,8,3},{0,8,131},{0,8,67},{0,9,230},{128,7,7},{0,8,91}, + {0,8,27},{0,9,150},{132,7,67},{0,8,123},{0,8,59},{0,9,214}, + {130,7,19},{0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139}, + {0,8,75},{0,9,246},{128,7,5},{0,8,87},{0,8,23},{77,8,0}, + {131,7,51},{0,8,119},{0,8,55},{0,9,206},{129,7,15},{0,8,103}, + {0,8,39},{0,9,174},{0,8,7},{0,8,135},{0,8,71},{0,9,238}, + {128,7,9},{0,8,95},{0,8,31},{0,9,158},{132,7,99},{0,8,127}, + {0,8,63},{0,9,222},{130,7,27},{0,8,111},{0,8,47},{0,9,190}, + {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80}, + {0,8,16},{132,8,115},{130,7,31},{0,8,112},{0,8,48},{0,9,193}, + {128,7,10},{0,8,96},{0,8,32},{0,9,161},{0,8,0},{0,8,128}, + {0,8,64},{0,9,225},{128,7,6},{0,8,88},{0,8,24},{0,9,145}, + {131,7,59},{0,8,120},{0,8,56},{0,9,209},{129,7,17},{0,8,104}, + {0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},{0,9,241}, + {128,7,4},{0,8,84},{0,8,20},{133,8,227},{131,7,43},{0,8,116}, + {0,8,52},{0,9,201},{129,7,13},{0,8,100},{0,8,36},{0,9,169}, + {0,8,4},{0,8,132},{0,8,68},{0,9,233},{128,7,8},{0,8,92}, + {0,8,28},{0,9,153},{132,7,83},{0,8,124},{0,8,60},{0,9,217}, + {130,7,23},{0,8,108},{0,8,44},{0,9,185},{0,8,12},{0,8,140}, + {0,8,76},{0,9,249},{128,7,3},{0,8,82},{0,8,18},{133,8,163}, + {131,7,35},{0,8,114},{0,8,50},{0,9,197},{129,7,11},{0,8,98}, + {0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229}, + {128,7,7},{0,8,90},{0,8,26},{0,9,149},{132,7,67},{0,8,122}, + {0,8,58},{0,9,213},{130,7,19},{0,8,106},{0,8,42},{0,9,181}, + {0,8,10},{0,8,138},{0,8,74},{0,9,245},{128,7,5},{0,8,86}, + {0,8,22},{65,8,0},{131,7,51},{0,8,118},{0,8,54},{0,9,205}, + {129,7,15},{0,8,102},{0,8,38},{0,9,173},{0,8,6},{0,8,134}, + {0,8,70},{0,9,237},{128,7,9},{0,8,94},{0,8,30},{0,9,157}, + {132,7,99},{0,8,126},{0,8,62},{0,9,221},{130,7,27},{0,8,110}, + {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253}, + {96,7,0},{0,8,81},{0,8,17},{133,8,131},{130,7,31},{0,8,113}, + {0,8,49},{0,9,195},{128,7,10},{0,8,97},{0,8,33},{0,9,163}, + {0,8,1},{0,8,129},{0,8,65},{0,9,227},{128,7,6},{0,8,89}, + {0,8,25},{0,9,147},{131,7,59},{0,8,121},{0,8,57},{0,9,211}, + {129,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},{0,8,137}, + {0,8,73},{0,9,243},{128,7,4},{0,8,85},{0,8,21},{144,8,3}, + {131,7,43},{0,8,117},{0,8,53},{0,9,203},{129,7,13},{0,8,101}, + {0,8,37},{0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235}, + {128,7,8},{0,8,93},{0,8,29},{0,9,155},{132,7,83},{0,8,125}, + {0,8,61},{0,9,219},{130,7,23},{0,8,109},{0,8,45},{0,9,187}, + {0,8,13},{0,8,141},{0,8,77},{0,9,251},{128,7,3},{0,8,83}, + {0,8,19},{133,8,195},{131,7,35},{0,8,115},{0,8,51},{0,9,199}, + {129,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131}, + {0,8,67},{0,9,231},{128,7,7},{0,8,91},{0,8,27},{0,9,151}, + {132,7,67},{0,8,123},{0,8,59},{0,9,215},{130,7,19},{0,8,107}, + {0,8,43},{0,9,183},{0,8,11},{0,8,139},{0,8,75},{0,9,247}, + {128,7,5},{0,8,87},{0,8,23},{77,8,0},{131,7,51},{0,8,119}, + {0,8,55},{0,9,207},{129,7,15},{0,8,103},{0,8,39},{0,9,175}, + {0,8,7},{0,8,135},{0,8,71},{0,9,239},{128,7,9},{0,8,95}, + {0,8,31},{0,9,159},{132,7,99},{0,8,127},{0,8,63},{0,9,223}, + {130,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143}, + {0,8,79},{0,9,255} + }; + + static const code distfix[32] = { + {128,5,1},{135,5,257},{131,5,17},{139,5,4097},{129,5,5}, + {137,5,1025},{133,5,65},{141,5,16385},{128,5,3},{136,5,513}, + {132,5,33},{140,5,8193},{130,5,9},{138,5,2049},{134,5,129}, + {142,5,32769},{128,5,2},{135,5,385},{131,5,25},{139,5,6145}, + {129,5,7},{137,5,1537},{133,5,97},{141,5,24577},{128,5,4}, + {136,5,769},{132,5,49},{140,5,12289},{130,5,13},{138,5,3073}, + {134,5,193},{142,5,49153} + }; diff -Nrcpad gcc-4.4.4/zlib/contrib/infback9/inflate9.h gcc-4.4.5/zlib/contrib/infback9/inflate9.h *** gcc-4.4.4/zlib/contrib/infback9/inflate9.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/infback9/inflate9.h Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,47 ---- + /* inflate9.h -- internal inflate state definition + * Copyright (C) 1995-2003 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + + /* Possible inflate modes between inflate() calls */ + typedef enum { + TYPE, /* i: waiting for type bits, including last-flag bit */ + STORED, /* i: waiting for stored size (length and complement) */ + TABLE, /* i: waiting for dynamic block table lengths */ + LEN, /* i: waiting for length/lit code */ + DONE, /* finished check, done -- remain here until reset */ + BAD /* got a data error -- remain here until reset */ + } inflate_mode; + + /* + State transitions between above modes - + + (most modes can go to the BAD mode -- not shown for clarity) + + Read deflate blocks: + TYPE -> STORED or TABLE or LEN or DONE + STORED -> TYPE + TABLE -> LENLENS -> CODELENS -> LEN + Read deflate codes: + LEN -> LEN or TYPE + */ + + /* state maintained between inflate() calls. Approximately 7K bytes. */ + struct inflate_state { + /* sliding window */ + unsigned char FAR *window; /* allocated sliding window, if needed */ + /* dynamic table building */ + unsigned ncode; /* number of code length code lengths */ + unsigned nlen; /* number of length code lengths */ + unsigned ndist; /* number of distance code lengths */ + unsigned have; /* number of code lengths in lens[] */ + code FAR *next; /* next available space in codes[] */ + unsigned short lens[320]; /* temporary storage for code lengths */ + unsigned short work[288]; /* work area for code table building */ + code codes[ENOUGH]; /* space for code tables */ + }; diff -Nrcpad gcc-4.4.4/zlib/contrib/infback9/inftree9.c gcc-4.4.5/zlib/contrib/infback9/inftree9.c *** gcc-4.4.4/zlib/contrib/infback9/inftree9.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/infback9/inftree9.c Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,323 ---- + /* inftree9.c -- generate Huffman trees for efficient decoding + * Copyright (C) 1995-2005 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + #include "zutil.h" + #include "inftree9.h" + + #define MAXBITS 15 + + const char inflate9_copyright[] = + " inflate9 1.2.3 Copyright 1995-2005 Mark Adler "; + /* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot + include such an acknowledgment, I would appreciate that you keep this + copyright string in the executable of your product. + */ + + /* + Build a set of tables to decode the provided canonical Huffman code. + The code lengths are lens[0..codes-1]. The result starts at *table, + whose indices are 0..2^bits-1. work is a writable array of at least + lens shorts, which is used as a work area. type is the type of code + to be generated, CODES, LENS, or DISTS. On return, zero is success, + -1 is an invalid code, and +1 means that ENOUGH isn't enough. table + on return points to the next available entry's address. bits is the + requested root table index bits, and on return it is the actual root + table index bits. It will differ if the request is greater than the + longest code or if it is less than the shortest code. + */ + int inflate_table9(type, lens, codes, table, bits, work) + codetype type; + unsigned short FAR *lens; + unsigned codes; + code FAR * FAR *table; + unsigned FAR *bits; + unsigned short FAR *work; + { + unsigned len; /* a code's length in bits */ + unsigned sym; /* index of code symbols */ + unsigned min, max; /* minimum and maximum code lengths */ + unsigned root; /* number of index bits for root table */ + unsigned curr; /* number of index bits for current table */ + unsigned drop; /* code bits to drop for sub-table */ + int left; /* number of prefix codes available */ + unsigned used; /* code entries in table used */ + unsigned huff; /* Huffman code */ + unsigned incr; /* for incrementing code, index */ + unsigned fill; /* index for replicating entries */ + unsigned low; /* low bits for current root entry */ + unsigned mask; /* mask for low root bits */ + code this; /* table entry for duplication */ + code FAR *next; /* next available space in table */ + const unsigned short FAR *base; /* base value table to use */ + const unsigned short FAR *extra; /* extra bits table to use */ + int end; /* use base and extra for symbol > end */ + unsigned short count[MAXBITS+1]; /* number of codes of each length */ + unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ + static const unsigned short lbase[31] = { /* Length codes 257..285 base */ + 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, + 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, + 131, 163, 195, 227, 3, 0, 0}; + static const unsigned short lext[31] = { /* Length codes 257..285 extra */ + 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, + 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, + 133, 133, 133, 133, 144, 201, 196}; + static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ + 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, + 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, + 4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153}; + static const unsigned short dext[32] = { /* Distance codes 0..31 extra */ + 128, 128, 128, 128, 129, 129, 130, 130, 131, 131, 132, 132, + 133, 133, 134, 134, 135, 135, 136, 136, 137, 137, 138, 138, + 139, 139, 140, 140, 141, 141, 142, 142}; + + /* + Process a set of code lengths to create a canonical Huffman code. The + code lengths are lens[0..codes-1]. Each length corresponds to the + symbols 0..codes-1. The Huffman code is generated by first sorting the + symbols by length from short to long, and retaining the symbol order + for codes with equal lengths. Then the code starts with all zero bits + for the first code of the shortest length, and the codes are integer + increments for the same length, and zeros are appended as the length + increases. For the deflate format, these bits are stored backwards + from their more natural integer increment ordering, and so when the + decoding tables are built in the large loop below, the integer codes + are incremented backwards. + + This routine assumes, but does not check, that all of the entries in + lens[] are in the range 0..MAXBITS. The caller must assure this. + 1..MAXBITS is interpreted as that code length. zero means that that + symbol does not occur in this code. + + The codes are sorted by computing a count of codes for each length, + creating from that a table of starting indices for each length in the + sorted table, and then entering the symbols in order in the sorted + table. The sorted table is work[], with that space being provided by + the caller. + + The length counts are used for other purposes as well, i.e. finding + the minimum and maximum length codes, determining if there are any + codes at all, checking for a valid set of lengths, and looking ahead + at length counts to determine sub-table sizes when building the + decoding tables. + */ + + /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */ + for (len = 0; len <= MAXBITS; len++) + count[len] = 0; + for (sym = 0; sym < codes; sym++) + count[lens[sym]]++; + + /* bound code lengths, force root to be within code lengths */ + root = *bits; + for (max = MAXBITS; max >= 1; max--) + if (count[max] != 0) break; + if (root > max) root = max; + if (max == 0) return -1; /* no codes! */ + for (min = 1; min <= MAXBITS; min++) + if (count[min] != 0) break; + if (root < min) root = min; + + /* check for an over-subscribed or incomplete set of lengths */ + left = 1; + for (len = 1; len <= MAXBITS; len++) { + left <<= 1; + left -= count[len]; + if (left < 0) return -1; /* over-subscribed */ + } + if (left > 0 && (type == CODES || max != 1)) + return -1; /* incomplete set */ + + /* generate offsets into symbol table for each length for sorting */ + offs[1] = 0; + for (len = 1; len < MAXBITS; len++) + offs[len + 1] = offs[len] + count[len]; + + /* sort symbols by length, by symbol order within each length */ + for (sym = 0; sym < codes; sym++) + if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym; + + /* + Create and fill in decoding tables. In this loop, the table being + filled is at next and has curr index bits. The code being used is huff + with length len. That code is converted to an index by dropping drop + bits off of the bottom. For codes where len is less than drop + curr, + those top drop + curr - len bits are incremented through all values to + fill the table with replicated entries. + + root is the number of index bits for the root table. When len exceeds + root, sub-tables are created pointed to by the root entry with an index + of the low root bits of huff. This is saved in low to check for when a + new sub-table should be started. drop is zero when the root table is + being filled, and drop is root when sub-tables are being filled. + + When a new sub-table is needed, it is necessary to look ahead in the + code lengths to determine what size sub-table is needed. The length + counts are used for this, and so count[] is decremented as codes are + entered in the tables. + + used keeps track of how many table entries have been allocated from the + provided *table space. It is checked when a LENS table is being made + against the space in *table, ENOUGH, minus the maximum space needed by + the worst case distance code, MAXD. This should never happen, but the + sufficiency of ENOUGH has not been proven exhaustively, hence the check. + This assumes that when type == LENS, bits == 9. + + sym increments through all symbols, and the loop terminates when + all codes of length max, i.e. all codes, have been processed. This + routine permits incomplete codes, so another loop after this one fills + in the rest of the decoding tables with invalid code markers. + */ + + /* set up for code type */ + switch (type) { + case CODES: + base = extra = work; /* dummy value--not used */ + end = 19; + break; + case LENS: + base = lbase; + base -= 257; + extra = lext; + extra -= 257; + end = 256; + break; + default: /* DISTS */ + base = dbase; + extra = dext; + end = -1; + } + + /* initialize state for loop */ + huff = 0; /* starting code */ + sym = 0; /* starting code symbol */ + len = min; /* starting code length */ + next = *table; /* current table to fill in */ + curr = root; /* current table index bits */ + drop = 0; /* current bits to drop from code for index */ + low = (unsigned)(-1); /* trigger new sub-table when len > root */ + used = 1U << root; /* use root table entries */ + mask = used - 1; /* mask for comparing low */ + + /* check available table space */ + if (type == LENS && used >= ENOUGH - MAXD) + return 1; + + /* process all codes and make table entries */ + for (;;) { + /* create table entry */ + this.bits = (unsigned char)(len - drop); + if ((int)(work[sym]) < end) { + this.op = (unsigned char)0; + this.val = work[sym]; + } + else if ((int)(work[sym]) > end) { + this.op = (unsigned char)(extra[work[sym]]); + this.val = base[work[sym]]; + } + else { + this.op = (unsigned char)(32 + 64); /* end of block */ + this.val = 0; + } + + /* replicate for those indices with low len bits equal to huff */ + incr = 1U << (len - drop); + fill = 1U << curr; + do { + fill -= incr; + next[(huff >> drop) + fill] = this; + } while (fill != 0); + + /* backwards increment the len-bit code huff */ + incr = 1U << (len - 1); + while (huff & incr) + incr >>= 1; + if (incr != 0) { + huff &= incr - 1; + huff += incr; + } + else + huff = 0; + + /* go to next symbol, update count, len */ + sym++; + if (--(count[len]) == 0) { + if (len == max) break; + len = lens[work[sym]]; + } + + /* create new sub-table if needed */ + if (len > root && (huff & mask) != low) { + /* if first time, transition to sub-tables */ + if (drop == 0) + drop = root; + + /* increment past last table */ + next += 1U << curr; + + /* determine length of next table */ + curr = len - drop; + left = (int)(1 << curr); + while (curr + drop < max) { + left -= count[curr + drop]; + if (left <= 0) break; + curr++; + left <<= 1; + } + + /* check for enough space */ + used += 1U << curr; + if (type == LENS && used >= ENOUGH - MAXD) + return 1; + + /* point entry in root table to sub-table */ + low = huff & mask; + (*table)[low].op = (unsigned char)curr; + (*table)[low].bits = (unsigned char)root; + (*table)[low].val = (unsigned short)(next - *table); + } + } + + /* + Fill in rest of table for incomplete codes. This loop is similar to the + loop above in incrementing huff for table indices. It is assumed that + len is equal to curr + drop, so there is no loop needed to increment + through high index bits. When the current sub-table is filled, the loop + drops back to the root table to fill in any remaining entries there. + */ + this.op = (unsigned char)64; /* invalid code marker */ + this.bits = (unsigned char)(len - drop); + this.val = (unsigned short)0; + while (huff != 0) { + /* when done with sub-table, drop back to root table */ + if (drop != 0 && (huff & mask) != low) { + drop = 0; + len = root; + next = *table; + curr = root; + this.bits = (unsigned char)len; + } + + /* put invalid code marker in table */ + next[huff >> drop] = this; + + /* backwards increment the len-bit code huff */ + incr = 1U << (len - 1); + while (huff & incr) + incr >>= 1; + if (incr != 0) { + huff &= incr - 1; + huff += incr; + } + else + huff = 0; + } + + /* set return parameters */ + *table += used; + *bits = root; + return 0; + } diff -Nrcpad gcc-4.4.4/zlib/contrib/infback9/inftree9.h gcc-4.4.5/zlib/contrib/infback9/inftree9.h *** gcc-4.4.4/zlib/contrib/infback9/inftree9.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/infback9/inftree9.h Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,55 ---- + /* inftree9.h -- header to use inftree9.c + * Copyright (C) 1995-2003 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + + /* Structure for decoding tables. Each entry provides either the + information needed to do the operation requested by the code that + indexed that table entry, or it provides a pointer to another + table that indexes more bits of the code. op indicates whether + the entry is a pointer to another table, a literal, a length or + distance, an end-of-block, or an invalid code. For a table + pointer, the low four bits of op is the number of index bits of + that table. For a length or distance, the low four bits of op + is the number of extra bits to get after the code. bits is + the number of bits in this code or part of the code to drop off + of the bit buffer. val is the actual byte to output in the case + of a literal, the base length or distance, or the offset from + the current table to the next table. Each entry is four bytes. */ + typedef struct { + unsigned char op; /* operation, extra bits, table bits */ + unsigned char bits; /* bits in this part of the code */ + unsigned short val; /* offset in table or code value */ + } code; + + /* op values as set by inflate_table(): + 00000000 - literal + 0000tttt - table link, tttt != 0 is the number of table index bits + 100eeeee - length or distance, eeee is the number of extra bits + 01100000 - end of block + 01000000 - invalid code + */ + + /* Maximum size of dynamic tree. The maximum found in a long but non- + exhaustive search was 1444 code structures (852 for length/literals + and 592 for distances, the latter actually the result of an + exhaustive search). The true maximum is not known, but the value + below is more than safe. */ + #define ENOUGH 2048 + #define MAXD 592 + + /* Type of code to build for inftable() */ + typedef enum { + CODES, + LENS, + DISTS + } codetype; + + extern int inflate_table9 OF((codetype type, unsigned short FAR *lens, + unsigned codes, code FAR * FAR *table, + unsigned FAR *bits, unsigned short FAR *work)); diff -Nrcpad gcc-4.4.4/zlib/contrib/inflate86/inffas86.c gcc-4.4.5/zlib/contrib/inflate86/inffas86.c *** gcc-4.4.4/zlib/contrib/inflate86/inffas86.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/inflate86/inffas86.c Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,1157 ---- + /* inffas86.c is a hand tuned assembler version of + * + * inffast.c -- fast decoding + * Copyright (C) 1995-2003 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + * + * Copyright (C) 2003 Chris Anderson + * Please use the copyright conditions above. + * + * Dec-29-2003 -- I added AMD64 inflate asm support. This version is also + * slightly quicker on x86 systems because, instead of using rep movsb to copy + * data, it uses rep movsw, which moves data in 2-byte chunks instead of single + * bytes. I've tested the AMD64 code on a Fedora Core 1 + the x86_64 updates + * from http://fedora.linux.duke.edu/fc1_x86_64 + * which is running on an Athlon 64 3000+ / Gigabyte GA-K8VT800M system with + * 1GB ram. The 64-bit version is about 4% faster than the 32-bit version, + * when decompressing mozilla-source-1.3.tar.gz. + * + * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from + * the gcc -S output of zlib-1.2.0/inffast.c. Zlib-1.2.0 is in beta release at + * the moment. I have successfully compiled and tested this code with gcc2.96, + * gcc3.2, icc5.0, msvc6.0. It is very close to the speed of inffast.S + * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX + * enabled. I will attempt to merge the MMX code into this version. Newer + * versions of this and inffast.S can be found at + * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/ + */ + + #include "zutil.h" + #include "inftrees.h" + #include "inflate.h" + #include "inffast.h" + + /* Mark Adler's comments from inffast.c: */ + + /* + Decode literal, length, and distance codes and write out the resulting + literal and match bytes until either not enough input or output is + available, an end-of-block is encountered, or a data error is encountered. + When large enough input and output buffers are supplied to inflate(), for + example, a 16K input buffer and a 64K output buffer, more than 95% of the + inflate execution time is spent in this routine. + + Entry assumptions: + + state->mode == LEN + strm->avail_in >= 6 + strm->avail_out >= 258 + start >= strm->avail_out + state->bits < 8 + + On return, state->mode is one of: + + LEN -- ran out of enough output space or enough available input + TYPE -- reached end of block code, inflate() to interpret next block + BAD -- error in block data + + Notes: + + - The maximum input bits used by a length/distance pair is 15 bits for the + length code, 5 bits for the length extra, 15 bits for the distance code, + and 13 bits for the distance extra. This totals 48 bits, or six bytes. + Therefore if strm->avail_in >= 6, then there is enough input to avoid + checking for available input while decoding. + + - The maximum bytes that a single length/distance pair can output is 258 + bytes, which is the maximum length that can be coded. inflate_fast() + requires strm->avail_out >= 258 for each loop to avoid checking for + output space. + */ + void inflate_fast(strm, start) + z_streamp strm; + unsigned start; /* inflate()'s starting value for strm->avail_out */ + { + struct inflate_state FAR *state; + struct inffast_ar { + /* 64 32 x86 x86_64 */ + /* ar offset register */ + /* 0 0 */ void *esp; /* esp save */ + /* 8 4 */ void *ebp; /* ebp save */ + /* 16 8 */ unsigned char FAR *in; /* esi rsi local strm->next_in */ + /* 24 12 */ unsigned char FAR *last; /* r9 while in < last */ + /* 32 16 */ unsigned char FAR *out; /* edi rdi local strm->next_out */ + /* 40 20 */ unsigned char FAR *beg; /* inflate()'s init next_out */ + /* 48 24 */ unsigned char FAR *end; /* r10 while out < end */ + /* 56 28 */ unsigned char FAR *window;/* size of window, wsize!=0 */ + /* 64 32 */ code const FAR *lcode; /* ebp rbp local strm->lencode */ + /* 72 36 */ code const FAR *dcode; /* r11 local strm->distcode */ + /* 80 40 */ unsigned long hold; /* edx rdx local strm->hold */ + /* 88 44 */ unsigned bits; /* ebx rbx local strm->bits */ + /* 92 48 */ unsigned wsize; /* window size */ + /* 96 52 */ unsigned write; /* window write index */ + /*100 56 */ unsigned lmask; /* r12 mask for lcode */ + /*104 60 */ unsigned dmask; /* r13 mask for dcode */ + /*108 64 */ unsigned len; /* r14 match length */ + /*112 68 */ unsigned dist; /* r15 match distance */ + /*116 72 */ unsigned status; /* set when state chng*/ + } ar; + + #if defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 ) + #define PAD_AVAIL_IN 6 + #define PAD_AVAIL_OUT 258 + #else + #define PAD_AVAIL_IN 5 + #define PAD_AVAIL_OUT 257 + #endif + + /* copy state to local variables */ + state = (struct inflate_state FAR *)strm->state; + ar.in = strm->next_in; + ar.last = ar.in + (strm->avail_in - PAD_AVAIL_IN); + ar.out = strm->next_out; + ar.beg = ar.out - (start - strm->avail_out); + ar.end = ar.out + (strm->avail_out - PAD_AVAIL_OUT); + ar.wsize = state->wsize; + ar.write = state->write; + ar.window = state->window; + ar.hold = state->hold; + ar.bits = state->bits; + ar.lcode = state->lencode; + ar.dcode = state->distcode; + ar.lmask = (1U << state->lenbits) - 1; + ar.dmask = (1U << state->distbits) - 1; + + /* decode literals and length/distances until end-of-block or not enough + input data or output space */ + + /* align in on 1/2 hold size boundary */ + while (((unsigned long)(void *)ar.in & (sizeof(ar.hold) / 2 - 1)) != 0) { + ar.hold += (unsigned long)*ar.in++ << ar.bits; + ar.bits += 8; + } + + #if defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 ) + __asm__ __volatile__ ( + " leaq %0, %%rax\n" + " movq %%rbp, 8(%%rax)\n" /* save regs rbp and rsp */ + " movq %%rsp, (%%rax)\n" + " movq %%rax, %%rsp\n" /* make rsp point to &ar */ + " movq 16(%%rsp), %%rsi\n" /* rsi = in */ + " movq 32(%%rsp), %%rdi\n" /* rdi = out */ + " movq 24(%%rsp), %%r9\n" /* r9 = last */ + " movq 48(%%rsp), %%r10\n" /* r10 = end */ + " movq 64(%%rsp), %%rbp\n" /* rbp = lcode */ + " movq 72(%%rsp), %%r11\n" /* r11 = dcode */ + " movq 80(%%rsp), %%rdx\n" /* rdx = hold */ + " movl 88(%%rsp), %%ebx\n" /* ebx = bits */ + " movl 100(%%rsp), %%r12d\n" /* r12d = lmask */ + " movl 104(%%rsp), %%r13d\n" /* r13d = dmask */ + /* r14d = len */ + /* r15d = dist */ + " cld\n" + " cmpq %%rdi, %%r10\n" + " je .L_one_time\n" /* if only one decode left */ + " cmpq %%rsi, %%r9\n" + " je .L_one_time\n" + " jmp .L_do_loop\n" + + ".L_one_time:\n" + " movq %%r12, %%r8\n" /* r8 = lmask */ + " cmpb $32, %%bl\n" + " ja .L_get_length_code_one_time\n" + + " lodsl\n" /* eax = *(uint *)in++ */ + " movb %%bl, %%cl\n" /* cl = bits, needs it for shifting */ + " addb $32, %%bl\n" /* bits += 32 */ + " shlq %%cl, %%rax\n" + " orq %%rax, %%rdx\n" /* hold |= *((uint *)in)++ << bits */ + " jmp .L_get_length_code_one_time\n" + + ".align 32,0x90\n" + ".L_while_test:\n" + " cmpq %%rdi, %%r10\n" + " jbe .L_break_loop\n" + " cmpq %%rsi, %%r9\n" + " jbe .L_break_loop\n" + + ".L_do_loop:\n" + " movq %%r12, %%r8\n" /* r8 = lmask */ + " cmpb $32, %%bl\n" + " ja .L_get_length_code\n" /* if (32 < bits) */ + + " lodsl\n" /* eax = *(uint *)in++ */ + " movb %%bl, %%cl\n" /* cl = bits, needs it for shifting */ + " addb $32, %%bl\n" /* bits += 32 */ + " shlq %%cl, %%rax\n" + " orq %%rax, %%rdx\n" /* hold |= *((uint *)in)++ << bits */ + + ".L_get_length_code:\n" + " andq %%rdx, %%r8\n" /* r8 &= hold */ + " movl (%%rbp,%%r8,4), %%eax\n" /* eax = lcode[hold & lmask] */ + + " movb %%ah, %%cl\n" /* cl = this.bits */ + " subb %%ah, %%bl\n" /* bits -= this.bits */ + " shrq %%cl, %%rdx\n" /* hold >>= this.bits */ + + " testb %%al, %%al\n" + " jnz .L_test_for_length_base\n" /* if (op != 0) 45.7% */ + + " movq %%r12, %%r8\n" /* r8 = lmask */ + " shrl $16, %%eax\n" /* output this.val char */ + " stosb\n" + + ".L_get_length_code_one_time:\n" + " andq %%rdx, %%r8\n" /* r8 &= hold */ + " movl (%%rbp,%%r8,4), %%eax\n" /* eax = lcode[hold & lmask] */ + + ".L_dolen:\n" + " movb %%ah, %%cl\n" /* cl = this.bits */ + " subb %%ah, %%bl\n" /* bits -= this.bits */ + " shrq %%cl, %%rdx\n" /* hold >>= this.bits */ + + " testb %%al, %%al\n" + " jnz .L_test_for_length_base\n" /* if (op != 0) 45.7% */ + + " shrl $16, %%eax\n" /* output this.val char */ + " stosb\n" + " jmp .L_while_test\n" + + ".align 32,0x90\n" + ".L_test_for_length_base:\n" + " movl %%eax, %%r14d\n" /* len = this */ + " shrl $16, %%r14d\n" /* len = this.val */ + " movb %%al, %%cl\n" + + " testb $16, %%al\n" + " jz .L_test_for_second_level_length\n" /* if ((op & 16) == 0) 8% */ + " andb $15, %%cl\n" /* op &= 15 */ + " jz .L_decode_distance\n" /* if (!op) */ + + ".L_add_bits_to_len:\n" + " subb %%cl, %%bl\n" + " xorl %%eax, %%eax\n" + " incl %%eax\n" + " shll %%cl, %%eax\n" + " decl %%eax\n" + " andl %%edx, %%eax\n" /* eax &= hold */ + " shrq %%cl, %%rdx\n" + " addl %%eax, %%r14d\n" /* len += hold & mask[op] */ + + ".L_decode_distance:\n" + " movq %%r13, %%r8\n" /* r8 = dmask */ + " cmpb $32, %%bl\n" + " ja .L_get_distance_code\n" /* if (32 < bits) */ + + " lodsl\n" /* eax = *(uint *)in++ */ + " movb %%bl, %%cl\n" /* cl = bits, needs it for shifting */ + " addb $32, %%bl\n" /* bits += 32 */ + " shlq %%cl, %%rax\n" + " orq %%rax, %%rdx\n" /* hold |= *((uint *)in)++ << bits */ + + ".L_get_distance_code:\n" + " andq %%rdx, %%r8\n" /* r8 &= hold */ + " movl (%%r11,%%r8,4), %%eax\n" /* eax = dcode[hold & dmask] */ + + ".L_dodist:\n" + " movl %%eax, %%r15d\n" /* dist = this */ + " shrl $16, %%r15d\n" /* dist = this.val */ + " movb %%ah, %%cl\n" + " subb %%ah, %%bl\n" /* bits -= this.bits */ + " shrq %%cl, %%rdx\n" /* hold >>= this.bits */ + " movb %%al, %%cl\n" /* cl = this.op */ + + " testb $16, %%al\n" /* if ((op & 16) == 0) */ + " jz .L_test_for_second_level_dist\n" + " andb $15, %%cl\n" /* op &= 15 */ + " jz .L_check_dist_one\n" + + ".L_add_bits_to_dist:\n" + " subb %%cl, %%bl\n" + " xorl %%eax, %%eax\n" + " incl %%eax\n" + " shll %%cl, %%eax\n" + " decl %%eax\n" /* (1 << op) - 1 */ + " andl %%edx, %%eax\n" /* eax &= hold */ + " shrq %%cl, %%rdx\n" + " addl %%eax, %%r15d\n" /* dist += hold & ((1 << op) - 1) */ + + ".L_check_window:\n" + " movq %%rsi, %%r8\n" /* save in so from can use it's reg */ + " movq %%rdi, %%rax\n" + " subq 40(%%rsp), %%rax\n" /* nbytes = out - beg */ + + " cmpl %%r15d, %%eax\n" + " jb .L_clip_window\n" /* if (dist > nbytes) 4.2% */ + + " movl %%r14d, %%ecx\n" /* ecx = len */ + " movq %%rdi, %%rsi\n" + " subq %%r15, %%rsi\n" /* from = out - dist */ + + " sarl %%ecx\n" + " jnc .L_copy_two\n" /* if len % 2 == 0 */ + + " rep movsw\n" + " movb (%%rsi), %%al\n" + " movb %%al, (%%rdi)\n" + " incq %%rdi\n" + + " movq %%r8, %%rsi\n" /* move in back to %rsi, toss from */ + " jmp .L_while_test\n" + + ".L_copy_two:\n" + " rep movsw\n" + " movq %%r8, %%rsi\n" /* move in back to %rsi, toss from */ + " jmp .L_while_test\n" + + ".align 32,0x90\n" + ".L_check_dist_one:\n" + " cmpl $1, %%r15d\n" /* if dist 1, is a memset */ + " jne .L_check_window\n" + " cmpq %%rdi, 40(%%rsp)\n" /* if out == beg, outside window */ + " je .L_check_window\n" + + " movl %%r14d, %%ecx\n" /* ecx = len */ + " movb -1(%%rdi), %%al\n" + " movb %%al, %%ah\n" + + " sarl %%ecx\n" + " jnc .L_set_two\n" + " movb %%al, (%%rdi)\n" + " incq %%rdi\n" + + ".L_set_two:\n" + " rep stosw\n" + " jmp .L_while_test\n" + + ".align 32,0x90\n" + ".L_test_for_second_level_length:\n" + " testb $64, %%al\n" + " jnz .L_test_for_end_of_block\n" /* if ((op & 64) != 0) */ + + " xorl %%eax, %%eax\n" + " incl %%eax\n" + " shll %%cl, %%eax\n" + " decl %%eax\n" + " andl %%edx, %%eax\n" /* eax &= hold */ + " addl %%r14d, %%eax\n" /* eax += len */ + " movl (%%rbp,%%rax,4), %%eax\n" /* eax = lcode[val+(hold&mask[op])]*/ + " jmp .L_dolen\n" + + ".align 32,0x90\n" + ".L_test_for_second_level_dist:\n" + " testb $64, %%al\n" + " jnz .L_invalid_distance_code\n" /* if ((op & 64) != 0) */ + + " xorl %%eax, %%eax\n" + " incl %%eax\n" + " shll %%cl, %%eax\n" + " decl %%eax\n" + " andl %%edx, %%eax\n" /* eax &= hold */ + " addl %%r15d, %%eax\n" /* eax += dist */ + " movl (%%r11,%%rax,4), %%eax\n" /* eax = dcode[val+(hold&mask[op])]*/ + " jmp .L_dodist\n" + + ".align 32,0x90\n" + ".L_clip_window:\n" + " movl %%eax, %%ecx\n" /* ecx = nbytes */ + " movl 92(%%rsp), %%eax\n" /* eax = wsize, prepare for dist cmp */ + " negl %%ecx\n" /* nbytes = -nbytes */ + + " cmpl %%r15d, %%eax\n" + " jb .L_invalid_distance_too_far\n" /* if (dist > wsize) */ + + " addl %%r15d, %%ecx\n" /* nbytes = dist - nbytes */ + " cmpl $0, 96(%%rsp)\n" + " jne .L_wrap_around_window\n" /* if (write != 0) */ + + " movq 56(%%rsp), %%rsi\n" /* from = window */ + " subl %%ecx, %%eax\n" /* eax -= nbytes */ + " addq %%rax, %%rsi\n" /* from += wsize - nbytes */ + + " movl %%r14d, %%eax\n" /* eax = len */ + " cmpl %%ecx, %%r14d\n" + " jbe .L_do_copy\n" /* if (nbytes >= len) */ + + " subl %%ecx, %%eax\n" /* eax -= nbytes */ + " rep movsb\n" + " movq %%rdi, %%rsi\n" + " subq %%r15, %%rsi\n" /* from = &out[ -dist ] */ + " jmp .L_do_copy\n" + + ".align 32,0x90\n" + ".L_wrap_around_window:\n" + " movl 96(%%rsp), %%eax\n" /* eax = write */ + " cmpl %%eax, %%ecx\n" + " jbe .L_contiguous_in_window\n" /* if (write >= nbytes) */ + + " movl 92(%%rsp), %%esi\n" /* from = wsize */ + " addq 56(%%rsp), %%rsi\n" /* from += window */ + " addq %%rax, %%rsi\n" /* from += write */ + " subq %%rcx, %%rsi\n" /* from -= nbytes */ + " subl %%eax, %%ecx\n" /* nbytes -= write */ + + " movl %%r14d, %%eax\n" /* eax = len */ + " cmpl %%ecx, %%eax\n" + " jbe .L_do_copy\n" /* if (nbytes >= len) */ + + " subl %%ecx, %%eax\n" /* len -= nbytes */ + " rep movsb\n" + " movq 56(%%rsp), %%rsi\n" /* from = window */ + " movl 96(%%rsp), %%ecx\n" /* nbytes = write */ + " cmpl %%ecx, %%eax\n" + " jbe .L_do_copy\n" /* if (nbytes >= len) */ + + " subl %%ecx, %%eax\n" /* len -= nbytes */ + " rep movsb\n" + " movq %%rdi, %%rsi\n" + " subq %%r15, %%rsi\n" /* from = out - dist */ + " jmp .L_do_copy\n" + + ".align 32,0x90\n" + ".L_contiguous_in_window:\n" + " movq 56(%%rsp), %%rsi\n" /* rsi = window */ + " addq %%rax, %%rsi\n" + " subq %%rcx, %%rsi\n" /* from += write - nbytes */ + + " movl %%r14d, %%eax\n" /* eax = len */ + " cmpl %%ecx, %%eax\n" + " jbe .L_do_copy\n" /* if (nbytes >= len) */ + + " subl %%ecx, %%eax\n" /* len -= nbytes */ + " rep movsb\n" + " movq %%rdi, %%rsi\n" + " subq %%r15, %%rsi\n" /* from = out - dist */ + " jmp .L_do_copy\n" /* if (nbytes >= len) */ + + ".align 32,0x90\n" + ".L_do_copy:\n" + " movl %%eax, %%ecx\n" /* ecx = len */ + " rep movsb\n" + + " movq %%r8, %%rsi\n" /* move in back to %esi, toss from */ + " jmp .L_while_test\n" + + ".L_test_for_end_of_block:\n" + " testb $32, %%al\n" + " jz .L_invalid_literal_length_code\n" + " movl $1, 116(%%rsp)\n" + " jmp .L_break_loop_with_status\n" + + ".L_invalid_literal_length_code:\n" + " movl $2, 116(%%rsp)\n" + " jmp .L_break_loop_with_status\n" + + ".L_invalid_distance_code:\n" + " movl $3, 116(%%rsp)\n" + " jmp .L_break_loop_with_status\n" + + ".L_invalid_distance_too_far:\n" + " movl $4, 116(%%rsp)\n" + " jmp .L_break_loop_with_status\n" + + ".L_break_loop:\n" + " movl $0, 116(%%rsp)\n" + + ".L_break_loop_with_status:\n" + /* put in, out, bits, and hold back into ar and pop esp */ + " movq %%rsi, 16(%%rsp)\n" /* in */ + " movq %%rdi, 32(%%rsp)\n" /* out */ + " movl %%ebx, 88(%%rsp)\n" /* bits */ + " movq %%rdx, 80(%%rsp)\n" /* hold */ + " movq (%%rsp), %%rax\n" /* restore rbp and rsp */ + " movq 8(%%rsp), %%rbp\n" + " movq %%rax, %%rsp\n" + : + : "m" (ar) + : "memory", "%rax", "%rbx", "%rcx", "%rdx", "%rsi", "%rdi", + "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15" + ); + #elif ( defined( __GNUC__ ) || defined( __ICC ) ) && defined( __i386 ) + __asm__ __volatile__ ( + " leal %0, %%eax\n" + " movl %%esp, (%%eax)\n" /* save esp, ebp */ + " movl %%ebp, 4(%%eax)\n" + " movl %%eax, %%esp\n" + " movl 8(%%esp), %%esi\n" /* esi = in */ + " movl 16(%%esp), %%edi\n" /* edi = out */ + " movl 40(%%esp), %%edx\n" /* edx = hold */ + " movl 44(%%esp), %%ebx\n" /* ebx = bits */ + " movl 32(%%esp), %%ebp\n" /* ebp = lcode */ + + " cld\n" + " jmp .L_do_loop\n" + + ".align 32,0x90\n" + ".L_while_test:\n" + " cmpl %%edi, 24(%%esp)\n" /* out < end */ + " jbe .L_break_loop\n" + " cmpl %%esi, 12(%%esp)\n" /* in < last */ + " jbe .L_break_loop\n" + + ".L_do_loop:\n" + " cmpb $15, %%bl\n" + " ja .L_get_length_code\n" /* if (15 < bits) */ + + " xorl %%eax, %%eax\n" + " lodsw\n" /* al = *(ushort *)in++ */ + " movb %%bl, %%cl\n" /* cl = bits, needs it for shifting */ + " addb $16, %%bl\n" /* bits += 16 */ + " shll %%cl, %%eax\n" + " orl %%eax, %%edx\n" /* hold |= *((ushort *)in)++ << bits */ + + ".L_get_length_code:\n" + " movl 56(%%esp), %%eax\n" /* eax = lmask */ + " andl %%edx, %%eax\n" /* eax &= hold */ + " movl (%%ebp,%%eax,4), %%eax\n" /* eax = lcode[hold & lmask] */ + + ".L_dolen:\n" + " movb %%ah, %%cl\n" /* cl = this.bits */ + " subb %%ah, %%bl\n" /* bits -= this.bits */ + " shrl %%cl, %%edx\n" /* hold >>= this.bits */ + + " testb %%al, %%al\n" + " jnz .L_test_for_length_base\n" /* if (op != 0) 45.7% */ + + " shrl $16, %%eax\n" /* output this.val char */ + " stosb\n" + " jmp .L_while_test\n" + + ".align 32,0x90\n" + ".L_test_for_length_base:\n" + " movl %%eax, %%ecx\n" /* len = this */ + " shrl $16, %%ecx\n" /* len = this.val */ + " movl %%ecx, 64(%%esp)\n" /* save len */ + " movb %%al, %%cl\n" + + " testb $16, %%al\n" + " jz .L_test_for_second_level_length\n" /* if ((op & 16) == 0) 8% */ + " andb $15, %%cl\n" /* op &= 15 */ + " jz .L_decode_distance\n" /* if (!op) */ + " cmpb %%cl, %%bl\n" + " jae .L_add_bits_to_len\n" /* if (op <= bits) */ + + " movb %%cl, %%ch\n" /* stash op in ch, freeing cl */ + " xorl %%eax, %%eax\n" + " lodsw\n" /* al = *(ushort *)in++ */ + " movb %%bl, %%cl\n" /* cl = bits, needs it for shifting */ + " addb $16, %%bl\n" /* bits += 16 */ + " shll %%cl, %%eax\n" + " orl %%eax, %%edx\n" /* hold |= *((ushort *)in)++ << bits */ + " movb %%ch, %%cl\n" /* move op back to ecx */ + + ".L_add_bits_to_len:\n" + " subb %%cl, %%bl\n" + " xorl %%eax, %%eax\n" + " incl %%eax\n" + " shll %%cl, %%eax\n" + " decl %%eax\n" + " andl %%edx, %%eax\n" /* eax &= hold */ + " shrl %%cl, %%edx\n" + " addl %%eax, 64(%%esp)\n" /* len += hold & mask[op] */ + + ".L_decode_distance:\n" + " cmpb $15, %%bl\n" + " ja .L_get_distance_code\n" /* if (15 < bits) */ + + " xorl %%eax, %%eax\n" + " lodsw\n" /* al = *(ushort *)in++ */ + " movb %%bl, %%cl\n" /* cl = bits, needs it for shifting */ + " addb $16, %%bl\n" /* bits += 16 */ + " shll %%cl, %%eax\n" + " orl %%eax, %%edx\n" /* hold |= *((ushort *)in)++ << bits */ + + ".L_get_distance_code:\n" + " movl 60(%%esp), %%eax\n" /* eax = dmask */ + " movl 36(%%esp), %%ecx\n" /* ecx = dcode */ + " andl %%edx, %%eax\n" /* eax &= hold */ + " movl (%%ecx,%%eax,4), %%eax\n"/* eax = dcode[hold & dmask] */ + + ".L_dodist:\n" + " movl %%eax, %%ebp\n" /* dist = this */ + " shrl $16, %%ebp\n" /* dist = this.val */ + " movb %%ah, %%cl\n" + " subb %%ah, %%bl\n" /* bits -= this.bits */ + " shrl %%cl, %%edx\n" /* hold >>= this.bits */ + " movb %%al, %%cl\n" /* cl = this.op */ + + " testb $16, %%al\n" /* if ((op & 16) == 0) */ + " jz .L_test_for_second_level_dist\n" + " andb $15, %%cl\n" /* op &= 15 */ + " jz .L_check_dist_one\n" + " cmpb %%cl, %%bl\n" + " jae .L_add_bits_to_dist\n" /* if (op <= bits) 97.6% */ + + " movb %%cl, %%ch\n" /* stash op in ch, freeing cl */ + " xorl %%eax, %%eax\n" + " lodsw\n" /* al = *(ushort *)in++ */ + " movb %%bl, %%cl\n" /* cl = bits, needs it for shifting */ + " addb $16, %%bl\n" /* bits += 16 */ + " shll %%cl, %%eax\n" + " orl %%eax, %%edx\n" /* hold |= *((ushort *)in)++ << bits */ + " movb %%ch, %%cl\n" /* move op back to ecx */ + + ".L_add_bits_to_dist:\n" + " subb %%cl, %%bl\n" + " xorl %%eax, %%eax\n" + " incl %%eax\n" + " shll %%cl, %%eax\n" + " decl %%eax\n" /* (1 << op) - 1 */ + " andl %%edx, %%eax\n" /* eax &= hold */ + " shrl %%cl, %%edx\n" + " addl %%eax, %%ebp\n" /* dist += hold & ((1 << op) - 1) */ + + ".L_check_window:\n" + " movl %%esi, 8(%%esp)\n" /* save in so from can use it's reg */ + " movl %%edi, %%eax\n" + " subl 20(%%esp), %%eax\n" /* nbytes = out - beg */ + + " cmpl %%ebp, %%eax\n" + " jb .L_clip_window\n" /* if (dist > nbytes) 4.2% */ + + " movl 64(%%esp), %%ecx\n" /* ecx = len */ + " movl %%edi, %%esi\n" + " subl %%ebp, %%esi\n" /* from = out - dist */ + + " sarl %%ecx\n" + " jnc .L_copy_two\n" /* if len % 2 == 0 */ + + " rep movsw\n" + " movb (%%esi), %%al\n" + " movb %%al, (%%edi)\n" + " incl %%edi\n" + + " movl 8(%%esp), %%esi\n" /* move in back to %esi, toss from */ + " movl 32(%%esp), %%ebp\n" /* ebp = lcode */ + " jmp .L_while_test\n" + + ".L_copy_two:\n" + " rep movsw\n" + " movl 8(%%esp), %%esi\n" /* move in back to %esi, toss from */ + " movl 32(%%esp), %%ebp\n" /* ebp = lcode */ + " jmp .L_while_test\n" + + ".align 32,0x90\n" + ".L_check_dist_one:\n" + " cmpl $1, %%ebp\n" /* if dist 1, is a memset */ + " jne .L_check_window\n" + " cmpl %%edi, 20(%%esp)\n" + " je .L_check_window\n" /* out == beg, if outside window */ + + " movl 64(%%esp), %%ecx\n" /* ecx = len */ + " movb -1(%%edi), %%al\n" + " movb %%al, %%ah\n" + + " sarl %%ecx\n" + " jnc .L_set_two\n" + " movb %%al, (%%edi)\n" + " incl %%edi\n" + + ".L_set_two:\n" + " rep stosw\n" + " movl 32(%%esp), %%ebp\n" /* ebp = lcode */ + " jmp .L_while_test\n" + + ".align 32,0x90\n" + ".L_test_for_second_level_length:\n" + " testb $64, %%al\n" + " jnz .L_test_for_end_of_block\n" /* if ((op & 64) != 0) */ + + " xorl %%eax, %%eax\n" + " incl %%eax\n" + " shll %%cl, %%eax\n" + " decl %%eax\n" + " andl %%edx, %%eax\n" /* eax &= hold */ + " addl 64(%%esp), %%eax\n" /* eax += len */ + " movl (%%ebp,%%eax,4), %%eax\n" /* eax = lcode[val+(hold&mask[op])]*/ + " jmp .L_dolen\n" + + ".align 32,0x90\n" + ".L_test_for_second_level_dist:\n" + " testb $64, %%al\n" + " jnz .L_invalid_distance_code\n" /* if ((op & 64) != 0) */ + + " xorl %%eax, %%eax\n" + " incl %%eax\n" + " shll %%cl, %%eax\n" + " decl %%eax\n" + " andl %%edx, %%eax\n" /* eax &= hold */ + " addl %%ebp, %%eax\n" /* eax += dist */ + " movl 36(%%esp), %%ecx\n" /* ecx = dcode */ + " movl (%%ecx,%%eax,4), %%eax\n" /* eax = dcode[val+(hold&mask[op])]*/ + " jmp .L_dodist\n" + + ".align 32,0x90\n" + ".L_clip_window:\n" + " movl %%eax, %%ecx\n" + " movl 48(%%esp), %%eax\n" /* eax = wsize */ + " negl %%ecx\n" /* nbytes = -nbytes */ + " movl 28(%%esp), %%esi\n" /* from = window */ + + " cmpl %%ebp, %%eax\n" + " jb .L_invalid_distance_too_far\n" /* if (dist > wsize) */ + + " addl %%ebp, %%ecx\n" /* nbytes = dist - nbytes */ + " cmpl $0, 52(%%esp)\n" + " jne .L_wrap_around_window\n" /* if (write != 0) */ + + " subl %%ecx, %%eax\n" + " addl %%eax, %%esi\n" /* from += wsize - nbytes */ + + " movl 64(%%esp), %%eax\n" /* eax = len */ + " cmpl %%ecx, %%eax\n" + " jbe .L_do_copy\n" /* if (nbytes >= len) */ + + " subl %%ecx, %%eax\n" /* len -= nbytes */ + " rep movsb\n" + " movl %%edi, %%esi\n" + " subl %%ebp, %%esi\n" /* from = out - dist */ + " jmp .L_do_copy\n" + + ".align 32,0x90\n" + ".L_wrap_around_window:\n" + " movl 52(%%esp), %%eax\n" /* eax = write */ + " cmpl %%eax, %%ecx\n" + " jbe .L_contiguous_in_window\n" /* if (write >= nbytes) */ + + " addl 48(%%esp), %%esi\n" /* from += wsize */ + " addl %%eax, %%esi\n" /* from += write */ + " subl %%ecx, %%esi\n" /* from -= nbytes */ + " subl %%eax, %%ecx\n" /* nbytes -= write */ + + " movl 64(%%esp), %%eax\n" /* eax = len */ + " cmpl %%ecx, %%eax\n" + " jbe .L_do_copy\n" /* if (nbytes >= len) */ + + " subl %%ecx, %%eax\n" /* len -= nbytes */ + " rep movsb\n" + " movl 28(%%esp), %%esi\n" /* from = window */ + " movl 52(%%esp), %%ecx\n" /* nbytes = write */ + " cmpl %%ecx, %%eax\n" + " jbe .L_do_copy\n" /* if (nbytes >= len) */ + + " subl %%ecx, %%eax\n" /* len -= nbytes */ + " rep movsb\n" + " movl %%edi, %%esi\n" + " subl %%ebp, %%esi\n" /* from = out - dist */ + " jmp .L_do_copy\n" + + ".align 32,0x90\n" + ".L_contiguous_in_window:\n" + " addl %%eax, %%esi\n" + " subl %%ecx, %%esi\n" /* from += write - nbytes */ + + " movl 64(%%esp), %%eax\n" /* eax = len */ + " cmpl %%ecx, %%eax\n" + " jbe .L_do_copy\n" /* if (nbytes >= len) */ + + " subl %%ecx, %%eax\n" /* len -= nbytes */ + " rep movsb\n" + " movl %%edi, %%esi\n" + " subl %%ebp, %%esi\n" /* from = out - dist */ + " jmp .L_do_copy\n" /* if (nbytes >= len) */ + + ".align 32,0x90\n" + ".L_do_copy:\n" + " movl %%eax, %%ecx\n" + " rep movsb\n" + + " movl 8(%%esp), %%esi\n" /* move in back to %esi, toss from */ + " movl 32(%%esp), %%ebp\n" /* ebp = lcode */ + " jmp .L_while_test\n" + + ".L_test_for_end_of_block:\n" + " testb $32, %%al\n" + " jz .L_invalid_literal_length_code\n" + " movl $1, 72(%%esp)\n" + " jmp .L_break_loop_with_status\n" + + ".L_invalid_literal_length_code:\n" + " movl $2, 72(%%esp)\n" + " jmp .L_break_loop_with_status\n" + + ".L_invalid_distance_code:\n" + " movl $3, 72(%%esp)\n" + " jmp .L_break_loop_with_status\n" + + ".L_invalid_distance_too_far:\n" + " movl 8(%%esp), %%esi\n" + " movl $4, 72(%%esp)\n" + " jmp .L_break_loop_with_status\n" + + ".L_break_loop:\n" + " movl $0, 72(%%esp)\n" + + ".L_break_loop_with_status:\n" + /* put in, out, bits, and hold back into ar and pop esp */ + " movl %%esi, 8(%%esp)\n" /* save in */ + " movl %%edi, 16(%%esp)\n" /* save out */ + " movl %%ebx, 44(%%esp)\n" /* save bits */ + " movl %%edx, 40(%%esp)\n" /* save hold */ + " movl 4(%%esp), %%ebp\n" /* restore esp, ebp */ + " movl (%%esp), %%esp\n" + : + : "m" (ar) + : "memory", "%eax", "%ebx", "%ecx", "%edx", "%esi", "%edi" + ); + #elif defined( _MSC_VER ) && ! defined( _M_AMD64 ) + __asm { + lea eax, ar + mov [eax], esp /* save esp, ebp */ + mov [eax+4], ebp + mov esp, eax + mov esi, [esp+8] /* esi = in */ + mov edi, [esp+16] /* edi = out */ + mov edx, [esp+40] /* edx = hold */ + mov ebx, [esp+44] /* ebx = bits */ + mov ebp, [esp+32] /* ebp = lcode */ + + cld + jmp L_do_loop + + ALIGN 4 + L_while_test: + cmp [esp+24], edi + jbe L_break_loop + cmp [esp+12], esi + jbe L_break_loop + + L_do_loop: + cmp bl, 15 + ja L_get_length_code /* if (15 < bits) */ + + xor eax, eax + lodsw /* al = *(ushort *)in++ */ + mov cl, bl /* cl = bits, needs it for shifting */ + add bl, 16 /* bits += 16 */ + shl eax, cl + or edx, eax /* hold |= *((ushort *)in)++ << bits */ + + L_get_length_code: + mov eax, [esp+56] /* eax = lmask */ + and eax, edx /* eax &= hold */ + mov eax, [ebp+eax*4] /* eax = lcode[hold & lmask] */ + + L_dolen: + mov cl, ah /* cl = this.bits */ + sub bl, ah /* bits -= this.bits */ + shr edx, cl /* hold >>= this.bits */ + + test al, al + jnz L_test_for_length_base /* if (op != 0) 45.7% */ + + shr eax, 16 /* output this.val char */ + stosb + jmp L_while_test + + ALIGN 4 + L_test_for_length_base: + mov ecx, eax /* len = this */ + shr ecx, 16 /* len = this.val */ + mov [esp+64], ecx /* save len */ + mov cl, al + + test al, 16 + jz L_test_for_second_level_length /* if ((op & 16) == 0) 8% */ + and cl, 15 /* op &= 15 */ + jz L_decode_distance /* if (!op) */ + cmp bl, cl + jae L_add_bits_to_len /* if (op <= bits) */ + + mov ch, cl /* stash op in ch, freeing cl */ + xor eax, eax + lodsw /* al = *(ushort *)in++ */ + mov cl, bl /* cl = bits, needs it for shifting */ + add bl, 16 /* bits += 16 */ + shl eax, cl + or edx, eax /* hold |= *((ushort *)in)++ << bits */ + mov cl, ch /* move op back to ecx */ + + L_add_bits_to_len: + sub bl, cl + xor eax, eax + inc eax + shl eax, cl + dec eax + and eax, edx /* eax &= hold */ + shr edx, cl + add [esp+64], eax /* len += hold & mask[op] */ + + L_decode_distance: + cmp bl, 15 + ja L_get_distance_code /* if (15 < bits) */ + + xor eax, eax + lodsw /* al = *(ushort *)in++ */ + mov cl, bl /* cl = bits, needs it for shifting */ + add bl, 16 /* bits += 16 */ + shl eax, cl + or edx, eax /* hold |= *((ushort *)in)++ << bits */ + + L_get_distance_code: + mov eax, [esp+60] /* eax = dmask */ + mov ecx, [esp+36] /* ecx = dcode */ + and eax, edx /* eax &= hold */ + mov eax, [ecx+eax*4]/* eax = dcode[hold & dmask] */ + + L_dodist: + mov ebp, eax /* dist = this */ + shr ebp, 16 /* dist = this.val */ + mov cl, ah + sub bl, ah /* bits -= this.bits */ + shr edx, cl /* hold >>= this.bits */ + mov cl, al /* cl = this.op */ + + test al, 16 /* if ((op & 16) == 0) */ + jz L_test_for_second_level_dist + and cl, 15 /* op &= 15 */ + jz L_check_dist_one + cmp bl, cl + jae L_add_bits_to_dist /* if (op <= bits) 97.6% */ + + mov ch, cl /* stash op in ch, freeing cl */ + xor eax, eax + lodsw /* al = *(ushort *)in++ */ + mov cl, bl /* cl = bits, needs it for shifting */ + add bl, 16 /* bits += 16 */ + shl eax, cl + or edx, eax /* hold |= *((ushort *)in)++ << bits */ + mov cl, ch /* move op back to ecx */ + + L_add_bits_to_dist: + sub bl, cl + xor eax, eax + inc eax + shl eax, cl + dec eax /* (1 << op) - 1 */ + and eax, edx /* eax &= hold */ + shr edx, cl + add ebp, eax /* dist += hold & ((1 << op) - 1) */ + + L_check_window: + mov [esp+8], esi /* save in so from can use it's reg */ + mov eax, edi + sub eax, [esp+20] /* nbytes = out - beg */ + + cmp eax, ebp + jb L_clip_window /* if (dist > nbytes) 4.2% */ + + mov ecx, [esp+64] /* ecx = len */ + mov esi, edi + sub esi, ebp /* from = out - dist */ + + sar ecx, 1 + jnc L_copy_two + + rep movsw + mov al, [esi] + mov [edi], al + inc edi + + mov esi, [esp+8] /* move in back to %esi, toss from */ + mov ebp, [esp+32] /* ebp = lcode */ + jmp L_while_test + + L_copy_two: + rep movsw + mov esi, [esp+8] /* move in back to %esi, toss from */ + mov ebp, [esp+32] /* ebp = lcode */ + jmp L_while_test + + ALIGN 4 + L_check_dist_one: + cmp ebp, 1 /* if dist 1, is a memset */ + jne L_check_window + cmp [esp+20], edi + je L_check_window /* out == beg, if outside window */ + + mov ecx, [esp+64] /* ecx = len */ + mov al, [edi-1] + mov ah, al + + sar ecx, 1 + jnc L_set_two + mov [edi], al /* memset out with from[-1] */ + inc edi + + L_set_two: + rep stosw + mov ebp, [esp+32] /* ebp = lcode */ + jmp L_while_test + + ALIGN 4 + L_test_for_second_level_length: + test al, 64 + jnz L_test_for_end_of_block /* if ((op & 64) != 0) */ + + xor eax, eax + inc eax + shl eax, cl + dec eax + and eax, edx /* eax &= hold */ + add eax, [esp+64] /* eax += len */ + mov eax, [ebp+eax*4] /* eax = lcode[val+(hold&mask[op])]*/ + jmp L_dolen + + ALIGN 4 + L_test_for_second_level_dist: + test al, 64 + jnz L_invalid_distance_code /* if ((op & 64) != 0) */ + + xor eax, eax + inc eax + shl eax, cl + dec eax + and eax, edx /* eax &= hold */ + add eax, ebp /* eax += dist */ + mov ecx, [esp+36] /* ecx = dcode */ + mov eax, [ecx+eax*4] /* eax = dcode[val+(hold&mask[op])]*/ + jmp L_dodist + + ALIGN 4 + L_clip_window: + mov ecx, eax + mov eax, [esp+48] /* eax = wsize */ + neg ecx /* nbytes = -nbytes */ + mov esi, [esp+28] /* from = window */ + + cmp eax, ebp + jb L_invalid_distance_too_far /* if (dist > wsize) */ + + add ecx, ebp /* nbytes = dist - nbytes */ + cmp dword ptr [esp+52], 0 + jne L_wrap_around_window /* if (write != 0) */ + + sub eax, ecx + add esi, eax /* from += wsize - nbytes */ + + mov eax, [esp+64] /* eax = len */ + cmp eax, ecx + jbe L_do_copy /* if (nbytes >= len) */ + + sub eax, ecx /* len -= nbytes */ + rep movsb + mov esi, edi + sub esi, ebp /* from = out - dist */ + jmp L_do_copy + + ALIGN 4 + L_wrap_around_window: + mov eax, [esp+52] /* eax = write */ + cmp ecx, eax + jbe L_contiguous_in_window /* if (write >= nbytes) */ + + add esi, [esp+48] /* from += wsize */ + add esi, eax /* from += write */ + sub esi, ecx /* from -= nbytes */ + sub ecx, eax /* nbytes -= write */ + + mov eax, [esp+64] /* eax = len */ + cmp eax, ecx + jbe L_do_copy /* if (nbytes >= len) */ + + sub eax, ecx /* len -= nbytes */ + rep movsb + mov esi, [esp+28] /* from = window */ + mov ecx, [esp+52] /* nbytes = write */ + cmp eax, ecx + jbe L_do_copy /* if (nbytes >= len) */ + + sub eax, ecx /* len -= nbytes */ + rep movsb + mov esi, edi + sub esi, ebp /* from = out - dist */ + jmp L_do_copy + + ALIGN 4 + L_contiguous_in_window: + add esi, eax + sub esi, ecx /* from += write - nbytes */ + + mov eax, [esp+64] /* eax = len */ + cmp eax, ecx + jbe L_do_copy /* if (nbytes >= len) */ + + sub eax, ecx /* len -= nbytes */ + rep movsb + mov esi, edi + sub esi, ebp /* from = out - dist */ + jmp L_do_copy + + ALIGN 4 + L_do_copy: + mov ecx, eax + rep movsb + + mov esi, [esp+8] /* move in back to %esi, toss from */ + mov ebp, [esp+32] /* ebp = lcode */ + jmp L_while_test + + L_test_for_end_of_block: + test al, 32 + jz L_invalid_literal_length_code + mov dword ptr [esp+72], 1 + jmp L_break_loop_with_status + + L_invalid_literal_length_code: + mov dword ptr [esp+72], 2 + jmp L_break_loop_with_status + + L_invalid_distance_code: + mov dword ptr [esp+72], 3 + jmp L_break_loop_with_status + + L_invalid_distance_too_far: + mov esi, [esp+4] + mov dword ptr [esp+72], 4 + jmp L_break_loop_with_status + + L_break_loop: + mov dword ptr [esp+72], 0 + + L_break_loop_with_status: + /* put in, out, bits, and hold back into ar and pop esp */ + mov [esp+8], esi /* save in */ + mov [esp+16], edi /* save out */ + mov [esp+44], ebx /* save bits */ + mov [esp+40], edx /* save hold */ + mov ebp, [esp+4] /* restore esp, ebp */ + mov esp, [esp] + } + #else + #error "x86 architecture not defined" + #endif + + if (ar.status > 1) { + if (ar.status == 2) + strm->msg = "invalid literal/length code"; + else if (ar.status == 3) + strm->msg = "invalid distance code"; + else + strm->msg = "invalid distance too far back"; + state->mode = BAD; + } + else if ( ar.status == 1 ) { + state->mode = TYPE; + } + + /* return unused bytes (on entry, bits < 8, so in won't go too far back) */ + ar.len = ar.bits >> 3; + ar.in -= ar.len; + ar.bits -= ar.len << 3; + ar.hold &= (1U << ar.bits) - 1; + + /* update state and return */ + strm->next_in = ar.in; + strm->next_out = ar.out; + strm->avail_in = (unsigned)(ar.in < ar.last ? + PAD_AVAIL_IN + (ar.last - ar.in) : + PAD_AVAIL_IN - (ar.in - ar.last)); + strm->avail_out = (unsigned)(ar.out < ar.end ? + PAD_AVAIL_OUT + (ar.end - ar.out) : + PAD_AVAIL_OUT - (ar.out - ar.end)); + state->hold = ar.hold; + state->bits = ar.bits; + return; + } + diff -Nrcpad gcc-4.4.4/zlib/contrib/inflate86/inffast.S gcc-4.4.5/zlib/contrib/inflate86/inffast.S *** gcc-4.4.4/zlib/contrib/inflate86/inffast.S Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/inflate86/inffast.S Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,1368 ---- + /* + * inffast.S is a hand tuned assembler version of: + * + * inffast.c -- fast decoding + * Copyright (C) 1995-2003 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + * + * Copyright (C) 2003 Chris Anderson + * Please use the copyright conditions above. + * + * This version (Jan-23-2003) of inflate_fast was coded and tested under + * GNU/Linux on a pentium 3, using the gcc-3.2 compiler distribution. On that + * machine, I found that gzip style archives decompressed about 20% faster than + * the gcc-3.2 -O3 -fomit-frame-pointer compiled version. Your results will + * depend on how large of a buffer is used for z_stream.next_in & next_out + * (8K-32K worked best for my 256K cpu cache) and how much overhead there is in + * stream processing I/O and crc32/addler32. In my case, this routine used + * 70% of the cpu time and crc32 used 20%. + * + * I am confident that this version will work in the general case, but I have + * not tested a wide variety of datasets or a wide variety of platforms. + * + * Jan-24-2003 -- Added -DUSE_MMX define for slightly faster inflating. + * It should be a runtime flag instead of compile time flag... + * + * Jan-26-2003 -- Added runtime check for MMX support with cpuid instruction. + * With -DUSE_MMX, only MMX code is compiled. With -DNO_MMX, only non-MMX code + * is compiled. Without either option, runtime detection is enabled. Runtime + * detection should work on all modern cpus and the recomended algorithm (flip + * ID bit on eflags and then use the cpuid instruction) is used in many + * multimedia applications. Tested under win2k with gcc-2.95 and gas-2.12 + * distributed with cygwin3. Compiling with gcc-2.95 -c inffast.S -o + * inffast.obj generates a COFF object which can then be linked with MSVC++ + * compiled code. Tested under FreeBSD 4.7 with gcc-2.95. + * + * Jan-28-2003 -- Tested Athlon XP... MMX mode is slower than no MMX (and + * slower than compiler generated code). Adjusted cpuid check to use the MMX + * code only for Pentiums < P4 until I have more data on the P4. Speed + * improvment is only about 15% on the Athlon when compared with code generated + * with MSVC++. Not sure yet, but I think the P4 will also be slower using the + * MMX mode because many of it's x86 ALU instructions execute in .5 cycles and + * have less latency than MMX ops. Added code to buffer the last 11 bytes of + * the input stream since the MMX code grabs bits in chunks of 32, which + * differs from the inffast.c algorithm. I don't think there would have been + * read overruns where a page boundary was crossed (a segfault), but there + * could have been overruns when next_in ends on unaligned memory (unintialized + * memory read). + * + * Mar-13-2003 -- P4 MMX is slightly slower than P4 NO_MMX. I created a C + * version of the non-MMX code so that it doesn't depend on zstrm and zstate + * structure offsets which are hard coded in this file. This was last tested + * with zlib-1.2.0 which is currently in beta testing, newer versions of this + * and inffas86.c can be found at http://www.eetbeetee.com/zlib/ and + * http://www.charm.net/~christop/zlib/ + */ + + + /* + * if you have underscore linking problems (_inflate_fast undefined), try + * using -DGAS_COFF + */ + #if ! defined( GAS_COFF ) && ! defined( GAS_ELF ) + + #if defined( WIN32 ) || defined( __CYGWIN__ ) + #define GAS_COFF /* windows object format */ + #else + #define GAS_ELF + #endif + + #endif /* ! GAS_COFF && ! GAS_ELF */ + + + #if defined( GAS_COFF ) + + /* coff externals have underscores */ + #define inflate_fast _inflate_fast + #define inflate_fast_use_mmx _inflate_fast_use_mmx + + #endif /* GAS_COFF */ + + + .file "inffast.S" + + .globl inflate_fast + + .text + .align 4,0 + .L_invalid_literal_length_code_msg: + .string "invalid literal/length code" + + .align 4,0 + .L_invalid_distance_code_msg: + .string "invalid distance code" + + .align 4,0 + .L_invalid_distance_too_far_msg: + .string "invalid distance too far back" + + #if ! defined( NO_MMX ) + .align 4,0 + .L_mask: /* mask[N] = ( 1 << N ) - 1 */ + .long 0 + .long 1 + .long 3 + .long 7 + .long 15 + .long 31 + .long 63 + .long 127 + .long 255 + .long 511 + .long 1023 + .long 2047 + .long 4095 + .long 8191 + .long 16383 + .long 32767 + .long 65535 + .long 131071 + .long 262143 + .long 524287 + .long 1048575 + .long 2097151 + .long 4194303 + .long 8388607 + .long 16777215 + .long 33554431 + .long 67108863 + .long 134217727 + .long 268435455 + .long 536870911 + .long 1073741823 + .long 2147483647 + .long 4294967295 + #endif /* NO_MMX */ + + .text + + /* + * struct z_stream offsets, in zlib.h + */ + #define next_in_strm 0 /* strm->next_in */ + #define avail_in_strm 4 /* strm->avail_in */ + #define next_out_strm 12 /* strm->next_out */ + #define avail_out_strm 16 /* strm->avail_out */ + #define msg_strm 24 /* strm->msg */ + #define state_strm 28 /* strm->state */ + + /* + * struct inflate_state offsets, in inflate.h + */ + #define mode_state 0 /* state->mode */ + #define wsize_state 32 /* state->wsize */ + #define write_state 40 /* state->write */ + #define window_state 44 /* state->window */ + #define hold_state 48 /* state->hold */ + #define bits_state 52 /* state->bits */ + #define lencode_state 68 /* state->lencode */ + #define distcode_state 72 /* state->distcode */ + #define lenbits_state 76 /* state->lenbits */ + #define distbits_state 80 /* state->distbits */ + + /* + * inflate_fast's activation record + */ + #define local_var_size 64 /* how much local space for vars */ + #define strm_sp 88 /* first arg: z_stream * (local_var_size + 24) */ + #define start_sp 92 /* second arg: unsigned int (local_var_size + 28) */ + + /* + * offsets for local vars on stack + */ + #define out 60 /* unsigned char* */ + #define window 56 /* unsigned char* */ + #define wsize 52 /* unsigned int */ + #define write 48 /* unsigned int */ + #define in 44 /* unsigned char* */ + #define beg 40 /* unsigned char* */ + #define buf 28 /* char[ 12 ] */ + #define len 24 /* unsigned int */ + #define last 20 /* unsigned char* */ + #define end 16 /* unsigned char* */ + #define dcode 12 /* code* */ + #define lcode 8 /* code* */ + #define dmask 4 /* unsigned int */ + #define lmask 0 /* unsigned int */ + + /* + * typedef enum inflate_mode consts, in inflate.h + */ + #define INFLATE_MODE_TYPE 11 /* state->mode flags enum-ed in inflate.h */ + #define INFLATE_MODE_BAD 26 + + + #if ! defined( USE_MMX ) && ! defined( NO_MMX ) + + #define RUN_TIME_MMX + + #define CHECK_MMX 1 + #define DO_USE_MMX 2 + #define DONT_USE_MMX 3 + + .globl inflate_fast_use_mmx + + .data + + .align 4,0 + inflate_fast_use_mmx: /* integer flag for run time control 1=check,2=mmx,3=no */ + .long CHECK_MMX + + #if defined( GAS_ELF ) + /* elf info */ + .type inflate_fast_use_mmx,@object + .size inflate_fast_use_mmx,4 + #endif + + #endif /* RUN_TIME_MMX */ + + #if defined( GAS_COFF ) + /* coff info: scl 2 = extern, type 32 = function */ + .def inflate_fast; .scl 2; .type 32; .endef + #endif + + .text + + .align 32,0x90 + inflate_fast: + pushl %edi + pushl %esi + pushl %ebp + pushl %ebx + pushf /* save eflags (strm_sp, state_sp assumes this is 32 bits) */ + subl $local_var_size, %esp + cld + + #define strm_r %esi + #define state_r %edi + + movl strm_sp(%esp), strm_r + movl state_strm(strm_r), state_r + + /* in = strm->next_in; + * out = strm->next_out; + * last = in + strm->avail_in - 11; + * beg = out - (start - strm->avail_out); + * end = out + (strm->avail_out - 257); + */ + movl avail_in_strm(strm_r), %edx + movl next_in_strm(strm_r), %eax + + addl %eax, %edx /* avail_in += next_in */ + subl $11, %edx /* avail_in -= 11 */ + + movl %eax, in(%esp) + movl %edx, last(%esp) + + movl start_sp(%esp), %ebp + movl avail_out_strm(strm_r), %ecx + movl next_out_strm(strm_r), %ebx + + subl %ecx, %ebp /* start -= avail_out */ + negl %ebp /* start = -start */ + addl %ebx, %ebp /* start += next_out */ + + subl $257, %ecx /* avail_out -= 257 */ + addl %ebx, %ecx /* avail_out += out */ + + movl %ebx, out(%esp) + movl %ebp, beg(%esp) + movl %ecx, end(%esp) + + /* wsize = state->wsize; + * write = state->write; + * window = state->window; + * hold = state->hold; + * bits = state->bits; + * lcode = state->lencode; + * dcode = state->distcode; + * lmask = ( 1 << state->lenbits ) - 1; + * dmask = ( 1 << state->distbits ) - 1; + */ + + movl lencode_state(state_r), %eax + movl distcode_state(state_r), %ecx + + movl %eax, lcode(%esp) + movl %ecx, dcode(%esp) + + movl $1, %eax + movl lenbits_state(state_r), %ecx + shll %cl, %eax + decl %eax + movl %eax, lmask(%esp) + + movl $1, %eax + movl distbits_state(state_r), %ecx + shll %cl, %eax + decl %eax + movl %eax, dmask(%esp) + + movl wsize_state(state_r), %eax + movl write_state(state_r), %ecx + movl window_state(state_r), %edx + + movl %eax, wsize(%esp) + movl %ecx, write(%esp) + movl %edx, window(%esp) + + movl hold_state(state_r), %ebp + movl bits_state(state_r), %ebx + + #undef strm_r + #undef state_r + + #define in_r %esi + #define from_r %esi + #define out_r %edi + + movl in(%esp), in_r + movl last(%esp), %ecx + cmpl in_r, %ecx + ja .L_align_long /* if in < last */ + + addl $11, %ecx /* ecx = &in[ avail_in ] */ + subl in_r, %ecx /* ecx = avail_in */ + movl $12, %eax + subl %ecx, %eax /* eax = 12 - avail_in */ + leal buf(%esp), %edi + rep movsb /* memcpy( buf, in, avail_in ) */ + movl %eax, %ecx + xorl %eax, %eax + rep stosb /* memset( &buf[ avail_in ], 0, 12 - avail_in ) */ + leal buf(%esp), in_r /* in = buf */ + movl in_r, last(%esp) /* last = in, do just one iteration */ + jmp .L_is_aligned + + /* align in_r on long boundary */ + .L_align_long: + testl $3, in_r + jz .L_is_aligned + xorl %eax, %eax + movb (in_r), %al + incl in_r + movl %ebx, %ecx + addl $8, %ebx + shll %cl, %eax + orl %eax, %ebp + jmp .L_align_long + + .L_is_aligned: + movl out(%esp), out_r + + #if defined( NO_MMX ) + jmp .L_do_loop + #endif + + #if defined( USE_MMX ) + jmp .L_init_mmx + #endif + + /*** Runtime MMX check ***/ + + #if defined( RUN_TIME_MMX ) + .L_check_mmx: + cmpl $DO_USE_MMX, inflate_fast_use_mmx + je .L_init_mmx + ja .L_do_loop /* > 2 */ + + pushl %eax + pushl %ebx + pushl %ecx + pushl %edx + pushf + movl (%esp), %eax /* copy eflags to eax */ + xorl $0x200000, (%esp) /* try toggling ID bit of eflags (bit 21) + * to see if cpu supports cpuid... + * ID bit method not supported by NexGen but + * bios may load a cpuid instruction and + * cpuid may be disabled on Cyrix 5-6x86 */ + popf + pushf + popl %edx /* copy new eflags to edx */ + xorl %eax, %edx /* test if ID bit is flipped */ + jz .L_dont_use_mmx /* not flipped if zero */ + xorl %eax, %eax + cpuid + cmpl $0x756e6547, %ebx /* check for GenuineIntel in ebx,ecx,edx */ + jne .L_dont_use_mmx + cmpl $0x6c65746e, %ecx + jne .L_dont_use_mmx + cmpl $0x49656e69, %edx + jne .L_dont_use_mmx + movl $1, %eax + cpuid /* get cpu features */ + shrl $8, %eax + andl $15, %eax + cmpl $6, %eax /* check for Pentium family, is 0xf for P4 */ + jne .L_dont_use_mmx + testl $0x800000, %edx /* test if MMX feature is set (bit 23) */ + jnz .L_use_mmx + jmp .L_dont_use_mmx + .L_use_mmx: + movl $DO_USE_MMX, inflate_fast_use_mmx + jmp .L_check_mmx_pop + .L_dont_use_mmx: + movl $DONT_USE_MMX, inflate_fast_use_mmx + .L_check_mmx_pop: + popl %edx + popl %ecx + popl %ebx + popl %eax + jmp .L_check_mmx + #endif + + + /*** Non-MMX code ***/ + + #if defined ( NO_MMX ) || defined( RUN_TIME_MMX ) + + #define hold_r %ebp + #define bits_r %bl + #define bitslong_r %ebx + + .align 32,0x90 + .L_while_test: + /* while (in < last && out < end) + */ + cmpl out_r, end(%esp) + jbe .L_break_loop /* if (out >= end) */ + + cmpl in_r, last(%esp) + jbe .L_break_loop + + .L_do_loop: + /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out + * + * do { + * if (bits < 15) { + * hold |= *((unsigned short *)in)++ << bits; + * bits += 16 + * } + * this = lcode[hold & lmask] + */ + cmpb $15, bits_r + ja .L_get_length_code /* if (15 < bits) */ + + xorl %eax, %eax + lodsw /* al = *(ushort *)in++ */ + movb bits_r, %cl /* cl = bits, needs it for shifting */ + addb $16, bits_r /* bits += 16 */ + shll %cl, %eax + orl %eax, hold_r /* hold |= *((ushort *)in)++ << bits */ + + .L_get_length_code: + movl lmask(%esp), %edx /* edx = lmask */ + movl lcode(%esp), %ecx /* ecx = lcode */ + andl hold_r, %edx /* edx &= hold */ + movl (%ecx,%edx,4), %eax /* eax = lcode[hold & lmask] */ + + .L_dolen: + /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out + * + * dolen: + * bits -= this.bits; + * hold >>= this.bits + */ + movb %ah, %cl /* cl = this.bits */ + subb %ah, bits_r /* bits -= this.bits */ + shrl %cl, hold_r /* hold >>= this.bits */ + + /* check if op is a literal + * if (op == 0) { + * PUP(out) = this.val; + * } + */ + testb %al, %al + jnz .L_test_for_length_base /* if (op != 0) 45.7% */ + + shrl $16, %eax /* output this.val char */ + stosb + jmp .L_while_test + + .L_test_for_length_base: + /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out, %edx = len + * + * else if (op & 16) { + * len = this.val + * op &= 15 + * if (op) { + * if (op > bits) { + * hold |= *((unsigned short *)in)++ << bits; + * bits += 16 + * } + * len += hold & mask[op]; + * bits -= op; + * hold >>= op; + * } + */ + #define len_r %edx + movl %eax, len_r /* len = this */ + shrl $16, len_r /* len = this.val */ + movb %al, %cl + + testb $16, %al + jz .L_test_for_second_level_length /* if ((op & 16) == 0) 8% */ + andb $15, %cl /* op &= 15 */ + jz .L_save_len /* if (!op) */ + cmpb %cl, bits_r + jae .L_add_bits_to_len /* if (op <= bits) */ + + movb %cl, %ch /* stash op in ch, freeing cl */ + xorl %eax, %eax + lodsw /* al = *(ushort *)in++ */ + movb bits_r, %cl /* cl = bits, needs it for shifting */ + addb $16, bits_r /* bits += 16 */ + shll %cl, %eax + orl %eax, hold_r /* hold |= *((ushort *)in)++ << bits */ + movb %ch, %cl /* move op back to ecx */ + + .L_add_bits_to_len: + movl $1, %eax + shll %cl, %eax + decl %eax + subb %cl, bits_r + andl hold_r, %eax /* eax &= hold */ + shrl %cl, hold_r + addl %eax, len_r /* len += hold & mask[op] */ + + .L_save_len: + movl len_r, len(%esp) /* save len */ + #undef len_r + + .L_decode_distance: + /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out, %edx = dist + * + * if (bits < 15) { + * hold |= *((unsigned short *)in)++ << bits; + * bits += 16 + * } + * this = dcode[hold & dmask]; + * dodist: + * bits -= this.bits; + * hold >>= this.bits; + * op = this.op; + */ + + cmpb $15, bits_r + ja .L_get_distance_code /* if (15 < bits) */ + + xorl %eax, %eax + lodsw /* al = *(ushort *)in++ */ + movb bits_r, %cl /* cl = bits, needs it for shifting */ + addb $16, bits_r /* bits += 16 */ + shll %cl, %eax + orl %eax, hold_r /* hold |= *((ushort *)in)++ << bits */ + + .L_get_distance_code: + movl dmask(%esp), %edx /* edx = dmask */ + movl dcode(%esp), %ecx /* ecx = dcode */ + andl hold_r, %edx /* edx &= hold */ + movl (%ecx,%edx,4), %eax /* eax = dcode[hold & dmask] */ + + #define dist_r %edx + .L_dodist: + movl %eax, dist_r /* dist = this */ + shrl $16, dist_r /* dist = this.val */ + movb %ah, %cl + subb %ah, bits_r /* bits -= this.bits */ + shrl %cl, hold_r /* hold >>= this.bits */ + + /* if (op & 16) { + * dist = this.val + * op &= 15 + * if (op > bits) { + * hold |= *((unsigned short *)in)++ << bits; + * bits += 16 + * } + * dist += hold & mask[op]; + * bits -= op; + * hold >>= op; + */ + movb %al, %cl /* cl = this.op */ + + testb $16, %al /* if ((op & 16) == 0) */ + jz .L_test_for_second_level_dist + andb $15, %cl /* op &= 15 */ + jz .L_check_dist_one + cmpb %cl, bits_r + jae .L_add_bits_to_dist /* if (op <= bits) 97.6% */ + + movb %cl, %ch /* stash op in ch, freeing cl */ + xorl %eax, %eax + lodsw /* al = *(ushort *)in++ */ + movb bits_r, %cl /* cl = bits, needs it for shifting */ + addb $16, bits_r /* bits += 16 */ + shll %cl, %eax + orl %eax, hold_r /* hold |= *((ushort *)in)++ << bits */ + movb %ch, %cl /* move op back to ecx */ + + .L_add_bits_to_dist: + movl $1, %eax + shll %cl, %eax + decl %eax /* (1 << op) - 1 */ + subb %cl, bits_r + andl hold_r, %eax /* eax &= hold */ + shrl %cl, hold_r + addl %eax, dist_r /* dist += hold & ((1 << op) - 1) */ + jmp .L_check_window + + .L_check_window: + /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist + * %ecx = nbytes + * + * nbytes = out - beg; + * if (dist <= nbytes) { + * from = out - dist; + * do { + * PUP(out) = PUP(from); + * } while (--len > 0) { + * } + */ + + movl in_r, in(%esp) /* save in so from can use it's reg */ + movl out_r, %eax + subl beg(%esp), %eax /* nbytes = out - beg */ + + cmpl dist_r, %eax + jb .L_clip_window /* if (dist > nbytes) 4.2% */ + + movl len(%esp), %ecx + movl out_r, from_r + subl dist_r, from_r /* from = out - dist */ + + subl $3, %ecx + movb (from_r), %al + movb %al, (out_r) + movb 1(from_r), %al + movb 2(from_r), %dl + addl $3, from_r + movb %al, 1(out_r) + movb %dl, 2(out_r) + addl $3, out_r + rep movsb + + movl in(%esp), in_r /* move in back to %esi, toss from */ + jmp .L_while_test + + .align 16,0x90 + .L_check_dist_one: + cmpl $1, dist_r + jne .L_check_window + cmpl out_r, beg(%esp) + je .L_check_window + + decl out_r + movl len(%esp), %ecx + movb (out_r), %al + subl $3, %ecx + + movb %al, 1(out_r) + movb %al, 2(out_r) + movb %al, 3(out_r) + addl $4, out_r + rep stosb + + jmp .L_while_test + + .align 16,0x90 + .L_test_for_second_level_length: + /* else if ((op & 64) == 0) { + * this = lcode[this.val + (hold & mask[op])]; + * } + */ + testb $64, %al + jnz .L_test_for_end_of_block /* if ((op & 64) != 0) */ + + movl $1, %eax + shll %cl, %eax + decl %eax + andl hold_r, %eax /* eax &= hold */ + addl %edx, %eax /* eax += this.val */ + movl lcode(%esp), %edx /* edx = lcode */ + movl (%edx,%eax,4), %eax /* eax = lcode[val + (hold&mask[op])] */ + jmp .L_dolen + + .align 16,0x90 + .L_test_for_second_level_dist: + /* else if ((op & 64) == 0) { + * this = dcode[this.val + (hold & mask[op])]; + * } + */ + testb $64, %al + jnz .L_invalid_distance_code /* if ((op & 64) != 0) */ + + movl $1, %eax + shll %cl, %eax + decl %eax + andl hold_r, %eax /* eax &= hold */ + addl %edx, %eax /* eax += this.val */ + movl dcode(%esp), %edx /* edx = dcode */ + movl (%edx,%eax,4), %eax /* eax = dcode[val + (hold&mask[op])] */ + jmp .L_dodist + + .align 16,0x90 + .L_clip_window: + /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist + * %ecx = nbytes + * + * else { + * if (dist > wsize) { + * invalid distance + * } + * from = window; + * nbytes = dist - nbytes; + * if (write == 0) { + * from += wsize - nbytes; + */ + #define nbytes_r %ecx + movl %eax, nbytes_r + movl wsize(%esp), %eax /* prepare for dist compare */ + negl nbytes_r /* nbytes = -nbytes */ + movl window(%esp), from_r /* from = window */ + + cmpl dist_r, %eax + jb .L_invalid_distance_too_far /* if (dist > wsize) */ + + addl dist_r, nbytes_r /* nbytes = dist - nbytes */ + cmpl $0, write(%esp) + jne .L_wrap_around_window /* if (write != 0) */ + + subl nbytes_r, %eax + addl %eax, from_r /* from += wsize - nbytes */ + + /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist + * %ecx = nbytes, %eax = len + * + * if (nbytes < len) { + * len -= nbytes; + * do { + * PUP(out) = PUP(from); + * } while (--nbytes); + * from = out - dist; + * } + * } + */ + #define len_r %eax + movl len(%esp), len_r + cmpl nbytes_r, len_r + jbe .L_do_copy1 /* if (nbytes >= len) */ + + subl nbytes_r, len_r /* len -= nbytes */ + rep movsb + movl out_r, from_r + subl dist_r, from_r /* from = out - dist */ + jmp .L_do_copy1 + + cmpl nbytes_r, len_r + jbe .L_do_copy1 /* if (nbytes >= len) */ + + subl nbytes_r, len_r /* len -= nbytes */ + rep movsb + movl out_r, from_r + subl dist_r, from_r /* from = out - dist */ + jmp .L_do_copy1 + + .L_wrap_around_window: + /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist + * %ecx = nbytes, %eax = write, %eax = len + * + * else if (write < nbytes) { + * from += wsize + write - nbytes; + * nbytes -= write; + * if (nbytes < len) { + * len -= nbytes; + * do { + * PUP(out) = PUP(from); + * } while (--nbytes); + * from = window; + * nbytes = write; + * if (nbytes < len) { + * len -= nbytes; + * do { + * PUP(out) = PUP(from); + * } while(--nbytes); + * from = out - dist; + * } + * } + * } + */ + #define write_r %eax + movl write(%esp), write_r + cmpl write_r, nbytes_r + jbe .L_contiguous_in_window /* if (write >= nbytes) */ + + addl wsize(%esp), from_r + addl write_r, from_r + subl nbytes_r, from_r /* from += wsize + write - nbytes */ + subl write_r, nbytes_r /* nbytes -= write */ + #undef write_r + + movl len(%esp), len_r + cmpl nbytes_r, len_r + jbe .L_do_copy1 /* if (nbytes >= len) */ + + subl nbytes_r, len_r /* len -= nbytes */ + rep movsb + movl window(%esp), from_r /* from = window */ + movl write(%esp), nbytes_r /* nbytes = write */ + cmpl nbytes_r, len_r + jbe .L_do_copy1 /* if (nbytes >= len) */ + + subl nbytes_r, len_r /* len -= nbytes */ + rep movsb + movl out_r, from_r + subl dist_r, from_r /* from = out - dist */ + jmp .L_do_copy1 + + .L_contiguous_in_window: + /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist + * %ecx = nbytes, %eax = write, %eax = len + * + * else { + * from += write - nbytes; + * if (nbytes < len) { + * len -= nbytes; + * do { + * PUP(out) = PUP(from); + * } while (--nbytes); + * from = out - dist; + * } + * } + */ + #define write_r %eax + addl write_r, from_r + subl nbytes_r, from_r /* from += write - nbytes */ + #undef write_r + + movl len(%esp), len_r + cmpl nbytes_r, len_r + jbe .L_do_copy1 /* if (nbytes >= len) */ + + subl nbytes_r, len_r /* len -= nbytes */ + rep movsb + movl out_r, from_r + subl dist_r, from_r /* from = out - dist */ + + .L_do_copy1: + /* regs: %esi = from, %esi = in, %ebp = hold, %bl = bits, %edi = out + * %eax = len + * + * while (len > 0) { + * PUP(out) = PUP(from); + * len--; + * } + * } + * } while (in < last && out < end); + */ + #undef nbytes_r + #define in_r %esi + movl len_r, %ecx + rep movsb + + movl in(%esp), in_r /* move in back to %esi, toss from */ + jmp .L_while_test + + #undef len_r + #undef dist_r + + #endif /* NO_MMX || RUN_TIME_MMX */ + + + /*** MMX code ***/ + + #if defined( USE_MMX ) || defined( RUN_TIME_MMX ) + + .align 32,0x90 + .L_init_mmx: + emms + + #undef bits_r + #undef bitslong_r + #define bitslong_r %ebp + #define hold_mm %mm0 + movd %ebp, hold_mm + movl %ebx, bitslong_r + + #define used_mm %mm1 + #define dmask2_mm %mm2 + #define lmask2_mm %mm3 + #define lmask_mm %mm4 + #define dmask_mm %mm5 + #define tmp_mm %mm6 + + movd lmask(%esp), lmask_mm + movq lmask_mm, lmask2_mm + movd dmask(%esp), dmask_mm + movq dmask_mm, dmask2_mm + pxor used_mm, used_mm + movl lcode(%esp), %ebx /* ebx = lcode */ + jmp .L_do_loop_mmx + + .align 32,0x90 + .L_while_test_mmx: + /* while (in < last && out < end) + */ + cmpl out_r, end(%esp) + jbe .L_break_loop /* if (out >= end) */ + + cmpl in_r, last(%esp) + jbe .L_break_loop + + .L_do_loop_mmx: + psrlq used_mm, hold_mm /* hold_mm >>= last bit length */ + + cmpl $32, bitslong_r + ja .L_get_length_code_mmx /* if (32 < bits) */ + + movd bitslong_r, tmp_mm + movd (in_r), %mm7 + addl $4, in_r + psllq tmp_mm, %mm7 + addl $32, bitslong_r + por %mm7, hold_mm /* hold_mm |= *((uint *)in)++ << bits */ + + .L_get_length_code_mmx: + pand hold_mm, lmask_mm + movd lmask_mm, %eax + movq lmask2_mm, lmask_mm + movl (%ebx,%eax,4), %eax /* eax = lcode[hold & lmask] */ + + .L_dolen_mmx: + movzbl %ah, %ecx /* ecx = this.bits */ + movd %ecx, used_mm + subl %ecx, bitslong_r /* bits -= this.bits */ + + testb %al, %al + jnz .L_test_for_length_base_mmx /* if (op != 0) 45.7% */ + + shrl $16, %eax /* output this.val char */ + stosb + jmp .L_while_test_mmx + + .L_test_for_length_base_mmx: + #define len_r %edx + movl %eax, len_r /* len = this */ + shrl $16, len_r /* len = this.val */ + + testb $16, %al + jz .L_test_for_second_level_length_mmx /* if ((op & 16) == 0) 8% */ + andl $15, %eax /* op &= 15 */ + jz .L_decode_distance_mmx /* if (!op) */ + + psrlq used_mm, hold_mm /* hold_mm >>= last bit length */ + movd %eax, used_mm + movd hold_mm, %ecx + subl %eax, bitslong_r + andl .L_mask(,%eax,4), %ecx + addl %ecx, len_r /* len += hold & mask[op] */ + + .L_decode_distance_mmx: + psrlq used_mm, hold_mm /* hold_mm >>= last bit length */ + + cmpl $32, bitslong_r + ja .L_get_dist_code_mmx /* if (32 < bits) */ + + movd bitslong_r, tmp_mm + movd (in_r), %mm7 + addl $4, in_r + psllq tmp_mm, %mm7 + addl $32, bitslong_r + por %mm7, hold_mm /* hold_mm |= *((uint *)in)++ << bits */ + + .L_get_dist_code_mmx: + movl dcode(%esp), %ebx /* ebx = dcode */ + pand hold_mm, dmask_mm + movd dmask_mm, %eax + movq dmask2_mm, dmask_mm + movl (%ebx,%eax,4), %eax /* eax = dcode[hold & lmask] */ + + .L_dodist_mmx: + #define dist_r %ebx + movzbl %ah, %ecx /* ecx = this.bits */ + movl %eax, dist_r + shrl $16, dist_r /* dist = this.val */ + subl %ecx, bitslong_r /* bits -= this.bits */ + movd %ecx, used_mm + + testb $16, %al /* if ((op & 16) == 0) */ + jz .L_test_for_second_level_dist_mmx + andl $15, %eax /* op &= 15 */ + jz .L_check_dist_one_mmx + + .L_add_bits_to_dist_mmx: + psrlq used_mm, hold_mm /* hold_mm >>= last bit length */ + movd %eax, used_mm /* save bit length of current op */ + movd hold_mm, %ecx /* get the next bits on input stream */ + subl %eax, bitslong_r /* bits -= op bits */ + andl .L_mask(,%eax,4), %ecx /* ecx = hold & mask[op] */ + addl %ecx, dist_r /* dist += hold & mask[op] */ + + .L_check_window_mmx: + movl in_r, in(%esp) /* save in so from can use it's reg */ + movl out_r, %eax + subl beg(%esp), %eax /* nbytes = out - beg */ + + cmpl dist_r, %eax + jb .L_clip_window_mmx /* if (dist > nbytes) 4.2% */ + + movl len_r, %ecx + movl out_r, from_r + subl dist_r, from_r /* from = out - dist */ + + subl $3, %ecx + movb (from_r), %al + movb %al, (out_r) + movb 1(from_r), %al + movb 2(from_r), %dl + addl $3, from_r + movb %al, 1(out_r) + movb %dl, 2(out_r) + addl $3, out_r + rep movsb + + movl in(%esp), in_r /* move in back to %esi, toss from */ + movl lcode(%esp), %ebx /* move lcode back to %ebx, toss dist */ + jmp .L_while_test_mmx + + .align 16,0x90 + .L_check_dist_one_mmx: + cmpl $1, dist_r + jne .L_check_window_mmx + cmpl out_r, beg(%esp) + je .L_check_window_mmx + + decl out_r + movl len_r, %ecx + movb (out_r), %al + subl $3, %ecx + + movb %al, 1(out_r) + movb %al, 2(out_r) + movb %al, 3(out_r) + addl $4, out_r + rep stosb + + movl lcode(%esp), %ebx /* move lcode back to %ebx, toss dist */ + jmp .L_while_test_mmx + + .align 16,0x90 + .L_test_for_second_level_length_mmx: + testb $64, %al + jnz .L_test_for_end_of_block /* if ((op & 64) != 0) */ + + andl $15, %eax + psrlq used_mm, hold_mm /* hold_mm >>= last bit length */ + movd hold_mm, %ecx + andl .L_mask(,%eax,4), %ecx + addl len_r, %ecx + movl (%ebx,%ecx,4), %eax /* eax = lcode[hold & lmask] */ + jmp .L_dolen_mmx + + .align 16,0x90 + .L_test_for_second_level_dist_mmx: + testb $64, %al + jnz .L_invalid_distance_code /* if ((op & 64) != 0) */ + + andl $15, %eax + psrlq used_mm, hold_mm /* hold_mm >>= last bit length */ + movd hold_mm, %ecx + andl .L_mask(,%eax,4), %ecx + movl dcode(%esp), %eax /* ecx = dcode */ + addl dist_r, %ecx + movl (%eax,%ecx,4), %eax /* eax = lcode[hold & lmask] */ + jmp .L_dodist_mmx + + .align 16,0x90 + .L_clip_window_mmx: + #define nbytes_r %ecx + movl %eax, nbytes_r + movl wsize(%esp), %eax /* prepare for dist compare */ + negl nbytes_r /* nbytes = -nbytes */ + movl window(%esp), from_r /* from = window */ + + cmpl dist_r, %eax + jb .L_invalid_distance_too_far /* if (dist > wsize) */ + + addl dist_r, nbytes_r /* nbytes = dist - nbytes */ + cmpl $0, write(%esp) + jne .L_wrap_around_window_mmx /* if (write != 0) */ + + subl nbytes_r, %eax + addl %eax, from_r /* from += wsize - nbytes */ + + cmpl nbytes_r, len_r + jbe .L_do_copy1_mmx /* if (nbytes >= len) */ + + subl nbytes_r, len_r /* len -= nbytes */ + rep movsb + movl out_r, from_r + subl dist_r, from_r /* from = out - dist */ + jmp .L_do_copy1_mmx + + cmpl nbytes_r, len_r + jbe .L_do_copy1_mmx /* if (nbytes >= len) */ + + subl nbytes_r, len_r /* len -= nbytes */ + rep movsb + movl out_r, from_r + subl dist_r, from_r /* from = out - dist */ + jmp .L_do_copy1_mmx + + .L_wrap_around_window_mmx: + #define write_r %eax + movl write(%esp), write_r + cmpl write_r, nbytes_r + jbe .L_contiguous_in_window_mmx /* if (write >= nbytes) */ + + addl wsize(%esp), from_r + addl write_r, from_r + subl nbytes_r, from_r /* from += wsize + write - nbytes */ + subl write_r, nbytes_r /* nbytes -= write */ + #undef write_r + + cmpl nbytes_r, len_r + jbe .L_do_copy1_mmx /* if (nbytes >= len) */ + + subl nbytes_r, len_r /* len -= nbytes */ + rep movsb + movl window(%esp), from_r /* from = window */ + movl write(%esp), nbytes_r /* nbytes = write */ + cmpl nbytes_r, len_r + jbe .L_do_copy1_mmx /* if (nbytes >= len) */ + + subl nbytes_r, len_r /* len -= nbytes */ + rep movsb + movl out_r, from_r + subl dist_r, from_r /* from = out - dist */ + jmp .L_do_copy1_mmx + + .L_contiguous_in_window_mmx: + #define write_r %eax + addl write_r, from_r + subl nbytes_r, from_r /* from += write - nbytes */ + #undef write_r + + cmpl nbytes_r, len_r + jbe .L_do_copy1_mmx /* if (nbytes >= len) */ + + subl nbytes_r, len_r /* len -= nbytes */ + rep movsb + movl out_r, from_r + subl dist_r, from_r /* from = out - dist */ + + .L_do_copy1_mmx: + #undef nbytes_r + #define in_r %esi + movl len_r, %ecx + rep movsb + + movl in(%esp), in_r /* move in back to %esi, toss from */ + movl lcode(%esp), %ebx /* move lcode back to %ebx, toss dist */ + jmp .L_while_test_mmx + + #undef hold_r + #undef bitslong_r + + #endif /* USE_MMX || RUN_TIME_MMX */ + + + /*** USE_MMX, NO_MMX, and RUNTIME_MMX from here on ***/ + + .L_invalid_distance_code: + /* else { + * strm->msg = "invalid distance code"; + * state->mode = BAD; + * } + */ + movl $.L_invalid_distance_code_msg, %ecx + movl $INFLATE_MODE_BAD, %edx + jmp .L_update_stream_state + + .L_test_for_end_of_block: + /* else if (op & 32) { + * state->mode = TYPE; + * break; + * } + */ + testb $32, %al + jz .L_invalid_literal_length_code /* if ((op & 32) == 0) */ + + movl $0, %ecx + movl $INFLATE_MODE_TYPE, %edx + jmp .L_update_stream_state + + .L_invalid_literal_length_code: + /* else { + * strm->msg = "invalid literal/length code"; + * state->mode = BAD; + * } + */ + movl $.L_invalid_literal_length_code_msg, %ecx + movl $INFLATE_MODE_BAD, %edx + jmp .L_update_stream_state + + .L_invalid_distance_too_far: + /* strm->msg = "invalid distance too far back"; + * state->mode = BAD; + */ + movl in(%esp), in_r /* from_r has in's reg, put in back */ + movl $.L_invalid_distance_too_far_msg, %ecx + movl $INFLATE_MODE_BAD, %edx + jmp .L_update_stream_state + + .L_update_stream_state: + /* set strm->msg = %ecx, strm->state->mode = %edx */ + movl strm_sp(%esp), %eax + testl %ecx, %ecx /* if (msg != NULL) */ + jz .L_skip_msg + movl %ecx, msg_strm(%eax) /* strm->msg = msg */ + .L_skip_msg: + movl state_strm(%eax), %eax /* state = strm->state */ + movl %edx, mode_state(%eax) /* state->mode = edx (BAD | TYPE) */ + jmp .L_break_loop + + .align 32,0x90 + .L_break_loop: + + /* + * Regs: + * + * bits = %ebp when mmx, and in %ebx when non-mmx + * hold = %hold_mm when mmx, and in %ebp when non-mmx + * in = %esi + * out = %edi + */ + + #if defined( USE_MMX ) || defined( RUN_TIME_MMX ) + + #if defined( RUN_TIME_MMX ) + + cmpl $DO_USE_MMX, inflate_fast_use_mmx + jne .L_update_next_in + + #endif /* RUN_TIME_MMX */ + + movl %ebp, %ebx + + .L_update_next_in: + + #endif + + #define strm_r %eax + #define state_r %edx + + /* len = bits >> 3; + * in -= len; + * bits -= len << 3; + * hold &= (1U << bits) - 1; + * state->hold = hold; + * state->bits = bits; + * strm->next_in = in; + * strm->next_out = out; + */ + movl strm_sp(%esp), strm_r + movl %ebx, %ecx + movl state_strm(strm_r), state_r + shrl $3, %ecx + subl %ecx, in_r + shll $3, %ecx + subl %ecx, %ebx + movl out_r, next_out_strm(strm_r) + movl %ebx, bits_state(state_r) + movl %ebx, %ecx + + leal buf(%esp), %ebx + cmpl %ebx, last(%esp) + jne .L_buf_not_used /* if buf != last */ + + subl %ebx, in_r /* in -= buf */ + movl next_in_strm(strm_r), %ebx + movl %ebx, last(%esp) /* last = strm->next_in */ + addl %ebx, in_r /* in += strm->next_in */ + movl avail_in_strm(strm_r), %ebx + subl $11, %ebx + addl %ebx, last(%esp) /* last = &strm->next_in[ avail_in - 11 ] */ + + .L_buf_not_used: + movl in_r, next_in_strm(strm_r) + + movl $1, %ebx + shll %cl, %ebx + decl %ebx + + #if defined( USE_MMX ) || defined( RUN_TIME_MMX ) + + #if defined( RUN_TIME_MMX ) + + cmpl $DO_USE_MMX, inflate_fast_use_mmx + jne .L_update_hold + + #endif /* RUN_TIME_MMX */ + + psrlq used_mm, hold_mm /* hold_mm >>= last bit length */ + movd hold_mm, %ebp + + emms + + .L_update_hold: + + #endif /* USE_MMX || RUN_TIME_MMX */ + + andl %ebx, %ebp + movl %ebp, hold_state(state_r) + + #define last_r %ebx + + /* strm->avail_in = in < last ? 11 + (last - in) : 11 - (in - last) */ + movl last(%esp), last_r + cmpl in_r, last_r + jbe .L_last_is_smaller /* if (in >= last) */ + + subl in_r, last_r /* last -= in */ + addl $11, last_r /* last += 11 */ + movl last_r, avail_in_strm(strm_r) + jmp .L_fixup_out + .L_last_is_smaller: + subl last_r, in_r /* in -= last */ + negl in_r /* in = -in */ + addl $11, in_r /* in += 11 */ + movl in_r, avail_in_strm(strm_r) + + #undef last_r + #define end_r %ebx + + .L_fixup_out: + /* strm->avail_out = out < end ? 257 + (end - out) : 257 - (out - end)*/ + movl end(%esp), end_r + cmpl out_r, end_r + jbe .L_end_is_smaller /* if (out >= end) */ + + subl out_r, end_r /* end -= out */ + addl $257, end_r /* end += 257 */ + movl end_r, avail_out_strm(strm_r) + jmp .L_done + .L_end_is_smaller: + subl end_r, out_r /* out -= end */ + negl out_r /* out = -out */ + addl $257, out_r /* out += 257 */ + movl out_r, avail_out_strm(strm_r) + + #undef end_r + #undef strm_r + #undef state_r + + .L_done: + addl $local_var_size, %esp + popf + popl %ebx + popl %ebp + popl %esi + popl %edi + ret + + #if defined( GAS_ELF ) + /* elf info */ + .type inflate_fast,@function + .size inflate_fast,.-inflate_fast + #endif diff -Nrcpad gcc-4.4.4/zlib/contrib/iostream/test.cpp gcc-4.4.5/zlib/contrib/iostream/test.cpp *** gcc-4.4.4/zlib/contrib/iostream/test.cpp Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/iostream/test.cpp Mon Oct 11 17:35:40 2004 *************** *** 0 **** --- 1,24 ---- + + #include "zfstream.h" + + int main() { + + // Construct a stream object with this filebuffer. Anything sent + // to this stream will go to standard out. + gzofstream os( 1, ios::out ); + + // This text is getting compressed and sent to stdout. + // To prove this, run 'test | zcat'. + os << "Hello, Mommy" << endl; + + os << setcompressionlevel( Z_NO_COMPRESSION ); + os << "hello, hello, hi, ho!" << endl; + + setcompressionlevel( os, Z_DEFAULT_COMPRESSION ) + << "I'm compressing again" << endl; + + os.close(); + + return 0; + + } diff -Nrcpad gcc-4.4.4/zlib/contrib/iostream/zfstream.cpp gcc-4.4.5/zlib/contrib/iostream/zfstream.cpp *** gcc-4.4.4/zlib/contrib/iostream/zfstream.cpp Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/iostream/zfstream.cpp Mon Oct 11 18:45:43 2004 *************** *** 0 **** --- 1,329 ---- + + #include "zfstream.h" + + gzfilebuf::gzfilebuf() : + file(NULL), + mode(0), + own_file_descriptor(0) + { } + + gzfilebuf::~gzfilebuf() { + + sync(); + if ( own_file_descriptor ) + close(); + + } + + gzfilebuf *gzfilebuf::open( const char *name, + int io_mode ) { + + if ( is_open() ) + return NULL; + + char char_mode[10]; + char *p = char_mode; + + if ( io_mode & ios::in ) { + mode = ios::in; + *p++ = 'r'; + } else if ( io_mode & ios::app ) { + mode = ios::app; + *p++ = 'a'; + } else { + mode = ios::out; + *p++ = 'w'; + } + + if ( io_mode & ios::binary ) { + mode |= ios::binary; + *p++ = 'b'; + } + + // Hard code the compression level + if ( io_mode & (ios::out|ios::app )) { + *p++ = '9'; + } + + // Put the end-of-string indicator + *p = '\0'; + + if ( (file = gzopen(name, char_mode)) == NULL ) + return NULL; + + own_file_descriptor = 1; + + return this; + + } + + gzfilebuf *gzfilebuf::attach( int file_descriptor, + int io_mode ) { + + if ( is_open() ) + return NULL; + + char char_mode[10]; + char *p = char_mode; + + if ( io_mode & ios::in ) { + mode = ios::in; + *p++ = 'r'; + } else if ( io_mode & ios::app ) { + mode = ios::app; + *p++ = 'a'; + } else { + mode = ios::out; + *p++ = 'w'; + } + + if ( io_mode & ios::binary ) { + mode |= ios::binary; + *p++ = 'b'; + } + + // Hard code the compression level + if ( io_mode & (ios::out|ios::app )) { + *p++ = '9'; + } + + // Put the end-of-string indicator + *p = '\0'; + + if ( (file = gzdopen(file_descriptor, char_mode)) == NULL ) + return NULL; + + own_file_descriptor = 0; + + return this; + + } + + gzfilebuf *gzfilebuf::close() { + + if ( is_open() ) { + + sync(); + gzclose( file ); + file = NULL; + + } + + return this; + + } + + int gzfilebuf::setcompressionlevel( int comp_level ) { + + return gzsetparams(file, comp_level, -2); + + } + + int gzfilebuf::setcompressionstrategy( int comp_strategy ) { + + return gzsetparams(file, -2, comp_strategy); + + } + + + streampos gzfilebuf::seekoff( streamoff off, ios::seek_dir dir, int which ) { + + return streampos(EOF); + + } + + int gzfilebuf::underflow() { + + // If the file hasn't been opened for reading, error. + if ( !is_open() || !(mode & ios::in) ) + return EOF; + + // if a buffer doesn't exists, allocate one. + if ( !base() ) { + + if ( (allocate()) == EOF ) + return EOF; + setp(0,0); + + } else { + + if ( in_avail() ) + return (unsigned char) *gptr(); + + if ( out_waiting() ) { + if ( flushbuf() == EOF ) + return EOF; + } + + } + + // Attempt to fill the buffer. + + int result = fillbuf(); + if ( result == EOF ) { + // disable get area + setg(0,0,0); + return EOF; + } + + return (unsigned char) *gptr(); + + } + + int gzfilebuf::overflow( int c ) { + + if ( !is_open() || !(mode & ios::out) ) + return EOF; + + if ( !base() ) { + if ( allocate() == EOF ) + return EOF; + setg(0,0,0); + } else { + if (in_avail()) { + return EOF; + } + if (out_waiting()) { + if (flushbuf() == EOF) + return EOF; + } + } + + int bl = blen(); + setp( base(), base() + bl); + + if ( c != EOF ) { + + *pptr() = c; + pbump(1); + + } + + return 0; + + } + + int gzfilebuf::sync() { + + if ( !is_open() ) + return EOF; + + if ( out_waiting() ) + return flushbuf(); + + return 0; + + } + + int gzfilebuf::flushbuf() { + + int n; + char *q; + + q = pbase(); + n = pptr() - q; + + if ( gzwrite( file, q, n) < n ) + return EOF; + + setp(0,0); + + return 0; + + } + + int gzfilebuf::fillbuf() { + + int required; + char *p; + + p = base(); + + required = blen(); + + int t = gzread( file, p, required ); + + if ( t <= 0) return EOF; + + setg( base(), base(), base()+t); + + return t; + + } + + gzfilestream_common::gzfilestream_common() : + ios( gzfilestream_common::rdbuf() ) + { } + + gzfilestream_common::~gzfilestream_common() + { } + + void gzfilestream_common::attach( int fd, int io_mode ) { + + if ( !buffer.attach( fd, io_mode) ) + clear( ios::failbit | ios::badbit ); + else + clear(); + + } + + void gzfilestream_common::open( const char *name, int io_mode ) { + + if ( !buffer.open( name, io_mode ) ) + clear( ios::failbit | ios::badbit ); + else + clear(); + + } + + void gzfilestream_common::close() { + + if ( !buffer.close() ) + clear( ios::failbit | ios::badbit ); + + } + + gzfilebuf *gzfilestream_common::rdbuf() + { + return &buffer; + } + + gzifstream::gzifstream() : + ios( gzfilestream_common::rdbuf() ) + { + clear( ios::badbit ); + } + + gzifstream::gzifstream( const char *name, int io_mode ) : + ios( gzfilestream_common::rdbuf() ) + { + gzfilestream_common::open( name, io_mode ); + } + + gzifstream::gzifstream( int fd, int io_mode ) : + ios( gzfilestream_common::rdbuf() ) + { + gzfilestream_common::attach( fd, io_mode ); + } + + gzifstream::~gzifstream() { } + + gzofstream::gzofstream() : + ios( gzfilestream_common::rdbuf() ) + { + clear( ios::badbit ); + } + + gzofstream::gzofstream( const char *name, int io_mode ) : + ios( gzfilestream_common::rdbuf() ) + { + gzfilestream_common::open( name, io_mode ); + } + + gzofstream::gzofstream( int fd, int io_mode ) : + ios( gzfilestream_common::rdbuf() ) + { + gzfilestream_common::attach( fd, io_mode ); + } + + gzofstream::~gzofstream() { } diff -Nrcpad gcc-4.4.4/zlib/contrib/iostream/zfstream.h gcc-4.4.5/zlib/contrib/iostream/zfstream.h *** gcc-4.4.4/zlib/contrib/iostream/zfstream.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/iostream/zfstream.h Mon Oct 11 18:45:43 2004 *************** *** 0 **** --- 1,128 ---- + + #ifndef zfstream_h + #define zfstream_h + + #include + #include "zlib.h" + + class gzfilebuf : public streambuf { + + public: + + gzfilebuf( ); + virtual ~gzfilebuf(); + + gzfilebuf *open( const char *name, int io_mode ); + gzfilebuf *attach( int file_descriptor, int io_mode ); + gzfilebuf *close(); + + int setcompressionlevel( int comp_level ); + int setcompressionstrategy( int comp_strategy ); + + inline int is_open() const { return (file !=NULL); } + + virtual streampos seekoff( streamoff, ios::seek_dir, int ); + + virtual int sync(); + + protected: + + virtual int underflow(); + virtual int overflow( int = EOF ); + + private: + + gzFile file; + short mode; + short own_file_descriptor; + + int flushbuf(); + int fillbuf(); + + }; + + class gzfilestream_common : virtual public ios { + + friend class gzifstream; + friend class gzofstream; + friend gzofstream &setcompressionlevel( gzofstream &, int ); + friend gzofstream &setcompressionstrategy( gzofstream &, int ); + + public: + virtual ~gzfilestream_common(); + + void attach( int fd, int io_mode ); + void open( const char *name, int io_mode ); + void close(); + + protected: + gzfilestream_common(); + + private: + gzfilebuf *rdbuf(); + + gzfilebuf buffer; + + }; + + class gzifstream : public gzfilestream_common, public istream { + + public: + + gzifstream(); + gzifstream( const char *name, int io_mode = ios::in ); + gzifstream( int fd, int io_mode = ios::in ); + + virtual ~gzifstream(); + + }; + + class gzofstream : public gzfilestream_common, public ostream { + + public: + + gzofstream(); + gzofstream( const char *name, int io_mode = ios::out ); + gzofstream( int fd, int io_mode = ios::out ); + + virtual ~gzofstream(); + + }; + + template class gzomanip { + friend gzofstream &operator<<(gzofstream &, const gzomanip &); + public: + gzomanip(gzofstream &(*f)(gzofstream &, T), T v) : func(f), val(v) { } + private: + gzofstream &(*func)(gzofstream &, T); + T val; + }; + + template gzofstream &operator<<(gzofstream &s, const gzomanip &m) + { + return (*m.func)(s, m.val); + } + + inline gzofstream &setcompressionlevel( gzofstream &s, int l ) + { + (s.rdbuf())->setcompressionlevel(l); + return s; + } + + inline gzofstream &setcompressionstrategy( gzofstream &s, int l ) + { + (s.rdbuf())->setcompressionstrategy(l); + return s; + } + + inline gzomanip setcompressionlevel(int l) + { + return gzomanip(&setcompressionlevel,l); + } + + inline gzomanip setcompressionstrategy(int l) + { + return gzomanip(&setcompressionstrategy,l); + } + + #endif diff -Nrcpad gcc-4.4.4/zlib/contrib/iostream2/zstream.h gcc-4.4.5/zlib/contrib/iostream2/zstream.h *** gcc-4.4.4/zlib/contrib/iostream2/zstream.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/iostream2/zstream.h Mon Oct 11 17:35:40 2004 *************** *** 0 **** --- 1,307 ---- + /* + * + * Copyright (c) 1997 + * Christian Michelsen Research AS + * Advanced Computing + * Fantoftvegen 38, 5036 BERGEN, Norway + * http://www.cmr.no + * + * Permission to use, copy, modify, distribute and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation. Christian Michelsen Research AS makes no + * representations about the suitability of this software for any + * purpose. It is provided "as is" without express or implied warranty. + * + */ + + #ifndef ZSTREAM__H + #define ZSTREAM__H + + /* + * zstream.h - C++ interface to the 'zlib' general purpose compression library + * $Id: zstream.h,v 1.1 1999/05/04 19:30:27 tromey Exp $ + */ + + #include + #include + #include + #include "zlib.h" + + #if defined(_WIN32) + # include + # include + # define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY) + #else + # define SET_BINARY_MODE(file) + #endif + + class zstringlen { + public: + zstringlen(class izstream&); + zstringlen(class ozstream&, const char*); + size_t value() const { return val.word; } + private: + struct Val { unsigned char byte; size_t word; } val; + }; + + // ----------------------------- izstream ----------------------------- + + class izstream + { + public: + izstream() : m_fp(0) {} + izstream(FILE* fp) : m_fp(0) { open(fp); } + izstream(const char* name) : m_fp(0) { open(name); } + ~izstream() { close(); } + + /* Opens a gzip (.gz) file for reading. + * open() can be used to read a file which is not in gzip format; + * in this case read() will directly read from the file without + * decompression. errno can be checked to distinguish two error + * cases (if errno is zero, the zlib error is Z_MEM_ERROR). + */ + void open(const char* name) { + if (m_fp) close(); + m_fp = ::gzopen(name, "rb"); + } + + void open(FILE* fp) { + SET_BINARY_MODE(fp); + if (m_fp) close(); + m_fp = ::gzdopen(fileno(fp), "rb"); + } + + /* Flushes all pending input if necessary, closes the compressed file + * and deallocates all the (de)compression state. The return value is + * the zlib error number (see function error() below). + */ + int close() { + int r = ::gzclose(m_fp); + m_fp = 0; return r; + } + + /* Binary read the given number of bytes from the compressed file. + */ + int read(void* buf, size_t len) { + return ::gzread(m_fp, buf, len); + } + + /* Returns the error message for the last error which occurred on the + * given compressed file. errnum is set to zlib error number. If an + * error occurred in the file system and not in the compression library, + * errnum is set to Z_ERRNO and the application may consult errno + * to get the exact error code. + */ + const char* error(int* errnum) { + return ::gzerror(m_fp, errnum); + } + + gzFile fp() { return m_fp; } + + private: + gzFile m_fp; + }; + + /* + * Binary read the given (array of) object(s) from the compressed file. + * If the input file was not in gzip format, read() copies the objects number + * of bytes into the buffer. + * returns the number of uncompressed bytes actually read + * (0 for end of file, -1 for error). + */ + template + inline int read(izstream& zs, T* x, Items items) { + return ::gzread(zs.fp(), x, items*sizeof(T)); + } + + /* + * Binary input with the '>' operator. + */ + template + inline izstream& operator>(izstream& zs, T& x) { + ::gzread(zs.fp(), &x, sizeof(T)); + return zs; + } + + + inline zstringlen::zstringlen(izstream& zs) { + zs > val.byte; + if (val.byte == 255) zs > val.word; + else val.word = val.byte; + } + + /* + * Read length of string + the string with the '>' operator. + */ + inline izstream& operator>(izstream& zs, char* x) { + zstringlen len(zs); + ::gzread(zs.fp(), x, len.value()); + x[len.value()] = '\0'; + return zs; + } + + inline char* read_string(izstream& zs) { + zstringlen len(zs); + char* x = new char[len.value()+1]; + ::gzread(zs.fp(), x, len.value()); + x[len.value()] = '\0'; + return x; + } + + // ----------------------------- ozstream ----------------------------- + + class ozstream + { + public: + ozstream() : m_fp(0), m_os(0) { + } + ozstream(FILE* fp, int level = Z_DEFAULT_COMPRESSION) + : m_fp(0), m_os(0) { + open(fp, level); + } + ozstream(const char* name, int level = Z_DEFAULT_COMPRESSION) + : m_fp(0), m_os(0) { + open(name, level); + } + ~ozstream() { + close(); + } + + /* Opens a gzip (.gz) file for writing. + * The compression level parameter should be in 0..9 + * errno can be checked to distinguish two error cases + * (if errno is zero, the zlib error is Z_MEM_ERROR). + */ + void open(const char* name, int level = Z_DEFAULT_COMPRESSION) { + char mode[4] = "wb\0"; + if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level; + if (m_fp) close(); + m_fp = ::gzopen(name, mode); + } + + /* open from a FILE pointer. + */ + void open(FILE* fp, int level = Z_DEFAULT_COMPRESSION) { + SET_BINARY_MODE(fp); + char mode[4] = "wb\0"; + if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level; + if (m_fp) close(); + m_fp = ::gzdopen(fileno(fp), mode); + } + + /* Flushes all pending output if necessary, closes the compressed file + * and deallocates all the (de)compression state. The return value is + * the zlib error number (see function error() below). + */ + int close() { + if (m_os) { + ::gzwrite(m_fp, m_os->str(), m_os->pcount()); + delete[] m_os->str(); delete m_os; m_os = 0; + } + int r = ::gzclose(m_fp); m_fp = 0; return r; + } + + /* Binary write the given number of bytes into the compressed file. + */ + int write(const void* buf, size_t len) { + return ::gzwrite(m_fp, (voidp) buf, len); + } + + /* Flushes all pending output into the compressed file. The parameter + * _flush is as in the deflate() function. The return value is the zlib + * error number (see function gzerror below). flush() returns Z_OK if + * the flush_ parameter is Z_FINISH and all output could be flushed. + * flush() should be called only when strictly necessary because it can + * degrade compression. + */ + int flush(int _flush) { + os_flush(); + return ::gzflush(m_fp, _flush); + } + + /* Returns the error message for the last error which occurred on the + * given compressed file. errnum is set to zlib error number. If an + * error occurred in the file system and not in the compression library, + * errnum is set to Z_ERRNO and the application may consult errno + * to get the exact error code. + */ + const char* error(int* errnum) { + return ::gzerror(m_fp, errnum); + } + + gzFile fp() { return m_fp; } + + ostream& os() { + if (m_os == 0) m_os = new ostrstream; + return *m_os; + } + + void os_flush() { + if (m_os && m_os->pcount()>0) { + ostrstream* oss = new ostrstream; + oss->fill(m_os->fill()); + oss->flags(m_os->flags()); + oss->precision(m_os->precision()); + oss->width(m_os->width()); + ::gzwrite(m_fp, m_os->str(), m_os->pcount()); + delete[] m_os->str(); delete m_os; m_os = oss; + } + } + + private: + gzFile m_fp; + ostrstream* m_os; + }; + + /* + * Binary write the given (array of) object(s) into the compressed file. + * returns the number of uncompressed bytes actually written + * (0 in case of error). + */ + template + inline int write(ozstream& zs, const T* x, Items items) { + return ::gzwrite(zs.fp(), (voidp) x, items*sizeof(T)); + } + + /* + * Binary output with the '<' operator. + */ + template + inline ozstream& operator<(ozstream& zs, const T& x) { + ::gzwrite(zs.fp(), (voidp) &x, sizeof(T)); + return zs; + } + + inline zstringlen::zstringlen(ozstream& zs, const char* x) { + val.byte = 255; val.word = ::strlen(x); + if (val.word < 255) zs < (val.byte = val.word); + else zs < val; + } + + /* + * Write length of string + the string with the '<' operator. + */ + inline ozstream& operator<(ozstream& zs, const char* x) { + zstringlen len(zs, x); + ::gzwrite(zs.fp(), (voidp) x, len.value()); + return zs; + } + + #ifdef _MSC_VER + inline ozstream& operator<(ozstream& zs, char* const& x) { + return zs < (const char*) x; + } + #endif + + /* + * Ascii write with the << operator; + */ + template + inline ostream& operator<<(ozstream& zs, const T& x) { + zs.os_flush(); + return zs.os() << x; + } + + #endif diff -Nrcpad gcc-4.4.4/zlib/contrib/iostream2/zstream_test.cpp gcc-4.4.5/zlib/contrib/iostream2/zstream_test.cpp *** gcc-4.4.4/zlib/contrib/iostream2/zstream_test.cpp Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/iostream2/zstream_test.cpp Mon Oct 11 18:45:43 2004 *************** *** 0 **** --- 1,25 ---- + #include "zstream.h" + #include + #include + #include + + void main() { + char h[256] = "Hello"; + char* g = "Goodbye"; + ozstream out("temp.gz"); + out < "This works well" < h < g; + out.close(); + + izstream in("temp.gz"); // read it back + char *x = read_string(in), *y = new char[256], z[256]; + in > y > z; + in.close(); + cout << x << endl << y << endl << z << endl; + + out.open("temp.gz"); // try ascii output; zcat temp.gz to see the results + out << setw(50) << setfill('#') << setprecision(20) << x << endl << y << endl << z << endl; + out << z << endl << y << endl << x << endl; + out << 1.1234567890123456789 << endl; + + delete[] x; delete[] y; + } diff -Nrcpad gcc-4.4.4/zlib/contrib/iostream3/README gcc-4.4.5/zlib/contrib/iostream3/README *** gcc-4.4.4/zlib/contrib/iostream3/README Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/iostream3/README Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,35 ---- + These classes provide a C++ stream interface to the zlib library. It allows you + to do things like: + + gzofstream outf("blah.gz"); + outf << "These go into the gzip file " << 123 << endl; + + It does this by deriving a specialized stream buffer for gzipped files, which is + the way Stroustrup would have done it. :-> + + The gzifstream and gzofstream classes were originally written by Kevin Ruland + and made available in the zlib contrib/iostream directory. The older version still + compiles under gcc 2.xx, but not under gcc 3.xx, which sparked the development of + this version. + + The new classes are as standard-compliant as possible, closely following the + approach of the standard library's fstream classes. It compiles under gcc versions + 3.2 and 3.3, but not under gcc 2.xx. This is mainly due to changes in the standard + library naming scheme. The new version of gzifstream/gzofstream/gzfilebuf differs + from the previous one in the following respects: + - added showmanyc + - added setbuf, with support for unbuffered output via setbuf(0,0) + - a few bug fixes of stream behavior + - gzipped output file opened with default compression level instead of maximum level + - setcompressionlevel()/strategy() members replaced by single setcompression() + + The code is provided "as is", with the permission to use, copy, modify, distribute + and sell it for any purpose without fee. + + Ludwig Schwardt + + + DSP Lab + Electrical & Electronic Engineering Department + University of Stellenbosch + South Africa diff -Nrcpad gcc-4.4.4/zlib/contrib/iostream3/TODO gcc-4.4.5/zlib/contrib/iostream3/TODO *** gcc-4.4.4/zlib/contrib/iostream3/TODO Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/iostream3/TODO Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,17 ---- + Possible upgrades to gzfilebuf: + + - The ability to do putback (e.g. putbackfail) + + - The ability to seek (zlib supports this, but could be slow/tricky) + + - Simultaneous read/write access (does it make sense?) + + - Support for ios_base::ate open mode + + - Locale support? + + - Check public interface to see which calls give problems + (due to dependence on library internals) + + - Override operator<<(ostream&, gzfilebuf*) to allow direct copying + of stream buffer to stream ( i.e. os << is.rdbuf(); ) diff -Nrcpad gcc-4.4.4/zlib/contrib/iostream3/test.cc gcc-4.4.5/zlib/contrib/iostream3/test.cc *** gcc-4.4.4/zlib/contrib/iostream3/test.cc Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/iostream3/test.cc Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,50 ---- + /* + * Test program for gzifstream and gzofstream + * + * by Ludwig Schwardt + * original version by Kevin Ruland + */ + + #include "zfstream.h" + #include // for cout + + int main() { + + gzofstream outf; + gzifstream inf; + char buf[80]; + + outf.open("test1.txt.gz"); + outf << "The quick brown fox sidestepped the lazy canine\n" + << 1.3 << "\nPlan " << 9 << std::endl; + outf.close(); + std::cout << "Wrote the following message to 'test1.txt.gz' (check with zcat or zless):\n" + << "The quick brown fox sidestepped the lazy canine\n" + << 1.3 << "\nPlan " << 9 << std::endl; + + std::cout << "\nReading 'test1.txt.gz' (buffered) produces:\n"; + inf.open("test1.txt.gz"); + while (inf.getline(buf,80,'\n')) { + std::cout << buf << "\t(" << inf.rdbuf()->in_avail() << " chars left in buffer)\n"; + } + inf.close(); + + outf.rdbuf()->pubsetbuf(0,0); + outf.open("test2.txt.gz"); + outf << setcompression(Z_NO_COMPRESSION) + << "The quick brown fox sidestepped the lazy canine\n" + << 1.3 << "\nPlan " << 9 << std::endl; + outf.close(); + std::cout << "\nWrote the same message to 'test2.txt.gz' in uncompressed form"; + + std::cout << "\nReading 'test2.txt.gz' (unbuffered) produces:\n"; + inf.rdbuf()->pubsetbuf(0,0); + inf.open("test2.txt.gz"); + while (inf.getline(buf,80,'\n')) { + std::cout << buf << "\t(" << inf.rdbuf()->in_avail() << " chars left in buffer)\n"; + } + inf.close(); + + return 0; + + } diff -Nrcpad gcc-4.4.4/zlib/contrib/iostream3/zfstream.cc gcc-4.4.5/zlib/contrib/iostream3/zfstream.cc *** gcc-4.4.4/zlib/contrib/iostream3/zfstream.cc Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/iostream3/zfstream.cc Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,479 ---- + /* + * A C++ I/O streams interface to the zlib gz* functions + * + * by Ludwig Schwardt + * original version by Kevin Ruland + * + * This version is standard-compliant and compatible with gcc 3.x. + */ + + #include "zfstream.h" + #include // for strcpy, strcat, strlen (mode strings) + #include // for BUFSIZ + + // Internal buffer sizes (default and "unbuffered" versions) + #define BIGBUFSIZE BUFSIZ + #define SMALLBUFSIZE 1 + + /*****************************************************************************/ + + // Default constructor + gzfilebuf::gzfilebuf() + : file(NULL), io_mode(std::ios_base::openmode(0)), own_fd(false), + buffer(NULL), buffer_size(BIGBUFSIZE), own_buffer(true) + { + // No buffers to start with + this->disable_buffer(); + } + + // Destructor + gzfilebuf::~gzfilebuf() + { + // Sync output buffer and close only if responsible for file + // (i.e. attached streams should be left open at this stage) + this->sync(); + if (own_fd) + this->close(); + // Make sure internal buffer is deallocated + this->disable_buffer(); + } + + // Set compression level and strategy + int + gzfilebuf::setcompression(int comp_level, + int comp_strategy) + { + return gzsetparams(file, comp_level, comp_strategy); + } + + // Open gzipped file + gzfilebuf* + gzfilebuf::open(const char *name, + std::ios_base::openmode mode) + { + // Fail if file already open + if (this->is_open()) + return NULL; + // Don't support simultaneous read/write access (yet) + if ((mode & std::ios_base::in) && (mode & std::ios_base::out)) + return NULL; + + // Build mode string for gzopen and check it [27.8.1.3.2] + char char_mode[6] = "\0\0\0\0\0"; + if (!this->open_mode(mode, char_mode)) + return NULL; + + // Attempt to open file + if ((file = gzopen(name, char_mode)) == NULL) + return NULL; + + // On success, allocate internal buffer and set flags + this->enable_buffer(); + io_mode = mode; + own_fd = true; + return this; + } + + // Attach to gzipped file + gzfilebuf* + gzfilebuf::attach(int fd, + std::ios_base::openmode mode) + { + // Fail if file already open + if (this->is_open()) + return NULL; + // Don't support simultaneous read/write access (yet) + if ((mode & std::ios_base::in) && (mode & std::ios_base::out)) + return NULL; + + // Build mode string for gzdopen and check it [27.8.1.3.2] + char char_mode[6] = "\0\0\0\0\0"; + if (!this->open_mode(mode, char_mode)) + return NULL; + + // Attempt to attach to file + if ((file = gzdopen(fd, char_mode)) == NULL) + return NULL; + + // On success, allocate internal buffer and set flags + this->enable_buffer(); + io_mode = mode; + own_fd = false; + return this; + } + + // Close gzipped file + gzfilebuf* + gzfilebuf::close() + { + // Fail immediately if no file is open + if (!this->is_open()) + return NULL; + // Assume success + gzfilebuf* retval = this; + // Attempt to sync and close gzipped file + if (this->sync() == -1) + retval = NULL; + if (gzclose(file) < 0) + retval = NULL; + // File is now gone anyway (postcondition [27.8.1.3.8]) + file = NULL; + own_fd = false; + // Destroy internal buffer if it exists + this->disable_buffer(); + return retval; + } + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + // Convert int open mode to mode string + bool + gzfilebuf::open_mode(std::ios_base::openmode mode, + char* c_mode) const + { + bool testb = mode & std::ios_base::binary; + bool testi = mode & std::ios_base::in; + bool testo = mode & std::ios_base::out; + bool testt = mode & std::ios_base::trunc; + bool testa = mode & std::ios_base::app; + + // Check for valid flag combinations - see [27.8.1.3.2] (Table 92) + // Original zfstream hardcoded the compression level to maximum here... + // Double the time for less than 1% size improvement seems + // excessive though - keeping it at the default level + // To change back, just append "9" to the next three mode strings + if (!testi && testo && !testt && !testa) + strcpy(c_mode, "w"); + if (!testi && testo && !testt && testa) + strcpy(c_mode, "a"); + if (!testi && testo && testt && !testa) + strcpy(c_mode, "w"); + if (testi && !testo && !testt && !testa) + strcpy(c_mode, "r"); + // No read/write mode yet + // if (testi && testo && !testt && !testa) + // strcpy(c_mode, "r+"); + // if (testi && testo && testt && !testa) + // strcpy(c_mode, "w+"); + + // Mode string should be empty for invalid combination of flags + if (strlen(c_mode) == 0) + return false; + if (testb) + strcat(c_mode, "b"); + return true; + } + + // Determine number of characters in internal get buffer + std::streamsize + gzfilebuf::showmanyc() + { + // Calls to underflow will fail if file not opened for reading + if (!this->is_open() || !(io_mode & std::ios_base::in)) + return -1; + // Make sure get area is in use + if (this->gptr() && (this->gptr() < this->egptr())) + return std::streamsize(this->egptr() - this->gptr()); + else + return 0; + } + + // Fill get area from gzipped file + gzfilebuf::int_type + gzfilebuf::underflow() + { + // If something is left in the get area by chance, return it + // (this shouldn't normally happen, as underflow is only supposed + // to be called when gptr >= egptr, but it serves as error check) + if (this->gptr() && (this->gptr() < this->egptr())) + return traits_type::to_int_type(*(this->gptr())); + + // If the file hasn't been opened for reading, produce error + if (!this->is_open() || !(io_mode & std::ios_base::in)) + return traits_type::eof(); + + // Attempt to fill internal buffer from gzipped file + // (buffer must be guaranteed to exist...) + int bytes_read = gzread(file, buffer, buffer_size); + // Indicates error or EOF + if (bytes_read <= 0) + { + // Reset get area + this->setg(buffer, buffer, buffer); + return traits_type::eof(); + } + // Make all bytes read from file available as get area + this->setg(buffer, buffer, buffer + bytes_read); + + // Return next character in get area + return traits_type::to_int_type(*(this->gptr())); + } + + // Write put area to gzipped file + gzfilebuf::int_type + gzfilebuf::overflow(int_type c) + { + // Determine whether put area is in use + if (this->pbase()) + { + // Double-check pointer range + if (this->pptr() > this->epptr() || this->pptr() < this->pbase()) + return traits_type::eof(); + // Add extra character to buffer if not EOF + if (!traits_type::eq_int_type(c, traits_type::eof())) + { + *(this->pptr()) = traits_type::to_char_type(c); + this->pbump(1); + } + // Number of characters to write to file + int bytes_to_write = this->pptr() - this->pbase(); + // Overflow doesn't fail if nothing is to be written + if (bytes_to_write > 0) + { + // If the file hasn't been opened for writing, produce error + if (!this->is_open() || !(io_mode & std::ios_base::out)) + return traits_type::eof(); + // If gzipped file won't accept all bytes written to it, fail + if (gzwrite(file, this->pbase(), bytes_to_write) != bytes_to_write) + return traits_type::eof(); + // Reset next pointer to point to pbase on success + this->pbump(-bytes_to_write); + } + } + // Write extra character to file if not EOF + else if (!traits_type::eq_int_type(c, traits_type::eof())) + { + // If the file hasn't been opened for writing, produce error + if (!this->is_open() || !(io_mode & std::ios_base::out)) + return traits_type::eof(); + // Impromptu char buffer (allows "unbuffered" output) + char_type last_char = traits_type::to_char_type(c); + // If gzipped file won't accept this character, fail + if (gzwrite(file, &last_char, 1) != 1) + return traits_type::eof(); + } + + // If you got here, you have succeeded (even if c was EOF) + // The return value should therefore be non-EOF + if (traits_type::eq_int_type(c, traits_type::eof())) + return traits_type::not_eof(c); + else + return c; + } + + // Assign new buffer + std::streambuf* + gzfilebuf::setbuf(char_type* p, + std::streamsize n) + { + // First make sure stuff is sync'ed, for safety + if (this->sync() == -1) + return NULL; + // If buffering is turned off on purpose via setbuf(0,0), still allocate one... + // "Unbuffered" only really refers to put [27.8.1.4.10], while get needs at + // least a buffer of size 1 (very inefficient though, therefore make it bigger?) + // This follows from [27.5.2.4.3]/12 (gptr needs to point at something, it seems) + if (!p || !n) + { + // Replace existing buffer (if any) with small internal buffer + this->disable_buffer(); + buffer = NULL; + buffer_size = 0; + own_buffer = true; + this->enable_buffer(); + } + else + { + // Replace existing buffer (if any) with external buffer + this->disable_buffer(); + buffer = p; + buffer_size = n; + own_buffer = false; + this->enable_buffer(); + } + return this; + } + + // Write put area to gzipped file (i.e. ensures that put area is empty) + int + gzfilebuf::sync() + { + return traits_type::eq_int_type(this->overflow(), traits_type::eof()) ? -1 : 0; + } + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + // Allocate internal buffer + void + gzfilebuf::enable_buffer() + { + // If internal buffer required, allocate one + if (own_buffer && !buffer) + { + // Check for buffered vs. "unbuffered" + if (buffer_size > 0) + { + // Allocate internal buffer + buffer = new char_type[buffer_size]; + // Get area starts empty and will be expanded by underflow as need arises + this->setg(buffer, buffer, buffer); + // Setup entire internal buffer as put area. + // The one-past-end pointer actually points to the last element of the buffer, + // so that overflow(c) can safely add the extra character c to the sequence. + // These pointers remain in place for the duration of the buffer + this->setp(buffer, buffer + buffer_size - 1); + } + else + { + // Even in "unbuffered" case, (small?) get buffer is still required + buffer_size = SMALLBUFSIZE; + buffer = new char_type[buffer_size]; + this->setg(buffer, buffer, buffer); + // "Unbuffered" means no put buffer + this->setp(0, 0); + } + } + else + { + // If buffer already allocated, reset buffer pointers just to make sure no + // stale chars are lying around + this->setg(buffer, buffer, buffer); + this->setp(buffer, buffer + buffer_size - 1); + } + } + + // Destroy internal buffer + void + gzfilebuf::disable_buffer() + { + // If internal buffer exists, deallocate it + if (own_buffer && buffer) + { + // Preserve unbuffered status by zeroing size + if (!this->pbase()) + buffer_size = 0; + delete[] buffer; + buffer = NULL; + this->setg(0, 0, 0); + this->setp(0, 0); + } + else + { + // Reset buffer pointers to initial state if external buffer exists + this->setg(buffer, buffer, buffer); + if (buffer) + this->setp(buffer, buffer + buffer_size - 1); + else + this->setp(0, 0); + } + } + + /*****************************************************************************/ + + // Default constructor initializes stream buffer + gzifstream::gzifstream() + : std::istream(NULL), sb() + { this->init(&sb); } + + // Initialize stream buffer and open file + gzifstream::gzifstream(const char* name, + std::ios_base::openmode mode) + : std::istream(NULL), sb() + { + this->init(&sb); + this->open(name, mode); + } + + // Initialize stream buffer and attach to file + gzifstream::gzifstream(int fd, + std::ios_base::openmode mode) + : std::istream(NULL), sb() + { + this->init(&sb); + this->attach(fd, mode); + } + + // Open file and go into fail() state if unsuccessful + void + gzifstream::open(const char* name, + std::ios_base::openmode mode) + { + if (!sb.open(name, mode | std::ios_base::in)) + this->setstate(std::ios_base::failbit); + else + this->clear(); + } + + // Attach to file and go into fail() state if unsuccessful + void + gzifstream::attach(int fd, + std::ios_base::openmode mode) + { + if (!sb.attach(fd, mode | std::ios_base::in)) + this->setstate(std::ios_base::failbit); + else + this->clear(); + } + + // Close file + void + gzifstream::close() + { + if (!sb.close()) + this->setstate(std::ios_base::failbit); + } + + /*****************************************************************************/ + + // Default constructor initializes stream buffer + gzofstream::gzofstream() + : std::ostream(NULL), sb() + { this->init(&sb); } + + // Initialize stream buffer and open file + gzofstream::gzofstream(const char* name, + std::ios_base::openmode mode) + : std::ostream(NULL), sb() + { + this->init(&sb); + this->open(name, mode); + } + + // Initialize stream buffer and attach to file + gzofstream::gzofstream(int fd, + std::ios_base::openmode mode) + : std::ostream(NULL), sb() + { + this->init(&sb); + this->attach(fd, mode); + } + + // Open file and go into fail() state if unsuccessful + void + gzofstream::open(const char* name, + std::ios_base::openmode mode) + { + if (!sb.open(name, mode | std::ios_base::out)) + this->setstate(std::ios_base::failbit); + else + this->clear(); + } + + // Attach to file and go into fail() state if unsuccessful + void + gzofstream::attach(int fd, + std::ios_base::openmode mode) + { + if (!sb.attach(fd, mode | std::ios_base::out)) + this->setstate(std::ios_base::failbit); + else + this->clear(); + } + + // Close file + void + gzofstream::close() + { + if (!sb.close()) + this->setstate(std::ios_base::failbit); + } diff -Nrcpad gcc-4.4.4/zlib/contrib/iostream3/zfstream.h gcc-4.4.5/zlib/contrib/iostream3/zfstream.h *** gcc-4.4.4/zlib/contrib/iostream3/zfstream.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/iostream3/zfstream.h Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,466 ---- + /* + * A C++ I/O streams interface to the zlib gz* functions + * + * by Ludwig Schwardt + * original version by Kevin Ruland + * + * This version is standard-compliant and compatible with gcc 3.x. + */ + + #ifndef ZFSTREAM_H + #define ZFSTREAM_H + + #include // not iostream, since we don't need cin/cout + #include + #include "zlib.h" + + /*****************************************************************************/ + + /** + * @brief Gzipped file stream buffer class. + * + * This class implements basic_filebuf for gzipped files. It doesn't yet support + * seeking (allowed by zlib but slow/limited), putback and read/write access + * (tricky). Otherwise, it attempts to be a drop-in replacement for the standard + * file streambuf. + */ + class gzfilebuf : public std::streambuf + { + public: + // Default constructor. + gzfilebuf(); + + // Destructor. + virtual + ~gzfilebuf(); + + /** + * @brief Set compression level and strategy on the fly. + * @param comp_level Compression level (see zlib.h for allowed values) + * @param comp_strategy Compression strategy (see zlib.h for allowed values) + * @return Z_OK on success, Z_STREAM_ERROR otherwise. + * + * Unfortunately, these parameters cannot be modified separately, as the + * previous zfstream version assumed. Since the strategy is seldom changed, + * it can default and setcompression(level) then becomes like the old + * setcompressionlevel(level). + */ + int + setcompression(int comp_level, + int comp_strategy = Z_DEFAULT_STRATEGY); + + /** + * @brief Check if file is open. + * @return True if file is open. + */ + bool + is_open() const { return (file != NULL); } + + /** + * @brief Open gzipped file. + * @param name File name. + * @param mode Open mode flags. + * @return @c this on success, NULL on failure. + */ + gzfilebuf* + open(const char* name, + std::ios_base::openmode mode); + + /** + * @brief Attach to already open gzipped file. + * @param fd File descriptor. + * @param mode Open mode flags. + * @return @c this on success, NULL on failure. + */ + gzfilebuf* + attach(int fd, + std::ios_base::openmode mode); + + /** + * @brief Close gzipped file. + * @return @c this on success, NULL on failure. + */ + gzfilebuf* + close(); + + protected: + /** + * @brief Convert ios open mode int to mode string used by zlib. + * @return True if valid mode flag combination. + */ + bool + open_mode(std::ios_base::openmode mode, + char* c_mode) const; + + /** + * @brief Number of characters available in stream buffer. + * @return Number of characters. + * + * This indicates number of characters in get area of stream buffer. + * These characters can be read without accessing the gzipped file. + */ + virtual std::streamsize + showmanyc(); + + /** + * @brief Fill get area from gzipped file. + * @return First character in get area on success, EOF on error. + * + * This actually reads characters from gzipped file to stream + * buffer. Always buffered. + */ + virtual int_type + underflow(); + + /** + * @brief Write put area to gzipped file. + * @param c Extra character to add to buffer contents. + * @return Non-EOF on success, EOF on error. + * + * This actually writes characters in stream buffer to + * gzipped file. With unbuffered output this is done one + * character at a time. + */ + virtual int_type + overflow(int_type c = traits_type::eof()); + + /** + * @brief Installs external stream buffer. + * @param p Pointer to char buffer. + * @param n Size of external buffer. + * @return @c this on success, NULL on failure. + * + * Call setbuf(0,0) to enable unbuffered output. + */ + virtual std::streambuf* + setbuf(char_type* p, + std::streamsize n); + + /** + * @brief Flush stream buffer to file. + * @return 0 on success, -1 on error. + * + * This calls underflow(EOF) to do the job. + */ + virtual int + sync(); + + // + // Some future enhancements + // + // virtual int_type uflow(); + // virtual int_type pbackfail(int_type c = traits_type::eof()); + // virtual pos_type + // seekoff(off_type off, + // std::ios_base::seekdir way, + // std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out); + // virtual pos_type + // seekpos(pos_type sp, + // std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out); + + private: + /** + * @brief Allocate internal buffer. + * + * This function is safe to call multiple times. It will ensure + * that a proper internal buffer exists if it is required. If the + * buffer already exists or is external, the buffer pointers will be + * reset to their original state. + */ + void + enable_buffer(); + + /** + * @brief Destroy internal buffer. + * + * This function is safe to call multiple times. It will ensure + * that the internal buffer is deallocated if it exists. In any + * case, it will also reset the buffer pointers. + */ + void + disable_buffer(); + + /** + * Underlying file pointer. + */ + gzFile file; + + /** + * Mode in which file was opened. + */ + std::ios_base::openmode io_mode; + + /** + * @brief True if this object owns file descriptor. + * + * This makes the class responsible for closing the file + * upon destruction. + */ + bool own_fd; + + /** + * @brief Stream buffer. + * + * For simplicity this remains allocated on the free store for the + * entire life span of the gzfilebuf object, unless replaced by setbuf. + */ + char_type* buffer; + + /** + * @brief Stream buffer size. + * + * Defaults to system default buffer size (typically 8192 bytes). + * Modified by setbuf. + */ + std::streamsize buffer_size; + + /** + * @brief True if this object owns stream buffer. + * + * This makes the class responsible for deleting the buffer + * upon destruction. + */ + bool own_buffer; + }; + + /*****************************************************************************/ + + /** + * @brief Gzipped file input stream class. + * + * This class implements ifstream for gzipped files. Seeking and putback + * is not supported yet. + */ + class gzifstream : public std::istream + { + public: + // Default constructor + gzifstream(); + + /** + * @brief Construct stream on gzipped file to be opened. + * @param name File name. + * @param mode Open mode flags (forced to contain ios::in). + */ + explicit + gzifstream(const char* name, + std::ios_base::openmode mode = std::ios_base::in); + + /** + * @brief Construct stream on already open gzipped file. + * @param fd File descriptor. + * @param mode Open mode flags (forced to contain ios::in). + */ + explicit + gzifstream(int fd, + std::ios_base::openmode mode = std::ios_base::in); + + /** + * Obtain underlying stream buffer. + */ + gzfilebuf* + rdbuf() const + { return const_cast(&sb); } + + /** + * @brief Check if file is open. + * @return True if file is open. + */ + bool + is_open() { return sb.is_open(); } + + /** + * @brief Open gzipped file. + * @param name File name. + * @param mode Open mode flags (forced to contain ios::in). + * + * Stream will be in state good() if file opens successfully; + * otherwise in state fail(). This differs from the behavior of + * ifstream, which never sets the state to good() and therefore + * won't allow you to reuse the stream for a second file unless + * you manually clear() the state. The choice is a matter of + * convenience. + */ + void + open(const char* name, + std::ios_base::openmode mode = std::ios_base::in); + + /** + * @brief Attach to already open gzipped file. + * @param fd File descriptor. + * @param mode Open mode flags (forced to contain ios::in). + * + * Stream will be in state good() if attach succeeded; otherwise + * in state fail(). + */ + void + attach(int fd, + std::ios_base::openmode mode = std::ios_base::in); + + /** + * @brief Close gzipped file. + * + * Stream will be in state fail() if close failed. + */ + void + close(); + + private: + /** + * Underlying stream buffer. + */ + gzfilebuf sb; + }; + + /*****************************************************************************/ + + /** + * @brief Gzipped file output stream class. + * + * This class implements ofstream for gzipped files. Seeking and putback + * is not supported yet. + */ + class gzofstream : public std::ostream + { + public: + // Default constructor + gzofstream(); + + /** + * @brief Construct stream on gzipped file to be opened. + * @param name File name. + * @param mode Open mode flags (forced to contain ios::out). + */ + explicit + gzofstream(const char* name, + std::ios_base::openmode mode = std::ios_base::out); + + /** + * @brief Construct stream on already open gzipped file. + * @param fd File descriptor. + * @param mode Open mode flags (forced to contain ios::out). + */ + explicit + gzofstream(int fd, + std::ios_base::openmode mode = std::ios_base::out); + + /** + * Obtain underlying stream buffer. + */ + gzfilebuf* + rdbuf() const + { return const_cast(&sb); } + + /** + * @brief Check if file is open. + * @return True if file is open. + */ + bool + is_open() { return sb.is_open(); } + + /** + * @brief Open gzipped file. + * @param name File name. + * @param mode Open mode flags (forced to contain ios::out). + * + * Stream will be in state good() if file opens successfully; + * otherwise in state fail(). This differs from the behavior of + * ofstream, which never sets the state to good() and therefore + * won't allow you to reuse the stream for a second file unless + * you manually clear() the state. The choice is a matter of + * convenience. + */ + void + open(const char* name, + std::ios_base::openmode mode = std::ios_base::out); + + /** + * @brief Attach to already open gzipped file. + * @param fd File descriptor. + * @param mode Open mode flags (forced to contain ios::out). + * + * Stream will be in state good() if attach succeeded; otherwise + * in state fail(). + */ + void + attach(int fd, + std::ios_base::openmode mode = std::ios_base::out); + + /** + * @brief Close gzipped file. + * + * Stream will be in state fail() if close failed. + */ + void + close(); + + private: + /** + * Underlying stream buffer. + */ + gzfilebuf sb; + }; + + /*****************************************************************************/ + + /** + * @brief Gzipped file output stream manipulator class. + * + * This class defines a two-argument manipulator for gzofstream. It is used + * as base for the setcompression(int,int) manipulator. + */ + template + class gzomanip2 + { + public: + // Allows insertor to peek at internals + template + friend gzofstream& + operator<<(gzofstream&, + const gzomanip2&); + + // Constructor + gzomanip2(gzofstream& (*f)(gzofstream&, T1, T2), + T1 v1, + T2 v2); + private: + // Underlying manipulator function + gzofstream& + (*func)(gzofstream&, T1, T2); + + // Arguments for manipulator function + T1 val1; + T2 val2; + }; + + /*****************************************************************************/ + + // Manipulator function thunks through to stream buffer + inline gzofstream& + setcompression(gzofstream &gzs, int l, int s = Z_DEFAULT_STRATEGY) + { + (gzs.rdbuf())->setcompression(l, s); + return gzs; + } + + // Manipulator constructor stores arguments + template + inline + gzomanip2::gzomanip2(gzofstream &(*f)(gzofstream &, T1, T2), + T1 v1, + T2 v2) + : func(f), val1(v1), val2(v2) + { } + + // Insertor applies underlying manipulator function to stream + template + inline gzofstream& + operator<<(gzofstream& s, const gzomanip2& m) + { return (*m.func)(s, m.val1, m.val2); } + + // Insert this onto stream to simplify setting of compression level + inline gzomanip2 + setcompression(int l, int s = Z_DEFAULT_STRATEGY) + { return gzomanip2(&setcompression, l, s); } + + #endif // ZFSTREAM_H diff -Nrcpad gcc-4.4.4/zlib/contrib/masm686/match.asm gcc-4.4.5/zlib/contrib/masm686/match.asm *** gcc-4.4.4/zlib/contrib/masm686/match.asm Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masm686/match.asm Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,413 ---- + + ; match.asm -- Pentium-Pro optimized version of longest_match() + ; + ; Updated for zlib 1.1.3 and converted to MASM 6.1x + ; Copyright (C) 2000 Dan Higdon + ; and Chuck Walbourn + ; Corrections by Cosmin Truta + ; + ; This is free software; you can redistribute it and/or modify it + ; under the terms of the GNU General Public License. + + ; Based on match.S + ; Written for zlib 1.1.2 + ; Copyright (C) 1998 Brian Raiter + ; + ; Modified by Gilles Vollant (2005) for add gzhead and gzindex + + .686P + .MODEL FLAT + + ;=========================================================================== + ; EQUATES + ;=========================================================================== + + MAX_MATCH EQU 258 + MIN_MATCH EQU 3 + MIN_LOOKAHEAD EQU (MAX_MATCH + MIN_MATCH + 1) + MAX_MATCH_8 EQU ((MAX_MATCH + 7) AND (NOT 7)) + + ;=========================================================================== + ; STRUCTURES + ;=========================================================================== + + ; This STRUCT assumes a 4-byte alignment + + DEFLATE_STATE STRUCT + ds_strm dd ? + ds_status dd ? + ds_pending_buf dd ? + ds_pending_buf_size dd ? + ds_pending_out dd ? + ds_pending dd ? + ds_wrap dd ? + ; gzhead and gzindex are added in zlib 1.2.2.2 (see deflate.h) + ds_gzhead dd ? + ds_gzindex dd ? + ds_data_type db ? + ds_method db ? + db ? ; padding + db ? ; padding + ds_last_flush dd ? + ds_w_size dd ? ; used + ds_w_bits dd ? + ds_w_mask dd ? ; used + ds_window dd ? ; used + ds_window_size dd ? + ds_prev dd ? ; used + ds_head dd ? + ds_ins_h dd ? + ds_hash_size dd ? + ds_hash_bits dd ? + ds_hash_mask dd ? + ds_hash_shift dd ? + ds_block_start dd ? + ds_match_length dd ? ; used + ds_prev_match dd ? ; used + ds_match_available dd ? + ds_strstart dd ? ; used + ds_match_start dd ? ; used + ds_lookahead dd ? ; used + ds_prev_length dd ? ; used + ds_max_chain_length dd ? ; used + ds_max_laxy_match dd ? + ds_level dd ? + ds_strategy dd ? + ds_good_match dd ? ; used + ds_nice_match dd ? ; used + + ; Don't need anymore of the struct for match + DEFLATE_STATE ENDS + + ;=========================================================================== + ; CODE + ;=========================================================================== + _TEXT SEGMENT + + ;--------------------------------------------------------------------------- + ; match_init + ;--------------------------------------------------------------------------- + ALIGN 4 + PUBLIC _match_init + _match_init PROC + ; no initialization needed + ret + _match_init ENDP + + ;--------------------------------------------------------------------------- + ; uInt longest_match(deflate_state *deflatestate, IPos curmatch) + ;--------------------------------------------------------------------------- + ALIGN 4 + + PUBLIC _longest_match + _longest_match PROC + + ; Since this code uses EBP for a scratch register, the stack frame must + ; be manually constructed and referenced relative to the ESP register. + + ; Stack image + ; Variables + chainlenwmask = 0 ; high word: current chain len + ; low word: s->wmask + window = 4 ; local copy of s->window + windowbestlen = 8 ; s->window + bestlen + scanend = 12 ; last two bytes of string + scanstart = 16 ; first two bytes of string + scanalign = 20 ; dword-misalignment of string + nicematch = 24 ; a good enough match size + bestlen = 28 ; size of best match so far + scan = 32 ; ptr to string wanting match + varsize = 36 ; number of bytes (also offset to last saved register) + + ; Saved Registers (actually pushed into place) + ebx_save = 36 + edi_save = 40 + esi_save = 44 + ebp_save = 48 + + ; Parameters + retaddr = 52 + deflatestate = 56 + curmatch = 60 + + ; Save registers that the compiler may be using + push ebp + push edi + push esi + push ebx + + ; Allocate local variable space + sub esp,varsize + + ; Retrieve the function arguments. ecx will hold cur_match + ; throughout the entire function. edx will hold the pointer to the + ; deflate_state structure during the function's setup (before + ; entering the main loop). + + mov edx, [esp+deflatestate] + ASSUME edx:PTR DEFLATE_STATE + + mov ecx, [esp+curmatch] + + ; uInt wmask = s->w_mask; + ; unsigned chain_length = s->max_chain_length; + ; if (s->prev_length >= s->good_match) { + ; chain_length >>= 2; + ; } + + mov eax, [edx].ds_prev_length + mov ebx, [edx].ds_good_match + cmp eax, ebx + mov eax, [edx].ds_w_mask + mov ebx, [edx].ds_max_chain_length + jl SHORT LastMatchGood + shr ebx, 2 + LastMatchGood: + + ; chainlen is decremented once beforehand so that the function can + ; use the sign flag instead of the zero flag for the exit test. + ; It is then shifted into the high word, to make room for the wmask + ; value, which it will always accompany. + + dec ebx + shl ebx, 16 + or ebx, eax + mov [esp+chainlenwmask], ebx + + ; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; + + mov eax, [edx].ds_nice_match + mov ebx, [edx].ds_lookahead + cmp ebx, eax + jl SHORT LookaheadLess + mov ebx, eax + LookaheadLess: + mov [esp+nicematch], ebx + + ;/* register Bytef *scan = s->window + s->strstart; */ + + mov esi, [edx].ds_window + mov [esp+window], esi + mov ebp, [edx].ds_strstart + lea edi, [esi+ebp] + mov [esp+scan],edi + + ;/* Determine how many bytes the scan ptr is off from being */ + ;/* dword-aligned. */ + + mov eax, edi + neg eax + and eax, 3 + mov [esp+scanalign], eax + + ;/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ? */ + ;/* s->strstart - (IPos)MAX_DIST(s) : NIL; */ + + mov eax, [edx].ds_w_size + sub eax, MIN_LOOKAHEAD + sub ebp, eax + jg SHORT LimitPositive + xor ebp, ebp + LimitPositive: + + ;/* int best_len = s->prev_length; */ + + mov eax, [edx].ds_prev_length + mov [esp+bestlen], eax + + ;/* Store the sum of s->window + best_len in %esi locally, and in %esi. */ + + add esi, eax + mov [esp+windowbestlen], esi + + ;/* register ush scan_start = *(ushf*)scan; */ + ;/* register ush scan_end = *(ushf*)(scan+best_len-1); */ + ;/* Posf *prev = s->prev; */ + + movzx ebx, WORD PTR[edi] + mov [esp+scanstart], ebx + movzx ebx, WORD PTR[eax+edi-1] + mov [esp+scanend], ebx + mov edi, [edx].ds_prev + + ;/* Jump into the main loop. */ + + mov edx, [esp+chainlenwmask] + jmp SHORT LoopEntry + + ;/* do { + ; * match = s->window + cur_match; + ; * if (*(ushf*)(match+best_len-1) != scan_end || + ; * *(ushf*)match != scan_start) continue; + ; * [...] + ; * } while ((cur_match = prev[cur_match & wmask]) > limit + ; * && --chain_length != 0); + ; * + ; * Here is the inner loop of the function. The function will spend the + ; * majority of its time in this loop, and majority of that time will + ; * be spent in the first ten instructions. + ; * + ; * Within this loop: + ; * %ebx = scanend + ; * %ecx = curmatch + ; * %edx = chainlenwmask - i.e., ((chainlen << 16) | wmask) + ; * %esi = windowbestlen - i.e., (window + bestlen) + ; * %edi = prev + ; * %ebp = limit + ; */ + + ALIGN 4 + LookupLoop: + and ecx, edx + movzx ecx, WORD PTR[edi+ecx*2] + cmp ecx, ebp + jbe LeaveNow + sub edx, 000010000H + js LeaveNow + + LoopEntry: + movzx eax, WORD PTR[esi+ecx-1] + cmp eax, ebx + jnz SHORT LookupLoop + + mov eax, [esp+window] + movzx eax, WORD PTR[eax+ecx] + cmp eax, [esp+scanstart] + jnz SHORT LookupLoop + + ;/* Store the current value of chainlen. */ + + mov [esp+chainlenwmask], edx + + ;/* Point %edi to the string under scrutiny, and %esi to the string we */ + ;/* are hoping to match it up with. In actuality, %esi and %edi are */ + ;/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is */ + ;/* initialized to -(MAX_MATCH_8 - scanalign). */ + + mov esi, [esp+window] + mov edi, [esp+scan] + add esi, ecx + mov eax, [esp+scanalign] + mov edx, -MAX_MATCH_8 + lea edi, [edi+eax+MAX_MATCH_8] + lea esi, [esi+eax+MAX_MATCH_8] + + ;/* Test the strings for equality, 8 bytes at a time. At the end, + ; * adjust %edx so that it is offset to the exact byte that mismatched. + ; * + ; * We already know at this point that the first three bytes of the + ; * strings match each other, and they can be safely passed over before + ; * starting the compare loop. So what this code does is skip over 0-3 + ; * bytes, as much as necessary in order to dword-align the %edi + ; * pointer. (%esi will still be misaligned three times out of four.) + ; * + ; * It should be confessed that this loop usually does not represent + ; * much of the total running time. Replacing it with a more + ; * straightforward "rep cmpsb" would not drastically degrade + ; * performance. + ; */ + + LoopCmps: + mov eax, DWORD PTR[esi+edx] + xor eax, DWORD PTR[edi+edx] + jnz SHORT LeaveLoopCmps + + mov eax, DWORD PTR[esi+edx+4] + xor eax, DWORD PTR[edi+edx+4] + jnz SHORT LeaveLoopCmps4 + + add edx, 8 + jnz SHORT LoopCmps + jmp LenMaximum + ALIGN 4 + + LeaveLoopCmps4: + add edx, 4 + + LeaveLoopCmps: + test eax, 00000FFFFH + jnz SHORT LenLower + + add edx, 2 + shr eax, 16 + + LenLower: + sub al, 1 + adc edx, 0 + + ;/* Calculate the length of the match. If it is longer than MAX_MATCH, */ + ;/* then automatically accept it as the best possible match and leave. */ + + lea eax, [edi+edx] + mov edi, [esp+scan] + sub eax, edi + cmp eax, MAX_MATCH + jge SHORT LenMaximum + + ;/* If the length of the match is not longer than the best match we */ + ;/* have so far, then forget it and return to the lookup loop. */ + + mov edx, [esp+deflatestate] + mov ebx, [esp+bestlen] + cmp eax, ebx + jg SHORT LongerMatch + mov esi, [esp+windowbestlen] + mov edi, [edx].ds_prev + mov ebx, [esp+scanend] + mov edx, [esp+chainlenwmask] + jmp LookupLoop + ALIGN 4 + + ;/* s->match_start = cur_match; */ + ;/* best_len = len; */ + ;/* if (len >= nice_match) break; */ + ;/* scan_end = *(ushf*)(scan+best_len-1); */ + + LongerMatch: + mov ebx, [esp+nicematch] + mov [esp+bestlen], eax + mov [edx].ds_match_start, ecx + cmp eax, ebx + jge SHORT LeaveNow + mov esi, [esp+window] + add esi, eax + mov [esp+windowbestlen], esi + movzx ebx, WORD PTR[edi+eax-1] + mov edi, [edx].ds_prev + mov [esp+scanend], ebx + mov edx, [esp+chainlenwmask] + jmp LookupLoop + ALIGN 4 + + ;/* Accept the current string, with the maximum possible length. */ + + LenMaximum: + mov edx, [esp+deflatestate] + mov DWORD PTR[esp+bestlen], MAX_MATCH + mov [edx].ds_match_start, ecx + + ;/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len; */ + ;/* return s->lookahead; */ + + LeaveNow: + mov edx, [esp+deflatestate] + mov ebx, [esp+bestlen] + mov eax, [edx].ds_lookahead + cmp ebx, eax + jg SHORT LookaheadRet + mov eax, ebx + LookaheadRet: + + ; Restore the stack and return from whence we came. + + add esp, varsize + pop ebx + pop esi + pop edi + pop ebp + ret + + _longest_match ENDP + + _TEXT ENDS + END diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx64/bld_ml64.bat gcc-4.4.5/zlib/contrib/masmx64/bld_ml64.bat *** gcc-4.4.4/zlib/contrib/masmx64/bld_ml64.bat Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx64/bld_ml64.bat Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,2 ---- + ml64.exe /Flinffasx64 /c /Zi inffasx64.asm + ml64.exe /Flgvmat64 /c /Zi gvmat64.asm diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx64/gvmat64.asm gcc-4.4.5/zlib/contrib/masmx64/gvmat64.asm *** gcc-4.4.4/zlib/contrib/masmx64/gvmat64.asm Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx64/gvmat64.asm Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,513 ---- + ;uInt longest_match_x64( + ; deflate_state *s, + ; IPos cur_match); /* current match */ + + ; gvmat64.asm -- Asm portion of the optimized longest_match for 32 bits x86 + ; Copyright (C) 1995-2005 Jean-loup Gailly, Brian Raiter and Gilles Vollant. + ; + ; File written by Gilles Vollant, by converting to assembly the longest_match + ; from Jean-loup Gailly in deflate.c of zLib and infoZip zip. + ; + ; and by taking inspiration on asm686 with masm, optimised assembly code + ; from Brian Raiter, written 1998 + ; + ; http://www.zlib.net + ; http://www.winimage.com/zLibDll + ; http://www.muppetlabs.com/~breadbox/software/assembly.html + ; + ; to compile this file for infozip Zip, I use option: + ; ml64.exe /Flgvmat64 /c /Zi /DINFOZIP gvmat64.asm + ; + ; to compile this file for zLib, I use option: + ; ml64.exe /Flgvmat64 /c /Zi gvmat64.asm + ; Be carrefull to adapt zlib1222add below to your version of zLib + ; (if you use a version of zLib before 1.0.4 or after 1.2.2.2, change + ; value of zlib1222add later) + ; + ; This file compile with Microsoft Macro Assembler (x64) for AMD64 + ; + ; ml64.exe is given with Visual Studio 2005 and Windows 2003 server DDK + ; + ; (you can get Windows 2003 server DDK with ml64 and cl for AMD64 from + ; http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price) + ; + + + ;uInt longest_match(s, cur_match) + ; deflate_state *s; + ; IPos cur_match; /* current match */ + .code + longest_match PROC + + + ;LocalVarsSize equ 88 + LocalVarsSize equ 72 + + ; register used : rax,rbx,rcx,rdx,rsi,rdi,r8,r9,r10,r11,r12 + ; free register : r14,r15 + ; register can be saved : rsp + + chainlenwmask equ rsp + 8 - LocalVarsSize ; high word: current chain len + ; low word: s->wmask + ;window equ rsp + xx - LocalVarsSize ; local copy of s->window ; stored in r10 + ;windowbestlen equ rsp + xx - LocalVarsSize ; s->window + bestlen , use r10+r11 + ;scanstart equ rsp + xx - LocalVarsSize ; first two bytes of string ; stored in r12w + ;scanend equ rsp + xx - LocalVarsSize ; last two bytes of string use ebx + ;scanalign equ rsp + xx - LocalVarsSize ; dword-misalignment of string r13 + ;bestlen equ rsp + xx - LocalVarsSize ; size of best match so far -> r11d + ;scan equ rsp + xx - LocalVarsSize ; ptr to string wanting match -> r9 + IFDEF INFOZIP + ELSE + nicematch equ (rsp + 16 - LocalVarsSize) ; a good enough match size + ENDIF + + save_rdi equ rsp + 24 - LocalVarsSize + save_rsi equ rsp + 32 - LocalVarsSize + save_rbx equ rsp + 40 - LocalVarsSize + save_rbp equ rsp + 48 - LocalVarsSize + save_r12 equ rsp + 56 - LocalVarsSize + save_r13 equ rsp + 64 - LocalVarsSize + ;save_r14 equ rsp + 72 - LocalVarsSize + ;save_r15 equ rsp + 80 - LocalVarsSize + + + + ; all the +4 offsets are due to the addition of pending_buf_size (in zlib + ; in the deflate_state structure since the asm code was first written + ; (if you compile with zlib 1.0.4 or older, remove the +4). + ; Note : these value are good with a 8 bytes boundary pack structure + + + MAX_MATCH equ 258 + MIN_MATCH equ 3 + MIN_LOOKAHEAD equ (MAX_MATCH+MIN_MATCH+1) + + + ;;; Offsets for fields in the deflate_state structure. These numbers + ;;; are calculated from the definition of deflate_state, with the + ;;; assumption that the compiler will dword-align the fields. (Thus, + ;;; changing the definition of deflate_state could easily cause this + ;;; program to crash horribly, without so much as a warning at + ;;; compile time. Sigh.) + + ; all the +zlib1222add offsets are due to the addition of fields + ; in zlib in the deflate_state structure since the asm code was first written + ; (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)"). + ; (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0"). + ; if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8"). + + + IFDEF INFOZIP + + _DATA SEGMENT + COMM window_size:DWORD + ; WMask ; 7fff + COMM window:BYTE:010040H + COMM prev:WORD:08000H + ; MatchLen : unused + ; PrevMatch : unused + COMM strstart:DWORD + COMM match_start:DWORD + ; Lookahead : ignore + COMM prev_length:DWORD ; PrevLen + COMM max_chain_length:DWORD + COMM good_match:DWORD + COMM nice_match:DWORD + prev_ad equ OFFSET prev + window_ad equ OFFSET window + nicematch equ nice_match + _DATA ENDS + WMask equ 07fffh + + ELSE + + IFNDEF zlib1222add + zlib1222add equ 8 + ENDIF + dsWSize equ 56+zlib1222add+(zlib1222add/2) + dsWMask equ 64+zlib1222add+(zlib1222add/2) + dsWindow equ 72+zlib1222add + dsPrev equ 88+zlib1222add + dsMatchLen equ 128+zlib1222add + dsPrevMatch equ 132+zlib1222add + dsStrStart equ 140+zlib1222add + dsMatchStart equ 144+zlib1222add + dsLookahead equ 148+zlib1222add + dsPrevLen equ 152+zlib1222add + dsMaxChainLen equ 156+zlib1222add + dsGoodMatch equ 172+zlib1222add + dsNiceMatch equ 176+zlib1222add + + window_size equ [ rcx + dsWSize] + WMask equ [ rcx + dsWMask] + window_ad equ [ rcx + dsWindow] + prev_ad equ [ rcx + dsPrev] + strstart equ [ rcx + dsStrStart] + match_start equ [ rcx + dsMatchStart] + Lookahead equ [ rcx + dsLookahead] ; 0ffffffffh on infozip + prev_length equ [ rcx + dsPrevLen] + max_chain_length equ [ rcx + dsMaxChainLen] + good_match equ [ rcx + dsGoodMatch] + nice_match equ [ rcx + dsNiceMatch] + ENDIF + + ; parameter 1 in r8(deflate state s), param 2 in rdx (cur match) + + ; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and + ; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp + ; + ; All registers must be preserved across the call, except for + ; rax, rcx, rdx, r8, r9, r10, and r11, which are scratch. + + + + ;;; Save registers that the compiler may be using, and adjust esp to + ;;; make room for our stack frame. + + + ;;; Retrieve the function arguments. r8d will hold cur_match + ;;; throughout the entire function. edx will hold the pointer to the + ;;; deflate_state structure during the function's setup (before + ;;; entering the main loop. + + ; parameter 1 in rcx (deflate_state* s), param 2 in edx -> r8 (cur match) + + ; this clear high 32 bits of r8, which can be garbage in both r8 and rdx + + mov [save_rdi],rdi + mov [save_rsi],rsi + mov [save_rbx],rbx + mov [save_rbp],rbp + IFDEF INFOZIP + mov r8d,ecx + ELSE + mov r8d,edx + ENDIF + mov [save_r12],r12 + mov [save_r13],r13 + ; mov [save_r14],r14 + ; mov [save_r15],r15 + + + ;;; uInt wmask = s->w_mask; + ;;; unsigned chain_length = s->max_chain_length; + ;;; if (s->prev_length >= s->good_match) { + ;;; chain_length >>= 2; + ;;; } + + mov edi, prev_length + mov esi, good_match + mov eax, WMask + mov ebx, max_chain_length + cmp edi, esi + jl LastMatchGood + shr ebx, 2 + LastMatchGood: + + ;;; chainlen is decremented once beforehand so that the function can + ;;; use the sign flag instead of the zero flag for the exit test. + ;;; It is then shifted into the high word, to make room for the wmask + ;;; value, which it will always accompany. + + dec ebx + shl ebx, 16 + or ebx, eax + + ;;; on zlib only + ;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; + + IFDEF INFOZIP + mov [chainlenwmask], ebx + ; on infozip nice_match = [nice_match] + ELSE + mov eax, nice_match + mov [chainlenwmask], ebx + mov r10d, Lookahead + cmp r10d, eax + cmovnl r10d, eax + mov [nicematch],r10d + ENDIF + + ;;; register Bytef *scan = s->window + s->strstart; + mov r10, window_ad + mov ebp, strstart + lea r13, [r10 + rbp] + + ;;; Determine how many bytes the scan ptr is off from being + ;;; dword-aligned. + + mov r9,r13 + neg r13 + and r13,3 + + ;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ? + ;;; s->strstart - (IPos)MAX_DIST(s) : NIL; + IFDEF INFOZIP + mov eax,07efah ; MAX_DIST = (WSIZE-MIN_LOOKAHEAD) (0x8000-(3+8+1)) + ELSE + mov eax, window_size + sub eax, MIN_LOOKAHEAD + ENDIF + xor edi,edi + sub ebp, eax + + mov r11d, prev_length + + cmovng ebp,edi + + ;;; int best_len = s->prev_length; + + + ;;; Store the sum of s->window + best_len in esi locally, and in esi. + + lea rsi,[r10+r11] + + ;;; register ush scan_start = *(ushf*)scan; + ;;; register ush scan_end = *(ushf*)(scan+best_len-1); + ;;; Posf *prev = s->prev; + + movzx r12d,word ptr [r9] + movzx ebx, word ptr [r9 + r11 - 1] + + mov rdi, prev_ad + + ;;; Jump into the main loop. + + mov edx, [chainlenwmask] + + cmp bx,word ptr [rsi + r8 - 1] + jz LookupLoopIsZero + + LookupLoop1: + and r8d, edx + + movzx r8d, word ptr [rdi + r8*2] + cmp r8d, ebp + jbe LeaveNow + sub edx, 00010000h + js LeaveNow + + LoopEntry1: + cmp bx,word ptr [rsi + r8 - 1] + jz LookupLoopIsZero + + LookupLoop2: + and r8d, edx + + movzx r8d, word ptr [rdi + r8*2] + cmp r8d, ebp + jbe LeaveNow + sub edx, 00010000h + js LeaveNow + + LoopEntry2: + cmp bx,word ptr [rsi + r8 - 1] + jz LookupLoopIsZero + + LookupLoop4: + and r8d, edx + + movzx r8d, word ptr [rdi + r8*2] + cmp r8d, ebp + jbe LeaveNow + sub edx, 00010000h + js LeaveNow + + LoopEntry4: + + cmp bx,word ptr [rsi + r8 - 1] + jnz LookupLoop1 + jmp LookupLoopIsZero + + + ;;; do { + ;;; match = s->window + cur_match; + ;;; if (*(ushf*)(match+best_len-1) != scan_end || + ;;; *(ushf*)match != scan_start) continue; + ;;; [...] + ;;; } while ((cur_match = prev[cur_match & wmask]) > limit + ;;; && --chain_length != 0); + ;;; + ;;; Here is the inner loop of the function. The function will spend the + ;;; majority of its time in this loop, and majority of that time will + ;;; be spent in the first ten instructions. + ;;; + ;;; Within this loop: + ;;; ebx = scanend + ;;; r8d = curmatch + ;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask) + ;;; esi = windowbestlen - i.e., (window + bestlen) + ;;; edi = prev + ;;; ebp = limit + + LookupLoop: + and r8d, edx + + movzx r8d, word ptr [rdi + r8*2] + cmp r8d, ebp + jbe LeaveNow + sub edx, 00010000h + js LeaveNow + + LoopEntry: + + cmp bx,word ptr [rsi + r8 - 1] + jnz LookupLoop1 + LookupLoopIsZero: + cmp r12w, word ptr [r10 + r8] + jnz LookupLoop1 + + + ;;; Store the current value of chainlen. + mov [chainlenwmask], edx + + ;;; Point edi to the string under scrutiny, and esi to the string we + ;;; are hoping to match it up with. In actuality, esi and edi are + ;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is + ;;; initialized to -(MAX_MATCH_8 - scanalign). + + lea rsi,[r8+r10] + mov rdx, 0fffffffffffffef8h; -(MAX_MATCH_8) + lea rsi, [rsi + r13 + 0108h] ;MAX_MATCH_8] + lea rdi, [r9 + r13 + 0108h] ;MAX_MATCH_8] + + prefetcht1 [rsi+rdx] + prefetcht1 [rdi+rdx] + + + ;;; Test the strings for equality, 8 bytes at a time. At the end, + ;;; adjust rdx so that it is offset to the exact byte that mismatched. + ;;; + ;;; We already know at this point that the first three bytes of the + ;;; strings match each other, and they can be safely passed over before + ;;; starting the compare loop. So what this code does is skip over 0-3 + ;;; bytes, as much as necessary in order to dword-align the edi + ;;; pointer. (rsi will still be misaligned three times out of four.) + ;;; + ;;; It should be confessed that this loop usually does not represent + ;;; much of the total running time. Replacing it with a more + ;;; straightforward "rep cmpsb" would not drastically degrade + ;;; performance. + + + LoopCmps: + mov rax, [rsi + rdx] + xor rax, [rdi + rdx] + jnz LeaveLoopCmps + + mov rax, [rsi + rdx + 8] + xor rax, [rdi + rdx + 8] + jnz LeaveLoopCmps8 + + + mov rax, [rsi + rdx + 8+8] + xor rax, [rdi + rdx + 8+8] + jnz LeaveLoopCmps16 + + add rdx,8+8+8 + + jmp short LoopCmps + LeaveLoopCmps16: add rdx,8 + LeaveLoopCmps8: add rdx,8 + LeaveLoopCmps: + + test eax, 0000FFFFh + jnz LenLower + + test eax,0ffffffffh + + jnz LenLower32 + + add rdx,4 + shr rax,32 + or ax,ax + jnz LenLower + + LenLower32: + shr eax,16 + add rdx,2 + LenLower: sub al, 1 + adc rdx, 0 + ;;; Calculate the length of the match. If it is longer than MAX_MATCH, + ;;; then automatically accept it as the best possible match and leave. + + lea rax, [rdi + rdx] + sub rax, r9 + cmp eax, MAX_MATCH + jge LenMaximum + + ;;; If the length of the match is not longer than the best match we + ;;; have so far, then forget it and return to the lookup loop. + ;/////////////////////////////////// + + cmp eax, r11d + jg LongerMatch + + lea rsi,[r10+r11] + + mov rdi, prev_ad + mov edx, [chainlenwmask] + jmp LookupLoop + + ;;; s->match_start = cur_match; + ;;; best_len = len; + ;;; if (len >= nice_match) break; + ;;; scan_end = *(ushf*)(scan+best_len-1); + + LongerMatch: + mov r11d, eax + mov match_start, r8d + cmp eax, [nicematch] + jge LeaveNow + + lea rsi,[r10+rax] + + movzx ebx, word ptr [r9 + rax - 1] + mov rdi, prev_ad + mov edx, [chainlenwmask] + jmp LookupLoop + + ;;; Accept the current string, with the maximum possible length. + + LenMaximum: + mov r11d,MAX_MATCH + mov match_start, r8d + + ;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len; + ;;; return s->lookahead; + + LeaveNow: + IFDEF INFOZIP + mov eax,r11d + ELSE + mov eax, Lookahead + cmp r11d, eax + cmovng eax, r11d + ENDIF + + ;;; Restore the stack and return from whence we came. + + + mov rsi,[save_rsi] + mov rdi,[save_rdi] + mov rbx,[save_rbx] + mov rbp,[save_rbp] + mov r12,[save_r12] + mov r13,[save_r13] + ; mov r14,[save_r14] + ; mov r15,[save_r15] + + + ret 0 + ; please don't remove this string ! + ; Your can freely use gvmat64 in any free or commercial app + ; but it is far better don't remove the string in the binary! + db 0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998, converted to amd 64 by Gilles Vollant 2005",0dh,0ah,0 + longest_match ENDP + + match_init PROC + ret 0 + match_init ENDP + + + END diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx64/gvmat64.obj gcc-4.4.5/zlib/contrib/masmx64/gvmat64.obj *** gcc-4.4.4/zlib/contrib/masmx64/gvmat64.obj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx64/gvmat64.obj Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,28 ---- + d†fÓ×B .textØ´ P`.data@PÀ.debug$S„Œ ,@B.debug$T<È @BH‰|$ÐH‰t$ØH‰\$àH‰l$èD‹ÂL‰d$ðL‰l$ø‹¹ ‹±´‹AL‹™¤;þ|ÁëÿËÁã Ø‹¸‰\$ÀD‹‘œD;ÐDMÐD‰T$ÈL‹QP‹©”NlM‹ÍI÷ÝIƒå‹AD-3ÿ+èD‹™ NïK4E·!C·\ ÿH‹y`‹T$ÀfA;\0ÿ„šD#ÂF·GD;ņnêˆbfA;\0ÿtuD#ÂF·GD;ņIêˆ=fA;\0ÿtPD#ÂF·GD;ņ$êˆfA;\0ÿu‘ë)D#ÂF·GD;ņýêˆñfA;\0ÿ…fÿÿÿfG;$…[ÿÿÿ‰T$ÀK4HºøþÿÿÿÿÿÿI´5K¼ 2:H‹2H3:u&H‹D2H3D:uH‹D2H3D:uHƒÂëØHƒÂHƒÂ©ÿÿu©ÿÿÿÿu HƒÂHÁè f ÀuÁèHƒÂ,HƒÒH:I+Á=}=A;ÃK4H‹y`‹T$Àé&ÿÿÿD‹ØD‰˜;D$È}$J4B·\ÿH‹y`‹T$ÀéÿþÿÿA»D‰˜‹œD;ØANÃH‹t$ØH‹|$ÐH‹\$àH‹l$èL‹d$ðL‹l$øÃ + asm686 with masm, optimised assembly code from Brian Raiter, written 1998, converted to amd 64 by Gilles Vollant 2005 + Ãó*X:\modifzLib\contrib\masmx64\gvmat64.asmôŒT-`%Ç*”½+UÏ›»òØ„(€±€²€ + ³€´€¸€º€»€!Æ€'Ç€-È€0É€6Ê€8Ë€:Ì€=Ô€?Õ€BÖ€D߀Jà€Ná€Uâ€Xã€\ä€aè€eé€kê€pï€sð€vñ€zø€}ù€‚û€„ü€†þ€€€” €˜€ž€¢€¦€¬€²€µ€º€½€Ã€É €Ï#€Õ$€×'€Ú)€ß*€â+€è,€î-€ô0€ú1€ü4€ÿ6€7€8€ 9€:€>€?€!@€#X€&Z€+[€.\€4]€:^€@b€Fc€Le€Qf€Wj€[q€_r€is€qt€yv€}w€Š€…‹€‰Œ€‹Ž€€•€—“€œ”€¡•€£—€§™€©š€­›€±ž€¶Ÿ€¸¡€½£€¿¥€Ã¦€Ç§€Ê¨€Ì«€Ï¬€Ó­€Õ®€Ù²€Ý³€à´€åµ€ç»€ê¼€ì¾€ðÀ€ôÁ€øÂ€ýʀˀ̀ Í€ πрҀӀԀ$Ù€*Ú€1ã€7ä€:å€>ë€Cì€Hí€Mî€Rï€Wð€\õ€×ü€×ý€ñŠ/X:\modifzLib\contrib\masmx64\gvmat64.obj4ÐvMicrosoft (R) Macro Assembler0match_init3××longest_matchLastMatchGoodLookupLoop1LoopEntry1LookupLoop2LoopEntry2LookupLoop4LoopEntry4LookupLoopLoopEntryLookupLoopIsZeroLoopCmpsLeaveLoopCmps16LeaveLoopCmps8LeaveLoopCmpsLenLower32LenLowerLongerMatchLenMaximumLeaveNow` d +  + ƒ + + µ ¹ + Î Ò + ç ë + þ  +   + + / + A E + X \ + n r + „ ˆ + ™  + µ ¹ + É Í + ä è + þ  +   + - 1 + A E + X \ + n r + òñ@comp.idv}ÿÿ.textØ.data.debug$S„,.debug$T< × $$000000=+²7ÏB×NôYüep#{@…LLoopCmps–©¦­µ±ÃÌLenLowerÓÎýÚ$LeaveNow1ålongest_matchmatch_initLastMatchGoodLookupLoop1LoopEntry1LookupLoop2LoopEntry2LookupLoop4LoopEntry4LookupLoopLoopEntryLookupLoopIsZeroLeaveLoopCmps16LeaveLoopCmps8LeaveLoopCmpsLenLower32LongerMatchLenMaximum \ No newline at end of file diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx64/inffas8664.c gcc-4.4.5/zlib/contrib/masmx64/inffas8664.c *** gcc-4.4.4/zlib/contrib/masmx64/inffas8664.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx64/inffas8664.c Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,186 ---- + /* inffas8664.c is a hand tuned assembler version of inffast.c - fast decoding + * version for AMD64 on Windows using Microsoft C compiler + * + * Copyright (C) 1995-2003 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + * + * Copyright (C) 2003 Chris Anderson + * Please use the copyright conditions above. + * + * 2005 - Adaptation to Microsoft C Compiler for AMD64 by Gilles Vollant + * + * inffas8664.c call function inffas8664fnc in inffasx64.asm + * inffasx64.asm is automatically convert from AMD64 portion of inffas86.c + * + * Dec-29-2003 -- I added AMD64 inflate asm support. This version is also + * slightly quicker on x86 systems because, instead of using rep movsb to copy + * data, it uses rep movsw, which moves data in 2-byte chunks instead of single + * bytes. I've tested the AMD64 code on a Fedora Core 1 + the x86_64 updates + * from http://fedora.linux.duke.edu/fc1_x86_64 + * which is running on an Athlon 64 3000+ / Gigabyte GA-K8VT800M system with + * 1GB ram. The 64-bit version is about 4% faster than the 32-bit version, + * when decompressing mozilla-source-1.3.tar.gz. + * + * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from + * the gcc -S output of zlib-1.2.0/inffast.c. Zlib-1.2.0 is in beta release at + * the moment. I have successfully compiled and tested this code with gcc2.96, + * gcc3.2, icc5.0, msvc6.0. It is very close to the speed of inffast.S + * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX + * enabled. I will attempt to merge the MMX code into this version. Newer + * versions of this and inffast.S can be found at + * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/ + * + */ + + #include + #include "zutil.h" + #include "inftrees.h" + #include "inflate.h" + #include "inffast.h" + + /* Mark Adler's comments from inffast.c: */ + + /* + Decode literal, length, and distance codes and write out the resulting + literal and match bytes until either not enough input or output is + available, an end-of-block is encountered, or a data error is encountered. + When large enough input and output buffers are supplied to inflate(), for + example, a 16K input buffer and a 64K output buffer, more than 95% of the + inflate execution time is spent in this routine. + + Entry assumptions: + + state->mode == LEN + strm->avail_in >= 6 + strm->avail_out >= 258 + start >= strm->avail_out + state->bits < 8 + + On return, state->mode is one of: + + LEN -- ran out of enough output space or enough available input + TYPE -- reached end of block code, inflate() to interpret next block + BAD -- error in block data + + Notes: + + - The maximum input bits used by a length/distance pair is 15 bits for the + length code, 5 bits for the length extra, 15 bits for the distance code, + and 13 bits for the distance extra. This totals 48 bits, or six bytes. + Therefore if strm->avail_in >= 6, then there is enough input to avoid + checking for available input while decoding. + + - The maximum bytes that a single length/distance pair can output is 258 + bytes, which is the maximum length that can be coded. inflate_fast() + requires strm->avail_out >= 258 for each loop to avoid checking for + output space. + */ + + + + typedef struct inffast_ar { + /* 64 32 x86 x86_64 */ + /* ar offset register */ + /* 0 0 */ void *esp; /* esp save */ + /* 8 4 */ void *ebp; /* ebp save */ + /* 16 8 */ unsigned char FAR *in; /* esi rsi local strm->next_in */ + /* 24 12 */ unsigned char FAR *last; /* r9 while in < last */ + /* 32 16 */ unsigned char FAR *out; /* edi rdi local strm->next_out */ + /* 40 20 */ unsigned char FAR *beg; /* inflate()'s init next_out */ + /* 48 24 */ unsigned char FAR *end; /* r10 while out < end */ + /* 56 28 */ unsigned char FAR *window;/* size of window, wsize!=0 */ + /* 64 32 */ code const FAR *lcode; /* ebp rbp local strm->lencode */ + /* 72 36 */ code const FAR *dcode; /* r11 local strm->distcode */ + /* 80 40 */ size_t /*unsigned long */hold; /* edx rdx local strm->hold */ + /* 88 44 */ unsigned bits; /* ebx rbx local strm->bits */ + /* 92 48 */ unsigned wsize; /* window size */ + /* 96 52 */ unsigned write; /* window write index */ + /*100 56 */ unsigned lmask; /* r12 mask for lcode */ + /*104 60 */ unsigned dmask; /* r13 mask for dcode */ + /*108 64 */ unsigned len; /* r14 match length */ + /*112 68 */ unsigned dist; /* r15 match distance */ + /*116 72 */ unsigned status; /* set when state chng*/ + } type_ar; + #ifdef ASMINF + + void inflate_fast(strm, start) + z_streamp strm; + unsigned start; /* inflate()'s starting value for strm->avail_out */ + { + struct inflate_state FAR *state; + type_ar ar; + void inffas8664fnc(struct inffast_ar * par); + + + + #if (defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )) || (defined(_MSC_VER) && defined(_M_AMD64)) + #define PAD_AVAIL_IN 6 + #define PAD_AVAIL_OUT 258 + #else + #define PAD_AVAIL_IN 5 + #define PAD_AVAIL_OUT 257 + #endif + + /* copy state to local variables */ + state = (struct inflate_state FAR *)strm->state; + + ar.in = strm->next_in; + ar.last = ar.in + (strm->avail_in - PAD_AVAIL_IN); + ar.out = strm->next_out; + ar.beg = ar.out - (start - strm->avail_out); + ar.end = ar.out + (strm->avail_out - PAD_AVAIL_OUT); + ar.wsize = state->wsize; + ar.write = state->write; + ar.window = state->window; + ar.hold = state->hold; + ar.bits = state->bits; + ar.lcode = state->lencode; + ar.dcode = state->distcode; + ar.lmask = (1U << state->lenbits) - 1; + ar.dmask = (1U << state->distbits) - 1; + + /* decode literals and length/distances until end-of-block or not enough + input data or output space */ + + /* align in on 1/2 hold size boundary */ + while (((size_t)(void *)ar.in & (sizeof(ar.hold) / 2 - 1)) != 0) { + ar.hold += (unsigned long)*ar.in++ << ar.bits; + ar.bits += 8; + } + + inffas8664fnc(&ar); + + if (ar.status > 1) { + if (ar.status == 2) + strm->msg = "invalid literal/length code"; + else if (ar.status == 3) + strm->msg = "invalid distance code"; + else + strm->msg = "invalid distance too far back"; + state->mode = BAD; + } + else if ( ar.status == 1 ) { + state->mode = TYPE; + } + + /* return unused bytes (on entry, bits < 8, so in won't go too far back) */ + ar.len = ar.bits >> 3; + ar.in -= ar.len; + ar.bits -= ar.len << 3; + ar.hold &= (1U << ar.bits) - 1; + + /* update state and return */ + strm->next_in = ar.in; + strm->next_out = ar.out; + strm->avail_in = (unsigned)(ar.in < ar.last ? + PAD_AVAIL_IN + (ar.last - ar.in) : + PAD_AVAIL_IN - (ar.in - ar.last)); + strm->avail_out = (unsigned)(ar.out < ar.end ? + PAD_AVAIL_OUT + (ar.end - ar.out) : + PAD_AVAIL_OUT - (ar.out - ar.end)); + state->hold = (unsigned long)ar.hold; + state->bits = ar.bits; + return; + } + + #endif diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx64/inffasx64.asm gcc-4.4.5/zlib/contrib/masmx64/inffasx64.asm *** gcc-4.4.4/zlib/contrib/masmx64/inffasx64.asm Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx64/inffasx64.asm Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,392 ---- + ; inffasx64.asm is a hand tuned assembler version of inffast.c - fast decoding + ; version for AMD64 on Windows using Microsoft C compiler + ; + ; inffasx64.asm is automatically convert from AMD64 portion of inffas86.c + ; inffasx64.asm is called by inffas8664.c, which contain more info. + + + ; to compile this file, I use option + ; ml64.exe /Flinffasx64 /c /Zi inffasx64.asm + ; with Microsoft Macro Assembler (x64) for AMD64 + ; + ; ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK + ; + ; (you can get Windows 2003 server DDK with ml64 and cl.exe for AMD64 from + ; http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price) + ; + + .code + inffas8664fnc PROC + + ; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and + ; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp + ; + ; All registers must be preserved across the call, except for + ; rax, rcx, rdx, r8, r-9, r10, and r11, which are scratch. + + + mov [rsp-8],rsi + mov [rsp-16],rdi + mov [rsp-24],r12 + mov [rsp-32],r13 + mov [rsp-40],r14 + mov [rsp-48],r15 + mov [rsp-56],rbx + + mov rax,rcx + + mov [rax+8], rbp ; /* save regs rbp and rsp */ + mov [rax], rsp + + mov rsp, rax ; /* make rsp point to &ar */ + + mov rsi, [rsp+16] ; /* rsi = in */ + mov rdi, [rsp+32] ; /* rdi = out */ + mov r9, [rsp+24] ; /* r9 = last */ + mov r10, [rsp+48] ; /* r10 = end */ + mov rbp, [rsp+64] ; /* rbp = lcode */ + mov r11, [rsp+72] ; /* r11 = dcode */ + mov rdx, [rsp+80] ; /* rdx = hold */ + mov ebx, [rsp+88] ; /* ebx = bits */ + mov r12d, [rsp+100] ; /* r12d = lmask */ + mov r13d, [rsp+104] ; /* r13d = dmask */ + ; /* r14d = len */ + ; /* r15d = dist */ + + + cld + cmp r10, rdi + je L_one_time ; /* if only one decode left */ + cmp r9, rsi + + jne L_do_loop + + + L_one_time: + mov r8, r12 ; /* r8 = lmask */ + cmp bl, 32 + ja L_get_length_code_one_time + + lodsd ; /* eax = *(uint *)in++ */ + mov cl, bl ; /* cl = bits, needs it for shifting */ + add bl, 32 ; /* bits += 32 */ + shl rax, cl + or rdx, rax ; /* hold |= *((uint *)in)++ << bits */ + jmp L_get_length_code_one_time + + ALIGN 4 + L_while_test: + cmp r10, rdi + jbe L_break_loop + cmp r9, rsi + jbe L_break_loop + + L_do_loop: + mov r8, r12 ; /* r8 = lmask */ + cmp bl, 32 + ja L_get_length_code ; /* if (32 < bits) */ + + lodsd ; /* eax = *(uint *)in++ */ + mov cl, bl ; /* cl = bits, needs it for shifting */ + add bl, 32 ; /* bits += 32 */ + shl rax, cl + or rdx, rax ; /* hold |= *((uint *)in)++ << bits */ + + L_get_length_code: + and r8, rdx ; /* r8 &= hold */ + mov eax, [rbp+r8*4] ; /* eax = lcode[hold & lmask] */ + + mov cl, ah ; /* cl = this.bits */ + sub bl, ah ; /* bits -= this.bits */ + shr rdx, cl ; /* hold >>= this.bits */ + + test al, al + jnz L_test_for_length_base ; /* if (op != 0) 45.7% */ + + mov r8, r12 ; /* r8 = lmask */ + shr eax, 16 ; /* output this.val char */ + stosb + + L_get_length_code_one_time: + and r8, rdx ; /* r8 &= hold */ + mov eax, [rbp+r8*4] ; /* eax = lcode[hold & lmask] */ + + L_dolen: + mov cl, ah ; /* cl = this.bits */ + sub bl, ah ; /* bits -= this.bits */ + shr rdx, cl ; /* hold >>= this.bits */ + + test al, al + jnz L_test_for_length_base ; /* if (op != 0) 45.7% */ + + shr eax, 16 ; /* output this.val char */ + stosb + jmp L_while_test + + ALIGN 4 + L_test_for_length_base: + mov r14d, eax ; /* len = this */ + shr r14d, 16 ; /* len = this.val */ + mov cl, al + + test al, 16 + jz L_test_for_second_level_length ; /* if ((op & 16) == 0) 8% */ + and cl, 15 ; /* op &= 15 */ + jz L_decode_distance ; /* if (!op) */ + + L_add_bits_to_len: + sub bl, cl + xor eax, eax + inc eax + shl eax, cl + dec eax + and eax, edx ; /* eax &= hold */ + shr rdx, cl + add r14d, eax ; /* len += hold & mask[op] */ + + L_decode_distance: + mov r8, r13 ; /* r8 = dmask */ + cmp bl, 32 + ja L_get_distance_code ; /* if (32 < bits) */ + + lodsd ; /* eax = *(uint *)in++ */ + mov cl, bl ; /* cl = bits, needs it for shifting */ + add bl, 32 ; /* bits += 32 */ + shl rax, cl + or rdx, rax ; /* hold |= *((uint *)in)++ << bits */ + + L_get_distance_code: + and r8, rdx ; /* r8 &= hold */ + mov eax, [r11+r8*4] ; /* eax = dcode[hold & dmask] */ + + L_dodist: + mov r15d, eax ; /* dist = this */ + shr r15d, 16 ; /* dist = this.val */ + mov cl, ah + sub bl, ah ; /* bits -= this.bits */ + shr rdx, cl ; /* hold >>= this.bits */ + mov cl, al ; /* cl = this.op */ + + test al, 16 ; /* if ((op & 16) == 0) */ + jz L_test_for_second_level_dist + and cl, 15 ; /* op &= 15 */ + jz L_check_dist_one + + L_add_bits_to_dist: + sub bl, cl + xor eax, eax + inc eax + shl eax, cl + dec eax ; /* (1 << op) - 1 */ + and eax, edx ; /* eax &= hold */ + shr rdx, cl + add r15d, eax ; /* dist += hold & ((1 << op) - 1) */ + + L_check_window: + mov r8, rsi ; /* save in so from can use it's reg */ + mov rax, rdi + sub rax, [rsp+40] ; /* nbytes = out - beg */ + + cmp eax, r15d + jb L_clip_window ; /* if (dist > nbytes) 4.2% */ + + mov ecx, r14d ; /* ecx = len */ + mov rsi, rdi + sub rsi, r15 ; /* from = out - dist */ + + sar ecx, 1 + jnc L_copy_two ; /* if len % 2 == 0 */ + + rep movsw + mov al, [rsi] + mov [rdi], al + inc rdi + + mov rsi, r8 ; /* move in back to %rsi, toss from */ + jmp L_while_test + + L_copy_two: + rep movsw + mov rsi, r8 ; /* move in back to %rsi, toss from */ + jmp L_while_test + + ALIGN 4 + L_check_dist_one: + cmp r15d, 1 ; /* if dist 1, is a memset */ + jne L_check_window + cmp [rsp+40], rdi ; /* if out == beg, outside window */ + je L_check_window + + mov ecx, r14d ; /* ecx = len */ + mov al, [rdi-1] + mov ah, al + + sar ecx, 1 + jnc L_set_two + mov [rdi], al + inc rdi + + L_set_two: + rep stosw + jmp L_while_test + + ALIGN 4 + L_test_for_second_level_length: + test al, 64 + jnz L_test_for_end_of_block ; /* if ((op & 64) != 0) */ + + xor eax, eax + inc eax + shl eax, cl + dec eax + and eax, edx ; /* eax &= hold */ + add eax, r14d ; /* eax += len */ + mov eax, [rbp+rax*4] ; /* eax = lcode[val+(hold&mask[op])]*/ + jmp L_dolen + + ALIGN 4 + L_test_for_second_level_dist: + test al, 64 + jnz L_invalid_distance_code ; /* if ((op & 64) != 0) */ + + xor eax, eax + inc eax + shl eax, cl + dec eax + and eax, edx ; /* eax &= hold */ + add eax, r15d ; /* eax += dist */ + mov eax, [r11+rax*4] ; /* eax = dcode[val+(hold&mask[op])]*/ + jmp L_dodist + + ALIGN 4 + L_clip_window: + mov ecx, eax ; /* ecx = nbytes */ + mov eax, [rsp+92] ; /* eax = wsize, prepare for dist cmp */ + neg ecx ; /* nbytes = -nbytes */ + + cmp eax, r15d + jb L_invalid_distance_too_far ; /* if (dist > wsize) */ + + add ecx, r15d ; /* nbytes = dist - nbytes */ + cmp dword ptr [rsp+96], 0 + jne L_wrap_around_window ; /* if (write != 0) */ + + mov rsi, [rsp+56] ; /* from = window */ + sub eax, ecx ; /* eax -= nbytes */ + add rsi, rax ; /* from += wsize - nbytes */ + + mov eax, r14d ; /* eax = len */ + cmp r14d, ecx + jbe L_do_copy ; /* if (nbytes >= len) */ + + sub eax, ecx ; /* eax -= nbytes */ + rep movsb + mov rsi, rdi + sub rsi, r15 ; /* from = &out[ -dist ] */ + jmp L_do_copy + + ALIGN 4 + L_wrap_around_window: + mov eax, [rsp+96] ; /* eax = write */ + cmp ecx, eax + jbe L_contiguous_in_window ; /* if (write >= nbytes) */ + + mov esi, [rsp+92] ; /* from = wsize */ + add rsi, [rsp+56] ; /* from += window */ + add rsi, rax ; /* from += write */ + sub rsi, rcx ; /* from -= nbytes */ + sub ecx, eax ; /* nbytes -= write */ + + mov eax, r14d ; /* eax = len */ + cmp eax, ecx + jbe L_do_copy ; /* if (nbytes >= len) */ + + sub eax, ecx ; /* len -= nbytes */ + rep movsb + mov rsi, [rsp+56] ; /* from = window */ + mov ecx, [rsp+96] ; /* nbytes = write */ + cmp eax, ecx + jbe L_do_copy ; /* if (nbytes >= len) */ + + sub eax, ecx ; /* len -= nbytes */ + rep movsb + mov rsi, rdi + sub rsi, r15 ; /* from = out - dist */ + jmp L_do_copy + + ALIGN 4 + L_contiguous_in_window: + mov rsi, [rsp+56] ; /* rsi = window */ + add rsi, rax + sub rsi, rcx ; /* from += write - nbytes */ + + mov eax, r14d ; /* eax = len */ + cmp eax, ecx + jbe L_do_copy ; /* if (nbytes >= len) */ + + sub eax, ecx ; /* len -= nbytes */ + rep movsb + mov rsi, rdi + sub rsi, r15 ; /* from = out - dist */ + jmp L_do_copy ; /* if (nbytes >= len) */ + + ALIGN 4 + L_do_copy: + mov ecx, eax ; /* ecx = len */ + rep movsb + + mov rsi, r8 ; /* move in back to %esi, toss from */ + jmp L_while_test + + L_test_for_end_of_block: + test al, 32 + jz L_invalid_literal_length_code + mov dword ptr [rsp+116], 1 + jmp L_break_loop_with_status + + L_invalid_literal_length_code: + mov dword ptr [rsp+116], 2 + jmp L_break_loop_with_status + + L_invalid_distance_code: + mov dword ptr [rsp+116], 3 + jmp L_break_loop_with_status + + L_invalid_distance_too_far: + mov dword ptr [rsp+116], 4 + jmp L_break_loop_with_status + + L_break_loop: + mov dword ptr [rsp+116], 0 + + L_break_loop_with_status: + ; /* put in, out, bits, and hold back into ar and pop esp */ + mov [rsp+16], rsi ; /* in */ + mov [rsp+32], rdi ; /* out */ + mov [rsp+88], ebx ; /* bits */ + mov [rsp+80], rdx ; /* hold */ + + mov rax, [rsp] ; /* restore rbp and rsp */ + mov rbp, [rsp+8] + mov rsp, rax + + + + mov rsi,[rsp-8] + mov rdi,[rsp-16] + mov r12,[rsp-24] + mov r13,[rsp-32] + mov r14,[rsp-40] + mov r15,[rsp-48] + mov rbx,[rsp-56] + + ret 0 + ; : + ; : "m" (ar) + ; : "memory", "%rax", "%rbx", "%rcx", "%rdx", "%rsi", "%rdi", + ; "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15" + ; ); + + inffas8664fnc ENDP + ;_TEXT ENDS + END diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx64/inffasx64.obj gcc-4.4.5/zlib/contrib/masmx64/inffasx64.obj *** gcc-4.4.4/zlib/contrib/masmx64/inffasx64.obj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx64/inffasx64.obj Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,52 ---- + d†ëŽBT'.text´ P`.data@PÀ.debug$S ËØ<@B.debug$T$0@BH‰t$øH‰|$ðL‰d$èL‰l$àL‰t$ØL‰|$ÐH‰\$ÈH‹ÁH‰hH‰ H‹àH‹t$H‹|$ L‹L$L‹T$0H‹l$@L‹\$HH‹T$P‹\$XD‹d$dD‹l$hüL;×tL;Îu*M‹Ä€û wP­ŠË€Ã HÓàH ÐëBfL;׆?L;Ά6M‹Ä€û w ­ŠË€Ã HÓàH ÐL#ÂB‹D…ŠÌ*ÜHÓê„Àu#M‹ÄÁèªL#ÂB‹D…ŠÌ*ÜHÓê„Àu Áèªë§ffD‹ðAÁîŠÈ¨„Ç€át*Ù3ÀÿÀÓàÿÈ#ÂHÓêDðM‹Å€û w ­ŠË€Ã HÓàH ÐL#ÂC‹ƒD‹øAÁïŠÌ*ÜHÓêŠÈ¨„€átP*Ù3ÀÿÀÓàÿÈ#ÂHÓêDøL‹ÆH‹ÇH+D$(A;Ç‚’A‹ÎH‹÷I+÷Ñùsóf¥ŠˆHÿÇI‹ðéÿþÿÿóf¥I‹ðéôþÿÿAƒÿu¼H9|$(tµA‹ÎŠGÿŠàÑùsˆHÿÇóf«éÎþÿÿf¨@…à3ÀÿÀÓàÿÈ#ÂAÆ‹D…éöþÿÿf¨@…Ø3ÀÿÀÓàÿÈ#ÂAÇA‹ƒé-ÿÿÿf‹È‹D$\÷ÙA;Ç‚¹Aσ|$`u!H‹t$8+ÁHðA‹ÆD;ñvo+Áó¤H‹÷I+÷ëcff‹D$`;Èv8‹t$\Ht$8HðH+ñ+ÈA‹Æ;Áv@+Áó¤H‹t$8‹L$`;Áv/+Áó¤H‹÷I+÷ë#ffH‹t$8HðH+ñA‹Æ;Áv+Áó¤H‹÷I+÷ëf‹Èó¤I‹ðéäýÿÿ¨ t + ÇD$të&ÇD$tëÇD$tëÇD$tëÇD$tH‰t$H‰|$ ‰\$XH‰T$PH‹$H‹l$H‹àH‹t$øH‹|$ðL‹d$èL‹l$àL‹t$ØL‹|$ÐH‹\$ÈÃó/O:\zlib-1.2.2.2\contrib\masmx64\inffasx64.asmôJ”u© –,ßå” } + µ¢òÀõ´€€€ + €€ €!€"€#$€&&€*'€-)€0+€5,€:-€?.€D/€I0€N1€S2€W3€\4€a9€b:€e;€g<€j>€lB€oC€rD€tF€uG€wH€zI€}J€€K€„O€‡P€Q€R€–U€™V€œW€žY€ŸZ€¡[€¤\€§]€ª`€­a€²c€´d€¶e€¹g€»h€½j€Àk€Ãl€Äo€Çp€Ìs€Ît€Ðu€Ów€Õx€×z€Ú{€Û|€à€€ã€ç‚€é„€ë…€ñ†€ô‡€öŠ€ø‹€úŒ€ü€þŽ€€€‘€”€ •€–€˜€™€š€›€œ€Ÿ€ €#£€&¤€*¥€,¦€.§€1¨€3ª€5«€;¬€>­€@°€B±€D²€F³€H´€Jµ€L¶€O·€Rº€U»€X¼€]¾€`¿€fÁ€i€lÀoÅ€qÆ€sÈ€vÉ€xÊ€zË€}Í€€΀…Ñ€ˆÒ€‹Ó€×€”Ø€–Ù€›Ú€Ü€ Ý€£Þ€¥à€§ဩ‫〮怱瀸뀺ì€Àî€Âï€Äð€Æñ€Èò€Êó€Íô€Ñõ€Øù€Úú€àü€âý€äþ€æÿ€è€ê€í€ñ€ø€ú€þ € € € € €€€€€€ €#€%€'€)€,€/€4"€8#€:$€<&€@'€E(€H)€K*€M,€P-€R.€T0€V1€X2€]3€a4€c5€e7€g8€i9€l:€o;€t?€y@€|A€C€‚D€„E€†G€ˆH€ŠI€J€K€”O€–P€˜R€›S€ V€¢W€¤X€¬Y€®\€¶]€¸`€Àa€Âd€Êe€Ìh€Ôl€Ùm€Þn€âo€çq€ër€ðs€ów€øx€ýy€z€{€ |€}€€ñß4O:\zlib-1.2.2.2\contrib\masmx64\inffasx64.obj4Л Microsoft (R) Macro Assembler3inffas8664fncL_one_timeL_while_testL_do_loopL_get_length_code$L_get_length_code_one_timeL_dolen L_test_for_length_baseL_add_bits_to_lenL_decode_distanceL_get_distance_codeL_dodistL_add_bits_to_distL_check_windowL_copy_twoL_check_dist_oneL_set_two(L_test_for_second_level_length&L_test_for_second_level_distL_clip_windowL_wrap_around_window L_contiguous_in_windowL_do_copy!L_test_for_end_of_block'L_invalid_literal_length_code!L_invalid_distance_code$L_invalid_distance_too_farL_break_loop"L_break_loop_with_statusd + h + + ¸ ¼ + Ñ Õ + ç ë + ÿ  +     + 1  5  + W  [  + j  n  + Œ   + ©  ­  + Æ  Ê  + å  é  + ù  ý  +  +   +  + 1 +  5 +  + G +  K +  + c +  g +  + x +  | +  + ¢ +  ¦ +  + Ê +  Î +  + ã +  ç +  +     + % ) + : ! > ! + ] " a " + † # Š # + © $ ­ $ + Ï % Ó % + ç & ë & + òñ@comp.id› }ÿÿ.text.data.debug$S <.debug$T$ $$000000l„*–4ªFÄL_dolenÌaàxöŠœL_dodist#°@ÃRÒ…Ýî®ø¸Ø4øB4Wtn”x ®®¸ÆÂáÌîÔinffas8664fncL_one_timeL_while_testL_do_loopL_get_length_codeL_get_length_code_one_timeL_test_for_length_baseL_add_bits_to_lenL_decode_distanceL_get_distance_codeL_add_bits_to_distL_check_windowL_copy_twoL_check_dist_oneL_set_twoL_test_for_second_level_lengthL_test_for_second_level_distL_clip_windowL_wrap_around_windowL_contiguous_in_windowL_do_copyL_test_for_end_of_blockL_invalid_literal_length_codeL_invalid_distance_codeL_invalid_distance_too_farL_break_loopL_break_loop_with_status \ No newline at end of file diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx64/readme.txt gcc-4.4.5/zlib/contrib/masmx64/readme.txt *** gcc-4.4.4/zlib/contrib/masmx64/readme.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx64/readme.txt Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,28 ---- + Summary + ------- + This directory contains ASM implementations of the functions + longest_match() and inflate_fast(), for 64 bits x86 (both AMD64 and Intel EM64t), + for use with Microsoft Macro Assembler (x64) for AMD64 and Microsoft C++ 64 bits. + + gvmat64.asm is written by Gilles Vollant (2005), by using Brian Raiter 686/32 bits + assembly optimized version from Jean-loup Gailly original longest_match function + + inffasx64.asm and inffas8664.c were written by Chris Anderson, by optimizing + original function from Mark Adler + + Use instructions + ---------------- + Copy these files into the zlib source directory. + + define ASMV and ASMINF in your project. Include inffas8664.c in your source tree, + and inffasx64.obj and gvmat64.obj as object to link. + + + Build instructions + ------------------ + run bld_64.bat with Microsoft Macro Assembler (x64) for AMD64 (ml64.exe) + + ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK + + You can get Windows 2003 server DDK with ml64 and cl for AMD64 from + http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price) diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx86/bld_ml32.bat gcc-4.4.5/zlib/contrib/masmx86/bld_ml32.bat *** gcc-4.4.4/zlib/contrib/masmx86/bld_ml32.bat Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx86/bld_ml32.bat Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,2 ---- + ml /coff /Zi /c /Flgvmat32.lst gvmat32.asm + ml /coff /Zi /c /Flinffas32.lst inffas32.asm diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx86/gvmat32.asm gcc-4.4.5/zlib/contrib/masmx86/gvmat32.asm *** gcc-4.4.4/zlib/contrib/masmx86/gvmat32.asm Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx86/gvmat32.asm Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,972 ---- + ; gvmat32.asm -- Asm portion of the optimized longest_match for 32 bits x86 + ; Copyright (C) 1995-1996 Jean-loup Gailly and Gilles Vollant. + ; File written by Gilles Vollant, by modifiying the longest_match + ; from Jean-loup Gailly in deflate.c + ; + ; http://www.zlib.net + ; http://www.winimage.com/zLibDll + ; http://www.muppetlabs.com/~breadbox/software/assembly.html + ; + ; For Visual C++ 4.x and higher and ML 6.x and higher + ; ml.exe is in directory \MASM611C of Win95 DDK + ; ml.exe is also distributed in http://www.masm32.com/masmdl.htm + ; and in VC++2003 toolkit at http://msdn.microsoft.com/visualc/vctoolkit2003/ + ; + ; this file contain two implementation of longest_match + ; + ; longest_match_7fff : written 1996 by Gilles Vollant optimized for + ; first Pentium. Assume s->w_mask == 0x7fff + ; longest_match_686 : written by Brian raiter (1998), optimized for Pentium Pro + ; + ; for using an seembly version of longest_match, you need define ASMV in project + ; There is two way in using gvmat32.asm + ; + ; A) Suggested method + ; if you want include both longest_match_7fff and longest_match_686 + ; compile the asm file running + ; ml /coff /Zi /Flgvmat32.lst /c gvmat32.asm + ; and include gvmat32c.c in your project + ; if you have an old cpu (386,486 or first Pentium) and s->w_mask==0x7fff, + ; longest_match_7fff will be used + ; if you have a more modern CPU (Pentium Pro, II and higher) + ; longest_match_686 will be used + ; on old cpu with s->w_mask!=0x7fff, longest_match_686 will be used, + ; but this is not a sitation you'll find often + ; + ; B) Alternative + ; if you are not interresed in old cpu performance and want the smaller + ; binaries possible + ; + ; compile the asm file running + ; ml /coff /Zi /c /Flgvmat32.lst /DNOOLDPENTIUMCODE gvmat32.asm + ; and do not include gvmat32c.c in your project (ou define also + ; NOOLDPENTIUMCODE) + ; + ; note : as I known, longest_match_686 is very faster than longest_match_7fff + ; on pentium Pro/II/III, faster (but less) in P4, but it seem + ; longest_match_7fff can be faster (very very litte) on AMD Athlon64/K8 + ; + ; see below : zlib1222add must be adjuster if you use a zlib version < 1.2.2.2 + + ;uInt longest_match_7fff(s, cur_match) + ; deflate_state *s; + ; IPos cur_match; /* current match */ + + NbStack equ 76 + cur_match equ dword ptr[esp+NbStack-0] + str_s equ dword ptr[esp+NbStack-4] + ; 5 dword on top (ret,ebp,esi,edi,ebx) + adrret equ dword ptr[esp+NbStack-8] + pushebp equ dword ptr[esp+NbStack-12] + pushedi equ dword ptr[esp+NbStack-16] + pushesi equ dword ptr[esp+NbStack-20] + pushebx equ dword ptr[esp+NbStack-24] + + chain_length equ dword ptr [esp+NbStack-28] + limit equ dword ptr [esp+NbStack-32] + best_len equ dword ptr [esp+NbStack-36] + window equ dword ptr [esp+NbStack-40] + prev equ dword ptr [esp+NbStack-44] + scan_start equ word ptr [esp+NbStack-48] + wmask equ dword ptr [esp+NbStack-52] + match_start_ptr equ dword ptr [esp+NbStack-56] + nice_match equ dword ptr [esp+NbStack-60] + scan equ dword ptr [esp+NbStack-64] + + windowlen equ dword ptr [esp+NbStack-68] + match_start equ dword ptr [esp+NbStack-72] + strend equ dword ptr [esp+NbStack-76] + NbStackAdd equ (NbStack-24) + + .386p + + name gvmatch + .MODEL FLAT + + + + ; all the +zlib1222add offsets are due to the addition of fields + ; in zlib in the deflate_state structure since the asm code was first written + ; (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)"). + ; (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0"). + ; if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8"). + + zlib1222add equ 8 + + ; Note : these value are good with a 8 bytes boundary pack structure + dep_chain_length equ 74h+zlib1222add + dep_window equ 30h+zlib1222add + dep_strstart equ 64h+zlib1222add + dep_prev_length equ 70h+zlib1222add + dep_nice_match equ 88h+zlib1222add + dep_w_size equ 24h+zlib1222add + dep_prev equ 38h+zlib1222add + dep_w_mask equ 2ch+zlib1222add + dep_good_match equ 84h+zlib1222add + dep_match_start equ 68h+zlib1222add + dep_lookahead equ 6ch+zlib1222add + + + _TEXT segment + + IFDEF NOUNDERLINE + IFDEF NOOLDPENTIUMCODE + public longest_match + public match_init + ELSE + public longest_match_7fff + public cpudetect32 + public longest_match_686 + ENDIF + ELSE + IFDEF NOOLDPENTIUMCODE + public _longest_match + public _match_init + ELSE + public _longest_match_7fff + public _cpudetect32 + public _longest_match_686 + ENDIF + ENDIF + + MAX_MATCH equ 258 + MIN_MATCH equ 3 + MIN_LOOKAHEAD equ (MAX_MATCH+MIN_MATCH+1) + + + + IFNDEF NOOLDPENTIUMCODE + IFDEF NOUNDERLINE + longest_match_7fff proc near + ELSE + _longest_match_7fff proc near + ENDIF + + mov edx,[esp+4] + + + + push ebp + push edi + push esi + push ebx + + sub esp,NbStackAdd + + ; initialize or check the variables used in match.asm. + mov ebp,edx + + ; chain_length = s->max_chain_length + ; if (prev_length>=good_match) chain_length >>= 2 + mov edx,[ebp+dep_chain_length] + mov ebx,[ebp+dep_prev_length] + cmp [ebp+dep_good_match],ebx + ja noshr + shr edx,2 + noshr: + ; we increment chain_length because in the asm, the --chain_lenght is in the beginning of the loop + inc edx + mov edi,[ebp+dep_nice_match] + mov chain_length,edx + mov eax,[ebp+dep_lookahead] + cmp eax,edi + ; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; + jae nolookaheadnicematch + mov edi,eax + nolookaheadnicematch: + ; best_len = s->prev_length + mov best_len,ebx + + ; window = s->window + mov esi,[ebp+dep_window] + mov ecx,[ebp+dep_strstart] + mov window,esi + + mov nice_match,edi + ; scan = window + strstart + add esi,ecx + mov scan,esi + ; dx = *window + mov dx,word ptr [esi] + ; bx = *(window+best_len-1) + mov bx,word ptr [esi+ebx-1] + add esi,MAX_MATCH-1 + ; scan_start = *scan + mov scan_start,dx + ; strend = scan + MAX_MATCH-1 + mov strend,esi + ; bx = scan_end = *(window+best_len-1) + + ; IPos limit = s->strstart > (IPos)MAX_DIST(s) ? + ; s->strstart - (IPos)MAX_DIST(s) : NIL; + + mov esi,[ebp+dep_w_size] + sub esi,MIN_LOOKAHEAD + ; here esi = MAX_DIST(s) + sub ecx,esi + ja nodist + xor ecx,ecx + nodist: + mov limit,ecx + + ; prev = s->prev + mov edx,[ebp+dep_prev] + mov prev,edx + + ; + mov edx,dword ptr [ebp+dep_match_start] + mov bp,scan_start + mov eax,cur_match + mov match_start,edx + + mov edx,window + mov edi,edx + add edi,best_len + mov esi,prev + dec edi + ; windowlen = window + best_len -1 + mov windowlen,edi + + jmp beginloop2 + align 4 + + ; here, in the loop + ; eax = ax = cur_match + ; ecx = limit + ; bx = scan_end + ; bp = scan_start + ; edi = windowlen (window + best_len -1) + ; esi = prev + + + ;// here; chain_length <=16 + normalbeg0add16: + add chain_length,16 + jz exitloop + normalbeg0: + cmp word ptr[edi+eax],bx + je normalbeg2noroll + rcontlabnoroll: + ; cur_match = prev[cur_match & wmask] + and eax,7fffh + mov ax,word ptr[esi+eax*2] + ; if cur_match > limit, go to exitloop + cmp ecx,eax + jnb exitloop + ; if --chain_length != 0, go to exitloop + dec chain_length + jnz normalbeg0 + jmp exitloop + + normalbeg2noroll: + ; if (scan_start==*(cur_match+window)) goto normalbeg2 + cmp bp,word ptr[edx+eax] + jne rcontlabnoroll + jmp normalbeg2 + + contloop3: + mov edi,windowlen + + ; cur_match = prev[cur_match & wmask] + and eax,7fffh + mov ax,word ptr[esi+eax*2] + ; if cur_match > limit, go to exitloop + cmp ecx,eax + jnbexitloopshort1: + jnb exitloop + ; if --chain_length != 0, go to exitloop + + + ; begin the main loop + beginloop2: + sub chain_length,16+1 + ; if chain_length <=16, don't use the unrolled loop + jna normalbeg0add16 + + do16: + cmp word ptr[edi+eax],bx + je normalbeg2dc0 + + maccn MACRO lab + and eax,7fffh + mov ax,word ptr[esi+eax*2] + cmp ecx,eax + jnb exitloop + cmp word ptr[edi+eax],bx + je lab + ENDM + + rcontloop0: + maccn normalbeg2dc1 + + rcontloop1: + maccn normalbeg2dc2 + + rcontloop2: + maccn normalbeg2dc3 + + rcontloop3: + maccn normalbeg2dc4 + + rcontloop4: + maccn normalbeg2dc5 + + rcontloop5: + maccn normalbeg2dc6 + + rcontloop6: + maccn normalbeg2dc7 + + rcontloop7: + maccn normalbeg2dc8 + + rcontloop8: + maccn normalbeg2dc9 + + rcontloop9: + maccn normalbeg2dc10 + + rcontloop10: + maccn short normalbeg2dc11 + + rcontloop11: + maccn short normalbeg2dc12 + + rcontloop12: + maccn short normalbeg2dc13 + + rcontloop13: + maccn short normalbeg2dc14 + + rcontloop14: + maccn short normalbeg2dc15 + + rcontloop15: + and eax,7fffh + mov ax,word ptr[esi+eax*2] + cmp ecx,eax + jnb exitloop + + sub chain_length,16 + ja do16 + jmp normalbeg0add16 + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + normbeg MACRO rcontlab,valsub + ; if we are here, we know that *(match+best_len-1) == scan_end + cmp bp,word ptr[edx+eax] + ; if (match != scan_start) goto rcontlab + jne rcontlab + ; calculate the good chain_length, and we'll compare scan and match string + add chain_length,16-valsub + jmp iseq + ENDM + + + normalbeg2dc11: + normbeg rcontloop11,11 + + normalbeg2dc12: + normbeg short rcontloop12,12 + + normalbeg2dc13: + normbeg short rcontloop13,13 + + normalbeg2dc14: + normbeg short rcontloop14,14 + + normalbeg2dc15: + normbeg short rcontloop15,15 + + normalbeg2dc10: + normbeg rcontloop10,10 + + normalbeg2dc9: + normbeg rcontloop9,9 + + normalbeg2dc8: + normbeg rcontloop8,8 + + normalbeg2dc7: + normbeg rcontloop7,7 + + normalbeg2dc6: + normbeg rcontloop6,6 + + normalbeg2dc5: + normbeg rcontloop5,5 + + normalbeg2dc4: + normbeg rcontloop4,4 + + normalbeg2dc3: + normbeg rcontloop3,3 + + normalbeg2dc2: + normbeg rcontloop2,2 + + normalbeg2dc1: + normbeg rcontloop1,1 + + normalbeg2dc0: + normbeg rcontloop0,0 + + + ; we go in normalbeg2 because *(ushf*)(match+best_len-1) == scan_end + + normalbeg2: + mov edi,window + + cmp bp,word ptr[edi+eax] + jne contloop3 ; if *(ushf*)match != scan_start, continue + + iseq: + ; if we are here, we know that *(match+best_len-1) == scan_end + ; and (match == scan_start) + + mov edi,edx + mov esi,scan ; esi = scan + add edi,eax ; edi = window + cur_match = match + + mov edx,[esi+3] ; compare manually dword at match+3 + xor edx,[edi+3] ; and scan +3 + + jz begincompare ; if equal, go to long compare + + ; we will determine the unmatch byte and calculate len (in esi) + or dl,dl + je eq1rr + mov esi,3 + jmp trfinval + eq1rr: + or dx,dx + je eq1 + + mov esi,4 + jmp trfinval + eq1: + and edx,0ffffffh + jz eq11 + mov esi,5 + jmp trfinval + eq11: + mov esi,6 + jmp trfinval + + begincompare: + ; here we now scan and match begin same + add edi,6 + add esi,6 + mov ecx,(MAX_MATCH-(2+4))/4 ; scan for at most MAX_MATCH bytes + repe cmpsd ; loop until mismatch + + je trfin ; go to trfin if not unmatch + ; we determine the unmatch byte + sub esi,4 + mov edx,[edi-4] + xor edx,[esi] + + or dl,dl + jnz trfin + inc esi + + or dx,dx + jnz trfin + inc esi + + and edx,0ffffffh + jnz trfin + inc esi + + trfin: + sub esi,scan ; esi = len + trfinval: + ; here we have finised compare, and esi contain len of equal string + cmp esi,best_len ; if len > best_len, go newbestlen + ja short newbestlen + ; now we restore edx, ecx and esi, for the big loop + mov esi,prev + mov ecx,limit + mov edx,window + jmp contloop3 + + newbestlen: + mov best_len,esi ; len become best_len + + mov match_start,eax ; save new position as match_start + cmp esi,nice_match ; if best_len >= nice_match, exit + jae exitloop + mov ecx,scan + mov edx,window ; restore edx=window + add ecx,esi + add esi,edx + + dec esi + mov windowlen,esi ; windowlen = window + best_len-1 + mov bx,[ecx-1] ; bx = *(scan+best_len-1) = scan_end + + ; now we restore ecx and esi, for the big loop : + mov esi,prev + mov ecx,limit + jmp contloop3 + + exitloop: + ; exit : s->match_start=match_start + mov ebx,match_start + mov ebp,str_s + mov ecx,best_len + mov dword ptr [ebp+dep_match_start],ebx + mov eax,dword ptr [ebp+dep_lookahead] + cmp ecx,eax + ja minexlo + mov eax,ecx + minexlo: + ; return min(best_len,s->lookahead) + + ; restore stack and register ebx,esi,edi,ebp + add esp,NbStackAdd + + pop ebx + pop esi + pop edi + pop ebp + ret + InfoAuthor: + ; please don't remove this string ! + ; Your are free use gvmat32 in any fre or commercial apps if you don't remove the string in the binary! + db 0dh,0ah,"GVMat32 optimised assembly code written 1996-98 by Gilles Vollant",0dh,0ah + + + + IFDEF NOUNDERLINE + longest_match_7fff endp + ELSE + _longest_match_7fff endp + ENDIF + + + IFDEF NOUNDERLINE + cpudetect32 proc near + ELSE + _cpudetect32 proc near + ENDIF + + push ebx + + pushfd ; push original EFLAGS + pop eax ; get original EFLAGS + mov ecx, eax ; save original EFLAGS + xor eax, 40000h ; flip AC bit in EFLAGS + push eax ; save new EFLAGS value on stack + popfd ; replace current EFLAGS value + pushfd ; get new EFLAGS + pop eax ; store new EFLAGS in EAX + xor eax, ecx ; can’t toggle AC bit, processor=80386 + jz end_cpu_is_386 ; jump if 80386 processor + push ecx + popfd ; restore AC bit in EFLAGS first + + pushfd + pushfd + pop ecx + + mov eax, ecx ; get original EFLAGS + xor eax, 200000h ; flip ID bit in EFLAGS + push eax ; save new EFLAGS value on stack + popfd ; replace current EFLAGS value + pushfd ; get new EFLAGS + pop eax ; store new EFLAGS in EAX + popfd ; restore original EFLAGS + xor eax, ecx ; can’t toggle ID bit, + je is_old_486 ; processor=old + + mov eax,1 + db 0fh,0a2h ;CPUID + + exitcpudetect: + pop ebx + ret + + end_cpu_is_386: + mov eax,0300h + jmp exitcpudetect + + is_old_486: + mov eax,0400h + jmp exitcpudetect + + IFDEF NOUNDERLINE + cpudetect32 endp + ELSE + _cpudetect32 endp + ENDIF + ENDIF + + MAX_MATCH equ 258 + MIN_MATCH equ 3 + MIN_LOOKAHEAD equ (MAX_MATCH + MIN_MATCH + 1) + MAX_MATCH_8_ equ ((MAX_MATCH + 7) AND 0FFF0h) + + + ;;; stack frame offsets + + chainlenwmask equ esp + 0 ; high word: current chain len + ; low word: s->wmask + window equ esp + 4 ; local copy of s->window + windowbestlen equ esp + 8 ; s->window + bestlen + scanstart equ esp + 16 ; first two bytes of string + scanend equ esp + 12 ; last two bytes of string + scanalign equ esp + 20 ; dword-misalignment of string + nicematch equ esp + 24 ; a good enough match size + bestlen equ esp + 28 ; size of best match so far + scan equ esp + 32 ; ptr to string wanting match + + LocalVarsSize equ 36 + ; saved ebx byte esp + 36 + ; saved edi byte esp + 40 + ; saved esi byte esp + 44 + ; saved ebp byte esp + 48 + ; return address byte esp + 52 + deflatestate equ esp + 56 ; the function arguments + curmatch equ esp + 60 + + ;;; Offsets for fields in the deflate_state structure. These numbers + ;;; are calculated from the definition of deflate_state, with the + ;;; assumption that the compiler will dword-align the fields. (Thus, + ;;; changing the definition of deflate_state could easily cause this + ;;; program to crash horribly, without so much as a warning at + ;;; compile time. Sigh.) + + dsWSize equ 36+zlib1222add + dsWMask equ 44+zlib1222add + dsWindow equ 48+zlib1222add + dsPrev equ 56+zlib1222add + dsMatchLen equ 88+zlib1222add + dsPrevMatch equ 92+zlib1222add + dsStrStart equ 100+zlib1222add + dsMatchStart equ 104+zlib1222add + dsLookahead equ 108+zlib1222add + dsPrevLen equ 112+zlib1222add + dsMaxChainLen equ 116+zlib1222add + dsGoodMatch equ 132+zlib1222add + dsNiceMatch equ 136+zlib1222add + + + ;;; match.asm -- Pentium-Pro-optimized version of longest_match() + ;;; Written for zlib 1.1.2 + ;;; Copyright (C) 1998 Brian Raiter + ;;; You can look at http://www.muppetlabs.com/~breadbox/software/assembly.html + ;;; + ;;; This is free software; you can redistribute it and/or modify it + ;;; under the terms of the GNU General Public License. + + ;GLOBAL _longest_match, _match_init + + + ;SECTION .text + + ;;; uInt longest_match(deflate_state *deflatestate, IPos curmatch) + + ;_longest_match: + IFDEF NOOLDPENTIUMCODE + IFDEF NOUNDERLINE + longest_match proc near + ELSE + _longest_match proc near + ENDIF + ELSE + IFDEF NOUNDERLINE + longest_match_686 proc near + ELSE + _longest_match_686 proc near + ENDIF + ENDIF + + ;;; Save registers that the compiler may be using, and adjust esp to + ;;; make room for our stack frame. + + push ebp + push edi + push esi + push ebx + sub esp, LocalVarsSize + + ;;; Retrieve the function arguments. ecx will hold cur_match + ;;; throughout the entire function. edx will hold the pointer to the + ;;; deflate_state structure during the function's setup (before + ;;; entering the main loop. + + mov edx, [deflatestate] + mov ecx, [curmatch] + + ;;; uInt wmask = s->w_mask; + ;;; unsigned chain_length = s->max_chain_length; + ;;; if (s->prev_length >= s->good_match) { + ;;; chain_length >>= 2; + ;;; } + + mov eax, [edx + dsPrevLen] + mov ebx, [edx + dsGoodMatch] + cmp eax, ebx + mov eax, [edx + dsWMask] + mov ebx, [edx + dsMaxChainLen] + jl LastMatchGood + shr ebx, 2 + LastMatchGood: + + ;;; chainlen is decremented once beforehand so that the function can + ;;; use the sign flag instead of the zero flag for the exit test. + ;;; It is then shifted into the high word, to make room for the wmask + ;;; value, which it will always accompany. + + dec ebx + shl ebx, 16 + or ebx, eax + mov [chainlenwmask], ebx + + ;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; + + mov eax, [edx + dsNiceMatch] + mov ebx, [edx + dsLookahead] + cmp ebx, eax + jl LookaheadLess + mov ebx, eax + LookaheadLess: mov [nicematch], ebx + + ;;; register Bytef *scan = s->window + s->strstart; + + mov esi, [edx + dsWindow] + mov [window], esi + mov ebp, [edx + dsStrStart] + lea edi, [esi + ebp] + mov [scan], edi + + ;;; Determine how many bytes the scan ptr is off from being + ;;; dword-aligned. + + mov eax, edi + neg eax + and eax, 3 + mov [scanalign], eax + + ;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ? + ;;; s->strstart - (IPos)MAX_DIST(s) : NIL; + + mov eax, [edx + dsWSize] + sub eax, MIN_LOOKAHEAD + sub ebp, eax + jg LimitPositive + xor ebp, ebp + LimitPositive: + + ;;; int best_len = s->prev_length; + + mov eax, [edx + dsPrevLen] + mov [bestlen], eax + + ;;; Store the sum of s->window + best_len in esi locally, and in esi. + + add esi, eax + mov [windowbestlen], esi + + ;;; register ush scan_start = *(ushf*)scan; + ;;; register ush scan_end = *(ushf*)(scan+best_len-1); + ;;; Posf *prev = s->prev; + + movzx ebx, word ptr [edi] + mov [scanstart], ebx + movzx ebx, word ptr [edi + eax - 1] + mov [scanend], ebx + mov edi, [edx + dsPrev] + + ;;; Jump into the main loop. + + mov edx, [chainlenwmask] + jmp short LoopEntry + + align 4 + + ;;; do { + ;;; match = s->window + cur_match; + ;;; if (*(ushf*)(match+best_len-1) != scan_end || + ;;; *(ushf*)match != scan_start) continue; + ;;; [...] + ;;; } while ((cur_match = prev[cur_match & wmask]) > limit + ;;; && --chain_length != 0); + ;;; + ;;; Here is the inner loop of the function. The function will spend the + ;;; majority of its time in this loop, and majority of that time will + ;;; be spent in the first ten instructions. + ;;; + ;;; Within this loop: + ;;; ebx = scanend + ;;; ecx = curmatch + ;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask) + ;;; esi = windowbestlen - i.e., (window + bestlen) + ;;; edi = prev + ;;; ebp = limit + + LookupLoop: + and ecx, edx + movzx ecx, word ptr [edi + ecx*2] + cmp ecx, ebp + jbe LeaveNow + sub edx, 00010000h + js LeaveNow + LoopEntry: movzx eax, word ptr [esi + ecx - 1] + cmp eax, ebx + jnz LookupLoop + mov eax, [window] + movzx eax, word ptr [eax + ecx] + cmp eax, [scanstart] + jnz LookupLoop + + ;;; Store the current value of chainlen. + + mov [chainlenwmask], edx + + ;;; Point edi to the string under scrutiny, and esi to the string we + ;;; are hoping to match it up with. In actuality, esi and edi are + ;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is + ;;; initialized to -(MAX_MATCH_8 - scanalign). + + mov esi, [window] + mov edi, [scan] + add esi, ecx + mov eax, [scanalign] + mov edx, 0fffffef8h; -(MAX_MATCH_8) + lea edi, [edi + eax + 0108h] ;MAX_MATCH_8] + lea esi, [esi + eax + 0108h] ;MAX_MATCH_8] + + ;;; Test the strings for equality, 8 bytes at a time. At the end, + ;;; adjust edx so that it is offset to the exact byte that mismatched. + ;;; + ;;; We already know at this point that the first three bytes of the + ;;; strings match each other, and they can be safely passed over before + ;;; starting the compare loop. So what this code does is skip over 0-3 + ;;; bytes, as much as necessary in order to dword-align the edi + ;;; pointer. (esi will still be misaligned three times out of four.) + ;;; + ;;; It should be confessed that this loop usually does not represent + ;;; much of the total running time. Replacing it with a more + ;;; straightforward "rep cmpsb" would not drastically degrade + ;;; performance. + + LoopCmps: + mov eax, [esi + edx] + xor eax, [edi + edx] + jnz LeaveLoopCmps + mov eax, [esi + edx + 4] + xor eax, [edi + edx + 4] + jnz LeaveLoopCmps4 + add edx, 8 + jnz LoopCmps + jmp short LenMaximum + LeaveLoopCmps4: add edx, 4 + LeaveLoopCmps: test eax, 0000FFFFh + jnz LenLower + add edx, 2 + shr eax, 16 + LenLower: sub al, 1 + adc edx, 0 + + ;;; Calculate the length of the match. If it is longer than MAX_MATCH, + ;;; then automatically accept it as the best possible match and leave. + + lea eax, [edi + edx] + mov edi, [scan] + sub eax, edi + cmp eax, MAX_MATCH + jge LenMaximum + + ;;; If the length of the match is not longer than the best match we + ;;; have so far, then forget it and return to the lookup loop. + + mov edx, [deflatestate] + mov ebx, [bestlen] + cmp eax, ebx + jg LongerMatch + mov esi, [windowbestlen] + mov edi, [edx + dsPrev] + mov ebx, [scanend] + mov edx, [chainlenwmask] + jmp LookupLoop + + ;;; s->match_start = cur_match; + ;;; best_len = len; + ;;; if (len >= nice_match) break; + ;;; scan_end = *(ushf*)(scan+best_len-1); + + LongerMatch: mov ebx, [nicematch] + mov [bestlen], eax + mov [edx + dsMatchStart], ecx + cmp eax, ebx + jge LeaveNow + mov esi, [window] + add esi, eax + mov [windowbestlen], esi + movzx ebx, word ptr [edi + eax - 1] + mov edi, [edx + dsPrev] + mov [scanend], ebx + mov edx, [chainlenwmask] + jmp LookupLoop + + ;;; Accept the current string, with the maximum possible length. + + LenMaximum: mov edx, [deflatestate] + mov dword ptr [bestlen], MAX_MATCH + mov [edx + dsMatchStart], ecx + + ;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len; + ;;; return s->lookahead; + + LeaveNow: + mov edx, [deflatestate] + mov ebx, [bestlen] + mov eax, [edx + dsLookahead] + cmp ebx, eax + jg LookaheadRet + mov eax, ebx + LookaheadRet: + + ;;; Restore the stack and return from whence we came. + + add esp, LocalVarsSize + pop ebx + pop esi + pop edi + pop ebp + + ret + ; please don't remove this string ! + ; Your can freely use gvmat32 in any free or commercial app if you don't remove the string in the binary! + db 0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998",0dh,0ah + + + IFDEF NOOLDPENTIUMCODE + IFDEF NOUNDERLINE + longest_match endp + ELSE + _longest_match endp + ENDIF + + IFDEF NOUNDERLINE + match_init proc near + ret + match_init endp + ELSE + _match_init proc near + ret + _match_init endp + ENDIF + ELSE + IFDEF NOUNDERLINE + longest_match_686 endp + ELSE + _longest_match_686 endp + ENDIF + ENDIF + + _TEXT ends + end diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx86/gvmat32.obj gcc-4.4.5/zlib/contrib/masmx86/gvmat32.obj *** gcc-4.4.4/zlib/contrib/masmx86/gvmat32.obj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx86/gvmat32.obj Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,87 ---- + L‰.B~i.text´¸] 0`.data@0À.debug$S|æb”@B.debug$T€T*@B‹T$UWVSƒì4‹ê‹U|‹]x9ŒwÁêB‹½‰T$0‹Et;Çs‹ø‰\$(‹u8‹Ml‰t$$‰|$ñ‰t$ f‹f‹\3ÿÆf‰T$‰4$‹u,î+Îw3ɉL$,‹U@‰T$ ‹Upf‹l$‹D$L‰T$‹T$$‹ú|$(‹t$ O‰|$ëNƒD$0„Ñf98t%ÿf‹F;ȃºÿL$0uãé¯f;,uÞéã‹|$%ÿf‹F;ȃƒl$0v¬f98„¬%ÿf‹F;ȃmf98„€%ÿf‹F;ȃRf98„T%ÿf‹F;ȃ7f98„(%ÿf‹F;ȃf98„ü%ÿf‹F;ȃf98„Ð%ÿf‹F;ȃæf98„¤%ÿf‹F;ȃËf98„u%ÿf‹F;ȃ°f98„F%ÿf‹F;ȃ•f98„%ÿf‹F;ȃzf98„è%ÿf‹F;ȃ_f98t}%ÿf‹F;ȃHf98tz%ÿf‹F;ȃ1f98ts%ÿf‹F;ȃf98tl%ÿf‹F;ȃf98te%ÿf‹F;ȃìƒl$0‡Yþÿÿéþÿÿf;,…yÿÿÿƒD$0éf;,u€ƒD$0éf;,u‡ƒD$0éõf;,uŽƒD$0éåf;,u•ƒD$0éÕf;,…ÿÿÿƒD$0éÁf;,…ßþÿÿƒD$0é­f;,…°þÿÿƒD$0é™f;,…þÿÿƒD$0 é…f;,…RþÿÿƒD$0 + ëtf;,…&þÿÿƒD$0 ëcf;,…úýÿÿƒD$0 ëRf;,…ÎýÿÿƒD$0 ëAf;,…¢ýÿÿƒD$0ë0f;,…výÿÿƒD$0ëf;,…JýÿÿƒD$0ë‹|$$f;,8…ýÿÿ‹ú‹t$ ø‹V3Wt- + Òt¾ëQf Òt¾ëEâÿÿÿt¾ë6¾ë/ƒÇƒÆ¹?ó§tƒî‹Wü3 + ÒuFf Òu + FâÿÿÿuF+t$ ;t$(w‹t$ ‹L$,‹T$$éŒüÿÿ‰t$(‰D$;t$s"‹L$ ‹T$$ÎòN‰t$f‹Yÿ‹t$ ‹L$,é\üÿÿ‹\$‹l$H‹L$(‰]p‹Et;Èw‹ÁƒÄ4[^_]à + GVMat32 optimised assembly code written 1996-98 by Gilles Vollant + SœX‹È5PœX3ÁtQœœY‹Á5 PœX3Át¸¢[øë÷¸ëðUWVSƒì$‹T$8‹L$<‹Bx‹šŒ;ËB4‹Z||ÁëKÁã ؉$‹‚‹Zt;Ø|‹Ø‰\$‹r8‰t$‹jl|5‰|$ ‹Ç÷؃à‰D$‹B,-+è3í‹Bx‰D$ð‰t$·‰\$·\8ÿ‰\$ ‹z@‹$ë#Ê· O;͆àêˆÔ·D1ÿ;ÃuÝ‹D$·;D$uω$‹t$‹|$ ñ‹D$ºøþÿÿ¼8´0‹23:u‹D23D:uƒÂuéëqƒÂ©ÿÿuƒÂÁè,ƒÒ:‹|$ +Ç=}L‹T$8‹\$;Ët$‹z@‹\$ ‹$éNÿÿÿ‹\$‰D$‰Jp;Ã}-‹t$ð‰t$·\8ÿ‹z@‰\$ ‹$é!ÿÿÿ‹T$8ÇD$‰Jp‹T$8‹\$‹Bt;؋ÃÄ$[^_]à + asm686 with masm, optimised assembly code from Brian Raiter, written 1998 +   +   %),. 0!2$6'9(<)@+D-F.J0M2R3X5]7`=c>i@kAmBoDsGvHzK}L‚M†NŠPŽQR”S˜T™VX f¥g«i¯j±m¶nºp¼qÂsÆtÈuÍyÑzÓ{Ø~Üá‚å„ç†íŒòŽô‘ø’þž¡4¤O§jª…­ °»³Ö¶ñ¹ ¼#¿:ÂQÅhÈË„̈ÍŠÎЕћҠâ´åÄèÔëäîôñô÷0úDýUfwˆ ™ ª»¿ÃÉËÏ Ñ"Ô#×%Ù(Û)Ý*â+ä-ç.é0î1ð3ö4ø5ý6ÿ89= > ?@BDEFHI!J"L%M'N(P.Q0R1U5X9Y;[?\C]G^LaPcTdXeZf^gbhdifkglkmopsqwr|v€w„xˆy‹zŽ{|’}”‚—„˜…™†š‡›ˆáâãäæë ì + í î ï ñóôõö÷øúÿ $%(),- ! " + # &*.179<? A!D)E*H+J,M0S1V2X3Z4\5`9c:g;j<n=rBtCvDyE}J€K…L‡M‰N‹SŽT’X”Y˜_›`Ÿa¤b¨c«g®h°²‚¶ƒ¸„¾…Ćʇψщӊ׋یßá‘ä˜è™ìšî›òœ÷þž¯° ± ²³´µ¶·¸!¹&º(»+¼.½0¾3Ã6Ä:Å<ÆAÇCÌGÍKÎMÏOÐSÑVÒZÓ]ÔbÛfÜjÝmÞoßqàuáwâ{ã€äƒå‡æŠçë“ì›ížó¢ô¦õ©ö«÷­ø¯ý²þ³ÿ´µ¶ñ,O:\updasm\contrib\masmx86\gvmat32.obj4 +  Microsoft (R) Macro Assembler8åå_longest_match_686LastMatchGoodLookaheadLessLimitPositiveLookupLoopLoopEntryLoopCmpsLeaveLoopCmps4LeaveLoopCmpsLenLowerLongerMatchLenMaximumLeaveNowLookaheadRet2>>_cpudetect32exitcpudetectend_cpu_is_386is_old_4869áá_longest_match_7fffnoshrnolookaheadnicematchnodistnormalbeg0add16normalbeg0rcontlabnorollnormalbeg2norollcontloop3jnbexitloopshort1beginloop2do16rcontloop0rcontloop1rcontloop2rcontloop3rcontloop4rcontloop5rcontloop6rcontloop7rcontloop8rcontloop9rcontloop10rcontloop11rcontloop12rcontloop13rcontloop14rcontloop15normalbeg2dc11normalbeg2dc12normalbeg2dc13normalbeg2dc14normalbeg2dc15normalbeg2dc10normalbeg2dc9normalbeg2dc8normalbeg2dc7normalbeg2dc6normalbeg2dc5normalbeg2dc4normalbeg2dc3normalbeg2dc2normalbeg2dc1normalbeg2dc0normalbeg2iseqeq1rr eq1eq11begincomparetrfintrfinvalnewbestlenexitloopminexloInfoAuthor ” + ®" ²" + Ç# Ë# + à$ ä$ + ù% ý% + & & + $' (' + 8( <( + R) V) + k* o* + + ƒ+ + –, š, + ¬- °- + À. Ä. + ø ü + / / + )0 -0 + C1 G1 + y } + ˜2 œ2 + ©3 ­3 + É4 Í4 + Û5 ß5 + ö6 ú6 + 7 7 + &8 *8 + B9 F9 + W: [: + t; x; + Š< Ž< + š= ž= + °> ´> + Æ? Ê? + Ü@ à@ + òA öA + B B + C "C + 4D 8D + JE NE + `F dF + vG zG + H ‘H + ¤I ¨I + »J ¿J + ÒK ÖK + éL íL + M M + N N + 4O 8O + NP RP + hQ lQ + ‚R †R + œS  S + µT ¹T + ÎU ÒU + çV ëV + W W + X X + 2Y 6Y + KZ OZ + d[ h[ + }\ \ + –] š] + ¬^ °^ + ¼_ À_ + Í` Ñ` + Üa àa + ìb ðb + c c + d d + )e -e + ?f Cf + Sg Wg + fh jh + òñž}\.fileþÿgO:\updasm\contrib\masmx86\gvmat32.asm@comp.id ÿÿ.text].data.debug$S|”.debug$TT á¸.bfeŽ.lf»e.efáeá > .bfáe(.lf!e.efeU% åà .bfeª.lfe.efe­8DF\T‹b°mÊLoopCmpsw†!LenLower.”b LeaveNowž«¯¸ÆÕnoshrà2nodistoõ «±Í0Ø:çLído16ôWþbm4xOƒjŽ…™ ¤»¯ÖºñÅ Ñ#Ý:éQõh  ´+Ä:ÔIäXôguƒ0‘DŸU­f»wɈיåªó»iseqÉeq1rräeq1ðeq11ÿþtrfin1trfinval5 Lexitloop|minexlo”œ!_longest_match_7fff_cpudetect32_longest_match_686LastMatchGoodLookaheadLessLimitPositiveLookupLoopLoopEntryLeaveLoopCmps4LeaveLoopCmpsLongerMatchLenMaximumLookaheadRetexitcpudetectend_cpu_is_386is_old_486nolookaheadnicematchnormalbeg0add16normalbeg0rcontlabnorollnormalbeg2norollcontloop3jnbexitloopshort1beginloop2rcontloop0rcontloop1rcontloop2rcontloop3rcontloop4rcontloop5rcontloop6rcontloop7rcontloop8rcontloop9rcontloop10rcontloop11rcontloop12rcontloop13rcontloop14rcontloop15normalbeg2dc11normalbeg2dc12normalbeg2dc13normalbeg2dc14normalbeg2dc15normalbeg2dc10normalbeg2dc9normalbeg2dc8normalbeg2dc7normalbeg2dc6normalbeg2dc5normalbeg2dc4normalbeg2dc3normalbeg2dc2normalbeg2dc1normalbeg2dc0normalbeg2begincomparenewbestlenInfoAuthor \ No newline at end of file diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx86/gvmat32c.c gcc-4.4.5/zlib/contrib/masmx86/gvmat32c.c *** gcc-4.4.4/zlib/contrib/masmx86/gvmat32c.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx86/gvmat32c.c Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,62 ---- + /* gvmat32.c -- C portion of the optimized longest_match for 32 bits x86 + * Copyright (C) 1995-1996 Jean-loup Gailly and Gilles Vollant. + * File written by Gilles Vollant, by modifiying the longest_match + * from Jean-loup Gailly in deflate.c + * it prepare all parameters and call the assembly longest_match_gvasm + * longest_match execute standard C code is wmask != 0x7fff + * (assembly code is faster with a fixed wmask) + * + * Read comment at beginning of gvmat32.asm for more information + */ + + #if defined(ASMV) && (!defined(NOOLDPENTIUMCODE)) + #include "deflate.h" + + /* if your C compiler don't add underline before function name, + define ADD_UNDERLINE_ASMFUNC */ + #ifdef ADD_UNDERLINE_ASMFUNC + #define longest_match_7fff _longest_match_7fff + #define longest_match_686 _longest_match_686 + #define cpudetect32 _cpudetect32 + #endif + + + unsigned long cpudetect32(); + + uInt longest_match_c( + deflate_state *s, + IPos cur_match); /* current match */ + + + uInt longest_match_7fff( + deflate_state *s, + IPos cur_match); /* current match */ + + uInt longest_match_686( + deflate_state *s, + IPos cur_match); /* current match */ + + + static uInt iIsPPro=2; + + void match_init () + { + iIsPPro = (((cpudetect32()/0x100)&0xf)>=6) ? 1 : 0; + } + + uInt longest_match( + deflate_state *s, + IPos cur_match) /* current match */ + { + if (iIsPPro!=0) + return longest_match_686(s,cur_match); + + if (s->w_mask != 0x7fff) + return longest_match_686(s,cur_match); + + /* now ((s->w_mask == 0x7fff) && (iIsPPro==0)) */ + return longest_match_7fff(s,cur_match); + } + + + #endif /* defined(ASMV) && (!defined(NOOLDPENTIUMCODE)) */ diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx86/inffas32.asm gcc-4.4.5/zlib/contrib/masmx86/inffas32.asm *** gcc-4.4.4/zlib/contrib/masmx86/inffas32.asm Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx86/inffas32.asm Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,1083 ---- + ;/* inffas32.asm is a hand tuned assembler version of inffast.c -- fast decoding + ; * + ; * inffas32.asm is derivated from inffas86.c, with translation of assembly code + ; * + ; * Copyright (C) 1995-2003 Mark Adler + ; * For conditions of distribution and use, see copyright notice in zlib.h + ; * + ; * Copyright (C) 2003 Chris Anderson + ; * Please use the copyright conditions above. + ; * + ; * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from + ; * the gcc -S output of zlib-1.2.0/inffast.c. Zlib-1.2.0 is in beta release at + ; * the moment. I have successfully compiled and tested this code with gcc2.96, + ; * gcc3.2, icc5.0, msvc6.0. It is very close to the speed of inffast.S + ; * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX + ; * enabled. I will attempt to merge the MMX code into this version. Newer + ; * versions of this and inffast.S can be found at + ; * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/ + ; * + ; * 2005 : modification by Gilles Vollant + ; */ + ; For Visual C++ 4.x and higher and ML 6.x and higher + ; ml.exe is in directory \MASM611C of Win95 DDK + ; ml.exe is also distributed in http://www.masm32.com/masmdl.htm + ; and in VC++2003 toolkit at http://msdn.microsoft.com/visualc/vctoolkit2003/ + ; + ; + ; compile with command line option + ; ml /coff /Zi /c /Flinffas32.lst inffas32.asm + + ; if you define NO_GZIP (see inflate.h), compile with + ; ml /coff /Zi /c /Flinffas32.lst /DNO_GUNZIP inffas32.asm + + + ; zlib122sup is 0 fort zlib 1.2.2.1 and lower + ; zlib122sup is 8 fort zlib 1.2.2.2 and more (with addition of dmax and head + ; in inflate_state in inflate.h) + zlib1222sup equ 8 + + + IFDEF GUNZIP + INFLATE_MODE_TYPE equ 11 + INFLATE_MODE_BAD equ 26 + ELSE + IFNDEF NO_GUNZIP + INFLATE_MODE_TYPE equ 11 + INFLATE_MODE_BAD equ 26 + ELSE + INFLATE_MODE_TYPE equ 3 + INFLATE_MODE_BAD equ 17 + ENDIF + ENDIF + + + ; 75 "inffast.S" + ;FILE "inffast.S" + + ;;;GLOBAL _inflate_fast + + ;;;SECTION .text + + + + .586p + .mmx + + name inflate_fast_x86 + .MODEL FLAT + + _DATA segment + inflate_fast_use_mmx: + dd 1 + + + _TEXT segment + PUBLIC _inflate_fast + + ALIGN 4 + _inflate_fast: + jmp inflate_fast_entry + + + + ALIGN 4 + db 'Fast decoding Code from Chris Anderson' + db 0 + + ALIGN 4 + invalid_literal_length_code_msg: + db 'invalid literal/length code' + db 0 + + ALIGN 4 + invalid_distance_code_msg: + db 'invalid distance code' + db 0 + + ALIGN 4 + invalid_distance_too_far_msg: + db 'invalid distance too far back' + db 0 + + + ALIGN 4 + inflate_fast_mask: + dd 0 + dd 1 + dd 3 + dd 7 + dd 15 + dd 31 + dd 63 + dd 127 + dd 255 + dd 511 + dd 1023 + dd 2047 + dd 4095 + dd 8191 + dd 16383 + dd 32767 + dd 65535 + dd 131071 + dd 262143 + dd 524287 + dd 1048575 + dd 2097151 + dd 4194303 + dd 8388607 + dd 16777215 + dd 33554431 + dd 67108863 + dd 134217727 + dd 268435455 + dd 536870911 + dd 1073741823 + dd 2147483647 + dd 4294967295 + + + mode_state equ 0 ;/* state->mode */ + wsize_state equ (32+zlib1222sup) ;/* state->wsize */ + write_state equ (36+4+zlib1222sup) ;/* state->write */ + window_state equ (40+4+zlib1222sup) ;/* state->window */ + hold_state equ (44+4+zlib1222sup) ;/* state->hold */ + bits_state equ (48+4+zlib1222sup) ;/* state->bits */ + lencode_state equ (64+4+zlib1222sup) ;/* state->lencode */ + distcode_state equ (68+4+zlib1222sup) ;/* state->distcode */ + lenbits_state equ (72+4+zlib1222sup) ;/* state->lenbits */ + distbits_state equ (76+4+zlib1222sup) ;/* state->distbits */ + + + ;;SECTION .text + ; 205 "inffast.S" + ;GLOBAL inflate_fast_use_mmx + + ;SECTION .data + + + ; GLOBAL inflate_fast_use_mmx:object + ;.size inflate_fast_use_mmx, 4 + ; 226 "inffast.S" + ;SECTION .text + + ALIGN 4 + inflate_fast_entry: + push edi + push esi + push ebp + push ebx + pushfd + sub esp,64 + cld + + + + + mov esi, [esp+88] + mov edi, [esi+28] + + + + + + + + mov edx, [esi+4] + mov eax, [esi+0] + + add edx,eax + sub edx,11 + + mov [esp+44],eax + mov [esp+20],edx + + mov ebp, [esp+92] + mov ecx, [esi+16] + mov ebx, [esi+12] + + sub ebp,ecx + neg ebp + add ebp,ebx + + sub ecx,257 + add ecx,ebx + + mov [esp+60],ebx + mov [esp+40],ebp + mov [esp+16],ecx + ; 285 "inffast.S" + mov eax, [edi+lencode_state] + mov ecx, [edi+distcode_state] + + mov [esp+8],eax + mov [esp+12],ecx + + mov eax,1 + mov ecx, [edi+lenbits_state] + shl eax,cl + dec eax + mov [esp+0],eax + + mov eax,1 + mov ecx, [edi+distbits_state] + shl eax,cl + dec eax + mov [esp+4],eax + + mov eax, [edi+wsize_state] + mov ecx, [edi+write_state] + mov edx, [edi+window_state] + + mov [esp+52],eax + mov [esp+48],ecx + mov [esp+56],edx + + mov ebp, [edi+hold_state] + mov ebx, [edi+bits_state] + ; 321 "inffast.S" + mov esi, [esp+44] + mov ecx, [esp+20] + cmp ecx,esi + ja L_align_long + + add ecx,11 + sub ecx,esi + mov eax,12 + sub eax,ecx + lea edi, [esp+28] + rep movsb + mov ecx,eax + xor eax,eax + rep stosb + lea esi, [esp+28] + mov [esp+20],esi + jmp L_is_aligned + + + L_align_long: + test esi,3 + jz L_is_aligned + xor eax,eax + mov al, [esi] + inc esi + mov ecx,ebx + add ebx,8 + shl eax,cl + or ebp,eax + jmp L_align_long + + L_is_aligned: + mov edi, [esp+60] + ; 366 "inffast.S" + L_check_mmx: + cmp dword ptr [inflate_fast_use_mmx],2 + je L_init_mmx + ja L_do_loop + + push eax + push ebx + push ecx + push edx + pushfd + mov eax, [esp] + xor dword ptr [esp],0200000h + + + + + popfd + pushfd + pop edx + xor edx,eax + jz L_dont_use_mmx + xor eax,eax + cpuid + cmp ebx,0756e6547h + jne L_dont_use_mmx + cmp ecx,06c65746eh + jne L_dont_use_mmx + cmp edx,049656e69h + jne L_dont_use_mmx + mov eax,1 + cpuid + shr eax,8 + and eax,15 + cmp eax,6 + jne L_dont_use_mmx + test edx,0800000h + jnz L_use_mmx + jmp L_dont_use_mmx + L_use_mmx: + mov dword ptr [inflate_fast_use_mmx],2 + jmp L_check_mmx_pop + L_dont_use_mmx: + mov dword ptr [inflate_fast_use_mmx],3 + L_check_mmx_pop: + pop edx + pop ecx + pop ebx + pop eax + jmp L_check_mmx + ; 426 "inffast.S" + ALIGN 4 + L_do_loop: + ; 437 "inffast.S" + cmp bl,15 + ja L_get_length_code + + xor eax,eax + lodsw + mov cl,bl + add bl,16 + shl eax,cl + or ebp,eax + + L_get_length_code: + mov edx, [esp+0] + mov ecx, [esp+8] + and edx,ebp + mov eax, [ecx+edx*4] + + L_dolen: + + + + + + + mov cl,ah + sub bl,ah + shr ebp,cl + + + + + + + test al,al + jnz L_test_for_length_base + + shr eax,16 + stosb + + L_while_test: + + + cmp [esp+16],edi + jbe L_break_loop + + cmp [esp+20],esi + ja L_do_loop + jmp L_break_loop + + L_test_for_length_base: + ; 502 "inffast.S" + mov edx,eax + shr edx,16 + mov cl,al + + test al,16 + jz L_test_for_second_level_length + and cl,15 + jz L_save_len + cmp bl,cl + jae L_add_bits_to_len + + mov ch,cl + xor eax,eax + lodsw + mov cl,bl + add bl,16 + shl eax,cl + or ebp,eax + mov cl,ch + + L_add_bits_to_len: + mov eax,1 + shl eax,cl + dec eax + sub bl,cl + and eax,ebp + shr ebp,cl + add edx,eax + + L_save_len: + mov [esp+24],edx + + + L_decode_distance: + ; 549 "inffast.S" + cmp bl,15 + ja L_get_distance_code + + xor eax,eax + lodsw + mov cl,bl + add bl,16 + shl eax,cl + or ebp,eax + + L_get_distance_code: + mov edx, [esp+4] + mov ecx, [esp+12] + and edx,ebp + mov eax, [ecx+edx*4] + + + L_dodist: + mov edx,eax + shr edx,16 + mov cl,ah + sub bl,ah + shr ebp,cl + ; 584 "inffast.S" + mov cl,al + + test al,16 + jz L_test_for_second_level_dist + and cl,15 + jz L_check_dist_one + cmp bl,cl + jae L_add_bits_to_dist + + mov ch,cl + xor eax,eax + lodsw + mov cl,bl + add bl,16 + shl eax,cl + or ebp,eax + mov cl,ch + + L_add_bits_to_dist: + mov eax,1 + shl eax,cl + dec eax + sub bl,cl + and eax,ebp + shr ebp,cl + add edx,eax + jmp L_check_window + + L_check_window: + ; 625 "inffast.S" + mov [esp+44],esi + mov eax,edi + sub eax, [esp+40] + + cmp eax,edx + jb L_clip_window + + mov ecx, [esp+24] + mov esi,edi + sub esi,edx + + sub ecx,3 + mov al, [esi] + mov [edi],al + mov al, [esi+1] + mov dl, [esi+2] + add esi,3 + mov [edi+1],al + mov [edi+2],dl + add edi,3 + rep movsb + + mov esi, [esp+44] + jmp L_while_test + + ALIGN 4 + L_check_dist_one: + cmp edx,1 + jne L_check_window + cmp [esp+40],edi + je L_check_window + + dec edi + mov ecx, [esp+24] + mov al, [edi] + sub ecx,3 + + mov [edi+1],al + mov [edi+2],al + mov [edi+3],al + add edi,4 + rep stosb + + jmp L_while_test + + ALIGN 4 + L_test_for_second_level_length: + + + + + test al,64 + jnz L_test_for_end_of_block + + mov eax,1 + shl eax,cl + dec eax + and eax,ebp + add eax,edx + mov edx, [esp+8] + mov eax, [edx+eax*4] + jmp L_dolen + + ALIGN 4 + L_test_for_second_level_dist: + + + + + test al,64 + jnz L_invalid_distance_code + + mov eax,1 + shl eax,cl + dec eax + and eax,ebp + add eax,edx + mov edx, [esp+12] + mov eax, [edx+eax*4] + jmp L_dodist + + ALIGN 4 + L_clip_window: + ; 721 "inffast.S" + mov ecx,eax + mov eax, [esp+52] + neg ecx + mov esi, [esp+56] + + cmp eax,edx + jb L_invalid_distance_too_far + + add ecx,edx + cmp dword ptr [esp+48],0 + jne L_wrap_around_window + + sub eax,ecx + add esi,eax + ; 749 "inffast.S" + mov eax, [esp+24] + cmp eax,ecx + jbe L_do_copy1 + + sub eax,ecx + rep movsb + mov esi,edi + sub esi,edx + jmp L_do_copy1 + + cmp eax,ecx + jbe L_do_copy1 + + sub eax,ecx + rep movsb + mov esi,edi + sub esi,edx + jmp L_do_copy1 + + L_wrap_around_window: + ; 793 "inffast.S" + mov eax, [esp+48] + cmp ecx,eax + jbe L_contiguous_in_window + + add esi, [esp+52] + add esi,eax + sub esi,ecx + sub ecx,eax + + + mov eax, [esp+24] + cmp eax,ecx + jbe L_do_copy1 + + sub eax,ecx + rep movsb + mov esi, [esp+56] + mov ecx, [esp+48] + cmp eax,ecx + jbe L_do_copy1 + + sub eax,ecx + rep movsb + mov esi,edi + sub esi,edx + jmp L_do_copy1 + + L_contiguous_in_window: + ; 836 "inffast.S" + add esi,eax + sub esi,ecx + + + mov eax, [esp+24] + cmp eax,ecx + jbe L_do_copy1 + + sub eax,ecx + rep movsb + mov esi,edi + sub esi,edx + + L_do_copy1: + ; 862 "inffast.S" + mov ecx,eax + rep movsb + + mov esi, [esp+44] + jmp L_while_test + ; 878 "inffast.S" + ALIGN 4 + L_init_mmx: + emms + + + + + + movd mm0,ebp + mov ebp,ebx + ; 896 "inffast.S" + movd mm4,[esp+0] + movq mm3,mm4 + movd mm5,[esp+4] + movq mm2,mm5 + pxor mm1,mm1 + mov ebx, [esp+8] + jmp L_do_loop_mmx + + ALIGN 4 + L_do_loop_mmx: + psrlq mm0,mm1 + + cmp ebp,32 + ja L_get_length_code_mmx + + movd mm6,ebp + movd mm7,[esi] + add esi,4 + psllq mm7,mm6 + add ebp,32 + por mm0,mm7 + + L_get_length_code_mmx: + pand mm4,mm0 + movd eax,mm4 + movq mm4,mm3 + mov eax, [ebx+eax*4] + + L_dolen_mmx: + movzx ecx,ah + movd mm1,ecx + sub ebp,ecx + + test al,al + jnz L_test_for_length_base_mmx + + shr eax,16 + stosb + + L_while_test_mmx: + + + cmp [esp+16],edi + jbe L_break_loop + + cmp [esp+20],esi + ja L_do_loop_mmx + jmp L_break_loop + + L_test_for_length_base_mmx: + + mov edx,eax + shr edx,16 + + test al,16 + jz L_test_for_second_level_length_mmx + and eax,15 + jz L_decode_distance_mmx + + psrlq mm0,mm1 + movd mm1,eax + movd ecx,mm0 + sub ebp,eax + and ecx, [inflate_fast_mask+eax*4] + add edx,ecx + + L_decode_distance_mmx: + psrlq mm0,mm1 + + cmp ebp,32 + ja L_get_dist_code_mmx + + movd mm6,ebp + movd mm7,[esi] + add esi,4 + psllq mm7,mm6 + add ebp,32 + por mm0,mm7 + + L_get_dist_code_mmx: + mov ebx, [esp+12] + pand mm5,mm0 + movd eax,mm5 + movq mm5,mm2 + mov eax, [ebx+eax*4] + + L_dodist_mmx: + + movzx ecx,ah + mov ebx,eax + shr ebx,16 + sub ebp,ecx + movd mm1,ecx + + test al,16 + jz L_test_for_second_level_dist_mmx + and eax,15 + jz L_check_dist_one_mmx + + L_add_bits_to_dist_mmx: + psrlq mm0,mm1 + movd mm1,eax + movd ecx,mm0 + sub ebp,eax + and ecx, [inflate_fast_mask+eax*4] + add ebx,ecx + + L_check_window_mmx: + mov [esp+44],esi + mov eax,edi + sub eax, [esp+40] + + cmp eax,ebx + jb L_clip_window_mmx + + mov ecx,edx + mov esi,edi + sub esi,ebx + + sub ecx,3 + mov al, [esi] + mov [edi],al + mov al, [esi+1] + mov dl, [esi+2] + add esi,3 + mov [edi+1],al + mov [edi+2],dl + add edi,3 + rep movsb + + mov esi, [esp+44] + mov ebx, [esp+8] + jmp L_while_test_mmx + + ALIGN 4 + L_check_dist_one_mmx: + cmp ebx,1 + jne L_check_window_mmx + cmp [esp+40],edi + je L_check_window_mmx + + dec edi + mov ecx,edx + mov al, [edi] + sub ecx,3 + + mov [edi+1],al + mov [edi+2],al + mov [edi+3],al + add edi,4 + rep stosb + + mov ebx, [esp+8] + jmp L_while_test_mmx + + ALIGN 4 + L_test_for_second_level_length_mmx: + test al,64 + jnz L_test_for_end_of_block + + and eax,15 + psrlq mm0,mm1 + movd ecx,mm0 + and ecx, [inflate_fast_mask+eax*4] + add ecx,edx + mov eax, [ebx+ecx*4] + jmp L_dolen_mmx + + ALIGN 4 + L_test_for_second_level_dist_mmx: + test al,64 + jnz L_invalid_distance_code + + and eax,15 + psrlq mm0,mm1 + movd ecx,mm0 + and ecx, [inflate_fast_mask+eax*4] + mov eax, [esp+12] + add ecx,ebx + mov eax, [eax+ecx*4] + jmp L_dodist_mmx + + ALIGN 4 + L_clip_window_mmx: + + mov ecx,eax + mov eax, [esp+52] + neg ecx + mov esi, [esp+56] + + cmp eax,ebx + jb L_invalid_distance_too_far + + add ecx,ebx + cmp dword ptr [esp+48],0 + jne L_wrap_around_window_mmx + + sub eax,ecx + add esi,eax + + cmp edx,ecx + jbe L_do_copy1_mmx + + sub edx,ecx + rep movsb + mov esi,edi + sub esi,ebx + jmp L_do_copy1_mmx + + cmp edx,ecx + jbe L_do_copy1_mmx + + sub edx,ecx + rep movsb + mov esi,edi + sub esi,ebx + jmp L_do_copy1_mmx + + L_wrap_around_window_mmx: + + mov eax, [esp+48] + cmp ecx,eax + jbe L_contiguous_in_window_mmx + + add esi, [esp+52] + add esi,eax + sub esi,ecx + sub ecx,eax + + + cmp edx,ecx + jbe L_do_copy1_mmx + + sub edx,ecx + rep movsb + mov esi, [esp+56] + mov ecx, [esp+48] + cmp edx,ecx + jbe L_do_copy1_mmx + + sub edx,ecx + rep movsb + mov esi,edi + sub esi,ebx + jmp L_do_copy1_mmx + + L_contiguous_in_window_mmx: + + add esi,eax + sub esi,ecx + + + cmp edx,ecx + jbe L_do_copy1_mmx + + sub edx,ecx + rep movsb + mov esi,edi + sub esi,ebx + + L_do_copy1_mmx: + + + mov ecx,edx + rep movsb + + mov esi, [esp+44] + mov ebx, [esp+8] + jmp L_while_test_mmx + ; 1174 "inffast.S" + L_invalid_distance_code: + + + + + + mov ecx, invalid_distance_code_msg + mov edx,INFLATE_MODE_BAD + jmp L_update_stream_state + + L_test_for_end_of_block: + + + + + + test al,32 + jz L_invalid_literal_length_code + + mov ecx,0 + mov edx,INFLATE_MODE_TYPE + jmp L_update_stream_state + + L_invalid_literal_length_code: + + + + + + mov ecx, invalid_literal_length_code_msg + mov edx,INFLATE_MODE_BAD + jmp L_update_stream_state + + L_invalid_distance_too_far: + + + + mov esi, [esp+44] + mov ecx, invalid_distance_too_far_msg + mov edx,INFLATE_MODE_BAD + jmp L_update_stream_state + + L_update_stream_state: + + mov eax, [esp+88] + test ecx,ecx + jz L_skip_msg + mov [eax+24],ecx + L_skip_msg: + mov eax, [eax+28] + mov [eax+mode_state],edx + jmp L_break_loop + + ALIGN 4 + L_break_loop: + ; 1243 "inffast.S" + cmp dword ptr [inflate_fast_use_mmx],2 + jne L_update_next_in + + + + mov ebx,ebp + + L_update_next_in: + ; 1266 "inffast.S" + mov eax, [esp+88] + mov ecx,ebx + mov edx, [eax+28] + shr ecx,3 + sub esi,ecx + shl ecx,3 + sub ebx,ecx + mov [eax+12],edi + mov [edx+bits_state],ebx + mov ecx,ebx + + lea ebx, [esp+28] + cmp [esp+20],ebx + jne L_buf_not_used + + sub esi,ebx + mov ebx, [eax+0] + mov [esp+20],ebx + add esi,ebx + mov ebx, [eax+4] + sub ebx,11 + add [esp+20],ebx + + L_buf_not_used: + mov [eax+0],esi + + mov ebx,1 + shl ebx,cl + dec ebx + + + + + + cmp dword ptr [inflate_fast_use_mmx],2 + jne L_update_hold + + + + psrlq mm0,mm1 + movd ebp,mm0 + + emms + + L_update_hold: + + + + and ebp,ebx + mov [edx+hold_state],ebp + + + + + mov ebx, [esp+20] + cmp ebx,esi + jbe L_last_is_smaller + + sub ebx,esi + add ebx,11 + mov [eax+4],ebx + jmp L_fixup_out + L_last_is_smaller: + sub esi,ebx + neg esi + add esi,11 + mov [eax+4],esi + + + + + L_fixup_out: + + mov ebx, [esp+16] + cmp ebx,edi + jbe L_end_is_smaller + + sub ebx,edi + add ebx,257 + mov [eax+16],ebx + jmp L_done + L_end_is_smaller: + sub edi,ebx + neg edi + add edi,257 + mov [eax+16],edi + + + + + + L_done: + add esp,64 + popfd + pop ebx + pop ebp + pop esi + pop edi + ret + + _TEXT ends + end diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx86/inffas32.obj gcc-4.4.5/zlib/contrib/masmx86/inffas32.obj *** gcc-4.4.4/zlib/contrib/masmx86/inffas32.obj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx86/inffas32.obj Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,158 ---- + LvŽBÖ/R.text›´PÈ Q P`.data›®@PÀ.debug$SŸ²Ê%þ@B.debug$T· ¶/@BéIFast decoding Code from Chris Andersoninvalid literal/length codeinvalid distance code‹ÿinvalid distance too far back‹ÿ?ÿÿÿÿÿÿÿ?ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ?ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ?ÿÿÿÿÿÿÿWVUSœƒì@ü‹t$X‹~‹V‹Ðƒê ‰D$,‰T$‹l$\‹N‹^ +é÷Ýëéˉ\$<‰l$(‰L$‹GL‹OP‰D$‰L$ ¸‹OTÓàH‰$¸‹OXÓàH‰D$‹G(‹O0‹W4‰D$4‰L$0‰T$8‹o8‹_<‹t$,‹L$;Îw"ƒÁ +θ +Á|$ó¤‹È3Àóªt$‰t$ë÷Æt3ÀŠF‹ËƒÃÓà èëè‹|$<ƒ=„‰wkPSQRœ‹$4$ œZ3ÐtD3À¢ûGenuu8ùntelu0úineIu(¸¢Áèƒàƒøu÷€uë Çë + ÇZY[X뇀ûw 3Àf­ŠË€ÃÓà è‹$‹L$#Õ‹‘ŠÌ*ÜÓí„ÀuÁèª9|$†b9t$wÄéW‹ÐÁêŠÈ¨„ô€át%8ËsŠé3Àf­ŠË€ÃÓà èŠÍ¸ÓàH*Ù#ÅÓíЉT$€ûw 3Àf­ŠË€ÃÓà è‹T$‹L$ #Õ‹‘‹ÐÁêŠÌ*ÜÓíŠÈ¨„²€áte8ËsŠé3Àf­ŠË€ÃÓà èŠÍ¸ÓàH*Ù#ÅÓíÐë‰t$,‹Ç+D$(;‚”‹L$‹÷+òƒéŠˆŠFŠVƒÆˆGˆWƒÇó¤‹t$,éÿÿÿƒúu½9|$(t·O‹L$ŠƒéˆGˆGˆGƒÇóªéèþÿÿ¨@…¸ÓàH#Å‹T$‹‚éºþÿÿ¨@…â¸ÓàH#Å‹T$ ‹‚éÿÿÿ‹È‹D$4÷Ù‹t$8;‚Þʃ|$0u$+Áð‹D$;Áv`+Áó¤‹÷+òëV;ÁvR+Áó¤‹÷+òëH‹D$0;Èv,t$4ð+ñ+È‹D$;Áv.+Áó¤‹t$8‹L$0;Áv+Áó¤‹÷+òëð+ñ‹D$;Áv+Áó¤‹÷+ò‹Èó¤‹t$,éþÿÿ‹ÿwnÅ‹ën$$ãnl$êïÉ‹\$ëÓÁƒý wnõn>ƒÆóþƒÅ ëÇÛà~àÜ‹ƒ¶ÌnÉ+é„ÀuÁèª9|$†9t$wºé‹ÐÁꨄàƒàtÓÁnÈ~Á+è# …ÑÓÁƒý wnõn>ƒÆóþƒÅ ëÇ‹\$ Ûè~èÕ‹ƒ¶Ì‹ØÁë+énɨ„¬ƒàtWÓÁnÈ~Á+è# …Ù‰t$,‹Ç+D$(;©‹Ê‹÷+óƒéŠˆŠFŠVƒÆˆGˆWƒÇó¤‹t$,‹\$é-ÿÿÿIƒûu¸9|$(t²O‹ÊŠƒéˆGˆGˆGƒÇóª‹\$éÿÿÿ‹ÿ¨@…ÞƒàÓÁ~Á# …Ê‹‹éÌþÿÿ‹ÿ¨@…®ƒàÓÁ~Á# …‹D$ Ë‹ˆéÿÿÿ‹ÿ‹È‹D$4÷Ù‹t$8;¢˃|$0u +Áð;ÑvX+Ñó¤‹÷+óëN;ÑvJ+Ñó¤‹÷+óë@‹D$0;Èv(t$4ð+ñ+È;Ñv*+Ñó¤‹t$8‹L$0;Ñv+Ñó¤‹÷+óëð+ñ;Ñv+Ñó¤‹÷+ó‹Êó¤‹t$,‹\$é$þÿÿ¹ºë,¨ t ¹º 빺ë‹t$,¹ºë‹D$X…Ét‰H‹@‰ëƒ=u‹Ý‹D$X‹Ë‹PÁé+ñÁá+Ù‰x ‰Z<‹Ë\$9\$u+ó‹‰\$ó‹Xƒë \$‰0»ÓãKƒ=uÓÁ~Åw#ë‰j8‹\$;Þv + +ރà ‰Xë + +ó÷ÞƒÆ ‰p‹\$;ßv +ßÉXë +û÷ßljxƒÄ@[]^_Ãà=Iÿ W à  § ÃÓò@W X + Y Z [ \]bcklno"q&r*t.u1v4x6y8z:|@}BF€JNƒQ„T†X‡\‰aŠd‹fŒgjor‘t’u“y•|–—‚™†šŠ›Ž‘ž” ˜¡œ¢ž£ ¥£¦¥§ª¨¬©°ª²«´¬¶­¸®¼¯À°Â´ÈµÊ¶Ì·Î¸Ï¹ÑºÔ»Ö¼Ø½ÚÀÞÃåÄëÅíÇîÈïÉðÊñËòÌõÍüÒýÓþÔÿÕÖ×ØÙ ÚÛÜÝÞß$à&á)â,ã/ä1å7æ9ç;éEêGìQîRïSðTñUòX÷[ø]ú_ûaücýfþhÿjmqsvxz|~€ƒ„ ˆ!Ž#’$”%™)›*ž+ -¢.¨/«0­1¯2±4³5µ6·7¹8¼9¾:À;Â>Ç?É@ÊAÌBÎCÐDÒGÖLÙMÛOÝPßQáRäSæTèWìXðYòZõ^÷_ú`üaþbdfg + h ijkmnopqr s"t$w)x+y,z.{0|2}4~6‚:ƒ<„@†B‡H‰LŠN‹PSŽUWZ‘]’`“c”f•i–k˜o™twžyŸ} ¢€£„¤†¥‰§Œ¨©’ª•«—­œµž¶¤¸©¹«º¬»®¼°½´¾·¿¼Ç¾ÈÄÊÉËËÌÌÍÎÎÐÏÔÐ×ÑÜÖÞ×âØäÙèÛêÜðÞòß÷àùâûãýåæçéê ë ì íïðòóôõöú!û#ü%þ)ÿ+-/3579 ; + ? C E GIKMOQSUY[]_ a!c"e&g'i)m*t.v4y5{78‚9‡:Š;<‘=”A—CšDœFŸG¢H¥I¨J«K®N±O´P·QºT½UÀVÂXÄYÆ[É\ÊaÎbÔdØeÚfßjákämænìoïpñrôs÷túuüvwz| } €‚ƒ„‡#ˆ&‰)Š,‹/24‘7’9“<•>–D—G˜I›LœORžTŸ[ ]£a¤c¥g§i¨oªq«s¬u®x¯z°|±²‚³…´ˆµ‹¶Ž·¹”º˜» ¿£À¥Á©Â«Ä¬Å®Æ°Ç³É¶Ê¹Ë¼Ì¿ÍÁÏÅÐÌÔÎÕÔ×רÚÙÝÚäÛæÜéÝðáòâøäûåþæçè éêëðñò ó$õ&ö,ø.ù3ú5ü7ý9ÿ;=?ACEGI K M O QSUY[]acegik m!o"s#w$y%{'}()*ƒ+…/‡0‰3‹467‘8“9•>—?™AB¡C¦K«L°M²U´V¶X»YÀZÂbÇcÌdÎjÒk×lÜmÞqâräsætévìwîxð}÷~ù‚û†ÿ‡ˆ‰Š ‹ ŒŽ‘’“ •"–$—(˜*™-š0›4ž6 ;¡=¢>¨E©G­J®M°O¶Q·T¼X½Z¾\À^ÁaÂdÃfÅhÆjÇmÈpÏtÐvÑxÓzԀՃօ؇ىÚÛ’â•ã–ä—å˜æ™çšè  inffas32.obj6/Microsoft (R) Macro Assembler Version 6.14.8444 L_test_for_length_base$ L_invalid_distance_too_far L_check_dist_one_mmx L_do_copy1_mmx L_wrap_around_window  + L_do_copy1 L_add_bits_to_len  L_do_loop' L_invalid_literal_length_code# invalid_distance_code_msg L_get_length_code_mmx  _inflate_fast  + L_init_mmx( L_test_for_second_level_length  + L_save_len L_add_bits_to_dist_mmx inflate_fast_mask L_update_next_in L_dodist  + L_skip_msg L_get_distance_code" L_wrap_around_window_mmx  L_do_loop_mmx! L_invalid_distance_code& L_test_for_second_level_dist! L_test_for_end_of_block) invalid_literal_length_code_msg*  L_test_for_second_level_dist_mmx L_clip_window_mmx  L_dolen_mmx  L_use_mmx  L_break_loop L_get_length_code L_add_bits_to_dist  L_fixup_out L_get_dist_code_mmx  L_clip_window,››$$$00001) invalid_literal_length_code_msg# invalid_distance_code_msg& invalid_distance_too_far_msg inflate_fast_mask inflate_fast_entry  L_align_long  L_is_aligned  L_check_mmx  L_use_mmx L_dont_use_mmx L_check_mmx_pop  L_do_loop L_get_length_code L_dolen  L_while_test L_test_for_length_base L_add_bits_to_len  + L_save_len L_decode_distance L_get_distance_code L_dodist L_add_bits_to_dist L_check_window L_check_dist_one( L_test_for_second_level_length& L_test_for_second_level_dist  L_clip_window L_wrap_around_window L_contiguous_in_window  + L_do_copy1  + L_init_mmx  L_do_loop_mmx L_get_length_code_mmx  L_dolen_mmx L_while_test_mmx$ L_test_for_length_base_mmx L_decode_distance_mmx L_get_dist_code_mmx  L_dodist_mmx L_add_bits_to_dist_mmx L_check_window_mmx L_check_dist_one_mmx, "L_test_for_second_level_length_mmx*  L_test_for_second_level_dist_mmx L_clip_window_mmx" L_wrap_around_window_mmx$ L_contiguous_in_window_mmx L_do_copy1_mmx! L_invalid_distance_code! L_test_for_end_of_block' L_invalid_literal_length_code$ L_invalid_distance_too_far L_update_stream_state  + L_skip_msg  L_break_loop L_update_next_in L_buf_not_used  L_update_hold L_last_is_smaller  L_fixup_out L_end_is_smaller L_done  L_check_mmx L_decode_distance_mmx L_dont_use_mmx  L_is_aligned L_check_window L_contiguous_in_window L_buf_not_used L_update_stream_state L_decode_distance  L_while_test inflate_fast_use_mmx, "L_test_for_second_level_length_mmx L_check_dist_one L_end_is_smaller L_check_window_mmx L_while_test_mmx  L_update_hold$ L_test_for_length_base_mmx  L_dodist_mmx  L_align_long inflate_fast_entry L_dolen L_last_is_smaller L_check_mmx_pop L_done$ L_contiguous_in_window_mmx& invalid_distance_too_far_msgU Y + w { +  ¡ + ½ Á + × Û + ÷ û +   + * . + ? C + h l + ! ‘! + ® ² + Ç" Ë" + Ý# á# + $ $ + % !% + ? C + \& `& + x' |' + Œ( ( + ¢) ¦) + Á* Å* + å+ é+ + þ, , + !- %- + I. M. + l p + —/ ›/ + Ã0 Ç0 + à1 ä1 + ÷2 û2 + 3 3 + $4 (4 + A5 E5 + _6 c6 + v7 z7 + •8 ™8 + Æ Ê + Ü à +   + , 0 + T X + q9 u9 + : “: + §; «; + ¿< Ã< + Ö2 Ú2 + ë= ï= + > > +  $ + 54 94 + R? V? + e@ i@ + }  + Ÿ £ + ¼$ À$ + ÒA ÖA + ï) ó) + ' ' + "5 &5 + @B DB + ZC ^C + v# z# +  - ¤- + È8 Ì8 + á å + D D + # ' + 9" =" + O+ S+ + h! l! + ‰1 1 +  E ¤E + ¼F ÀF + âG æG +  7  7 + " H & H + : % > % + \ I ` I + z  ~  + š J ž J + È / Ì / + ô 0 ø 0 +  + *  + * + 5 + K 9 + K + [ +  _ +  + u + , y + , + ˜ + . œ + . + » + ¿ + + ä +  è +  + + L  L + + ( / ( + A 3 E 3 + Y & ] & + u M y M + N “ N + ¨ O ¬ O + Å 6 É 6 + Ü P à P + ø Q ü Q +  <  < + % G ) G + F = J = + ` ; d ; + x B | B + ’ D – D + ´ M ¸ M + Î L Ò L + ï A ó A + @  @ + $  (  + D J H J + r C v C + Ž P ’ P + ª I ® I + È E Ì E + ä N è N + ý F F + #H 'H + ;: ?: + S9 W9 + q? u? + „O ˆO + ¡> ¥> + ¼Q ÀQ + ÎK ÒK + ô ø + òñ + òñ.fileþÿginffas32.asm@comp.idü ÿÿ.text› Q.data.debug$Sþ.debug$T L  ,„ >0 ^ sd $$$00001 ›È.bfeP.lfQe.ef›e8™ §Î   ו æ ûe  X " @® Vt aœ €Ò ‹I ¢û L_dodistõ ³é ¾è ÒU ë” ù¦ ¼ .² Fð g yº …; ð œj ®$ Áp Í áÜ ï Â Ú Þ (G 7Q L_dolenv G„ TÖ f6 ut †Q Ê ®ß É ß/ ì] ÿÌ "… =Þ S4 bO pf ‚… L_done’ “invalid_distance_code_msg_inflate_fastinflate_fast_maskinvalid_literal_length_code_msginflate_fast_use_mmxinvalid_distance_too_far_msgL_test_for_length_baseL_invalid_distance_too_farL_check_dist_one_mmxL_do_copy1_mmxL_wrap_around_windowL_do_copy1L_add_bits_to_lenL_do_loopL_invalid_literal_length_codeL_get_length_code_mmxL_init_mmxL_test_for_second_level_lengthL_save_lenL_add_bits_to_dist_mmxL_update_next_inL_skip_msgL_get_distance_codeL_wrap_around_window_mmxL_do_loop_mmxL_invalid_distance_codeL_test_for_second_level_distL_test_for_end_of_blockL_test_for_second_level_dist_mmxL_clip_window_mmxL_dolen_mmxL_use_mmxL_break_loopL_get_length_codeL_add_bits_to_distL_fixup_outL_get_dist_code_mmxL_clip_windowinflate_fast_entryL_align_longL_is_alignedL_check_mmxL_dont_use_mmxL_check_mmx_popL_while_testL_decode_distanceL_check_windowL_check_dist_oneL_contiguous_in_windowL_while_test_mmxL_test_for_length_base_mmxL_decode_distance_mmxL_dodist_mmxL_check_window_mmxL_test_for_second_level_length_mmxL_contiguous_in_window_mmxL_update_stream_stateL_buf_not_usedL_update_holdL_last_is_smallerL_end_is_smaller \ No newline at end of file diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx86/mkasm.bat gcc-4.4.5/zlib/contrib/masmx86/mkasm.bat *** gcc-4.4.4/zlib/contrib/masmx86/mkasm.bat Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx86/mkasm.bat Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,3 ---- + cl /DASMV /I..\.. /O2 /c gvmat32c.c + ml /coff /Zi /c /Flgvmat32.lst gvmat32.asm + ml /coff /Zi /c /Flinffas32.lst inffas32.asm diff -Nrcpad gcc-4.4.4/zlib/contrib/masmx86/readme.txt gcc-4.4.5/zlib/contrib/masmx86/readme.txt *** gcc-4.4.4/zlib/contrib/masmx86/readme.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/masmx86/readme.txt Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,21 ---- + + Summary + ------- + This directory contains ASM implementations of the functions + longest_match() and inflate_fast(). + + + Use instructions + ---------------- + Copy these files into the zlib source directory, then run the + appropriate makefile, as suggested below. + + + Build instructions + ------------------ + * With Microsoft C and MASM: + nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" OBJA="gvmat32c.obj gvmat32.obj inffas32.obj" + + * With Borland C and TASM: + make -f win32/Makefile.bor LOCAL_ZLIB="-DASMV -DASMINF" OBJA="gvmat32c.obj gvmat32.obj inffas32.obj" OBJPA="+gvmat32c.obj+gvmat32.obj+inffas32.obj" + diff -Nrcpad gcc-4.4.4/zlib/contrib/minizip/ChangeLogUnzip gcc-4.4.5/zlib/contrib/minizip/ChangeLogUnzip *** gcc-4.4.4/zlib/contrib/minizip/ChangeLogUnzip Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/minizip/ChangeLogUnzip Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,67 ---- + Change in 1.01e (12 feb 05) + - Fix in zipOpen2 for globalcomment (Rolf Kalbermatter) + - Fix possible memory leak in unzip.c (Zoran Stevanovic) + + Change in 1.01b (20 may 04) + - Integrate patch from Debian package (submited by Mark Brown) + - Add tools mztools from Xavier Roche + + Change in 1.01 (8 may 04) + - fix buffer overrun risk in unzip.c (Xavier Roche) + - fix a minor buffer insecurity in minizip.c (Mike Whittaker) + + Change in 1.00: (10 sept 03) + - rename to 1.00 + - cosmetic code change + + Change in 0.22: (19 May 03) + - crypting support (unless you define NOCRYPT) + - append file in existing zipfile + + Change in 0.21: (10 Mar 03) + - bug fixes + + Change in 0.17: (27 Jan 02) + - bug fixes + + Change in 0.16: (19 Jan 02) + - Support of ioapi for virtualize zip file access + + Change in 0.15: (19 Mar 98) + - fix memory leak in minizip.c + + Change in 0.14: (10 Mar 98) + - fix bugs in minizip.c sample for zipping big file + - fix problem in month in date handling + - fix bug in unzlocal_GetCurrentFileInfoInternal in unzip.c for + comment handling + + Change in 0.13: (6 Mar 98) + - fix bugs in zip.c + - add real minizip sample + + Change in 0.12: (4 Mar 98) + - add zip.c and zip.h for creates .zip file + - fix change_file_date in miniunz.c for Unix (Jean-loup Gailly) + - fix miniunz.c for file without specific record for directory + + Change in 0.11: (3 Mar 98) + - fix bug in unzGetCurrentFileInfo for get extra field and comment + - enhance miniunz sample, remove the bad unztst.c sample + + Change in 0.10: (2 Mar 98) + - fix bug in unzReadCurrentFile + - rename unzip* to unz* function and structure + - remove Windows-like hungary notation variable name + - modify some structure in unzip.h + - add somes comment in source + - remove unzipGetcCurrentFile function + - replace ZUNZEXPORT by ZEXPORT + - add unzGetLocalExtrafield for get the local extrafield info + - add a new sample, miniunz.c + + Change in 0.4: (25 Feb 98) + - suppress the type unzipFileInZip. + Only on file in the zipfile can be open at the same time + - fix somes typo in code + - added tm_unz structure in unzip_file_info (date/time in readable format) diff -Nrcpad gcc-4.4.4/zlib/contrib/minizip/Makefile gcc-4.4.5/zlib/contrib/minizip/Makefile *** gcc-4.4.4/zlib/contrib/minizip/Makefile Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/minizip/Makefile Mon Oct 11 18:45:43 2004 *************** *** 0 **** --- 1,25 ---- + CC=cc + CFLAGS=-O -I../.. + + UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a + ZIP_OBJS = minizip.o zip.o ioapi.o ../../libz.a + + .c.o: + $(CC) -c $(CFLAGS) $*.c + + all: miniunz minizip + + miniunz: $(UNZ_OBJS) + $(CC) $(CFLAGS) -o $@ $(UNZ_OBJS) + + minizip: $(ZIP_OBJS) + $(CC) $(CFLAGS) -o $@ $(ZIP_OBJS) + + test: miniunz minizip + ./minizip test readme.txt + ./miniunz -l test.zip + mv readme.txt readme.old + ./miniunz test.zip + + clean: + /bin/rm -f *.o *~ minizip miniunz diff -Nrcpad gcc-4.4.4/zlib/contrib/minizip/crypt.h gcc-4.4.5/zlib/contrib/minizip/crypt.h *** gcc-4.4.4/zlib/contrib/minizip/crypt.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/minizip/crypt.h Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,132 ---- + /* crypt.h -- base code for crypt/uncrypt ZIPfile + + + Version 1.01e, February 12th, 2005 + + Copyright (C) 1998-2005 Gilles Vollant + + This code is a modified version of crypting code in Infozip distribution + + The encryption/decryption parts of this source code (as opposed to the + non-echoing password parts) were originally written in Europe. The + whole source package can be freely distributed, including from the USA. + (Prior to January 2000, re-export from the US was a violation of US law.) + + This encryption code is a direct transcription of the algorithm from + Roger Schlafly, described by Phil Katz in the file appnote.txt. This + file (appnote.txt) is distributed with the PKZIP program (even in the + version without encryption capabilities). + + If you don't need crypting in your application, just define symbols + NOCRYPT and NOUNCRYPT. + + This code support the "Traditional PKWARE Encryption". + + The new AES encryption added on Zip format by Winzip (see the page + http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong + Encryption is not supported. + */ + + #define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8)) + + /*********************************************************************** + * Return the next byte in the pseudo-random sequence + */ + static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab) + { + unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an + * unpredictable manner on 16-bit systems; not a problem + * with any known compiler so far, though */ + + temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2; + return (int)(((temp * (temp ^ 1)) >> 8) & 0xff); + } + + /*********************************************************************** + * Update the encryption keys with the next byte of plain text + */ + static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c) + { + (*(pkeys+0)) = CRC32((*(pkeys+0)), c); + (*(pkeys+1)) += (*(pkeys+0)) & 0xff; + (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1; + { + register int keyshift = (int)((*(pkeys+1)) >> 24); + (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift); + } + return c; + } + + + /*********************************************************************** + * Initialize the encryption keys and the random header according to + * the given password. + */ + static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab) + { + *(pkeys+0) = 305419896L; + *(pkeys+1) = 591751049L; + *(pkeys+2) = 878082192L; + while (*passwd != '\0') { + update_keys(pkeys,pcrc_32_tab,(int)*passwd); + passwd++; + } + } + + #define zdecode(pkeys,pcrc_32_tab,c) \ + (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab))) + + #define zencode(pkeys,pcrc_32_tab,c,t) \ + (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c)) + + #ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED + + #define RAND_HEAD_LEN 12 + /* "last resort" source for second part of crypt seed pattern */ + # ifndef ZCR_SEED2 + # define ZCR_SEED2 3141592654UL /* use PI as default pattern */ + # endif + + static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting) + const char *passwd; /* password string */ + unsigned char *buf; /* where to write header */ + int bufSize; + unsigned long* pkeys; + const unsigned long* pcrc_32_tab; + unsigned long crcForCrypting; + { + int n; /* index in random header */ + int t; /* temporary */ + int c; /* random byte */ + unsigned char header[RAND_HEAD_LEN-2]; /* random header */ + static unsigned calls = 0; /* ensure different random header each time */ + + if (bufSize> 7) & 0xff; + header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t); + } + /* Encrypt random header (last two bytes is high word of crc) */ + init_keys(passwd, pkeys, pcrc_32_tab); + for (n = 0; n < RAND_HEAD_LEN-2; n++) + { + buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t); + } + buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t); + buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t); + return n; + } + + #endif diff -Nrcpad gcc-4.4.4/zlib/contrib/minizip/ioapi.c gcc-4.4.5/zlib/contrib/minizip/ioapi.c *** gcc-4.4.4/zlib/contrib/minizip/ioapi.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/minizip/ioapi.c Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,177 ---- + /* ioapi.c -- IO base function header for compress/uncompress .zip + files using zlib + zip or unzip API + + Version 1.01e, February 12th, 2005 + + Copyright (C) 1998-2005 Gilles Vollant + */ + + #include + #include + #include + + #include "zlib.h" + #include "ioapi.h" + + + + /* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */ + + #ifndef SEEK_CUR + #define SEEK_CUR 1 + #endif + + #ifndef SEEK_END + #define SEEK_END 2 + #endif + + #ifndef SEEK_SET + #define SEEK_SET 0 + #endif + + voidpf ZCALLBACK fopen_file_func OF(( + voidpf opaque, + const char* filename, + int mode)); + + uLong ZCALLBACK fread_file_func OF(( + voidpf opaque, + voidpf stream, + void* buf, + uLong size)); + + uLong ZCALLBACK fwrite_file_func OF(( + voidpf opaque, + voidpf stream, + const void* buf, + uLong size)); + + long ZCALLBACK ftell_file_func OF(( + voidpf opaque, + voidpf stream)); + + long ZCALLBACK fseek_file_func OF(( + voidpf opaque, + voidpf stream, + uLong offset, + int origin)); + + int ZCALLBACK fclose_file_func OF(( + voidpf opaque, + voidpf stream)); + + int ZCALLBACK ferror_file_func OF(( + voidpf opaque, + voidpf stream)); + + + voidpf ZCALLBACK fopen_file_func (opaque, filename, mode) + voidpf opaque; + const char* filename; + int mode; + { + FILE* file = NULL; + const char* mode_fopen = NULL; + if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) + mode_fopen = "rb"; + else + if (mode & ZLIB_FILEFUNC_MODE_EXISTING) + mode_fopen = "r+b"; + else + if (mode & ZLIB_FILEFUNC_MODE_CREATE) + mode_fopen = "wb"; + + if ((filename!=NULL) && (mode_fopen != NULL)) + file = fopen(filename, mode_fopen); + return file; + } + + + uLong ZCALLBACK fread_file_func (opaque, stream, buf, size) + voidpf opaque; + voidpf stream; + void* buf; + uLong size; + { + uLong ret; + ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream); + return ret; + } + + + uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size) + voidpf opaque; + voidpf stream; + const void* buf; + uLong size; + { + uLong ret; + ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream); + return ret; + } + + long ZCALLBACK ftell_file_func (opaque, stream) + voidpf opaque; + voidpf stream; + { + long ret; + ret = ftell((FILE *)stream); + return ret; + } + + long ZCALLBACK fseek_file_func (opaque, stream, offset, origin) + voidpf opaque; + voidpf stream; + uLong offset; + int origin; + { + int fseek_origin=0; + long ret; + switch (origin) + { + case ZLIB_FILEFUNC_SEEK_CUR : + fseek_origin = SEEK_CUR; + break; + case ZLIB_FILEFUNC_SEEK_END : + fseek_origin = SEEK_END; + break; + case ZLIB_FILEFUNC_SEEK_SET : + fseek_origin = SEEK_SET; + break; + default: return -1; + } + ret = 0; + fseek((FILE *)stream, offset, fseek_origin); + return ret; + } + + int ZCALLBACK fclose_file_func (opaque, stream) + voidpf opaque; + voidpf stream; + { + int ret; + ret = fclose((FILE *)stream); + return ret; + } + + int ZCALLBACK ferror_file_func (opaque, stream) + voidpf opaque; + voidpf stream; + { + int ret; + ret = ferror((FILE *)stream); + return ret; + } + + void fill_fopen_filefunc (pzlib_filefunc_def) + zlib_filefunc_def* pzlib_filefunc_def; + { + pzlib_filefunc_def->zopen_file = fopen_file_func; + pzlib_filefunc_def->zread_file = fread_file_func; + pzlib_filefunc_def->zwrite_file = fwrite_file_func; + pzlib_filefunc_def->ztell_file = ftell_file_func; + pzlib_filefunc_def->zseek_file = fseek_file_func; + pzlib_filefunc_def->zclose_file = fclose_file_func; + pzlib_filefunc_def->zerror_file = ferror_file_func; + pzlib_filefunc_def->opaque = NULL; + } diff -Nrcpad gcc-4.4.4/zlib/contrib/minizip/ioapi.h gcc-4.4.5/zlib/contrib/minizip/ioapi.h *** gcc-4.4.4/zlib/contrib/minizip/ioapi.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/minizip/ioapi.h Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,75 ---- + /* ioapi.h -- IO base function header for compress/uncompress .zip + files using zlib + zip or unzip API + + Version 1.01e, February 12th, 2005 + + Copyright (C) 1998-2005 Gilles Vollant + */ + + #ifndef _ZLIBIOAPI_H + #define _ZLIBIOAPI_H + + + #define ZLIB_FILEFUNC_SEEK_CUR (1) + #define ZLIB_FILEFUNC_SEEK_END (2) + #define ZLIB_FILEFUNC_SEEK_SET (0) + + #define ZLIB_FILEFUNC_MODE_READ (1) + #define ZLIB_FILEFUNC_MODE_WRITE (2) + #define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3) + + #define ZLIB_FILEFUNC_MODE_EXISTING (4) + #define ZLIB_FILEFUNC_MODE_CREATE (8) + + + #ifndef ZCALLBACK + + #if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK) + #define ZCALLBACK CALLBACK + #else + #define ZCALLBACK + #endif + #endif + + #ifdef __cplusplus + extern "C" { + #endif + + typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode)); + typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size)); + typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); + typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream)); + typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin)); + typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream)); + typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream)); + + typedef struct zlib_filefunc_def_s + { + open_file_func zopen_file; + read_file_func zread_file; + write_file_func zwrite_file; + tell_file_func ztell_file; + seek_file_func zseek_file; + close_file_func zclose_file; + testerror_file_func zerror_file; + voidpf opaque; + } zlib_filefunc_def; + + + + void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); + + #define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size)) + #define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size)) + #define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream)) + #define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode)) + #define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream)) + #define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream)) + + + #ifdef __cplusplus + } + #endif + + #endif + diff -Nrcpad gcc-4.4.4/zlib/contrib/minizip/iowin32.c gcc-4.4.5/zlib/contrib/minizip/iowin32.c *** gcc-4.4.4/zlib/contrib/minizip/iowin32.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/minizip/iowin32.c Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,270 ---- + /* iowin32.c -- IO base function header for compress/uncompress .zip + files using zlib + zip or unzip API + This IO API version uses the Win32 API (for Microsoft Windows) + + Version 1.01e, February 12th, 2005 + + Copyright (C) 1998-2005 Gilles Vollant + */ + + #include + + #include "zlib.h" + #include "ioapi.h" + #include "iowin32.h" + + #ifndef INVALID_HANDLE_VALUE + #define INVALID_HANDLE_VALUE (0xFFFFFFFF) + #endif + + #ifndef INVALID_SET_FILE_POINTER + #define INVALID_SET_FILE_POINTER ((DWORD)-1) + #endif + + voidpf ZCALLBACK win32_open_file_func OF(( + voidpf opaque, + const char* filename, + int mode)); + + uLong ZCALLBACK win32_read_file_func OF(( + voidpf opaque, + voidpf stream, + void* buf, + uLong size)); + + uLong ZCALLBACK win32_write_file_func OF(( + voidpf opaque, + voidpf stream, + const void* buf, + uLong size)); + + long ZCALLBACK win32_tell_file_func OF(( + voidpf opaque, + voidpf stream)); + + long ZCALLBACK win32_seek_file_func OF(( + voidpf opaque, + voidpf stream, + uLong offset, + int origin)); + + int ZCALLBACK win32_close_file_func OF(( + voidpf opaque, + voidpf stream)); + + int ZCALLBACK win32_error_file_func OF(( + voidpf opaque, + voidpf stream)); + + typedef struct + { + HANDLE hf; + int error; + } WIN32FILE_IOWIN; + + voidpf ZCALLBACK win32_open_file_func (opaque, filename, mode) + voidpf opaque; + const char* filename; + int mode; + { + const char* mode_fopen = NULL; + DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; + HANDLE hFile = 0; + voidpf ret=NULL; + + dwDesiredAccess = dwShareMode = dwFlagsAndAttributes = 0; + + if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) + { + dwDesiredAccess = GENERIC_READ; + dwCreationDisposition = OPEN_EXISTING; + dwShareMode = FILE_SHARE_READ; + } + else + if (mode & ZLIB_FILEFUNC_MODE_EXISTING) + { + dwDesiredAccess = GENERIC_WRITE | GENERIC_READ; + dwCreationDisposition = OPEN_EXISTING; + } + else + if (mode & ZLIB_FILEFUNC_MODE_CREATE) + { + dwDesiredAccess = GENERIC_WRITE | GENERIC_READ; + dwCreationDisposition = CREATE_ALWAYS; + } + + if ((filename!=NULL) && (dwDesiredAccess != 0)) + hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, + dwCreationDisposition, dwFlagsAndAttributes, NULL); + + if (hFile == INVALID_HANDLE_VALUE) + hFile = NULL; + + if (hFile != NULL) + { + WIN32FILE_IOWIN w32fiow; + w32fiow.hf = hFile; + w32fiow.error = 0; + ret = malloc(sizeof(WIN32FILE_IOWIN)); + if (ret==NULL) + CloseHandle(hFile); + else *((WIN32FILE_IOWIN*)ret) = w32fiow; + } + return ret; + } + + + uLong ZCALLBACK win32_read_file_func (opaque, stream, buf, size) + voidpf opaque; + voidpf stream; + void* buf; + uLong size; + { + uLong ret=0; + HANDLE hFile = NULL; + if (stream!=NULL) + hFile = ((WIN32FILE_IOWIN*)stream) -> hf; + if (hFile != NULL) + if (!ReadFile(hFile, buf, size, &ret, NULL)) + { + DWORD dwErr = GetLastError(); + if (dwErr == ERROR_HANDLE_EOF) + dwErr = 0; + ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; + } + + return ret; + } + + + uLong ZCALLBACK win32_write_file_func (opaque, stream, buf, size) + voidpf opaque; + voidpf stream; + const void* buf; + uLong size; + { + uLong ret=0; + HANDLE hFile = NULL; + if (stream!=NULL) + hFile = ((WIN32FILE_IOWIN*)stream) -> hf; + + if (hFile !=NULL) + if (!WriteFile(hFile, buf, size, &ret, NULL)) + { + DWORD dwErr = GetLastError(); + if (dwErr == ERROR_HANDLE_EOF) + dwErr = 0; + ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; + } + + return ret; + } + + long ZCALLBACK win32_tell_file_func (opaque, stream) + voidpf opaque; + voidpf stream; + { + long ret=-1; + HANDLE hFile = NULL; + if (stream!=NULL) + hFile = ((WIN32FILE_IOWIN*)stream) -> hf; + if (hFile != NULL) + { + DWORD dwSet = SetFilePointer(hFile, 0, NULL, FILE_CURRENT); + if (dwSet == INVALID_SET_FILE_POINTER) + { + DWORD dwErr = GetLastError(); + ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; + ret = -1; + } + else + ret=(long)dwSet; + } + return ret; + } + + long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin) + voidpf opaque; + voidpf stream; + uLong offset; + int origin; + { + DWORD dwMoveMethod=0xFFFFFFFF; + HANDLE hFile = NULL; + + long ret=-1; + if (stream!=NULL) + hFile = ((WIN32FILE_IOWIN*)stream) -> hf; + switch (origin) + { + case ZLIB_FILEFUNC_SEEK_CUR : + dwMoveMethod = FILE_CURRENT; + break; + case ZLIB_FILEFUNC_SEEK_END : + dwMoveMethod = FILE_END; + break; + case ZLIB_FILEFUNC_SEEK_SET : + dwMoveMethod = FILE_BEGIN; + break; + default: return -1; + } + + if (hFile != NULL) + { + DWORD dwSet = SetFilePointer(hFile, offset, NULL, dwMoveMethod); + if (dwSet == INVALID_SET_FILE_POINTER) + { + DWORD dwErr = GetLastError(); + ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; + ret = -1; + } + else + ret=0; + } + return ret; + } + + int ZCALLBACK win32_close_file_func (opaque, stream) + voidpf opaque; + voidpf stream; + { + int ret=-1; + + if (stream!=NULL) + { + HANDLE hFile; + hFile = ((WIN32FILE_IOWIN*)stream) -> hf; + if (hFile != NULL) + { + CloseHandle(hFile); + ret=0; + } + free(stream); + } + return ret; + } + + int ZCALLBACK win32_error_file_func (opaque, stream) + voidpf opaque; + voidpf stream; + { + int ret=-1; + if (stream!=NULL) + { + ret = ((WIN32FILE_IOWIN*)stream) -> error; + } + return ret; + } + + void fill_win32_filefunc (pzlib_filefunc_def) + zlib_filefunc_def* pzlib_filefunc_def; + { + pzlib_filefunc_def->zopen_file = win32_open_file_func; + pzlib_filefunc_def->zread_file = win32_read_file_func; + pzlib_filefunc_def->zwrite_file = win32_write_file_func; + pzlib_filefunc_def->ztell_file = win32_tell_file_func; + pzlib_filefunc_def->zseek_file = win32_seek_file_func; + pzlib_filefunc_def->zclose_file = win32_close_file_func; + pzlib_filefunc_def->zerror_file = win32_error_file_func; + pzlib_filefunc_def->opaque=NULL; + } diff -Nrcpad gcc-4.4.4/zlib/contrib/minizip/iowin32.h gcc-4.4.5/zlib/contrib/minizip/iowin32.h *** gcc-4.4.4/zlib/contrib/minizip/iowin32.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/minizip/iowin32.h Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,21 ---- + /* iowin32.h -- IO base function header for compress/uncompress .zip + files using zlib + zip or unzip API + This IO API version uses the Win32 API (for Microsoft Windows) + + Version 1.01e, February 12th, 2005 + + Copyright (C) 1998-2005 Gilles Vollant + */ + + #include + + + #ifdef __cplusplus + extern "C" { + #endif + + void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); + + #ifdef __cplusplus + } + #endif diff -Nrcpad gcc-4.4.4/zlib/contrib/minizip/miniunz.c gcc-4.4.5/zlib/contrib/minizip/miniunz.c *** gcc-4.4.4/zlib/contrib/minizip/miniunz.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/minizip/miniunz.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,585 ---- + /* + miniunz.c + Version 1.01e, February 12th, 2005 + + Copyright (C) 1998-2005 Gilles Vollant + */ + + + #include + #include + #include + #include + #include + #include + + #ifdef unix + # include + # include + #else + # include + # include + #endif + + #include "unzip.h" + + #define CASESENSITIVITY (0) + #define WRITEBUFFERSIZE (8192) + #define MAXFILENAME (256) + + #ifdef WIN32 + #define USEWIN32IOAPI + #include "iowin32.h" + #endif + /* + mini unzip, demo of unzip package + + usage : + Usage : miniunz [-exvlo] file.zip [file_to_extract] [-d extractdir] + + list the file in the zipfile, and print the content of FILE_ID.ZIP or README.TXT + if it exists + */ + + + /* change_file_date : change the date/time of a file + filename : the filename of the file where date/time must be modified + dosdate : the new date at the MSDos format (4 bytes) + tmu_date : the SAME new date at the tm_unz format */ + void change_file_date(filename,dosdate,tmu_date) + const char *filename; + uLong dosdate; + tm_unz tmu_date; + { + #ifdef WIN32 + HANDLE hFile; + FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite; + + hFile = CreateFile(filename,GENERIC_READ | GENERIC_WRITE, + 0,NULL,OPEN_EXISTING,0,NULL); + GetFileTime(hFile,&ftCreate,&ftLastAcc,&ftLastWrite); + DosDateTimeToFileTime((WORD)(dosdate>>16),(WORD)dosdate,&ftLocal); + LocalFileTimeToFileTime(&ftLocal,&ftm); + SetFileTime(hFile,&ftm,&ftLastAcc,&ftm); + CloseHandle(hFile); + #else + #ifdef unix + struct utimbuf ut; + struct tm newdate; + newdate.tm_sec = tmu_date.tm_sec; + newdate.tm_min=tmu_date.tm_min; + newdate.tm_hour=tmu_date.tm_hour; + newdate.tm_mday=tmu_date.tm_mday; + newdate.tm_mon=tmu_date.tm_mon; + if (tmu_date.tm_year > 1900) + newdate.tm_year=tmu_date.tm_year - 1900; + else + newdate.tm_year=tmu_date.tm_year ; + newdate.tm_isdst=-1; + + ut.actime=ut.modtime=mktime(&newdate); + utime(filename,&ut); + #endif + #endif + } + + + /* mymkdir and change_file_date are not 100 % portable + As I don't know well Unix, I wait feedback for the unix portion */ + + int mymkdir(dirname) + const char* dirname; + { + int ret=0; + #ifdef WIN32 + ret = mkdir(dirname); + #else + #ifdef unix + ret = mkdir (dirname,0775); + #endif + #endif + return ret; + } + + int makedir (newdir) + char *newdir; + { + char *buffer ; + char *p; + int len = (int)strlen(newdir); + + if (len <= 0) + return 0; + + buffer = (char*)malloc(len+1); + strcpy(buffer,newdir); + + if (buffer[len-1] == '/') { + buffer[len-1] = '\0'; + } + if (mymkdir(buffer) == 0) + { + free(buffer); + return 1; + } + + p = buffer+1; + while (1) + { + char hold; + + while(*p && *p != '\\' && *p != '/') + p++; + hold = *p; + *p = 0; + if ((mymkdir(buffer) == -1) && (errno == ENOENT)) + { + printf("couldn't create directory %s\n",buffer); + free(buffer); + return 0; + } + if (hold == 0) + break; + *p++ = hold; + } + free(buffer); + return 1; + } + + void do_banner() + { + printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n"); + printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n"); + } + + void do_help() + { + printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \ + " -e Extract without pathname (junk paths)\n" \ + " -x Extract with pathname\n" \ + " -v list files\n" \ + " -l list files\n" \ + " -d directory to extract into\n" \ + " -o overwrite files without prompting\n" \ + " -p extract crypted file using password\n\n"); + } + + + int do_list(uf) + unzFile uf; + { + uLong i; + unz_global_info gi; + int err; + + err = unzGetGlobalInfo (uf,&gi); + if (err!=UNZ_OK) + printf("error %d with zipfile in unzGetGlobalInfo \n",err); + printf(" Length Method Size Ratio Date Time CRC-32 Name\n"); + printf(" ------ ------ ---- ----- ---- ---- ------ ----\n"); + for (i=0;i0) + ratio = (file_info.compressed_size*100)/file_info.uncompressed_size; + + /* display a '*' if the file is crypted */ + if ((file_info.flag & 1) != 0) + charCrypt='*'; + + if (file_info.compression_method==0) + string_method="Stored"; + else + if (file_info.compression_method==Z_DEFLATED) + { + uInt iLevel=(uInt)((file_info.flag & 0x6)/2); + if (iLevel==0) + string_method="Defl:N"; + else if (iLevel==1) + string_method="Defl:X"; + else if ((iLevel==2) || (iLevel==3)) + string_method="Defl:F"; /* 2:fast , 3 : extra fast*/ + } + else + string_method="Unkn. "; + + printf("%7lu %6s%c%7lu %3lu%% %2.2lu-%2.2lu-%2.2lu %2.2lu:%2.2lu %8.8lx %s\n", + file_info.uncompressed_size,string_method, + charCrypt, + file_info.compressed_size, + ratio, + (uLong)file_info.tmu_date.tm_mon + 1, + (uLong)file_info.tmu_date.tm_mday, + (uLong)file_info.tmu_date.tm_year % 100, + (uLong)file_info.tmu_date.tm_hour,(uLong)file_info.tmu_date.tm_min, + (uLong)file_info.crc,filename_inzip); + if ((i+1)='a') && (rep<='z')) + rep -= 0x20; + } + while ((rep!='Y') && (rep!='N') && (rep!='A')); + } + + if (rep == 'N') + skip = 1; + + if (rep == 'A') + *popt_overwrite=1; + } + + if ((skip==0) && (err==UNZ_OK)) + { + fout=fopen(write_filename,"wb"); + + /* some zipfile don't contain directory alone before file */ + if ((fout==NULL) && ((*popt_extract_without_path)==0) && + (filename_withoutpath!=(char*)filename_inzip)) + { + char c=*(filename_withoutpath-1); + *(filename_withoutpath-1)='\0'; + makedir(write_filename); + *(filename_withoutpath-1)=c; + fout=fopen(write_filename,"wb"); + } + + if (fout==NULL) + { + printf("error opening %s\n",write_filename); + } + } + + if (fout!=NULL) + { + printf(" extracting: %s\n",write_filename); + + do + { + err = unzReadCurrentFile(uf,buf,size_buf); + if (err<0) + { + printf("error %d with zipfile in unzReadCurrentFile\n",err); + break; + } + if (err>0) + if (fwrite(buf,err,1,fout)!=1) + { + printf("error in writing extracted file\n"); + err=UNZ_ERRNO; + break; + } + } + while (err>0); + if (fout) + fclose(fout); + + if (err==0) + change_file_date(write_filename,file_info.dosDate, + file_info.tmu_date); + } + + if (err==UNZ_OK) + { + err = unzCloseCurrentFile (uf); + if (err!=UNZ_OK) + { + printf("error %d with zipfile in unzCloseCurrentFile\n",err); + } + } + else + unzCloseCurrentFile(uf); /* don't lose the error */ + } + + free(buf); + return err; + } + + + int do_extract(uf,opt_extract_without_path,opt_overwrite,password) + unzFile uf; + int opt_extract_without_path; + int opt_overwrite; + const char* password; + { + uLong i; + unz_global_info gi; + int err; + FILE* fout=NULL; + + err = unzGetGlobalInfo (uf,&gi); + if (err!=UNZ_OK) + printf("error %d with zipfile in unzGetGlobalInfo \n",err); + + for (i=0;i + #include + #include + #include + #include + #include + + #ifdef unix + # include + # include + # include + # include + #else + # include + # include + #endif + + #include "zip.h" + + #ifdef WIN32 + #define USEWIN32IOAPI + #include "iowin32.h" + #endif + + + + #define WRITEBUFFERSIZE (16384) + #define MAXFILENAME (256) + + #ifdef WIN32 + uLong filetime(f, tmzip, dt) + char *f; /* name of file to get info on */ + tm_zip *tmzip; /* return value: access, modific. and creation times */ + uLong *dt; /* dostime */ + { + int ret = 0; + { + FILETIME ftLocal; + HANDLE hFind; + WIN32_FIND_DATA ff32; + + hFind = FindFirstFile(f,&ff32); + if (hFind != INVALID_HANDLE_VALUE) + { + FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal); + FileTimeToDosDateTime(&ftLocal,((LPWORD)dt)+1,((LPWORD)dt)+0); + FindClose(hFind); + ret = 1; + } + } + return ret; + } + #else + #ifdef unix + uLong filetime(f, tmzip, dt) + char *f; /* name of file to get info on */ + tm_zip *tmzip; /* return value: access, modific. and creation times */ + uLong *dt; /* dostime */ + { + int ret=0; + struct stat s; /* results of stat() */ + struct tm* filedate; + time_t tm_t=0; + + if (strcmp(f,"-")!=0) + { + char name[MAXFILENAME+1]; + int len = strlen(f); + if (len > MAXFILENAME) + len = MAXFILENAME; + + strncpy(name, f,MAXFILENAME-1); + /* strncpy doesnt append the trailing NULL, of the string is too long. */ + name[ MAXFILENAME ] = '\0'; + + if (name[len - 1] == '/') + name[len - 1] = '\0'; + /* not all systems allow stat'ing a file with / appended */ + if (stat(name,&s)==0) + { + tm_t = s.st_mtime; + ret = 1; + } + } + filedate = localtime(&tm_t); + + tmzip->tm_sec = filedate->tm_sec; + tmzip->tm_min = filedate->tm_min; + tmzip->tm_hour = filedate->tm_hour; + tmzip->tm_mday = filedate->tm_mday; + tmzip->tm_mon = filedate->tm_mon ; + tmzip->tm_year = filedate->tm_year; + + return ret; + } + #else + uLong filetime(f, tmzip, dt) + char *f; /* name of file to get info on */ + tm_zip *tmzip; /* return value: access, modific. and creation times */ + uLong *dt; /* dostime */ + { + return 0; + } + #endif + #endif + + + + + int check_exist_file(filename) + const char* filename; + { + FILE* ftestexist; + int ret = 1; + ftestexist = fopen(filename,"rb"); + if (ftestexist==NULL) + ret = 0; + else + fclose(ftestexist); + return ret; + } + + void do_banner() + { + printf("MiniZip 1.01b, demo of zLib + Zip package written by Gilles Vollant\n"); + printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n"); + } + + void do_help() + { + printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] file.zip [files_to_add]\n\n" \ + " -o Overwrite existing file.zip\n" \ + " -a Append to existing file.zip\n" \ + " -0 Store only\n" \ + " -1 Compress faster\n" \ + " -9 Compress better\n\n"); + } + + /* calculate the CRC32 of a file, + because to encrypt a file, we need known the CRC32 of the file before */ + int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc) + { + unsigned long calculate_crc=0; + int err=ZIP_OK; + FILE * fin = fopen(filenameinzip,"rb"); + unsigned long size_read = 0; + unsigned long total_read = 0; + if (fin==NULL) + { + err = ZIP_ERRNO; + } + + if (err == ZIP_OK) + do + { + err = ZIP_OK; + size_read = (int)fread(buf,1,size_buf,fin); + if (size_read < size_buf) + if (feof(fin)==0) + { + printf("error in reading %s\n",filenameinzip); + err = ZIP_ERRNO; + } + + if (size_read>0) + calculate_crc = crc32(calculate_crc,buf,size_read); + total_read += size_read; + + } while ((err == ZIP_OK) && (size_read>0)); + + if (fin) + fclose(fin); + + *result_crc=calculate_crc; + printf("file %s crc %x\n",filenameinzip,calculate_crc); + return err; + } + + int main(argc,argv) + int argc; + char *argv[]; + { + int i; + int opt_overwrite=0; + int opt_compress_level=Z_DEFAULT_COMPRESSION; + int zipfilenamearg = 0; + char filename_try[MAXFILENAME+16]; + int zipok; + int err=0; + int size_buf=0; + void* buf=NULL; + const char* password=NULL; + + + do_banner(); + if (argc==1) + { + do_help(); + return 0; + } + else + { + for (i=1;i='0') && (c<='9')) + opt_compress_level = c-'0'; + + if (((c=='p') || (c=='P')) && (i+1='a') && (rep<='z')) + rep -= 0x20; + } + while ((rep!='Y') && (rep!='N') && (rep!='A')); + if (rep=='N') + zipok = 0; + if (rep=='A') + opt_overwrite = 2; + } + } + + if (zipok==1) + { + zipFile zf; + int errclose; + # ifdef USEWIN32IOAPI + zlib_filefunc_def ffunc; + fill_win32_filefunc(&ffunc); + zf = zipOpen2(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc); + # else + zf = zipOpen(filename_try,(opt_overwrite==2) ? 2 : 0); + # endif + + if (zf == NULL) + { + printf("error opening %s\n",filename_try); + err= ZIP_ERRNO; + } + else + printf("creating %s\n",filename_try); + + for (i=zipfilenamearg+1;(i='0') || (argv[i][1]<='9'))) && + (strlen(argv[i]) == 2))) + { + FILE * fin; + int size_read; + const char* filenameinzip = argv[i]; + zip_fileinfo zi; + unsigned long crcFile=0; + + zi.tmz_date.tm_sec = zi.tmz_date.tm_min = zi.tmz_date.tm_hour = + zi.tmz_date.tm_mday = zi.tmz_date.tm_mon = zi.tmz_date.tm_year = 0; + zi.dosDate = 0; + zi.internal_fa = 0; + zi.external_fa = 0; + filetime(filenameinzip,&zi.tmz_date,&zi.dosDate); + + /* + err = zipOpenNewFileInZip(zf,filenameinzip,&zi, + NULL,0,NULL,0,NULL / * comment * /, + (opt_compress_level != 0) ? Z_DEFLATED : 0, + opt_compress_level); + */ + if ((password != NULL) && (err==ZIP_OK)) + err = getFileCrc(filenameinzip,buf,size_buf,&crcFile); + + err = zipOpenNewFileInZip3(zf,filenameinzip,&zi, + NULL,0,NULL,0,NULL /* comment*/, + (opt_compress_level != 0) ? Z_DEFLATED : 0, + opt_compress_level,0, + /* -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, */ + -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, + password,crcFile); + + if (err != ZIP_OK) + printf("error in opening %s in zipfile\n",filenameinzip); + else + { + fin = fopen(filenameinzip,"rb"); + if (fin==NULL) + { + err=ZIP_ERRNO; + printf("error in opening %s for reading\n",filenameinzip); + } + } + + if (err == ZIP_OK) + do + { + err = ZIP_OK; + size_read = (int)fread(buf,1,size_buf,fin); + if (size_read < size_buf) + if (feof(fin)==0) + { + printf("error in reading %s\n",filenameinzip); + err = ZIP_ERRNO; + } + + if (size_read>0) + { + err = zipWriteInFileInZip (zf,buf,size_read); + if (err<0) + { + printf("error in writing %s in the zipfile\n", + filenameinzip); + } + + } + } while ((err == ZIP_OK) && (size_read>0)); + + if (fin) + fclose(fin); + + if (err<0) + err=ZIP_ERRNO; + else + { + err = zipCloseFileInZip(zf); + if (err!=ZIP_OK) + printf("error in closing %s in the zipfile\n", + filenameinzip); + } + } + } + errclose = zipClose(zf,NULL); + if (errclose != ZIP_OK) + printf("error in closing %s\n",filename_try); + } + else + { + do_help(); + } + + free(buf); + return 0; + } diff -Nrcpad gcc-4.4.4/zlib/contrib/minizip/mztools.c gcc-4.4.5/zlib/contrib/minizip/mztools.c *** gcc-4.4.4/zlib/contrib/minizip/mztools.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/minizip/mztools.c Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,281 ---- + /* + Additional tools for Minizip + Code: Xavier Roche '2004 + License: Same as ZLIB (www.gzip.org) + */ + + /* Code */ + #include + #include + #include + #include "zlib.h" + #include "unzip.h" + + #define READ_8(adr) ((unsigned char)*(adr)) + #define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) ) + #define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) ) + + #define WRITE_8(buff, n) do { \ + *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \ + } while(0) + #define WRITE_16(buff, n) do { \ + WRITE_8((unsigned char*)(buff), n); \ + WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \ + } while(0) + #define WRITE_32(buff, n) do { \ + WRITE_16((unsigned char*)(buff), (n) & 0xffff); \ + WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \ + } while(0) + + extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered) + const char* file; + const char* fileOut; + const char* fileOutTmp; + uLong* nRecovered; + uLong* bytesRecovered; + { + int err = Z_OK; + FILE* fpZip = fopen(file, "rb"); + FILE* fpOut = fopen(fileOut, "wb"); + FILE* fpOutCD = fopen(fileOutTmp, "wb"); + if (fpZip != NULL && fpOut != NULL) { + int entries = 0; + uLong totalBytes = 0; + char header[30]; + char filename[256]; + char extra[1024]; + int offset = 0; + int offsetCD = 0; + while ( fread(header, 1, 30, fpZip) == 30 ) { + int currentOffset = offset; + + /* File entry */ + if (READ_32(header) == 0x04034b50) { + unsigned int version = READ_16(header + 4); + unsigned int gpflag = READ_16(header + 6); + unsigned int method = READ_16(header + 8); + unsigned int filetime = READ_16(header + 10); + unsigned int filedate = READ_16(header + 12); + unsigned int crc = READ_32(header + 14); /* crc */ + unsigned int cpsize = READ_32(header + 18); /* compressed size */ + unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */ + unsigned int fnsize = READ_16(header + 26); /* file name length */ + unsigned int extsize = READ_16(header + 28); /* extra field length */ + filename[0] = extra[0] = '\0'; + + /* Header */ + if (fwrite(header, 1, 30, fpOut) == 30) { + offset += 30; + } else { + err = Z_ERRNO; + break; + } + + /* Filename */ + if (fnsize > 0) { + if (fread(filename, 1, fnsize, fpZip) == fnsize) { + if (fwrite(filename, 1, fnsize, fpOut) == fnsize) { + offset += fnsize; + } else { + err = Z_ERRNO; + break; + } + } else { + err = Z_ERRNO; + break; + } + } else { + err = Z_STREAM_ERROR; + break; + } + + /* Extra field */ + if (extsize > 0) { + if (fread(extra, 1, extsize, fpZip) == extsize) { + if (fwrite(extra, 1, extsize, fpOut) == extsize) { + offset += extsize; + } else { + err = Z_ERRNO; + break; + } + } else { + err = Z_ERRNO; + break; + } + } + + /* Data */ + { + int dataSize = cpsize; + if (dataSize == 0) { + dataSize = uncpsize; + } + if (dataSize > 0) { + char* data = malloc(dataSize); + if (data != NULL) { + if ((int)fread(data, 1, dataSize, fpZip) == dataSize) { + if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) { + offset += dataSize; + totalBytes += dataSize; + } else { + err = Z_ERRNO; + } + } else { + err = Z_ERRNO; + } + free(data); + if (err != Z_OK) { + break; + } + } else { + err = Z_MEM_ERROR; + break; + } + } + } + + /* Central directory entry */ + { + char header[46]; + char* comment = ""; + int comsize = (int) strlen(comment); + WRITE_32(header, 0x02014b50); + WRITE_16(header + 4, version); + WRITE_16(header + 6, version); + WRITE_16(header + 8, gpflag); + WRITE_16(header + 10, method); + WRITE_16(header + 12, filetime); + WRITE_16(header + 14, filedate); + WRITE_32(header + 16, crc); + WRITE_32(header + 20, cpsize); + WRITE_32(header + 24, uncpsize); + WRITE_16(header + 28, fnsize); + WRITE_16(header + 30, extsize); + WRITE_16(header + 32, comsize); + WRITE_16(header + 34, 0); /* disk # */ + WRITE_16(header + 36, 0); /* int attrb */ + WRITE_32(header + 38, 0); /* ext attrb */ + WRITE_32(header + 42, currentOffset); + /* Header */ + if (fwrite(header, 1, 46, fpOutCD) == 46) { + offsetCD += 46; + + /* Filename */ + if (fnsize > 0) { + if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) { + offsetCD += fnsize; + } else { + err = Z_ERRNO; + break; + } + } else { + err = Z_STREAM_ERROR; + break; + } + + /* Extra field */ + if (extsize > 0) { + if (fwrite(extra, 1, extsize, fpOutCD) == extsize) { + offsetCD += extsize; + } else { + err = Z_ERRNO; + break; + } + } + + /* Comment field */ + if (comsize > 0) { + if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) { + offsetCD += comsize; + } else { + err = Z_ERRNO; + break; + } + } + + + } else { + err = Z_ERRNO; + break; + } + } + + /* Success */ + entries++; + + } else { + break; + } + } + + /* Final central directory */ + { + int entriesZip = entries; + char header[22]; + char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools"; + int comsize = (int) strlen(comment); + if (entriesZip > 0xffff) { + entriesZip = 0xffff; + } + WRITE_32(header, 0x06054b50); + WRITE_16(header + 4, 0); /* disk # */ + WRITE_16(header + 6, 0); /* disk # */ + WRITE_16(header + 8, entriesZip); /* hack */ + WRITE_16(header + 10, entriesZip); /* hack */ + WRITE_32(header + 12, offsetCD); /* size of CD */ + WRITE_32(header + 16, offset); /* offset to CD */ + WRITE_16(header + 20, comsize); /* comment */ + + /* Header */ + if (fwrite(header, 1, 22, fpOutCD) == 22) { + + /* Comment field */ + if (comsize > 0) { + if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) { + err = Z_ERRNO; + } + } + + } else { + err = Z_ERRNO; + } + } + + /* Final merge (file + central directory) */ + fclose(fpOutCD); + if (err == Z_OK) { + fpOutCD = fopen(fileOutTmp, "rb"); + if (fpOutCD != NULL) { + int nRead; + char buffer[8192]; + while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) { + if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) { + err = Z_ERRNO; + break; + } + } + fclose(fpOutCD); + } + } + + /* Close */ + fclose(fpZip); + fclose(fpOut); + + /* Wipe temporary file */ + (void)remove(fileOutTmp); + + /* Number of recovered entries */ + if (err == Z_OK) { + if (nRecovered != NULL) { + *nRecovered = entries; + } + if (bytesRecovered != NULL) { + *bytesRecovered = totalBytes; + } + } + } else { + err = Z_STREAM_ERROR; + } + return err; + } diff -Nrcpad gcc-4.4.4/zlib/contrib/minizip/mztools.h gcc-4.4.5/zlib/contrib/minizip/mztools.h *** gcc-4.4.4/zlib/contrib/minizip/mztools.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/minizip/mztools.h Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,31 ---- + /* + Additional tools for Minizip + Code: Xavier Roche '2004 + License: Same as ZLIB (www.gzip.org) + */ + + #ifndef _zip_tools_H + #define _zip_tools_H + + #ifdef __cplusplus + extern "C" { + #endif + + #ifndef _ZLIB_H + #include "zlib.h" + #endif + + #include "unzip.h" + + /* Repair a ZIP file (missing central directory) + file: file to recover + fileOut: output file after recovery + fileOutTmp: temporary file name used for recovery + */ + extern int ZEXPORT unzRepair(const char* file, + const char* fileOut, + const char* fileOutTmp, + uLong* nRecovered, + uLong* bytesRecovered); + + #endif diff -Nrcpad gcc-4.4.4/zlib/contrib/minizip/unzip.c gcc-4.4.5/zlib/contrib/minizip/unzip.c *** gcc-4.4.4/zlib/contrib/minizip/unzip.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/minizip/unzip.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,1598 ---- + /* unzip.c -- IO for uncompress .zip files using zlib + Version 1.01e, February 12th, 2005 + + Copyright (C) 1998-2005 Gilles Vollant + + Read unzip.h for more info + */ + + /* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of + compatibility with older software. The following is from the original crypt.c. Code + woven in by Terry Thorsen 1/2003. + */ + /* + Copyright (c) 1990-2000 Info-ZIP. All rights reserved. + + See the accompanying file LICENSE, version 2000-Apr-09 or later + (the contents of which are also included in zip.h) for terms of use. + If, for some reason, all these files are missing, the Info-ZIP license + also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html + */ + /* + crypt.c (full version) by Info-ZIP. Last revised: [see crypt.h] + + The encryption/decryption parts of this source code (as opposed to the + non-echoing password parts) were originally written in Europe. The + whole source package can be freely distributed, including from the USA. + (Prior to January 2000, re-export from the US was a violation of US law.) + */ + + /* + This encryption code is a direct transcription of the algorithm from + Roger Schlafly, described by Phil Katz in the file appnote.txt. This + file (appnote.txt) is distributed with the PKZIP program (even in the + version without encryption capabilities). + */ + + + #include + #include + #include + #include "zlib.h" + #include "unzip.h" + + #ifdef STDC + # include + # include + # include + #endif + #ifdef NO_ERRNO_H + extern int errno; + #else + # include + #endif + + + #ifndef local + # define local static + #endif + /* compile with -Dlocal if your debugger can't find static symbols */ + + + #ifndef CASESENSITIVITYDEFAULT_NO + # if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES) + # define CASESENSITIVITYDEFAULT_NO + # endif + #endif + + + #ifndef UNZ_BUFSIZE + #define UNZ_BUFSIZE (16384) + #endif + + #ifndef UNZ_MAXFILENAMEINZIP + #define UNZ_MAXFILENAMEINZIP (256) + #endif + + #ifndef ALLOC + # define ALLOC(size) (malloc(size)) + #endif + #ifndef TRYFREE + # define TRYFREE(p) {if (p) free(p);} + #endif + + #define SIZECENTRALDIRITEM (0x2e) + #define SIZEZIPLOCALHEADER (0x1e) + + + + + const char unz_copyright[] = + " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll"; + + /* unz_file_info_interntal contain internal info about a file in zipfile*/ + typedef struct unz_file_info_internal_s + { + uLong offset_curfile;/* relative offset of local header 4 bytes */ + } unz_file_info_internal; + + + /* file_in_zip_read_info_s contain internal information about a file in zipfile, + when reading and decompress it */ + typedef struct + { + char *read_buffer; /* internal buffer for compressed data */ + z_stream stream; /* zLib stream structure for inflate */ + + uLong pos_in_zipfile; /* position in byte on the zipfile, for fseek*/ + uLong stream_initialised; /* flag set if stream structure is initialised*/ + + uLong offset_local_extrafield;/* offset of the local extra field */ + uInt size_local_extrafield;/* size of the local extra field */ + uLong pos_local_extrafield; /* position in the local extra field in read*/ + + uLong crc32; /* crc32 of all data uncompressed */ + uLong crc32_wait; /* crc32 we must obtain after decompress all */ + uLong rest_read_compressed; /* number of byte to be decompressed */ + uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/ + zlib_filefunc_def z_filefunc; + voidpf filestream; /* io structore of the zipfile */ + uLong compression_method; /* compression method (0==store) */ + uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/ + int raw; + } file_in_zip_read_info_s; + + + /* unz_s contain internal information about the zipfile + */ + typedef struct + { + zlib_filefunc_def z_filefunc; + voidpf filestream; /* io structore of the zipfile */ + unz_global_info gi; /* public global information */ + uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/ + uLong num_file; /* number of the current file in the zipfile*/ + uLong pos_in_central_dir; /* pos of the current file in the central dir*/ + uLong current_file_ok; /* flag about the usability of the current file*/ + uLong central_pos; /* position of the beginning of the central dir*/ + + uLong size_central_dir; /* size of the central directory */ + uLong offset_central_dir; /* offset of start of central directory with + respect to the starting disk number */ + + unz_file_info cur_file_info; /* public info about the current file in zip*/ + unz_file_info_internal cur_file_info_internal; /* private info about it*/ + file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current + file if we are decompressing it */ + int encrypted; + # ifndef NOUNCRYPT + unsigned long keys[3]; /* keys defining the pseudo-random sequence */ + const unsigned long* pcrc_32_tab; + # endif + } unz_s; + + + #ifndef NOUNCRYPT + #include "crypt.h" + #endif + + /* =========================================================================== + Read a byte from a gz_stream; update next_in and avail_in. Return EOF + for end of file. + IN assertion: the stream s has been sucessfully opened for reading. + */ + + + local int unzlocal_getByte OF(( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + int *pi)); + + local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi) + const zlib_filefunc_def* pzlib_filefunc_def; + voidpf filestream; + int *pi; + { + unsigned char c; + int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); + if (err==1) + { + *pi = (int)c; + return UNZ_OK; + } + else + { + if (ZERROR(*pzlib_filefunc_def,filestream)) + return UNZ_ERRNO; + else + return UNZ_EOF; + } + } + + + /* =========================================================================== + Reads a long in LSB order from the given gz_stream. Sets + */ + local int unzlocal_getShort OF(( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + uLong *pX)); + + local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX) + const zlib_filefunc_def* pzlib_filefunc_def; + voidpf filestream; + uLong *pX; + { + uLong x ; + int i; + int err; + + err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); + x = (uLong)i; + + if (err==UNZ_OK) + err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); + x += ((uLong)i)<<8; + + if (err==UNZ_OK) + *pX = x; + else + *pX = 0; + return err; + } + + local int unzlocal_getLong OF(( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + uLong *pX)); + + local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX) + const zlib_filefunc_def* pzlib_filefunc_def; + voidpf filestream; + uLong *pX; + { + uLong x ; + int i; + int err; + + err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); + x = (uLong)i; + + if (err==UNZ_OK) + err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); + x += ((uLong)i)<<8; + + if (err==UNZ_OK) + err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); + x += ((uLong)i)<<16; + + if (err==UNZ_OK) + err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); + x += ((uLong)i)<<24; + + if (err==UNZ_OK) + *pX = x; + else + *pX = 0; + return err; + } + + + /* My own strcmpi / strcasecmp */ + local int strcmpcasenosensitive_internal (fileName1,fileName2) + const char* fileName1; + const char* fileName2; + { + for (;;) + { + char c1=*(fileName1++); + char c2=*(fileName2++); + if ((c1>='a') && (c1<='z')) + c1 -= 0x20; + if ((c2>='a') && (c2<='z')) + c2 -= 0x20; + if (c1=='\0') + return ((c2=='\0') ? 0 : -1); + if (c2=='\0') + return 1; + if (c1c2) + return 1; + } + } + + + #ifdef CASESENSITIVITYDEFAULT_NO + #define CASESENSITIVITYDEFAULTVALUE 2 + #else + #define CASESENSITIVITYDEFAULTVALUE 1 + #endif + + #ifndef STRCMPCASENOSENTIVEFUNCTION + #define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal + #endif + + /* + Compare two filename (fileName1,fileName2). + If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) + If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi + or strcasecmp) + If iCaseSenisivity = 0, case sensitivity is defaut of your operating system + (like 1 on Unix, 2 on Windows) + + */ + extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity) + const char* fileName1; + const char* fileName2; + int iCaseSensitivity; + { + if (iCaseSensitivity==0) + iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE; + + if (iCaseSensitivity==1) + return strcmp(fileName1,fileName2); + + return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2); + } + + #ifndef BUFREADCOMMENT + #define BUFREADCOMMENT (0x400) + #endif + + /* + Locate the Central directory of a zipfile (at the end, just before + the global comment) + */ + local uLong unzlocal_SearchCentralDir OF(( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream)); + + local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream) + const zlib_filefunc_def* pzlib_filefunc_def; + voidpf filestream; + { + unsigned char* buf; + uLong uSizeFile; + uLong uBackRead; + uLong uMaxBack=0xffff; /* maximum size of global comment */ + uLong uPosFound=0; + + if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0) + return 0; + + + uSizeFile = ZTELL(*pzlib_filefunc_def,filestream); + + if (uMaxBack>uSizeFile) + uMaxBack = uSizeFile; + + buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4); + if (buf==NULL) + return 0; + + uBackRead = 4; + while (uBackReaduMaxBack) + uBackRead = uMaxBack; + else + uBackRead+=BUFREADCOMMENT; + uReadPos = uSizeFile-uBackRead ; + + uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ? + (BUFREADCOMMENT+4) : (uSizeFile-uReadPos); + if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0) + break; + + if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize) + break; + + for (i=(int)uReadSize-3; (i--)>0;) + if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && + ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06)) + { + uPosFound = uReadPos+i; + break; + } + + if (uPosFound!=0) + break; + } + TRYFREE(buf); + return uPosFound; + } + + /* + Open a Zip file. path contain the full pathname (by example, + on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer + "zlib/zlib114.zip". + If the zipfile cannot be opened (file doesn't exist or in not valid), the + return value is NULL. + Else, the return value is a unzFile Handle, usable with other function + of this unzip package. + */ + extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def) + const char *path; + zlib_filefunc_def* pzlib_filefunc_def; + { + unz_s us; + unz_s *s; + uLong central_pos,uL; + + uLong number_disk; /* number of the current dist, used for + spaning ZIP, unsupported, always 0*/ + uLong number_disk_with_CD; /* number the the disk with central dir, used + for spaning ZIP, unsupported, always 0*/ + uLong number_entry_CD; /* total number of entries in + the central dir + (same than number_entry on nospan) */ + + int err=UNZ_OK; + + if (unz_copyright[0]!=' ') + return NULL; + + if (pzlib_filefunc_def==NULL) + fill_fopen_filefunc(&us.z_filefunc); + else + us.z_filefunc = *pzlib_filefunc_def; + + us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque, + path, + ZLIB_FILEFUNC_MODE_READ | + ZLIB_FILEFUNC_MODE_EXISTING); + if (us.filestream==NULL) + return NULL; + + central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream); + if (central_pos==0) + err=UNZ_ERRNO; + + if (ZSEEK(us.z_filefunc, us.filestream, + central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0) + err=UNZ_ERRNO; + + /* the signature, already checked */ + if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK) + err=UNZ_ERRNO; + + /* number of this disk */ + if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK) + err=UNZ_ERRNO; + + /* number of the disk with the start of the central directory */ + if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK) + err=UNZ_ERRNO; + + /* total number of entries in the central dir on this disk */ + if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK) + err=UNZ_ERRNO; + + /* total number of entries in the central dir */ + if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK) + err=UNZ_ERRNO; + + if ((number_entry_CD!=us.gi.number_entry) || + (number_disk_with_CD!=0) || + (number_disk!=0)) + err=UNZ_BADZIPFILE; + + /* size of the central directory */ + if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK) + err=UNZ_ERRNO; + + /* offset of start of central directory with respect to the + starting disk number */ + if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK) + err=UNZ_ERRNO; + + /* zipfile comment length */ + if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK) + err=UNZ_ERRNO; + + if ((central_pospfile_in_zip_read!=NULL) + unzCloseCurrentFile(file); + + ZCLOSE(s->z_filefunc, s->filestream); + TRYFREE(s); + return UNZ_OK; + } + + + /* + Write info about the ZipFile in the *pglobal_info structure. + No preparation of the structure is needed + return UNZ_OK if there is no problem. */ + extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info) + unzFile file; + unz_global_info *pglobal_info; + { + unz_s* s; + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + *pglobal_info=s->gi; + return UNZ_OK; + } + + + /* + Translate date/time from Dos format to tm_unz (readable more easilty) + */ + local void unzlocal_DosDateToTmuDate (ulDosDate, ptm) + uLong ulDosDate; + tm_unz* ptm; + { + uLong uDate; + uDate = (uLong)(ulDosDate>>16); + ptm->tm_mday = (uInt)(uDate&0x1f) ; + ptm->tm_mon = (uInt)((((uDate)&0x1E0)/0x20)-1) ; + ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ; + + ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800); + ptm->tm_min = (uInt) ((ulDosDate&0x7E0)/0x20) ; + ptm->tm_sec = (uInt) (2*(ulDosDate&0x1f)) ; + } + + /* + Get Info about the current file in the zipfile, with internal only info + */ + local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file, + unz_file_info *pfile_info, + unz_file_info_internal + *pfile_info_internal, + char *szFileName, + uLong fileNameBufferSize, + void *extraField, + uLong extraFieldBufferSize, + char *szComment, + uLong commentBufferSize)); + + local int unzlocal_GetCurrentFileInfoInternal (file, + pfile_info, + pfile_info_internal, + szFileName, fileNameBufferSize, + extraField, extraFieldBufferSize, + szComment, commentBufferSize) + unzFile file; + unz_file_info *pfile_info; + unz_file_info_internal *pfile_info_internal; + char *szFileName; + uLong fileNameBufferSize; + void *extraField; + uLong extraFieldBufferSize; + char *szComment; + uLong commentBufferSize; + { + unz_s* s; + unz_file_info file_info; + unz_file_info_internal file_info_internal; + int err=UNZ_OK; + uLong uMagic; + long lSeek=0; + + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + if (ZSEEK(s->z_filefunc, s->filestream, + s->pos_in_central_dir+s->byte_before_the_zipfile, + ZLIB_FILEFUNC_SEEK_SET)!=0) + err=UNZ_ERRNO; + + + /* we check the magic */ + if (err==UNZ_OK) + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK) + err=UNZ_ERRNO; + else if (uMagic!=0x02014b50) + err=UNZ_BADZIPFILE; + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK) + err=UNZ_ERRNO; + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK) + err=UNZ_ERRNO; + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK) + err=UNZ_ERRNO; + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK) + err=UNZ_ERRNO; + + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK) + err=UNZ_ERRNO; + + unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date); + + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK) + err=UNZ_ERRNO; + + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK) + err=UNZ_ERRNO; + + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK) + err=UNZ_ERRNO; + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK) + err=UNZ_ERRNO; + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK) + err=UNZ_ERRNO; + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK) + err=UNZ_ERRNO; + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK) + err=UNZ_ERRNO; + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK) + err=UNZ_ERRNO; + + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK) + err=UNZ_ERRNO; + + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK) + err=UNZ_ERRNO; + + lSeek+=file_info.size_filename; + if ((err==UNZ_OK) && (szFileName!=NULL)) + { + uLong uSizeRead ; + if (file_info.size_filename0) && (fileNameBufferSize>0)) + if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead) + err=UNZ_ERRNO; + lSeek -= uSizeRead; + } + + + if ((err==UNZ_OK) && (extraField!=NULL)) + { + uLong uSizeRead ; + if (file_info.size_file_extraz_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0) + lSeek=0; + else + err=UNZ_ERRNO; + if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0)) + if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead) + err=UNZ_ERRNO; + lSeek += file_info.size_file_extra - uSizeRead; + } + else + lSeek+=file_info.size_file_extra; + + + if ((err==UNZ_OK) && (szComment!=NULL)) + { + uLong uSizeRead ; + if (file_info.size_file_commentz_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0) + lSeek=0; + else + err=UNZ_ERRNO; + if ((file_info.size_file_comment>0) && (commentBufferSize>0)) + if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead) + err=UNZ_ERRNO; + lSeek+=file_info.size_file_comment - uSizeRead; + } + else + lSeek+=file_info.size_file_comment; + + if ((err==UNZ_OK) && (pfile_info!=NULL)) + *pfile_info=file_info; + + if ((err==UNZ_OK) && (pfile_info_internal!=NULL)) + *pfile_info_internal=file_info_internal; + + return err; + } + + + + /* + Write info about the ZipFile in the *pglobal_info structure. + No preparation of the structure is needed + return UNZ_OK if there is no problem. + */ + extern int ZEXPORT unzGetCurrentFileInfo (file, + pfile_info, + szFileName, fileNameBufferSize, + extraField, extraFieldBufferSize, + szComment, commentBufferSize) + unzFile file; + unz_file_info *pfile_info; + char *szFileName; + uLong fileNameBufferSize; + void *extraField; + uLong extraFieldBufferSize; + char *szComment; + uLong commentBufferSize; + { + return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL, + szFileName,fileNameBufferSize, + extraField,extraFieldBufferSize, + szComment,commentBufferSize); + } + + /* + Set the current file of the zipfile to the first file. + return UNZ_OK if there is no problem + */ + extern int ZEXPORT unzGoToFirstFile (file) + unzFile file; + { + int err=UNZ_OK; + unz_s* s; + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + s->pos_in_central_dir=s->offset_central_dir; + s->num_file=0; + err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info, + &s->cur_file_info_internal, + NULL,0,NULL,0,NULL,0); + s->current_file_ok = (err == UNZ_OK); + return err; + } + + /* + Set the current file of the zipfile to the next file. + return UNZ_OK if there is no problem + return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. + */ + extern int ZEXPORT unzGoToNextFile (file) + unzFile file; + { + unz_s* s; + int err; + + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + if (!s->current_file_ok) + return UNZ_END_OF_LIST_OF_FILE; + if (s->gi.number_entry != 0xffff) /* 2^16 files overflow hack */ + if (s->num_file+1==s->gi.number_entry) + return UNZ_END_OF_LIST_OF_FILE; + + s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename + + s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ; + s->num_file++; + err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info, + &s->cur_file_info_internal, + NULL,0,NULL,0,NULL,0); + s->current_file_ok = (err == UNZ_OK); + return err; + } + + + /* + Try locate the file szFileName in the zipfile. + For the iCaseSensitivity signification, see unzipStringFileNameCompare + + return value : + UNZ_OK if the file is found. It becomes the current file. + UNZ_END_OF_LIST_OF_FILE if the file is not found + */ + extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity) + unzFile file; + const char *szFileName; + int iCaseSensitivity; + { + unz_s* s; + int err; + + /* We remember the 'current' position in the file so that we can jump + * back there if we fail. + */ + unz_file_info cur_file_infoSaved; + unz_file_info_internal cur_file_info_internalSaved; + uLong num_fileSaved; + uLong pos_in_central_dirSaved; + + + if (file==NULL) + return UNZ_PARAMERROR; + + if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP) + return UNZ_PARAMERROR; + + s=(unz_s*)file; + if (!s->current_file_ok) + return UNZ_END_OF_LIST_OF_FILE; + + /* Save the current state */ + num_fileSaved = s->num_file; + pos_in_central_dirSaved = s->pos_in_central_dir; + cur_file_infoSaved = s->cur_file_info; + cur_file_info_internalSaved = s->cur_file_info_internal; + + err = unzGoToFirstFile(file); + + while (err == UNZ_OK) + { + char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1]; + err = unzGetCurrentFileInfo(file,NULL, + szCurrentFileName,sizeof(szCurrentFileName)-1, + NULL,0,NULL,0); + if (err == UNZ_OK) + { + if (unzStringFileNameCompare(szCurrentFileName, + szFileName,iCaseSensitivity)==0) + return UNZ_OK; + err = unzGoToNextFile(file); + } + } + + /* We failed, so restore the state of the 'current file' to where we + * were. + */ + s->num_file = num_fileSaved ; + s->pos_in_central_dir = pos_in_central_dirSaved ; + s->cur_file_info = cur_file_infoSaved; + s->cur_file_info_internal = cur_file_info_internalSaved; + return err; + } + + + /* + /////////////////////////////////////////// + // Contributed by Ryan Haksi (mailto://cryogen@infoserve.net) + // I need random access + // + // Further optimization could be realized by adding an ability + // to cache the directory in memory. The goal being a single + // comprehensive file read to put the file I need in a memory. + */ + + /* + typedef struct unz_file_pos_s + { + uLong pos_in_zip_directory; // offset in file + uLong num_of_file; // # of file + } unz_file_pos; + */ + + extern int ZEXPORT unzGetFilePos(file, file_pos) + unzFile file; + unz_file_pos* file_pos; + { + unz_s* s; + + if (file==NULL || file_pos==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + if (!s->current_file_ok) + return UNZ_END_OF_LIST_OF_FILE; + + file_pos->pos_in_zip_directory = s->pos_in_central_dir; + file_pos->num_of_file = s->num_file; + + return UNZ_OK; + } + + extern int ZEXPORT unzGoToFilePos(file, file_pos) + unzFile file; + unz_file_pos* file_pos; + { + unz_s* s; + int err; + + if (file==NULL || file_pos==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + + /* jump to the right spot */ + s->pos_in_central_dir = file_pos->pos_in_zip_directory; + s->num_file = file_pos->num_of_file; + + /* set the current file */ + err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info, + &s->cur_file_info_internal, + NULL,0,NULL,0,NULL,0); + /* return results */ + s->current_file_ok = (err == UNZ_OK); + return err; + } + + /* + // Unzip Helper Functions - should be here? + /////////////////////////////////////////// + */ + + /* + Read the local header of the current zipfile + Check the coherency of the local header and info in the end of central + directory about this file + store in *piSizeVar the size of extra info in local header + (filename and size of extra field data) + */ + local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar, + poffset_local_extrafield, + psize_local_extrafield) + unz_s* s; + uInt* piSizeVar; + uLong *poffset_local_extrafield; + uInt *psize_local_extrafield; + { + uLong uMagic,uData,uFlags; + uLong size_filename; + uLong size_extra_field; + int err=UNZ_OK; + + *piSizeVar = 0; + *poffset_local_extrafield = 0; + *psize_local_extrafield = 0; + + if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile + + s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0) + return UNZ_ERRNO; + + + if (err==UNZ_OK) + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK) + err=UNZ_ERRNO; + else if (uMagic!=0x04034b50) + err=UNZ_BADZIPFILE; + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) + err=UNZ_ERRNO; + /* + else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion)) + err=UNZ_BADZIPFILE; + */ + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK) + err=UNZ_ERRNO; + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) + err=UNZ_ERRNO; + else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method)) + err=UNZ_BADZIPFILE; + + if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) && + (s->cur_file_info.compression_method!=Z_DEFLATED)) + err=UNZ_BADZIPFILE; + + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */ + err=UNZ_ERRNO; + + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */ + err=UNZ_ERRNO; + else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && + ((uFlags & 8)==0)) + err=UNZ_BADZIPFILE; + + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */ + err=UNZ_ERRNO; + else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && + ((uFlags & 8)==0)) + err=UNZ_BADZIPFILE; + + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */ + err=UNZ_ERRNO; + else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && + ((uFlags & 8)==0)) + err=UNZ_BADZIPFILE; + + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK) + err=UNZ_ERRNO; + else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename)) + err=UNZ_BADZIPFILE; + + *piSizeVar += (uInt)size_filename; + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK) + err=UNZ_ERRNO; + *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile + + SIZEZIPLOCALHEADER + size_filename; + *psize_local_extrafield = (uInt)size_extra_field; + + *piSizeVar += (uInt)size_extra_field; + + return err; + } + + /* + Open for reading data the current file in the zipfile. + If there is no error and the file is opened, the return value is UNZ_OK. + */ + extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) + unzFile file; + int* method; + int* level; + int raw; + const char* password; + { + int err=UNZ_OK; + uInt iSizeVar; + unz_s* s; + file_in_zip_read_info_s* pfile_in_zip_read_info; + uLong offset_local_extrafield; /* offset of the local extra field */ + uInt size_local_extrafield; /* size of the local extra field */ + # ifndef NOUNCRYPT + char source[12]; + # else + if (password != NULL) + return UNZ_PARAMERROR; + # endif + + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + if (!s->current_file_ok) + return UNZ_PARAMERROR; + + if (s->pfile_in_zip_read != NULL) + unzCloseCurrentFile(file); + + if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar, + &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK) + return UNZ_BADZIPFILE; + + pfile_in_zip_read_info = (file_in_zip_read_info_s*) + ALLOC(sizeof(file_in_zip_read_info_s)); + if (pfile_in_zip_read_info==NULL) + return UNZ_INTERNALERROR; + + pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE); + pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield; + pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield; + pfile_in_zip_read_info->pos_local_extrafield=0; + pfile_in_zip_read_info->raw=raw; + + if (pfile_in_zip_read_info->read_buffer==NULL) + { + TRYFREE(pfile_in_zip_read_info); + return UNZ_INTERNALERROR; + } + + pfile_in_zip_read_info->stream_initialised=0; + + if (method!=NULL) + *method = (int)s->cur_file_info.compression_method; + + if (level!=NULL) + { + *level = 6; + switch (s->cur_file_info.flag & 0x06) + { + case 6 : *level = 1; break; + case 4 : *level = 2; break; + case 2 : *level = 9; break; + } + } + + if ((s->cur_file_info.compression_method!=0) && + (s->cur_file_info.compression_method!=Z_DEFLATED)) + err=UNZ_BADZIPFILE; + + pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc; + pfile_in_zip_read_info->crc32=0; + pfile_in_zip_read_info->compression_method = + s->cur_file_info.compression_method; + pfile_in_zip_read_info->filestream=s->filestream; + pfile_in_zip_read_info->z_filefunc=s->z_filefunc; + pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile; + + pfile_in_zip_read_info->stream.total_out = 0; + + if ((s->cur_file_info.compression_method==Z_DEFLATED) && + (!raw)) + { + pfile_in_zip_read_info->stream.zalloc = (alloc_func)0; + pfile_in_zip_read_info->stream.zfree = (free_func)0; + pfile_in_zip_read_info->stream.opaque = (voidpf)0; + pfile_in_zip_read_info->stream.next_in = (voidpf)0; + pfile_in_zip_read_info->stream.avail_in = 0; + + err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS); + if (err == Z_OK) + pfile_in_zip_read_info->stream_initialised=1; + else + { + TRYFREE(pfile_in_zip_read_info); + return err; + } + /* windowBits is passed < 0 to tell that there is no zlib header. + * Note that in this case inflate *requires* an extra "dummy" byte + * after the compressed stream in order to complete decompression and + * return Z_STREAM_END. + * In unzip, i don't wait absolutely Z_STREAM_END because I known the + * size of both compressed and uncompressed data + */ + } + pfile_in_zip_read_info->rest_read_compressed = + s->cur_file_info.compressed_size ; + pfile_in_zip_read_info->rest_read_uncompressed = + s->cur_file_info.uncompressed_size ; + + + pfile_in_zip_read_info->pos_in_zipfile = + s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER + + iSizeVar; + + pfile_in_zip_read_info->stream.avail_in = (uInt)0; + + s->pfile_in_zip_read = pfile_in_zip_read_info; + + # ifndef NOUNCRYPT + if (password != NULL) + { + int i; + s->pcrc_32_tab = get_crc_table(); + init_keys(password,s->keys,s->pcrc_32_tab); + if (ZSEEK(s->z_filefunc, s->filestream, + s->pfile_in_zip_read->pos_in_zipfile + + s->pfile_in_zip_read->byte_before_the_zipfile, + SEEK_SET)!=0) + return UNZ_INTERNALERROR; + if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12) + return UNZ_INTERNALERROR; + + for (i = 0; i<12; i++) + zdecode(s->keys,s->pcrc_32_tab,source[i]); + + s->pfile_in_zip_read->pos_in_zipfile+=12; + s->encrypted=1; + } + # endif + + + return UNZ_OK; + } + + extern int ZEXPORT unzOpenCurrentFile (file) + unzFile file; + { + return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL); + } + + extern int ZEXPORT unzOpenCurrentFilePassword (file, password) + unzFile file; + const char* password; + { + return unzOpenCurrentFile3(file, NULL, NULL, 0, password); + } + + extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw) + unzFile file; + int* method; + int* level; + int raw; + { + return unzOpenCurrentFile3(file, method, level, raw, NULL); + } + + /* + Read bytes from the current file. + buf contain buffer where data must be copied + len the size of buf. + + return the number of byte copied if somes bytes are copied + return 0 if the end of file was reached + return <0 with error code if there is an error + (UNZ_ERRNO for IO error, or zLib error for uncompress error) + */ + extern int ZEXPORT unzReadCurrentFile (file, buf, len) + unzFile file; + voidp buf; + unsigned len; + { + int err=UNZ_OK; + uInt iRead = 0; + unz_s* s; + file_in_zip_read_info_s* pfile_in_zip_read_info; + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + pfile_in_zip_read_info=s->pfile_in_zip_read; + + if (pfile_in_zip_read_info==NULL) + return UNZ_PARAMERROR; + + + if ((pfile_in_zip_read_info->read_buffer == NULL)) + return UNZ_END_OF_LIST_OF_FILE; + if (len==0) + return 0; + + pfile_in_zip_read_info->stream.next_out = (Bytef*)buf; + + pfile_in_zip_read_info->stream.avail_out = (uInt)len; + + if ((len>pfile_in_zip_read_info->rest_read_uncompressed) && + (!(pfile_in_zip_read_info->raw))) + pfile_in_zip_read_info->stream.avail_out = + (uInt)pfile_in_zip_read_info->rest_read_uncompressed; + + if ((len>pfile_in_zip_read_info->rest_read_compressed+ + pfile_in_zip_read_info->stream.avail_in) && + (pfile_in_zip_read_info->raw)) + pfile_in_zip_read_info->stream.avail_out = + (uInt)pfile_in_zip_read_info->rest_read_compressed+ + pfile_in_zip_read_info->stream.avail_in; + + while (pfile_in_zip_read_info->stream.avail_out>0) + { + if ((pfile_in_zip_read_info->stream.avail_in==0) && + (pfile_in_zip_read_info->rest_read_compressed>0)) + { + uInt uReadThis = UNZ_BUFSIZE; + if (pfile_in_zip_read_info->rest_read_compressedrest_read_compressed; + if (uReadThis == 0) + return UNZ_EOF; + if (ZSEEK(pfile_in_zip_read_info->z_filefunc, + pfile_in_zip_read_info->filestream, + pfile_in_zip_read_info->pos_in_zipfile + + pfile_in_zip_read_info->byte_before_the_zipfile, + ZLIB_FILEFUNC_SEEK_SET)!=0) + return UNZ_ERRNO; + if (ZREAD(pfile_in_zip_read_info->z_filefunc, + pfile_in_zip_read_info->filestream, + pfile_in_zip_read_info->read_buffer, + uReadThis)!=uReadThis) + return UNZ_ERRNO; + + + # ifndef NOUNCRYPT + if(s->encrypted) + { + uInt i; + for(i=0;iread_buffer[i] = + zdecode(s->keys,s->pcrc_32_tab, + pfile_in_zip_read_info->read_buffer[i]); + } + # endif + + + pfile_in_zip_read_info->pos_in_zipfile += uReadThis; + + pfile_in_zip_read_info->rest_read_compressed-=uReadThis; + + pfile_in_zip_read_info->stream.next_in = + (Bytef*)pfile_in_zip_read_info->read_buffer; + pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis; + } + + if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw)) + { + uInt uDoCopy,i ; + + if ((pfile_in_zip_read_info->stream.avail_in == 0) && + (pfile_in_zip_read_info->rest_read_compressed == 0)) + return (iRead==0) ? UNZ_EOF : iRead; + + if (pfile_in_zip_read_info->stream.avail_out < + pfile_in_zip_read_info->stream.avail_in) + uDoCopy = pfile_in_zip_read_info->stream.avail_out ; + else + uDoCopy = pfile_in_zip_read_info->stream.avail_in ; + + for (i=0;istream.next_out+i) = + *(pfile_in_zip_read_info->stream.next_in+i); + + pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32, + pfile_in_zip_read_info->stream.next_out, + uDoCopy); + pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy; + pfile_in_zip_read_info->stream.avail_in -= uDoCopy; + pfile_in_zip_read_info->stream.avail_out -= uDoCopy; + pfile_in_zip_read_info->stream.next_out += uDoCopy; + pfile_in_zip_read_info->stream.next_in += uDoCopy; + pfile_in_zip_read_info->stream.total_out += uDoCopy; + iRead += uDoCopy; + } + else + { + uLong uTotalOutBefore,uTotalOutAfter; + const Bytef *bufBefore; + uLong uOutThis; + int flush=Z_SYNC_FLUSH; + + uTotalOutBefore = pfile_in_zip_read_info->stream.total_out; + bufBefore = pfile_in_zip_read_info->stream.next_out; + + /* + if ((pfile_in_zip_read_info->rest_read_uncompressed == + pfile_in_zip_read_info->stream.avail_out) && + (pfile_in_zip_read_info->rest_read_compressed == 0)) + flush = Z_FINISH; + */ + err=inflate(&pfile_in_zip_read_info->stream,flush); + + if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL)) + err = Z_DATA_ERROR; + + uTotalOutAfter = pfile_in_zip_read_info->stream.total_out; + uOutThis = uTotalOutAfter-uTotalOutBefore; + + pfile_in_zip_read_info->crc32 = + crc32(pfile_in_zip_read_info->crc32,bufBefore, + (uInt)(uOutThis)); + + pfile_in_zip_read_info->rest_read_uncompressed -= + uOutThis; + + iRead += (uInt)(uTotalOutAfter - uTotalOutBefore); + + if (err==Z_STREAM_END) + return (iRead==0) ? UNZ_EOF : iRead; + if (err!=Z_OK) + break; + } + } + + if (err==Z_OK) + return iRead; + return err; + } + + + /* + Give the current position in uncompressed data + */ + extern z_off_t ZEXPORT unztell (file) + unzFile file; + { + unz_s* s; + file_in_zip_read_info_s* pfile_in_zip_read_info; + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + pfile_in_zip_read_info=s->pfile_in_zip_read; + + if (pfile_in_zip_read_info==NULL) + return UNZ_PARAMERROR; + + return (z_off_t)pfile_in_zip_read_info->stream.total_out; + } + + + /* + return 1 if the end of file was reached, 0 elsewhere + */ + extern int ZEXPORT unzeof (file) + unzFile file; + { + unz_s* s; + file_in_zip_read_info_s* pfile_in_zip_read_info; + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + pfile_in_zip_read_info=s->pfile_in_zip_read; + + if (pfile_in_zip_read_info==NULL) + return UNZ_PARAMERROR; + + if (pfile_in_zip_read_info->rest_read_uncompressed == 0) + return 1; + else + return 0; + } + + + + /* + Read extra field from the current file (opened by unzOpenCurrentFile) + This is the local-header version of the extra field (sometimes, there is + more info in the local-header version than in the central-header) + + if buf==NULL, it return the size of the local extra field that can be read + + if buf!=NULL, len is the size of the buffer, the extra header is copied in + buf. + the return value is the number of bytes copied in buf, or (if <0) + the error code + */ + extern int ZEXPORT unzGetLocalExtrafield (file,buf,len) + unzFile file; + voidp buf; + unsigned len; + { + unz_s* s; + file_in_zip_read_info_s* pfile_in_zip_read_info; + uInt read_now; + uLong size_to_read; + + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + pfile_in_zip_read_info=s->pfile_in_zip_read; + + if (pfile_in_zip_read_info==NULL) + return UNZ_PARAMERROR; + + size_to_read = (pfile_in_zip_read_info->size_local_extrafield - + pfile_in_zip_read_info->pos_local_extrafield); + + if (buf==NULL) + return (int)size_to_read; + + if (len>size_to_read) + read_now = (uInt)size_to_read; + else + read_now = (uInt)len ; + + if (read_now==0) + return 0; + + if (ZSEEK(pfile_in_zip_read_info->z_filefunc, + pfile_in_zip_read_info->filestream, + pfile_in_zip_read_info->offset_local_extrafield + + pfile_in_zip_read_info->pos_local_extrafield, + ZLIB_FILEFUNC_SEEK_SET)!=0) + return UNZ_ERRNO; + + if (ZREAD(pfile_in_zip_read_info->z_filefunc, + pfile_in_zip_read_info->filestream, + buf,read_now)!=read_now) + return UNZ_ERRNO; + + return (int)read_now; + } + + /* + Close the file in zip opened with unzipOpenCurrentFile + Return UNZ_CRCERROR if all the file was read but the CRC is not good + */ + extern int ZEXPORT unzCloseCurrentFile (file) + unzFile file; + { + int err=UNZ_OK; + + unz_s* s; + file_in_zip_read_info_s* pfile_in_zip_read_info; + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + pfile_in_zip_read_info=s->pfile_in_zip_read; + + if (pfile_in_zip_read_info==NULL) + return UNZ_PARAMERROR; + + + if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) && + (!pfile_in_zip_read_info->raw)) + { + if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait) + err=UNZ_CRCERROR; + } + + + TRYFREE(pfile_in_zip_read_info->read_buffer); + pfile_in_zip_read_info->read_buffer = NULL; + if (pfile_in_zip_read_info->stream_initialised) + inflateEnd(&pfile_in_zip_read_info->stream); + + pfile_in_zip_read_info->stream_initialised = 0; + TRYFREE(pfile_in_zip_read_info); + + s->pfile_in_zip_read=NULL; + + return err; + } + + + /* + Get the global comment string of the ZipFile, in the szComment buffer. + uSizeBuf is the size of the szComment buffer. + return the number of byte copied or an error code <0 + */ + extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf) + unzFile file; + char *szComment; + uLong uSizeBuf; + { + int err=UNZ_OK; + unz_s* s; + uLong uReadThis ; + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + + uReadThis = uSizeBuf; + if (uReadThis>s->gi.size_comment) + uReadThis = s->gi.size_comment; + + if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0) + return UNZ_ERRNO; + + if (uReadThis>0) + { + *szComment='\0'; + if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis) + return UNZ_ERRNO; + } + + if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment)) + *(szComment+s->gi.size_comment)='\0'; + return (int)uReadThis; + } + + /* Additions by RX '2004 */ + extern uLong ZEXPORT unzGetOffset (file) + unzFile file; + { + unz_s* s; + + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + if (!s->current_file_ok) + return 0; + if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff) + if (s->num_file==s->gi.number_entry) + return 0; + return s->pos_in_central_dir; + } + + extern int ZEXPORT unzSetOffset (file, pos) + unzFile file; + uLong pos; + { + unz_s* s; + int err; + + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + + s->pos_in_central_dir = pos; + s->num_file = s->gi.number_entry; /* hack */ + err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info, + &s->cur_file_info_internal, + NULL,0,NULL,0,NULL,0); + s->current_file_ok = (err == UNZ_OK); + return err; + } diff -Nrcpad gcc-4.4.4/zlib/contrib/minizip/unzip.h gcc-4.4.5/zlib/contrib/minizip/unzip.h *** gcc-4.4.4/zlib/contrib/minizip/unzip.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/minizip/unzip.h Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,354 ---- + /* unzip.h -- IO for uncompress .zip files using zlib + Version 1.01e, February 12th, 2005 + + Copyright (C) 1998-2005 Gilles Vollant + + This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g + WinZip, InfoZip tools and compatible. + + Multi volume ZipFile (span) are not supported. + Encryption compatible with pkzip 2.04g only supported + Old compressions used by old PKZip 1.x are not supported + + + I WAIT FEEDBACK at mail info@winimage.com + Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution + + Condition of use and distribution are the same than zlib : + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + + */ + + /* for more info about .ZIP format, see + http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip + http://www.info-zip.org/pub/infozip/doc/ + PkWare has also a specification at : + ftp://ftp.pkware.com/probdesc.zip + */ + + #ifndef _unz_H + #define _unz_H + + #ifdef __cplusplus + extern "C" { + #endif + + #ifndef _ZLIB_H + #include "zlib.h" + #endif + + #ifndef _ZLIBIOAPI_H + #include "ioapi.h" + #endif + + #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) + /* like the STRICT of WIN32, we define a pointer that cannot be converted + from (void*) without cast */ + typedef struct TagunzFile__ { int unused; } unzFile__; + typedef unzFile__ *unzFile; + #else + typedef voidp unzFile; + #endif + + + #define UNZ_OK (0) + #define UNZ_END_OF_LIST_OF_FILE (-100) + #define UNZ_ERRNO (Z_ERRNO) + #define UNZ_EOF (0) + #define UNZ_PARAMERROR (-102) + #define UNZ_BADZIPFILE (-103) + #define UNZ_INTERNALERROR (-104) + #define UNZ_CRCERROR (-105) + + /* tm_unz contain date/time info */ + typedef struct tm_unz_s + { + uInt tm_sec; /* seconds after the minute - [0,59] */ + uInt tm_min; /* minutes after the hour - [0,59] */ + uInt tm_hour; /* hours since midnight - [0,23] */ + uInt tm_mday; /* day of the month - [1,31] */ + uInt tm_mon; /* months since January - [0,11] */ + uInt tm_year; /* years - [1980..2044] */ + } tm_unz; + + /* unz_global_info structure contain global data about the ZIPfile + These data comes from the end of central dir */ + typedef struct unz_global_info_s + { + uLong number_entry; /* total number of entries in + the central dir on this disk */ + uLong size_comment; /* size of the global comment of the zipfile */ + } unz_global_info; + + + /* unz_file_info contain information about a file in the zipfile */ + typedef struct unz_file_info_s + { + uLong version; /* version made by 2 bytes */ + uLong version_needed; /* version needed to extract 2 bytes */ + uLong flag; /* general purpose bit flag 2 bytes */ + uLong compression_method; /* compression method 2 bytes */ + uLong dosDate; /* last mod file date in Dos fmt 4 bytes */ + uLong crc; /* crc-32 4 bytes */ + uLong compressed_size; /* compressed size 4 bytes */ + uLong uncompressed_size; /* uncompressed size 4 bytes */ + uLong size_filename; /* filename length 2 bytes */ + uLong size_file_extra; /* extra field length 2 bytes */ + uLong size_file_comment; /* file comment length 2 bytes */ + + uLong disk_num_start; /* disk number start 2 bytes */ + uLong internal_fa; /* internal file attributes 2 bytes */ + uLong external_fa; /* external file attributes 4 bytes */ + + tm_unz tmu_date; + } unz_file_info; + + extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1, + const char* fileName2, + int iCaseSensitivity)); + /* + Compare two filename (fileName1,fileName2). + If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) + If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi + or strcasecmp) + If iCaseSenisivity = 0, case sensitivity is defaut of your operating system + (like 1 on Unix, 2 on Windows) + */ + + + extern unzFile ZEXPORT unzOpen OF((const char *path)); + /* + Open a Zip file. path contain the full pathname (by example, + on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer + "zlib/zlib113.zip". + If the zipfile cannot be opened (file don't exist or in not valid), the + return value is NULL. + Else, the return value is a unzFile Handle, usable with other function + of this unzip package. + */ + + extern unzFile ZEXPORT unzOpen2 OF((const char *path, + zlib_filefunc_def* pzlib_filefunc_def)); + /* + Open a Zip file, like unzOpen, but provide a set of file low level API + for read/write the zip file (see ioapi.h) + */ + + extern int ZEXPORT unzClose OF((unzFile file)); + /* + Close a ZipFile opened with unzipOpen. + If there is files inside the .Zip opened with unzOpenCurrentFile (see later), + these files MUST be closed with unzipCloseCurrentFile before call unzipClose. + return UNZ_OK if there is no problem. */ + + extern int ZEXPORT unzGetGlobalInfo OF((unzFile file, + unz_global_info *pglobal_info)); + /* + Write info about the ZipFile in the *pglobal_info structure. + No preparation of the structure is needed + return UNZ_OK if there is no problem. */ + + + extern int ZEXPORT unzGetGlobalComment OF((unzFile file, + char *szComment, + uLong uSizeBuf)); + /* + Get the global comment string of the ZipFile, in the szComment buffer. + uSizeBuf is the size of the szComment buffer. + return the number of byte copied or an error code <0 + */ + + + /***************************************************************************/ + /* Unzip package allow you browse the directory of the zipfile */ + + extern int ZEXPORT unzGoToFirstFile OF((unzFile file)); + /* + Set the current file of the zipfile to the first file. + return UNZ_OK if there is no problem + */ + + extern int ZEXPORT unzGoToNextFile OF((unzFile file)); + /* + Set the current file of the zipfile to the next file. + return UNZ_OK if there is no problem + return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. + */ + + extern int ZEXPORT unzLocateFile OF((unzFile file, + const char *szFileName, + int iCaseSensitivity)); + /* + Try locate the file szFileName in the zipfile. + For the iCaseSensitivity signification, see unzStringFileNameCompare + + return value : + UNZ_OK if the file is found. It becomes the current file. + UNZ_END_OF_LIST_OF_FILE if the file is not found + */ + + + /* ****************************************** */ + /* Ryan supplied functions */ + /* unz_file_info contain information about a file in the zipfile */ + typedef struct unz_file_pos_s + { + uLong pos_in_zip_directory; /* offset in zip file directory */ + uLong num_of_file; /* # of file */ + } unz_file_pos; + + extern int ZEXPORT unzGetFilePos( + unzFile file, + unz_file_pos* file_pos); + + extern int ZEXPORT unzGoToFilePos( + unzFile file, + unz_file_pos* file_pos); + + /* ****************************************** */ + + extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file, + unz_file_info *pfile_info, + char *szFileName, + uLong fileNameBufferSize, + void *extraField, + uLong extraFieldBufferSize, + char *szComment, + uLong commentBufferSize)); + /* + Get Info about the current file + if pfile_info!=NULL, the *pfile_info structure will contain somes info about + the current file + if szFileName!=NULL, the filemane string will be copied in szFileName + (fileNameBufferSize is the size of the buffer) + if extraField!=NULL, the extra field information will be copied in extraField + (extraFieldBufferSize is the size of the buffer). + This is the Central-header version of the extra field + if szComment!=NULL, the comment string of the file will be copied in szComment + (commentBufferSize is the size of the buffer) + */ + + /***************************************************************************/ + /* for reading the content of the current zipfile, you can open it, read data + from it, and close it (you can close it before reading all the file) + */ + + extern int ZEXPORT unzOpenCurrentFile OF((unzFile file)); + /* + Open for reading data the current file in the zipfile. + If there is no error, the return value is UNZ_OK. + */ + + extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file, + const char* password)); + /* + Open for reading data the current file in the zipfile. + password is a crypting password + If there is no error, the return value is UNZ_OK. + */ + + extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file, + int* method, + int* level, + int raw)); + /* + Same than unzOpenCurrentFile, but open for read raw the file (not uncompress) + if raw==1 + *method will receive method of compression, *level will receive level of + compression + note : you can set level parameter as NULL (if you did not want known level, + but you CANNOT set method parameter as NULL + */ + + extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file, + int* method, + int* level, + int raw, + const char* password)); + /* + Same than unzOpenCurrentFile, but open for read raw the file (not uncompress) + if raw==1 + *method will receive method of compression, *level will receive level of + compression + note : you can set level parameter as NULL (if you did not want known level, + but you CANNOT set method parameter as NULL + */ + + + extern int ZEXPORT unzCloseCurrentFile OF((unzFile file)); + /* + Close the file in zip opened with unzOpenCurrentFile + Return UNZ_CRCERROR if all the file was read but the CRC is not good + */ + + extern int ZEXPORT unzReadCurrentFile OF((unzFile file, + voidp buf, + unsigned len)); + /* + Read bytes from the current file (opened by unzOpenCurrentFile) + buf contain buffer where data must be copied + len the size of buf. + + return the number of byte copied if somes bytes are copied + return 0 if the end of file was reached + return <0 with error code if there is an error + (UNZ_ERRNO for IO error, or zLib error for uncompress error) + */ + + extern z_off_t ZEXPORT unztell OF((unzFile file)); + /* + Give the current position in uncompressed data + */ + + extern int ZEXPORT unzeof OF((unzFile file)); + /* + return 1 if the end of file was reached, 0 elsewhere + */ + + extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file, + voidp buf, + unsigned len)); + /* + Read extra field from the current file (opened by unzOpenCurrentFile) + This is the local-header version of the extra field (sometimes, there is + more info in the local-header version than in the central-header) + + if buf==NULL, it return the size of the local extra field + + if buf!=NULL, len is the size of the buffer, the extra header is copied in + buf. + the return value is the number of bytes copied in buf, or (if <0) + the error code + */ + + /***************************************************************************/ + + /* Get the current file offset */ + extern uLong ZEXPORT unzGetOffset (unzFile file); + + /* Set the current file offset */ + extern int ZEXPORT unzSetOffset (unzFile file, uLong pos); + + + + #ifdef __cplusplus + } + #endif + + #endif /* _unz_H */ diff -Nrcpad gcc-4.4.4/zlib/contrib/minizip/zip.c gcc-4.4.5/zlib/contrib/minizip/zip.c *** gcc-4.4.4/zlib/contrib/minizip/zip.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/minizip/zip.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,1219 ---- + /* zip.c -- IO on .zip files using zlib + Version 1.01e, February 12th, 2005 + + 27 Dec 2004 Rolf Kalbermatter + Modification to zipOpen2 to support globalComment retrieval. + + Copyright (C) 1998-2005 Gilles Vollant + + Read zip.h for more info + */ + + + #include + #include + #include + #include + #include "zlib.h" + #include "zip.h" + + #ifdef STDC + # include + # include + # include + #endif + #ifdef NO_ERRNO_H + extern int errno; + #else + # include + #endif + + + #ifndef local + # define local static + #endif + /* compile with -Dlocal if your debugger can't find static symbols */ + + #ifndef VERSIONMADEBY + # define VERSIONMADEBY (0x0) /* platform depedent */ + #endif + + #ifndef Z_BUFSIZE + #define Z_BUFSIZE (16384) + #endif + + #ifndef Z_MAXFILENAMEINZIP + #define Z_MAXFILENAMEINZIP (256) + #endif + + #ifndef ALLOC + # define ALLOC(size) (malloc(size)) + #endif + #ifndef TRYFREE + # define TRYFREE(p) {if (p) free(p);} + #endif + + /* + #define SIZECENTRALDIRITEM (0x2e) + #define SIZEZIPLOCALHEADER (0x1e) + */ + + /* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */ + + #ifndef SEEK_CUR + #define SEEK_CUR 1 + #endif + + #ifndef SEEK_END + #define SEEK_END 2 + #endif + + #ifndef SEEK_SET + #define SEEK_SET 0 + #endif + + #ifndef DEF_MEM_LEVEL + #if MAX_MEM_LEVEL >= 8 + # define DEF_MEM_LEVEL 8 + #else + # define DEF_MEM_LEVEL MAX_MEM_LEVEL + #endif + #endif + const char zip_copyright[] = + " zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll"; + + + #define SIZEDATA_INDATABLOCK (4096-(4*4)) + + #define LOCALHEADERMAGIC (0x04034b50) + #define CENTRALHEADERMAGIC (0x02014b50) + #define ENDHEADERMAGIC (0x06054b50) + + #define FLAG_LOCALHEADER_OFFSET (0x06) + #define CRC_LOCALHEADER_OFFSET (0x0e) + + #define SIZECENTRALHEADER (0x2e) /* 46 */ + + typedef struct linkedlist_datablock_internal_s + { + struct linkedlist_datablock_internal_s* next_datablock; + uLong avail_in_this_block; + uLong filled_in_this_block; + uLong unused; /* for future use and alignement */ + unsigned char data[SIZEDATA_INDATABLOCK]; + } linkedlist_datablock_internal; + + typedef struct linkedlist_data_s + { + linkedlist_datablock_internal* first_block; + linkedlist_datablock_internal* last_block; + } linkedlist_data; + + + typedef struct + { + z_stream stream; /* zLib stream structure for inflate */ + int stream_initialised; /* 1 is stream is initialised */ + uInt pos_in_buffered_data; /* last written byte in buffered_data */ + + uLong pos_local_header; /* offset of the local header of the file + currenty writing */ + char* central_header; /* central header data for the current file */ + uLong size_centralheader; /* size of the central header for cur file */ + uLong flag; /* flag of the file currently writing */ + + int method; /* compression method of file currenty wr.*/ + int raw; /* 1 for directly writing raw data */ + Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/ + uLong dosDate; + uLong crc32; + int encrypt; + #ifndef NOCRYPT + unsigned long keys[3]; /* keys defining the pseudo-random sequence */ + const unsigned long* pcrc_32_tab; + int crypt_header_size; + #endif + } curfile_info; + + typedef struct + { + zlib_filefunc_def z_filefunc; + voidpf filestream; /* io structore of the zipfile */ + linkedlist_data central_dir;/* datablock with central dir in construction*/ + int in_opened_file_inzip; /* 1 if a file in the zip is currently writ.*/ + curfile_info ci; /* info on the file curretly writing */ + + uLong begin_pos; /* position of the beginning of the zipfile */ + uLong add_position_when_writting_offset; + uLong number_entry; + #ifndef NO_ADDFILEINEXISTINGZIP + char *globalcomment; + #endif + } zip_internal; + + + + #ifndef NOCRYPT + #define INCLUDECRYPTINGCODE_IFCRYPTALLOWED + #include "crypt.h" + #endif + + local linkedlist_datablock_internal* allocate_new_datablock() + { + linkedlist_datablock_internal* ldi; + ldi = (linkedlist_datablock_internal*) + ALLOC(sizeof(linkedlist_datablock_internal)); + if (ldi!=NULL) + { + ldi->next_datablock = NULL ; + ldi->filled_in_this_block = 0 ; + ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ; + } + return ldi; + } + + local void free_datablock(ldi) + linkedlist_datablock_internal* ldi; + { + while (ldi!=NULL) + { + linkedlist_datablock_internal* ldinext = ldi->next_datablock; + TRYFREE(ldi); + ldi = ldinext; + } + } + + local void init_linkedlist(ll) + linkedlist_data* ll; + { + ll->first_block = ll->last_block = NULL; + } + + local void free_linkedlist(ll) + linkedlist_data* ll; + { + free_datablock(ll->first_block); + ll->first_block = ll->last_block = NULL; + } + + + local int add_data_in_datablock(ll,buf,len) + linkedlist_data* ll; + const void* buf; + uLong len; + { + linkedlist_datablock_internal* ldi; + const unsigned char* from_copy; + + if (ll==NULL) + return ZIP_INTERNALERROR; + + if (ll->last_block == NULL) + { + ll->first_block = ll->last_block = allocate_new_datablock(); + if (ll->first_block == NULL) + return ZIP_INTERNALERROR; + } + + ldi = ll->last_block; + from_copy = (unsigned char*)buf; + + while (len>0) + { + uInt copy_this; + uInt i; + unsigned char* to_copy; + + if (ldi->avail_in_this_block==0) + { + ldi->next_datablock = allocate_new_datablock(); + if (ldi->next_datablock == NULL) + return ZIP_INTERNALERROR; + ldi = ldi->next_datablock ; + ll->last_block = ldi; + } + + if (ldi->avail_in_this_block < len) + copy_this = (uInt)ldi->avail_in_this_block; + else + copy_this = (uInt)len; + + to_copy = &(ldi->data[ldi->filled_in_this_block]); + + for (i=0;ifilled_in_this_block += copy_this; + ldi->avail_in_this_block -= copy_this; + from_copy += copy_this ; + len -= copy_this; + } + return ZIP_OK; + } + + + + /****************************************************************************/ + + #ifndef NO_ADDFILEINEXISTINGZIP + /* =========================================================================== + Inputs a long in LSB order to the given file + nbByte == 1, 2 or 4 (byte, short or long) + */ + + local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, uLong x, int nbByte)); + local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte) + const zlib_filefunc_def* pzlib_filefunc_def; + voidpf filestream; + uLong x; + int nbByte; + { + unsigned char buf[4]; + int n; + for (n = 0; n < nbByte; n++) + { + buf[n] = (unsigned char)(x & 0xff); + x >>= 8; + } + if (x != 0) + { /* data overflow - hack for ZIP64 (X Roche) */ + for (n = 0; n < nbByte; n++) + { + buf[n] = 0xff; + } + } + + if (ZWRITE(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte) + return ZIP_ERRNO; + else + return ZIP_OK; + } + + local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte)); + local void ziplocal_putValue_inmemory (dest, x, nbByte) + void* dest; + uLong x; + int nbByte; + { + unsigned char* buf=(unsigned char*)dest; + int n; + for (n = 0; n < nbByte; n++) { + buf[n] = (unsigned char)(x & 0xff); + x >>= 8; + } + + if (x != 0) + { /* data overflow - hack for ZIP64 */ + for (n = 0; n < nbByte; n++) + { + buf[n] = 0xff; + } + } + } + + /****************************************************************************/ + + + local uLong ziplocal_TmzDateToDosDate(ptm,dosDate) + const tm_zip* ptm; + uLong dosDate; + { + uLong year = (uLong)ptm->tm_year; + if (year>1980) + year-=1980; + else if (year>80) + year-=80; + return + (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) | + ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour)); + } + + + /****************************************************************************/ + + local int ziplocal_getByte OF(( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + int *pi)); + + local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi) + const zlib_filefunc_def* pzlib_filefunc_def; + voidpf filestream; + int *pi; + { + unsigned char c; + int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); + if (err==1) + { + *pi = (int)c; + return ZIP_OK; + } + else + { + if (ZERROR(*pzlib_filefunc_def,filestream)) + return ZIP_ERRNO; + else + return ZIP_EOF; + } + } + + + /* =========================================================================== + Reads a long in LSB order from the given gz_stream. Sets + */ + local int ziplocal_getShort OF(( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + uLong *pX)); + + local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX) + const zlib_filefunc_def* pzlib_filefunc_def; + voidpf filestream; + uLong *pX; + { + uLong x ; + int i; + int err; + + err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i); + x = (uLong)i; + + if (err==ZIP_OK) + err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i); + x += ((uLong)i)<<8; + + if (err==ZIP_OK) + *pX = x; + else + *pX = 0; + return err; + } + + local int ziplocal_getLong OF(( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + uLong *pX)); + + local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX) + const zlib_filefunc_def* pzlib_filefunc_def; + voidpf filestream; + uLong *pX; + { + uLong x ; + int i; + int err; + + err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i); + x = (uLong)i; + + if (err==ZIP_OK) + err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i); + x += ((uLong)i)<<8; + + if (err==ZIP_OK) + err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i); + x += ((uLong)i)<<16; + + if (err==ZIP_OK) + err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i); + x += ((uLong)i)<<24; + + if (err==ZIP_OK) + *pX = x; + else + *pX = 0; + return err; + } + + #ifndef BUFREADCOMMENT + #define BUFREADCOMMENT (0x400) + #endif + /* + Locate the Central directory of a zipfile (at the end, just before + the global comment) + */ + local uLong ziplocal_SearchCentralDir OF(( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream)); + + local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream) + const zlib_filefunc_def* pzlib_filefunc_def; + voidpf filestream; + { + unsigned char* buf; + uLong uSizeFile; + uLong uBackRead; + uLong uMaxBack=0xffff; /* maximum size of global comment */ + uLong uPosFound=0; + + if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0) + return 0; + + + uSizeFile = ZTELL(*pzlib_filefunc_def,filestream); + + if (uMaxBack>uSizeFile) + uMaxBack = uSizeFile; + + buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4); + if (buf==NULL) + return 0; + + uBackRead = 4; + while (uBackReaduMaxBack) + uBackRead = uMaxBack; + else + uBackRead+=BUFREADCOMMENT; + uReadPos = uSizeFile-uBackRead ; + + uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ? + (BUFREADCOMMENT+4) : (uSizeFile-uReadPos); + if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0) + break; + + if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize) + break; + + for (i=(int)uReadSize-3; (i--)>0;) + if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && + ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06)) + { + uPosFound = uReadPos+i; + break; + } + + if (uPosFound!=0) + break; + } + TRYFREE(buf); + return uPosFound; + } + #endif /* !NO_ADDFILEINEXISTINGZIP*/ + + /************************************************************/ + extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc_def) + const char *pathname; + int append; + zipcharpc* globalcomment; + zlib_filefunc_def* pzlib_filefunc_def; + { + zip_internal ziinit; + zip_internal* zi; + int err=ZIP_OK; + + + if (pzlib_filefunc_def==NULL) + fill_fopen_filefunc(&ziinit.z_filefunc); + else + ziinit.z_filefunc = *pzlib_filefunc_def; + + ziinit.filestream = (*(ziinit.z_filefunc.zopen_file)) + (ziinit.z_filefunc.opaque, + pathname, + (append == APPEND_STATUS_CREATE) ? + (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) : + (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING)); + + if (ziinit.filestream == NULL) + return NULL; + ziinit.begin_pos = ZTELL(ziinit.z_filefunc,ziinit.filestream); + ziinit.in_opened_file_inzip = 0; + ziinit.ci.stream_initialised = 0; + ziinit.number_entry = 0; + ziinit.add_position_when_writting_offset = 0; + init_linkedlist(&(ziinit.central_dir)); + + + zi = (zip_internal*)ALLOC(sizeof(zip_internal)); + if (zi==NULL) + { + ZCLOSE(ziinit.z_filefunc,ziinit.filestream); + return NULL; + } + + /* now we add file in a zipfile */ + # ifndef NO_ADDFILEINEXISTINGZIP + ziinit.globalcomment = NULL; + if (append == APPEND_STATUS_ADDINZIP) + { + uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/ + + uLong size_central_dir; /* size of the central directory */ + uLong offset_central_dir; /* offset of start of central directory */ + uLong central_pos,uL; + + uLong number_disk; /* number of the current dist, used for + spaning ZIP, unsupported, always 0*/ + uLong number_disk_with_CD; /* number the the disk with central dir, used + for spaning ZIP, unsupported, always 0*/ + uLong number_entry; + uLong number_entry_CD; /* total number of entries in + the central dir + (same than number_entry on nospan) */ + uLong size_comment; + + central_pos = ziplocal_SearchCentralDir(&ziinit.z_filefunc,ziinit.filestream); + if (central_pos==0) + err=ZIP_ERRNO; + + if (ZSEEK(ziinit.z_filefunc, ziinit.filestream, + central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0) + err=ZIP_ERRNO; + + /* the signature, already checked */ + if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&uL)!=ZIP_OK) + err=ZIP_ERRNO; + + /* number of this disk */ + if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk)!=ZIP_OK) + err=ZIP_ERRNO; + + /* number of the disk with the start of the central directory */ + if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk_with_CD)!=ZIP_OK) + err=ZIP_ERRNO; + + /* total number of entries in the central dir on this disk */ + if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry)!=ZIP_OK) + err=ZIP_ERRNO; + + /* total number of entries in the central dir */ + if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry_CD)!=ZIP_OK) + err=ZIP_ERRNO; + + if ((number_entry_CD!=number_entry) || + (number_disk_with_CD!=0) || + (number_disk!=0)) + err=ZIP_BADZIPFILE; + + /* size of the central directory */ + if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&size_central_dir)!=ZIP_OK) + err=ZIP_ERRNO; + + /* offset of start of central directory with respect to the + starting disk number */ + if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&offset_central_dir)!=ZIP_OK) + err=ZIP_ERRNO; + + /* zipfile global comment length */ + if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&size_comment)!=ZIP_OK) + err=ZIP_ERRNO; + + if ((central_pos0) + { + ziinit.globalcomment = ALLOC(size_comment+1); + if (ziinit.globalcomment) + { + size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment); + ziinit.globalcomment[size_comment]=0; + } + } + + byte_before_the_zipfile = central_pos - + (offset_central_dir+size_central_dir); + ziinit.add_position_when_writting_offset = byte_before_the_zipfile; + + { + uLong size_central_dir_to_read = size_central_dir; + size_t buf_size = SIZEDATA_INDATABLOCK; + void* buf_read = (void*)ALLOC(buf_size); + if (ZSEEK(ziinit.z_filefunc, ziinit.filestream, + offset_central_dir + byte_before_the_zipfile, + ZLIB_FILEFUNC_SEEK_SET) != 0) + err=ZIP_ERRNO; + + while ((size_central_dir_to_read>0) && (err==ZIP_OK)) + { + uLong read_this = SIZEDATA_INDATABLOCK; + if (read_this > size_central_dir_to_read) + read_this = size_central_dir_to_read; + if (ZREAD(ziinit.z_filefunc, ziinit.filestream,buf_read,read_this) != read_this) + err=ZIP_ERRNO; + + if (err==ZIP_OK) + err = add_data_in_datablock(&ziinit.central_dir,buf_read, + (uLong)read_this); + size_central_dir_to_read-=read_this; + } + TRYFREE(buf_read); + } + ziinit.begin_pos = byte_before_the_zipfile; + ziinit.number_entry = number_entry_CD; + + if (ZSEEK(ziinit.z_filefunc, ziinit.filestream, + offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0) + err=ZIP_ERRNO; + } + + if (globalcomment) + { + *globalcomment = ziinit.globalcomment; + } + # endif /* !NO_ADDFILEINEXISTINGZIP*/ + + if (err != ZIP_OK) + { + # ifndef NO_ADDFILEINEXISTINGZIP + TRYFREE(ziinit.globalcomment); + # endif /* !NO_ADDFILEINEXISTINGZIP*/ + TRYFREE(zi); + return NULL; + } + else + { + *zi = ziinit; + return (zipFile)zi; + } + } + + extern zipFile ZEXPORT zipOpen (pathname, append) + const char *pathname; + int append; + { + return zipOpen2(pathname,append,NULL,NULL); + } + + extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi, + extrafield_local, size_extrafield_local, + extrafield_global, size_extrafield_global, + comment, method, level, raw, + windowBits, memLevel, strategy, + password, crcForCrypting) + zipFile file; + const char* filename; + const zip_fileinfo* zipfi; + const void* extrafield_local; + uInt size_extrafield_local; + const void* extrafield_global; + uInt size_extrafield_global; + const char* comment; + int method; + int level; + int raw; + int windowBits; + int memLevel; + int strategy; + const char* password; + uLong crcForCrypting; + { + zip_internal* zi; + uInt size_filename; + uInt size_comment; + uInt i; + int err = ZIP_OK; + + # ifdef NOCRYPT + if (password != NULL) + return ZIP_PARAMERROR; + # endif + + if (file == NULL) + return ZIP_PARAMERROR; + if ((method!=0) && (method!=Z_DEFLATED)) + return ZIP_PARAMERROR; + + zi = (zip_internal*)file; + + if (zi->in_opened_file_inzip == 1) + { + err = zipCloseFileInZip (file); + if (err != ZIP_OK) + return err; + } + + + if (filename==NULL) + filename="-"; + + if (comment==NULL) + size_comment = 0; + else + size_comment = (uInt)strlen(comment); + + size_filename = (uInt)strlen(filename); + + if (zipfi == NULL) + zi->ci.dosDate = 0; + else + { + if (zipfi->dosDate != 0) + zi->ci.dosDate = zipfi->dosDate; + else zi->ci.dosDate = ziplocal_TmzDateToDosDate(&zipfi->tmz_date,zipfi->dosDate); + } + + zi->ci.flag = 0; + if ((level==8) || (level==9)) + zi->ci.flag |= 2; + if ((level==2)) + zi->ci.flag |= 4; + if ((level==1)) + zi->ci.flag |= 6; + if (password != NULL) + zi->ci.flag |= 1; + + zi->ci.crc32 = 0; + zi->ci.method = method; + zi->ci.encrypt = 0; + zi->ci.stream_initialised = 0; + zi->ci.pos_in_buffered_data = 0; + zi->ci.raw = raw; + zi->ci.pos_local_header = ZTELL(zi->z_filefunc,zi->filestream) ; + zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + + size_extrafield_global + size_comment; + zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader); + + ziplocal_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4); + /* version info */ + ziplocal_putValue_inmemory(zi->ci.central_header+4,(uLong)VERSIONMADEBY,2); + ziplocal_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2); + ziplocal_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2); + ziplocal_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2); + ziplocal_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4); + ziplocal_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/ + ziplocal_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/ + ziplocal_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/ + ziplocal_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2); + ziplocal_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2); + ziplocal_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2); + ziplocal_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/ + + if (zipfi==NULL) + ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2); + else + ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2); + + if (zipfi==NULL) + ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4); + else + ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4); + + ziplocal_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header- zi->add_position_when_writting_offset,4); + + for (i=0;ici.central_header+SIZECENTRALHEADER+i) = *(filename+i); + + for (i=0;ici.central_header+SIZECENTRALHEADER+size_filename+i) = + *(((const char*)extrafield_global)+i); + + for (i=0;ici.central_header+SIZECENTRALHEADER+size_filename+ + size_extrafield_global+i) = *(comment+i); + if (zi->ci.central_header == NULL) + return ZIP_INTERNALERROR; + + /* write the local header */ + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC,4); + + if (err==ZIP_OK) + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */ + if (err==ZIP_OK) + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2); + + if (err==ZIP_OK) + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2); + + if (err==ZIP_OK) + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4); + + if (err==ZIP_OK) + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */ + if (err==ZIP_OK) + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */ + if (err==ZIP_OK) + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */ + + if (err==ZIP_OK) + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2); + + if (err==ZIP_OK) + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield_local,2); + + if ((err==ZIP_OK) && (size_filename>0)) + if (ZWRITE(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename) + err = ZIP_ERRNO; + + if ((err==ZIP_OK) && (size_extrafield_local>0)) + if (ZWRITE(zi->z_filefunc,zi->filestream,extrafield_local,size_extrafield_local) + !=size_extrafield_local) + err = ZIP_ERRNO; + + zi->ci.stream.avail_in = (uInt)0; + zi->ci.stream.avail_out = (uInt)Z_BUFSIZE; + zi->ci.stream.next_out = zi->ci.buffered_data; + zi->ci.stream.total_in = 0; + zi->ci.stream.total_out = 0; + + if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw)) + { + zi->ci.stream.zalloc = (alloc_func)0; + zi->ci.stream.zfree = (free_func)0; + zi->ci.stream.opaque = (voidpf)0; + + if (windowBits>0) + windowBits = -windowBits; + + err = deflateInit2(&zi->ci.stream, level, + Z_DEFLATED, windowBits, memLevel, strategy); + + if (err==Z_OK) + zi->ci.stream_initialised = 1; + } + # ifndef NOCRYPT + zi->ci.crypt_header_size = 0; + if ((err==Z_OK) && (password != NULL)) + { + unsigned char bufHead[RAND_HEAD_LEN]; + unsigned int sizeHead; + zi->ci.encrypt = 1; + zi->ci.pcrc_32_tab = get_crc_table(); + /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/ + + sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting); + zi->ci.crypt_header_size = sizeHead; + + if (ZWRITE(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead) + err = ZIP_ERRNO; + } + # endif + + if (err==Z_OK) + zi->in_opened_file_inzip = 1; + return err; + } + + extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi, + extrafield_local, size_extrafield_local, + extrafield_global, size_extrafield_global, + comment, method, level, raw) + zipFile file; + const char* filename; + const zip_fileinfo* zipfi; + const void* extrafield_local; + uInt size_extrafield_local; + const void* extrafield_global; + uInt size_extrafield_global; + const char* comment; + int method; + int level; + int raw; + { + return zipOpenNewFileInZip3 (file, filename, zipfi, + extrafield_local, size_extrafield_local, + extrafield_global, size_extrafield_global, + comment, method, level, raw, + -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, + NULL, 0); + } + + extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi, + extrafield_local, size_extrafield_local, + extrafield_global, size_extrafield_global, + comment, method, level) + zipFile file; + const char* filename; + const zip_fileinfo* zipfi; + const void* extrafield_local; + uInt size_extrafield_local; + const void* extrafield_global; + uInt size_extrafield_global; + const char* comment; + int method; + int level; + { + return zipOpenNewFileInZip2 (file, filename, zipfi, + extrafield_local, size_extrafield_local, + extrafield_global, size_extrafield_global, + comment, method, level, 0); + } + + local int zipFlushWriteBuffer(zi) + zip_internal* zi; + { + int err=ZIP_OK; + + if (zi->ci.encrypt != 0) + { + #ifndef NOCRYPT + uInt i; + int t; + for (i=0;ici.pos_in_buffered_data;i++) + zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, + zi->ci.buffered_data[i],t); + #endif + } + if (ZWRITE(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data) + !=zi->ci.pos_in_buffered_data) + err = ZIP_ERRNO; + zi->ci.pos_in_buffered_data = 0; + return err; + } + + extern int ZEXPORT zipWriteInFileInZip (file, buf, len) + zipFile file; + const void* buf; + unsigned len; + { + zip_internal* zi; + int err=ZIP_OK; + + if (file == NULL) + return ZIP_PARAMERROR; + zi = (zip_internal*)file; + + if (zi->in_opened_file_inzip == 0) + return ZIP_PARAMERROR; + + zi->ci.stream.next_in = (void*)buf; + zi->ci.stream.avail_in = len; + zi->ci.crc32 = crc32(zi->ci.crc32,buf,len); + + while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0)) + { + if (zi->ci.stream.avail_out == 0) + { + if (zipFlushWriteBuffer(zi) == ZIP_ERRNO) + err = ZIP_ERRNO; + zi->ci.stream.avail_out = (uInt)Z_BUFSIZE; + zi->ci.stream.next_out = zi->ci.buffered_data; + } + + + if(err != ZIP_OK) + break; + + if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw)) + { + uLong uTotalOutBefore = zi->ci.stream.total_out; + err=deflate(&zi->ci.stream, Z_NO_FLUSH); + zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ; + + } + else + { + uInt copy_this,i; + if (zi->ci.stream.avail_in < zi->ci.stream.avail_out) + copy_this = zi->ci.stream.avail_in; + else + copy_this = zi->ci.stream.avail_out; + for (i=0;ici.stream.next_out)+i) = + *(((const char*)zi->ci.stream.next_in)+i); + { + zi->ci.stream.avail_in -= copy_this; + zi->ci.stream.avail_out-= copy_this; + zi->ci.stream.next_in+= copy_this; + zi->ci.stream.next_out+= copy_this; + zi->ci.stream.total_in+= copy_this; + zi->ci.stream.total_out+= copy_this; + zi->ci.pos_in_buffered_data += copy_this; + } + } + } + + return err; + } + + extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32) + zipFile file; + uLong uncompressed_size; + uLong crc32; + { + zip_internal* zi; + uLong compressed_size; + int err=ZIP_OK; + + if (file == NULL) + return ZIP_PARAMERROR; + zi = (zip_internal*)file; + + if (zi->in_opened_file_inzip == 0) + return ZIP_PARAMERROR; + zi->ci.stream.avail_in = 0; + + if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw)) + while (err==ZIP_OK) + { + uLong uTotalOutBefore; + if (zi->ci.stream.avail_out == 0) + { + if (zipFlushWriteBuffer(zi) == ZIP_ERRNO) + err = ZIP_ERRNO; + zi->ci.stream.avail_out = (uInt)Z_BUFSIZE; + zi->ci.stream.next_out = zi->ci.buffered_data; + } + uTotalOutBefore = zi->ci.stream.total_out; + err=deflate(&zi->ci.stream, Z_FINISH); + zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ; + } + + if (err==Z_STREAM_END) + err=ZIP_OK; /* this is normal */ + + if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK)) + if (zipFlushWriteBuffer(zi)==ZIP_ERRNO) + err = ZIP_ERRNO; + + if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw)) + { + err=deflateEnd(&zi->ci.stream); + zi->ci.stream_initialised = 0; + } + + if (!zi->ci.raw) + { + crc32 = (uLong)zi->ci.crc32; + uncompressed_size = (uLong)zi->ci.stream.total_in; + } + compressed_size = (uLong)zi->ci.stream.total_out; + # ifndef NOCRYPT + compressed_size += zi->ci.crypt_header_size; + # endif + + ziplocal_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/ + ziplocal_putValue_inmemory(zi->ci.central_header+20, + compressed_size,4); /*compr size*/ + if (zi->ci.stream.data_type == Z_ASCII) + ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2); + ziplocal_putValue_inmemory(zi->ci.central_header+24, + uncompressed_size,4); /*uncompr size*/ + + if (err==ZIP_OK) + err = add_data_in_datablock(&zi->central_dir,zi->ci.central_header, + (uLong)zi->ci.size_centralheader); + free(zi->ci.central_header); + + if (err==ZIP_OK) + { + long cur_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream); + if (ZSEEK(zi->z_filefunc,zi->filestream, + zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0) + err = ZIP_ERRNO; + + if (err==ZIP_OK) + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */ + + if (err==ZIP_OK) /* compressed size, unknown */ + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4); + + if (err==ZIP_OK) /* uncompressed size, unknown */ + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4); + + if (ZSEEK(zi->z_filefunc,zi->filestream, + cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0) + err = ZIP_ERRNO; + } + + zi->number_entry ++; + zi->in_opened_file_inzip = 0; + + return err; + } + + extern int ZEXPORT zipCloseFileInZip (file) + zipFile file; + { + return zipCloseFileInZipRaw (file,0,0); + } + + extern int ZEXPORT zipClose (file, global_comment) + zipFile file; + const char* global_comment; + { + zip_internal* zi; + int err = 0; + uLong size_centraldir = 0; + uLong centraldir_pos_inzip; + uInt size_global_comment; + if (file == NULL) + return ZIP_PARAMERROR; + zi = (zip_internal*)file; + + if (zi->in_opened_file_inzip == 1) + { + err = zipCloseFileInZip (file); + } + + #ifndef NO_ADDFILEINEXISTINGZIP + if (global_comment==NULL) + global_comment = zi->globalcomment; + #endif + if (global_comment==NULL) + size_global_comment = 0; + else + size_global_comment = (uInt)strlen(global_comment); + + centraldir_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream); + if (err==ZIP_OK) + { + linkedlist_datablock_internal* ldi = zi->central_dir.first_block ; + while (ldi!=NULL) + { + if ((err==ZIP_OK) && (ldi->filled_in_this_block>0)) + if (ZWRITE(zi->z_filefunc,zi->filestream, + ldi->data,ldi->filled_in_this_block) + !=ldi->filled_in_this_block ) + err = ZIP_ERRNO; + + size_centraldir += ldi->filled_in_this_block; + ldi = ldi->next_datablock; + } + } + free_datablock(zi->central_dir.first_block); + + if (err==ZIP_OK) /* Magic End */ + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4); + + if (err==ZIP_OK) /* number of this disk */ + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2); + + if (err==ZIP_OK) /* number of the disk with the start of the central directory */ + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2); + + if (err==ZIP_OK) /* total number of entries in the central dir on this disk */ + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2); + + if (err==ZIP_OK) /* total number of entries in the central dir */ + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2); + + if (err==ZIP_OK) /* size of the central directory */ + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4); + + if (err==ZIP_OK) /* offset of start of central directory with respect to the + starting disk number */ + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream, + (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4); + + if (err==ZIP_OK) /* zipfile comment length */ + err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2); + + if ((err==ZIP_OK) && (size_global_comment>0)) + if (ZWRITE(zi->z_filefunc,zi->filestream, + global_comment,size_global_comment) != size_global_comment) + err = ZIP_ERRNO; + + if (ZCLOSE(zi->z_filefunc,zi->filestream) != 0) + if (err == ZIP_OK) + err = ZIP_ERRNO; + + #ifndef NO_ADDFILEINEXISTINGZIP + TRYFREE(zi->globalcomment); + #endif + TRYFREE(zi); + + return err; + } diff -Nrcpad gcc-4.4.4/zlib/contrib/minizip/zip.h gcc-4.4.5/zlib/contrib/minizip/zip.h *** gcc-4.4.4/zlib/contrib/minizip/zip.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/minizip/zip.h Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,235 ---- + /* zip.h -- IO for compress .zip files using zlib + Version 1.01e, February 12th, 2005 + + Copyright (C) 1998-2005 Gilles Vollant + + This unzip package allow creates .ZIP file, compatible with PKZip 2.04g + WinZip, InfoZip tools and compatible. + Multi volume ZipFile (span) are not supported. + Encryption compatible with pkzip 2.04g only supported + Old compressions used by old PKZip 1.x are not supported + + For uncompress .zip file, look at unzip.h + + + I WAIT FEEDBACK at mail info@winimage.com + Visit also http://www.winimage.com/zLibDll/unzip.html for evolution + + Condition of use and distribution are the same than zlib : + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + + */ + + /* for more info about .ZIP format, see + http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip + http://www.info-zip.org/pub/infozip/doc/ + PkWare has also a specification at : + ftp://ftp.pkware.com/probdesc.zip + */ + + #ifndef _zip_H + #define _zip_H + + #ifdef __cplusplus + extern "C" { + #endif + + #ifndef _ZLIB_H + #include "zlib.h" + #endif + + #ifndef _ZLIBIOAPI_H + #include "ioapi.h" + #endif + + #if defined(STRICTZIP) || defined(STRICTZIPUNZIP) + /* like the STRICT of WIN32, we define a pointer that cannot be converted + from (void*) without cast */ + typedef struct TagzipFile__ { int unused; } zipFile__; + typedef zipFile__ *zipFile; + #else + typedef voidp zipFile; + #endif + + #define ZIP_OK (0) + #define ZIP_EOF (0) + #define ZIP_ERRNO (Z_ERRNO) + #define ZIP_PARAMERROR (-102) + #define ZIP_BADZIPFILE (-103) + #define ZIP_INTERNALERROR (-104) + + #ifndef DEF_MEM_LEVEL + # if MAX_MEM_LEVEL >= 8 + # define DEF_MEM_LEVEL 8 + # else + # define DEF_MEM_LEVEL MAX_MEM_LEVEL + # endif + #endif + /* default memLevel */ + + /* tm_zip contain date/time info */ + typedef struct tm_zip_s + { + uInt tm_sec; /* seconds after the minute - [0,59] */ + uInt tm_min; /* minutes after the hour - [0,59] */ + uInt tm_hour; /* hours since midnight - [0,23] */ + uInt tm_mday; /* day of the month - [1,31] */ + uInt tm_mon; /* months since January - [0,11] */ + uInt tm_year; /* years - [1980..2044] */ + } tm_zip; + + typedef struct + { + tm_zip tmz_date; /* date in understandable format */ + uLong dosDate; /* if dos_date == 0, tmu_date is used */ + /* uLong flag; */ /* general purpose bit flag 2 bytes */ + + uLong internal_fa; /* internal file attributes 2 bytes */ + uLong external_fa; /* external file attributes 4 bytes */ + } zip_fileinfo; + + typedef const char* zipcharpc; + + + #define APPEND_STATUS_CREATE (0) + #define APPEND_STATUS_CREATEAFTER (1) + #define APPEND_STATUS_ADDINZIP (2) + + extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append)); + /* + Create a zipfile. + pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on + an Unix computer "zlib/zlib113.zip". + if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip + will be created at the end of the file. + (useful if the file contain a self extractor code) + if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will + add files in existing zip (be sure you don't add file that doesn't exist) + If the zipfile cannot be opened, the return value is NULL. + Else, the return value is a zipFile Handle, usable with other function + of this zip package. + */ + + /* Note : there is no delete function into a zipfile. + If you want delete file into a zipfile, you must open a zipfile, and create another + Of couse, you can use RAW reading and writing to copy the file you did not want delte + */ + + extern zipFile ZEXPORT zipOpen2 OF((const char *pathname, + int append, + zipcharpc* globalcomment, + zlib_filefunc_def* pzlib_filefunc_def)); + + extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file, + const char* filename, + const zip_fileinfo* zipfi, + const void* extrafield_local, + uInt size_extrafield_local, + const void* extrafield_global, + uInt size_extrafield_global, + const char* comment, + int method, + int level)); + /* + Open a file in the ZIP for writing. + filename : the filename in zip (if NULL, '-' without quote will be used + *zipfi contain supplemental information + if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local + contains the extrafield data the the local header + if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global + contains the extrafield data the the local header + if comment != NULL, comment contain the comment string + method contain the compression method (0 for store, Z_DEFLATED for deflate) + level contain the level of compression (can be Z_DEFAULT_COMPRESSION) + */ + + + extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file, + const char* filename, + const zip_fileinfo* zipfi, + const void* extrafield_local, + uInt size_extrafield_local, + const void* extrafield_global, + uInt size_extrafield_global, + const char* comment, + int method, + int level, + int raw)); + + /* + Same than zipOpenNewFileInZip, except if raw=1, we write raw file + */ + + extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file, + const char* filename, + const zip_fileinfo* zipfi, + const void* extrafield_local, + uInt size_extrafield_local, + const void* extrafield_global, + uInt size_extrafield_global, + const char* comment, + int method, + int level, + int raw, + int windowBits, + int memLevel, + int strategy, + const char* password, + uLong crcForCtypting)); + + /* + Same than zipOpenNewFileInZip2, except + windowBits,memLevel,,strategy : see parameter strategy in deflateInit2 + password : crypting password (NULL for no crypting) + crcForCtypting : crc of file to compress (needed for crypting) + */ + + + extern int ZEXPORT zipWriteInFileInZip OF((zipFile file, + const void* buf, + unsigned len)); + /* + Write data in the zipfile + */ + + extern int ZEXPORT zipCloseFileInZip OF((zipFile file)); + /* + Close the current file in the zipfile + */ + + extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file, + uLong uncompressed_size, + uLong crc32)); + /* + Close the current file in the zipfile, for fiel opened with + parameter raw=1 in zipOpenNewFileInZip2 + uncompressed_size and crc32 are value for the uncompressed size + */ + + extern int ZEXPORT zipClose OF((zipFile file, + const char* global_comment)); + /* + Close the zipfile + */ + + #ifdef __cplusplus + } + #endif + + #endif /* _zip_H */ diff -Nrcpad gcc-4.4.4/zlib/contrib/pascal/example.pas gcc-4.4.5/zlib/contrib/pascal/example.pas *** gcc-4.4.4/zlib/contrib/pascal/example.pas Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/pascal/example.pas Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,599 ---- + (* example.c -- usage example of the zlib compression library + * Copyright (C) 1995-2003 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + * + * Pascal translation + * Copyright (C) 1998 by Jacques Nomssi Nzali. + * For conditions of distribution and use, see copyright notice in readme.txt + * + * Adaptation to the zlibpas interface + * Copyright (C) 2003 by Cosmin Truta. + * For conditions of distribution and use, see copyright notice in readme.txt + *) + + program example; + + {$DEFINE TEST_COMPRESS} + {DO NOT $DEFINE TEST_GZIO} + {$DEFINE TEST_DEFLATE} + {$DEFINE TEST_INFLATE} + {$DEFINE TEST_FLUSH} + {$DEFINE TEST_SYNC} + {$DEFINE TEST_DICT} + + uses SysUtils, zlibpas; + + const TESTFILE = 'foo.gz'; + + (* "hello world" would be more standard, but the repeated "hello" + * stresses the compression code better, sorry... + *) + const hello: PChar = 'hello, hello!'; + + const dictionary: PChar = 'hello'; + + var dictId: LongInt; (* Adler32 value of the dictionary *) + + procedure CHECK_ERR(err: Integer; msg: String); + begin + if err <> Z_OK then + begin + WriteLn(msg, ' error: ', err); + Halt(1); + end; + end; + + procedure EXIT_ERR(const msg: String); + begin + WriteLn('Error: ', msg); + Halt(1); + end; + + (* =========================================================================== + * Test compress and uncompress + *) + {$IFDEF TEST_COMPRESS} + procedure test_compress(compr: Pointer; comprLen: LongInt; + uncompr: Pointer; uncomprLen: LongInt); + var err: Integer; + len: LongInt; + begin + len := StrLen(hello)+1; + + err := compress(compr, comprLen, hello, len); + CHECK_ERR(err, 'compress'); + + StrCopy(PChar(uncompr), 'garbage'); + + err := uncompress(uncompr, uncomprLen, compr, comprLen); + CHECK_ERR(err, 'uncompress'); + + if StrComp(PChar(uncompr), hello) <> 0 then + EXIT_ERR('bad uncompress') + else + WriteLn('uncompress(): ', PChar(uncompr)); + end; + {$ENDIF} + + (* =========================================================================== + * Test read/write of .gz files + *) + {$IFDEF TEST_GZIO} + procedure test_gzio(const fname: PChar; (* compressed file name *) + uncompr: Pointer; + uncomprLen: LongInt); + var err: Integer; + len: Integer; + zfile: gzFile; + pos: LongInt; + begin + len := StrLen(hello)+1; + + zfile := gzopen(fname, 'wb'); + if zfile = NIL then + begin + WriteLn('gzopen error'); + Halt(1); + end; + gzputc(zfile, 'h'); + if gzputs(zfile, 'ello') <> 4 then + begin + WriteLn('gzputs err: ', gzerror(zfile, err)); + Halt(1); + end; + {$IFDEF GZ_FORMAT_STRING} + if gzprintf(zfile, ', %s!', 'hello') <> 8 then + begin + WriteLn('gzprintf err: ', gzerror(zfile, err)); + Halt(1); + end; + {$ELSE} + if gzputs(zfile, ', hello!') <> 8 then + begin + WriteLn('gzputs err: ', gzerror(zfile, err)); + Halt(1); + end; + {$ENDIF} + gzseek(zfile, 1, SEEK_CUR); (* add one zero byte *) + gzclose(zfile); + + zfile := gzopen(fname, 'rb'); + if zfile = NIL then + begin + WriteLn('gzopen error'); + Halt(1); + end; + + StrCopy(PChar(uncompr), 'garbage'); + + if gzread(zfile, uncompr, uncomprLen) <> len then + begin + WriteLn('gzread err: ', gzerror(zfile, err)); + Halt(1); + end; + if StrComp(PChar(uncompr), hello) <> 0 then + begin + WriteLn('bad gzread: ', PChar(uncompr)); + Halt(1); + end + else + WriteLn('gzread(): ', PChar(uncompr)); + + pos := gzseek(zfile, -8, SEEK_CUR); + if (pos <> 6) or (gztell(zfile) <> pos) then + begin + WriteLn('gzseek error, pos=', pos, ', gztell=', gztell(zfile)); + Halt(1); + end; + + if gzgetc(zfile) <> ' ' then + begin + WriteLn('gzgetc error'); + Halt(1); + end; + + if gzungetc(' ', zfile) <> ' ' then + begin + WriteLn('gzungetc error'); + Halt(1); + end; + + gzgets(zfile, PChar(uncompr), uncomprLen); + uncomprLen := StrLen(PChar(uncompr)); + if uncomprLen <> 7 then (* " hello!" *) + begin + WriteLn('gzgets err after gzseek: ', gzerror(zfile, err)); + Halt(1); + end; + if StrComp(PChar(uncompr), hello + 6) <> 0 then + begin + WriteLn('bad gzgets after gzseek'); + Halt(1); + end + else + WriteLn('gzgets() after gzseek: ', PChar(uncompr)); + + gzclose(zfile); + end; + {$ENDIF} + + (* =========================================================================== + * Test deflate with small buffers + *) + {$IFDEF TEST_DEFLATE} + procedure test_deflate(compr: Pointer; comprLen: LongInt); + var c_stream: z_stream; (* compression stream *) + err: Integer; + len: LongInt; + begin + len := StrLen(hello)+1; + + c_stream.zalloc := NIL; + c_stream.zfree := NIL; + c_stream.opaque := NIL; + + err := deflateInit(c_stream, Z_DEFAULT_COMPRESSION); + CHECK_ERR(err, 'deflateInit'); + + c_stream.next_in := hello; + c_stream.next_out := compr; + + while (c_stream.total_in <> len) and + (c_stream.total_out < comprLen) do + begin + c_stream.avail_out := 1; { force small buffers } + c_stream.avail_in := 1; + err := deflate(c_stream, Z_NO_FLUSH); + CHECK_ERR(err, 'deflate'); + end; + + (* Finish the stream, still forcing small buffers: *) + while TRUE do + begin + c_stream.avail_out := 1; + err := deflate(c_stream, Z_FINISH); + if err = Z_STREAM_END then + break; + CHECK_ERR(err, 'deflate'); + end; + + err := deflateEnd(c_stream); + CHECK_ERR(err, 'deflateEnd'); + end; + {$ENDIF} + + (* =========================================================================== + * Test inflate with small buffers + *) + {$IFDEF TEST_INFLATE} + procedure test_inflate(compr: Pointer; comprLen : LongInt; + uncompr: Pointer; uncomprLen : LongInt); + var err: Integer; + d_stream: z_stream; (* decompression stream *) + begin + StrCopy(PChar(uncompr), 'garbage'); + + d_stream.zalloc := NIL; + d_stream.zfree := NIL; + d_stream.opaque := NIL; + + d_stream.next_in := compr; + d_stream.avail_in := 0; + d_stream.next_out := uncompr; + + err := inflateInit(d_stream); + CHECK_ERR(err, 'inflateInit'); + + while (d_stream.total_out < uncomprLen) and + (d_stream.total_in < comprLen) do + begin + d_stream.avail_out := 1; (* force small buffers *) + d_stream.avail_in := 1; + err := inflate(d_stream, Z_NO_FLUSH); + if err = Z_STREAM_END then + break; + CHECK_ERR(err, 'inflate'); + end; + + err := inflateEnd(d_stream); + CHECK_ERR(err, 'inflateEnd'); + + if StrComp(PChar(uncompr), hello) <> 0 then + EXIT_ERR('bad inflate') + else + WriteLn('inflate(): ', PChar(uncompr)); + end; + {$ENDIF} + + (* =========================================================================== + * Test deflate with large buffers and dynamic change of compression level + *) + {$IFDEF TEST_DEFLATE} + procedure test_large_deflate(compr: Pointer; comprLen: LongInt; + uncompr: Pointer; uncomprLen: LongInt); + var c_stream: z_stream; (* compression stream *) + err: Integer; + begin + c_stream.zalloc := NIL; + c_stream.zfree := NIL; + c_stream.opaque := NIL; + + err := deflateInit(c_stream, Z_BEST_SPEED); + CHECK_ERR(err, 'deflateInit'); + + c_stream.next_out := compr; + c_stream.avail_out := Integer(comprLen); + + (* At this point, uncompr is still mostly zeroes, so it should compress + * very well: + *) + c_stream.next_in := uncompr; + c_stream.avail_in := Integer(uncomprLen); + err := deflate(c_stream, Z_NO_FLUSH); + CHECK_ERR(err, 'deflate'); + if c_stream.avail_in <> 0 then + EXIT_ERR('deflate not greedy'); + + (* Feed in already compressed data and switch to no compression: *) + deflateParams(c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY); + c_stream.next_in := compr; + c_stream.avail_in := Integer(comprLen div 2); + err := deflate(c_stream, Z_NO_FLUSH); + CHECK_ERR(err, 'deflate'); + + (* Switch back to compressing mode: *) + deflateParams(c_stream, Z_BEST_COMPRESSION, Z_FILTERED); + c_stream.next_in := uncompr; + c_stream.avail_in := Integer(uncomprLen); + err := deflate(c_stream, Z_NO_FLUSH); + CHECK_ERR(err, 'deflate'); + + err := deflate(c_stream, Z_FINISH); + if err <> Z_STREAM_END then + EXIT_ERR('deflate should report Z_STREAM_END'); + + err := deflateEnd(c_stream); + CHECK_ERR(err, 'deflateEnd'); + end; + {$ENDIF} + + (* =========================================================================== + * Test inflate with large buffers + *) + {$IFDEF TEST_INFLATE} + procedure test_large_inflate(compr: Pointer; comprLen: LongInt; + uncompr: Pointer; uncomprLen: LongInt); + var err: Integer; + d_stream: z_stream; (* decompression stream *) + begin + StrCopy(PChar(uncompr), 'garbage'); + + d_stream.zalloc := NIL; + d_stream.zfree := NIL; + d_stream.opaque := NIL; + + d_stream.next_in := compr; + d_stream.avail_in := Integer(comprLen); + + err := inflateInit(d_stream); + CHECK_ERR(err, 'inflateInit'); + + while TRUE do + begin + d_stream.next_out := uncompr; (* discard the output *) + d_stream.avail_out := Integer(uncomprLen); + err := inflate(d_stream, Z_NO_FLUSH); + if err = Z_STREAM_END then + break; + CHECK_ERR(err, 'large inflate'); + end; + + err := inflateEnd(d_stream); + CHECK_ERR(err, 'inflateEnd'); + + if d_stream.total_out <> 2 * uncomprLen + comprLen div 2 then + begin + WriteLn('bad large inflate: ', d_stream.total_out); + Halt(1); + end + else + WriteLn('large_inflate(): OK'); + end; + {$ENDIF} + + (* =========================================================================== + * Test deflate with full flush + *) + {$IFDEF TEST_FLUSH} + procedure test_flush(compr: Pointer; var comprLen : LongInt); + var c_stream: z_stream; (* compression stream *) + err: Integer; + len: Integer; + begin + len := StrLen(hello)+1; + + c_stream.zalloc := NIL; + c_stream.zfree := NIL; + c_stream.opaque := NIL; + + err := deflateInit(c_stream, Z_DEFAULT_COMPRESSION); + CHECK_ERR(err, 'deflateInit'); + + c_stream.next_in := hello; + c_stream.next_out := compr; + c_stream.avail_in := 3; + c_stream.avail_out := Integer(comprLen); + err := deflate(c_stream, Z_FULL_FLUSH); + CHECK_ERR(err, 'deflate'); + + Inc(PByteArray(compr)^[3]); (* force an error in first compressed block *) + c_stream.avail_in := len - 3; + + err := deflate(c_stream, Z_FINISH); + if err <> Z_STREAM_END then + CHECK_ERR(err, 'deflate'); + + err := deflateEnd(c_stream); + CHECK_ERR(err, 'deflateEnd'); + + comprLen := c_stream.total_out; + end; + {$ENDIF} + + (* =========================================================================== + * Test inflateSync() + *) + {$IFDEF TEST_SYNC} + procedure test_sync(compr: Pointer; comprLen: LongInt; + uncompr: Pointer; uncomprLen : LongInt); + var err: Integer; + d_stream: z_stream; (* decompression stream *) + begin + StrCopy(PChar(uncompr), 'garbage'); + + d_stream.zalloc := NIL; + d_stream.zfree := NIL; + d_stream.opaque := NIL; + + d_stream.next_in := compr; + d_stream.avail_in := 2; (* just read the zlib header *) + + err := inflateInit(d_stream); + CHECK_ERR(err, 'inflateInit'); + + d_stream.next_out := uncompr; + d_stream.avail_out := Integer(uncomprLen); + + inflate(d_stream, Z_NO_FLUSH); + CHECK_ERR(err, 'inflate'); + + d_stream.avail_in := Integer(comprLen-2); (* read all compressed data *) + err := inflateSync(d_stream); (* but skip the damaged part *) + CHECK_ERR(err, 'inflateSync'); + + err := inflate(d_stream, Z_FINISH); + if err <> Z_DATA_ERROR then + EXIT_ERR('inflate should report DATA_ERROR'); + (* Because of incorrect adler32 *) + + err := inflateEnd(d_stream); + CHECK_ERR(err, 'inflateEnd'); + + WriteLn('after inflateSync(): hel', PChar(uncompr)); + end; + {$ENDIF} + + (* =========================================================================== + * Test deflate with preset dictionary + *) + {$IFDEF TEST_DICT} + procedure test_dict_deflate(compr: Pointer; comprLen: LongInt); + var c_stream: z_stream; (* compression stream *) + err: Integer; + begin + c_stream.zalloc := NIL; + c_stream.zfree := NIL; + c_stream.opaque := NIL; + + err := deflateInit(c_stream, Z_BEST_COMPRESSION); + CHECK_ERR(err, 'deflateInit'); + + err := deflateSetDictionary(c_stream, dictionary, StrLen(dictionary)); + CHECK_ERR(err, 'deflateSetDictionary'); + + dictId := c_stream.adler; + c_stream.next_out := compr; + c_stream.avail_out := Integer(comprLen); + + c_stream.next_in := hello; + c_stream.avail_in := StrLen(hello)+1; + + err := deflate(c_stream, Z_FINISH); + if err <> Z_STREAM_END then + EXIT_ERR('deflate should report Z_STREAM_END'); + + err := deflateEnd(c_stream); + CHECK_ERR(err, 'deflateEnd'); + end; + {$ENDIF} + + (* =========================================================================== + * Test inflate with a preset dictionary + *) + {$IFDEF TEST_DICT} + procedure test_dict_inflate(compr: Pointer; comprLen: LongInt; + uncompr: Pointer; uncomprLen: LongInt); + var err: Integer; + d_stream: z_stream; (* decompression stream *) + begin + StrCopy(PChar(uncompr), 'garbage'); + + d_stream.zalloc := NIL; + d_stream.zfree := NIL; + d_stream.opaque := NIL; + + d_stream.next_in := compr; + d_stream.avail_in := Integer(comprLen); + + err := inflateInit(d_stream); + CHECK_ERR(err, 'inflateInit'); + + d_stream.next_out := uncompr; + d_stream.avail_out := Integer(uncomprLen); + + while TRUE do + begin + err := inflate(d_stream, Z_NO_FLUSH); + if err = Z_STREAM_END then + break; + if err = Z_NEED_DICT then + begin + if d_stream.adler <> dictId then + EXIT_ERR('unexpected dictionary'); + err := inflateSetDictionary(d_stream, dictionary, StrLen(dictionary)); + end; + CHECK_ERR(err, 'inflate with dict'); + end; + + err := inflateEnd(d_stream); + CHECK_ERR(err, 'inflateEnd'); + + if StrComp(PChar(uncompr), hello) <> 0 then + EXIT_ERR('bad inflate with dict') + else + WriteLn('inflate with dictionary: ', PChar(uncompr)); + end; + {$ENDIF} + + var compr, uncompr: Pointer; + comprLen, uncomprLen: LongInt; + + begin + if zlibVersion^ <> ZLIB_VERSION[1] then + EXIT_ERR('Incompatible zlib version'); + + WriteLn('zlib version: ', zlibVersion); + WriteLn('zlib compile flags: ', Format('0x%x', [zlibCompileFlags])); + + comprLen := 10000 * SizeOf(Integer); (* don't overflow on MSDOS *) + uncomprLen := comprLen; + GetMem(compr, comprLen); + GetMem(uncompr, uncomprLen); + if (compr = NIL) or (uncompr = NIL) then + EXIT_ERR('Out of memory'); + (* compr and uncompr are cleared to avoid reading uninitialized + * data and to ensure that uncompr compresses well. + *) + FillChar(compr^, comprLen, 0); + FillChar(uncompr^, uncomprLen, 0); + + {$IFDEF TEST_COMPRESS} + WriteLn('** Testing compress'); + test_compress(compr, comprLen, uncompr, uncomprLen); + {$ENDIF} + + {$IFDEF TEST_GZIO} + WriteLn('** Testing gzio'); + if ParamCount >= 1 then + test_gzio(ParamStr(1), uncompr, uncomprLen) + else + test_gzio(TESTFILE, uncompr, uncomprLen); + {$ENDIF} + + {$IFDEF TEST_DEFLATE} + WriteLn('** Testing deflate with small buffers'); + test_deflate(compr, comprLen); + {$ENDIF} + {$IFDEF TEST_INFLATE} + WriteLn('** Testing inflate with small buffers'); + test_inflate(compr, comprLen, uncompr, uncomprLen); + {$ENDIF} + + {$IFDEF TEST_DEFLATE} + WriteLn('** Testing deflate with large buffers'); + test_large_deflate(compr, comprLen, uncompr, uncomprLen); + {$ENDIF} + {$IFDEF TEST_INFLATE} + WriteLn('** Testing inflate with large buffers'); + test_large_inflate(compr, comprLen, uncompr, uncomprLen); + {$ENDIF} + + {$IFDEF TEST_FLUSH} + WriteLn('** Testing deflate with full flush'); + test_flush(compr, comprLen); + {$ENDIF} + {$IFDEF TEST_SYNC} + WriteLn('** Testing inflateSync'); + test_sync(compr, comprLen, uncompr, uncomprLen); + {$ENDIF} + comprLen := uncomprLen; + + {$IFDEF TEST_DICT} + WriteLn('** Testing deflate and inflate with preset dictionary'); + test_dict_deflate(compr, comprLen); + test_dict_inflate(compr, comprLen, uncompr, uncomprLen); + {$ENDIF} + + FreeMem(compr, comprLen); + FreeMem(uncompr, uncomprLen); + end. diff -Nrcpad gcc-4.4.4/zlib/contrib/pascal/readme.txt gcc-4.4.5/zlib/contrib/pascal/readme.txt *** gcc-4.4.4/zlib/contrib/pascal/readme.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/pascal/readme.txt Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,76 ---- + + This directory contains a Pascal (Delphi, Kylix) interface to the + zlib data compression library. + + + Directory listing + ================= + + zlibd32.mak makefile for Borland C++ + example.pas usage example of zlib + zlibpas.pas the Pascal interface to zlib + readme.txt this file + + + Compatibility notes + =================== + + - Although the name "zlib" would have been more normal for the + zlibpas unit, this name is already taken by Borland's ZLib unit. + This is somehow unfortunate, because that unit is not a genuine + interface to the full-fledged zlib functionality, but a suite of + class wrappers around zlib streams. Other essential features, + such as checksums, are missing. + It would have been more appropriate for that unit to have a name + like "ZStreams", or something similar. + + - The C and zlib-supplied types int, uInt, long, uLong, etc. are + translated directly into Pascal types of similar sizes (Integer, + LongInt, etc.), to avoid namespace pollution. In particular, + there is no conversion of unsigned int into a Pascal unsigned + integer. The Word type is non-portable and has the same size + (16 bits) both in a 16-bit and in a 32-bit environment, unlike + Integer. Even if there is a 32-bit Cardinal type, there is no + real need for unsigned int in zlib under a 32-bit environment. + + - Except for the callbacks, the zlib function interfaces are + assuming the calling convention normally used in Pascal + (__pascal for DOS and Windows16, __fastcall for Windows32). + Since the cdecl keyword is used, the old Turbo Pascal does + not work with this interface. + + - The gz* function interfaces are not translated, to avoid + interfacing problems with the C runtime library. Besides, + gzprintf(gzFile file, const char *format, ...) + cannot be translated into Pascal. + + + Legal issues + ============ + + The zlibpas interface is: + Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler. + Copyright (C) 1998 by Bob Dellaca. + Copyright (C) 2003 by Cosmin Truta. + + The example program is: + Copyright (C) 1995-2003 by Jean-loup Gailly. + Copyright (C) 1998,1999,2000 by Jacques Nomssi Nzali. + Copyright (C) 2003 by Cosmin Truta. + + This software is provided 'as-is', without any express or implied + warranty. In no event will the author be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + diff -Nrcpad gcc-4.4.4/zlib/contrib/pascal/zlibd32.mak gcc-4.4.5/zlib/contrib/pascal/zlibd32.mak *** gcc-4.4.4/zlib/contrib/pascal/zlibd32.mak Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/pascal/zlibd32.mak Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,93 ---- + # Makefile for zlib + # For use with Delphi and C++ Builder under Win32 + # Updated for zlib 1.2.x by Cosmin Truta + + # ------------ Borland C++ ------------ + + # This project uses the Delphi (fastcall/register) calling convention: + LOC = -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl + + CC = bcc32 + LD = bcc32 + AR = tlib + # do not use "-pr" in CFLAGS + CFLAGS = -a -d -k- -O2 $(LOC) + LDFLAGS = + + + # variables + ZLIB_LIB = zlib.lib + + OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj + OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj + OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj + OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj + + + # targets + all: $(ZLIB_LIB) example.exe minigzip.exe + + .c.obj: + $(CC) -c $(CFLAGS) $*.c + + adler32.obj: adler32.c zlib.h zconf.h + + compress.obj: compress.c zlib.h zconf.h + + crc32.obj: crc32.c zlib.h zconf.h crc32.h + + deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h + + gzio.obj: gzio.c zutil.h zlib.h zconf.h + + infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + + inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h + + inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + + inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h + + trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h + + uncompr.obj: uncompr.c zlib.h zconf.h + + zutil.obj: zutil.c zutil.h zlib.h zconf.h + + example.obj: example.c zlib.h zconf.h + + minigzip.obj: minigzip.c zlib.h zconf.h + + + # For the sake of the old Borland make, + # the command line is cut to fit in the MS-DOS 128 byte limit: + $(ZLIB_LIB): $(OBJ1) $(OBJ2) + -del $(ZLIB_LIB) + $(AR) $(ZLIB_LIB) $(OBJP1) + $(AR) $(ZLIB_LIB) $(OBJP2) + + + # testing + test: example.exe minigzip.exe + example + echo hello world | minigzip | minigzip -d + + example.exe: example.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) example.obj $(ZLIB_LIB) + + minigzip.exe: minigzip.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB) + + + # cleanup + clean: + -del *.obj + -del *.exe + -del *.lib + -del *.tds + -del zlib.bak + -del foo.gz + diff -Nrcpad gcc-4.4.4/zlib/contrib/pascal/zlibpas.pas gcc-4.4.5/zlib/contrib/pascal/zlibpas.pas *** gcc-4.4.4/zlib/contrib/pascal/zlibpas.pas Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/pascal/zlibpas.pas Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,236 ---- + (* zlibpas -- Pascal interface to the zlib data compression library + * + * Copyright (C) 2003 Cosmin Truta. + * Derived from original sources by Bob Dellaca. + * For conditions of distribution and use, see copyright notice in readme.txt + *) + + unit zlibpas; + + interface + + const + ZLIB_VERSION = '1.2.3'; + + type + alloc_func = function(opaque: Pointer; items, size: Integer): Pointer; + cdecl; + free_func = procedure(opaque, address: Pointer); + cdecl; + + in_func = function(opaque: Pointer; var buf: PByte): Integer; + cdecl; + out_func = function(opaque: Pointer; buf: PByte; size: Integer): Integer; + cdecl; + + z_streamp = ^z_stream; + z_stream = packed record + next_in: PChar; (* next input byte *) + avail_in: Integer; (* number of bytes available at next_in *) + total_in: LongInt; (* total nb of input bytes read so far *) + + next_out: PChar; (* next output byte should be put there *) + avail_out: Integer; (* remaining free space at next_out *) + total_out: LongInt; (* total nb of bytes output so far *) + + msg: PChar; (* last error message, NULL if no error *) + state: Pointer; (* not visible by applications *) + + zalloc: alloc_func; (* used to allocate the internal state *) + zfree: free_func; (* used to free the internal state *) + opaque: Pointer; (* private data object passed to zalloc and zfree *) + + data_type: Integer; (* best guess about the data type: ascii or binary *) + adler: LongInt; (* adler32 value of the uncompressed data *) + reserved: LongInt; (* reserved for future use *) + end; + + (* constants *) + const + Z_NO_FLUSH = 0; + Z_PARTIAL_FLUSH = 1; + Z_SYNC_FLUSH = 2; + Z_FULL_FLUSH = 3; + Z_FINISH = 4; + + Z_OK = 0; + Z_STREAM_END = 1; + Z_NEED_DICT = 2; + Z_ERRNO = -1; + Z_STREAM_ERROR = -2; + Z_DATA_ERROR = -3; + Z_MEM_ERROR = -4; + Z_BUF_ERROR = -5; + Z_VERSION_ERROR = -6; + + Z_NO_COMPRESSION = 0; + Z_BEST_SPEED = 1; + Z_BEST_COMPRESSION = 9; + Z_DEFAULT_COMPRESSION = -1; + + Z_FILTERED = 1; + Z_HUFFMAN_ONLY = 2; + Z_RLE = 3; + Z_DEFAULT_STRATEGY = 0; + + Z_BINARY = 0; + Z_ASCII = 1; + Z_UNKNOWN = 2; + + Z_DEFLATED = 8; + + (* basic functions *) + function zlibVersion: PChar; + function deflateInit(var strm: z_stream; level: Integer): Integer; + function deflate(var strm: z_stream; flush: Integer): Integer; + function deflateEnd(var strm: z_stream): Integer; + function inflateInit(var strm: z_stream): Integer; + function inflate(var strm: z_stream; flush: Integer): Integer; + function inflateEnd(var strm: z_stream): Integer; + + (* advanced functions *) + function deflateInit2(var strm: z_stream; level, method, windowBits, + memLevel, strategy: Integer): Integer; + function deflateSetDictionary(var strm: z_stream; const dictionary: PChar; + dictLength: Integer): Integer; + function deflateCopy(var dest, source: z_stream): Integer; + function deflateReset(var strm: z_stream): Integer; + function deflateParams(var strm: z_stream; level, strategy: Integer): Integer; + function deflateBound(var strm: z_stream; sourceLen: LongInt): LongInt; + function deflatePrime(var strm: z_stream; bits, value: Integer): Integer; + function inflateInit2(var strm: z_stream; windowBits: Integer): Integer; + function inflateSetDictionary(var strm: z_stream; const dictionary: PChar; + dictLength: Integer): Integer; + function inflateSync(var strm: z_stream): Integer; + function inflateCopy(var dest, source: z_stream): Integer; + function inflateReset(var strm: z_stream): Integer; + function inflateBackInit(var strm: z_stream; + windowBits: Integer; window: PChar): Integer; + function inflateBack(var strm: z_stream; in_fn: in_func; in_desc: Pointer; + out_fn: out_func; out_desc: Pointer): Integer; + function inflateBackEnd(var strm: z_stream): Integer; + function zlibCompileFlags: LongInt; + + (* utility functions *) + function compress(dest: PChar; var destLen: LongInt; + const source: PChar; sourceLen: LongInt): Integer; + function compress2(dest: PChar; var destLen: LongInt; + const source: PChar; sourceLen: LongInt; + level: Integer): Integer; + function compressBound(sourceLen: LongInt): LongInt; + function uncompress(dest: PChar; var destLen: LongInt; + const source: PChar; sourceLen: LongInt): Integer; + + (* checksum functions *) + function adler32(adler: LongInt; const buf: PChar; len: Integer): LongInt; + function crc32(crc: LongInt; const buf: PChar; len: Integer): LongInt; + + (* various hacks, don't look :) *) + function deflateInit_(var strm: z_stream; level: Integer; + const version: PChar; stream_size: Integer): Integer; + function inflateInit_(var strm: z_stream; const version: PChar; + stream_size: Integer): Integer; + function deflateInit2_(var strm: z_stream; + level, method, windowBits, memLevel, strategy: Integer; + const version: PChar; stream_size: Integer): Integer; + function inflateInit2_(var strm: z_stream; windowBits: Integer; + const version: PChar; stream_size: Integer): Integer; + function inflateBackInit_(var strm: z_stream; + windowBits: Integer; window: PChar; + const version: PChar; stream_size: Integer): Integer; + + + implementation + + {$L adler32.obj} + {$L compress.obj} + {$L crc32.obj} + {$L deflate.obj} + {$L infback.obj} + {$L inffast.obj} + {$L inflate.obj} + {$L inftrees.obj} + {$L trees.obj} + {$L uncompr.obj} + {$L zutil.obj} + + function adler32; external; + function compress; external; + function compress2; external; + function compressBound; external; + function crc32; external; + function deflate; external; + function deflateBound; external; + function deflateCopy; external; + function deflateEnd; external; + function deflateInit_; external; + function deflateInit2_; external; + function deflateParams; external; + function deflatePrime; external; + function deflateReset; external; + function deflateSetDictionary; external; + function inflate; external; + function inflateBack; external; + function inflateBackEnd; external; + function inflateBackInit_; external; + function inflateCopy; external; + function inflateEnd; external; + function inflateInit_; external; + function inflateInit2_; external; + function inflateReset; external; + function inflateSetDictionary; external; + function inflateSync; external; + function uncompress; external; + function zlibCompileFlags; external; + function zlibVersion; external; + + function deflateInit(var strm: z_stream; level: Integer): Integer; + begin + Result := deflateInit_(strm, level, ZLIB_VERSION, sizeof(z_stream)); + end; + + function deflateInit2(var strm: z_stream; level, method, windowBits, memLevel, + strategy: Integer): Integer; + begin + Result := deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + ZLIB_VERSION, sizeof(z_stream)); + end; + + function inflateInit(var strm: z_stream): Integer; + begin + Result := inflateInit_(strm, ZLIB_VERSION, sizeof(z_stream)); + end; + + function inflateInit2(var strm: z_stream; windowBits: Integer): Integer; + begin + Result := inflateInit2_(strm, windowBits, ZLIB_VERSION, sizeof(z_stream)); + end; + + function inflateBackInit(var strm: z_stream; + windowBits: Integer; window: PChar): Integer; + begin + Result := inflateBackInit_(strm, windowBits, window, + ZLIB_VERSION, sizeof(z_stream)); + end; + + function _malloc(Size: Integer): Pointer; cdecl; + begin + GetMem(Result, Size); + end; + + procedure _free(Block: Pointer); cdecl; + begin + FreeMem(Block); + end; + + procedure _memset(P: Pointer; B: Byte; count: Integer); cdecl; + begin + FillChar(P^, count, B); + end; + + procedure _memcpy(dest, source: Pointer; count: Integer); cdecl; + begin + Move(source^, dest^, count); + end; + + end. diff -Nrcpad gcc-4.4.4/zlib/contrib/puff/Makefile gcc-4.4.5/zlib/contrib/puff/Makefile *** gcc-4.4.4/zlib/contrib/puff/Makefile Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/puff/Makefile Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,8 ---- + puff: puff.c puff.h + cc -DTEST -o puff puff.c + + test: puff + puff zeros.raw + + clean: + rm -f puff puff.o diff -Nrcpad gcc-4.4.4/zlib/contrib/puff/README gcc-4.4.5/zlib/contrib/puff/README *** gcc-4.4.4/zlib/contrib/puff/README Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/puff/README Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,63 ---- + Puff -- A Simple Inflate + 3 Mar 2003 + Mark Adler + madler@alumni.caltech.edu + + What this is -- + + puff.c provides the routine puff() to decompress the deflate data format. It + does so more slowly than zlib, but the code is about one-fifth the size of the + inflate code in zlib, and written to be very easy to read. + + Why I wrote this -- + + puff.c was written to document the deflate format unambiguously, by virtue of + being working C code. It is meant to supplement RFC 1951, which formally + describes the deflate format. I have received many questions on details of the + deflate format, and I hope that reading this code will answer those questions. + puff.c is heavily commented with details of the deflate format, especially + those little nooks and cranies of the format that might not be obvious from a + specification. + + puff.c may also be useful in applications where code size or memory usage is a + very limited resource, and speed is not as important. + + How to use it -- + + Well, most likely you should just be reading puff.c and using zlib for actual + applications, but if you must ... + + Include puff.h in your code, which provides this prototype: + + int puff(unsigned char *dest, /* pointer to destination pointer */ + unsigned long *destlen, /* amount of output space */ + unsigned char *source, /* pointer to source data pointer */ + unsigned long *sourcelen); /* amount of input available */ + + Then you can call puff() to decompress a deflate stream that is in memory in + its entirety at source, to a sufficiently sized block of memory for the + decompressed data at dest. puff() is the only external symbol in puff.c The + only C library functions that puff.c needs are setjmp() and longjmp(), which + are used to simplify error checking in the code to improve readabilty. puff.c + does no memory allocation, and uses less than 2K bytes off of the stack. + + If destlen is not enough space for the uncompressed data, then inflate will + return an error without writing more than destlen bytes. Note that this means + that in order to decompress the deflate data successfully, you need to know + the size of the uncompressed data ahead of time. + + If needed, puff() can determine the size of the uncompressed data with no + output space. This is done by passing dest equal to (unsigned char *)0. Then + the initial value of *destlen is ignored and *destlen is set to the length of + the uncompressed data. So if the size of the uncompressed data is not known, + then two passes of puff() can be used--first to determine the size, and second + to do the actual inflation after allocating the appropriate memory. Not + pretty, but it works. (This is one of the reasons you should be using zlib.) + + The deflate format is self-terminating. If the deflate stream does not end + in *sourcelen bytes, puff() will return an error without reading at or past + endsource. + + On return, *sourcelen is updated to the amount of input data consumed, and + *destlen is updated to the size of the uncompressed data. See the comments + in puff.c for the possible return codes for puff(). diff -Nrcpad gcc-4.4.4/zlib/contrib/puff/puff.c gcc-4.4.5/zlib/contrib/puff/puff.c *** gcc-4.4.4/zlib/contrib/puff/puff.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/puff/puff.c Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,837 ---- + /* + * puff.c + * Copyright (C) 2002-2004 Mark Adler + * For conditions of distribution and use, see copyright notice in puff.h + * version 1.8, 9 Jan 2004 + * + * puff.c is a simple inflate written to be an unambiguous way to specify the + * deflate format. It is not written for speed but rather simplicity. As a + * side benefit, this code might actually be useful when small code is more + * important than speed, such as bootstrap applications. For typical deflate + * data, zlib's inflate() is about four times as fast as puff(). zlib's + * inflate compiles to around 20K on my machine, whereas puff.c compiles to + * around 4K on my machine (a PowerPC using GNU cc). If the faster decode() + * function here is used, then puff() is only twice as slow as zlib's + * inflate(). + * + * All dynamically allocated memory comes from the stack. The stack required + * is less than 2K bytes. This code is compatible with 16-bit int's and + * assumes that long's are at least 32 bits. puff.c uses the short data type, + * assumed to be 16 bits, for arrays in order to to conserve memory. The code + * works whether integers are stored big endian or little endian. + * + * In the comments below are "Format notes" that describe the inflate process + * and document some of the less obvious aspects of the format. This source + * code is meant to supplement RFC 1951, which formally describes the deflate + * format: + * + * http://www.zlib.org/rfc-deflate.html + */ + + /* + * Change history: + * + * 1.0 10 Feb 2002 - First version + * 1.1 17 Feb 2002 - Clarifications of some comments and notes + * - Update puff() dest and source pointers on negative + * errors to facilitate debugging deflators + * - Remove longest from struct huffman -- not needed + * - Simplify offs[] index in construct() + * - Add input size and checking, using longjmp() to + * maintain easy readability + * - Use short data type for large arrays + * - Use pointers instead of long to specify source and + * destination sizes to avoid arbitrary 4 GB limits + * 1.2 17 Mar 2002 - Add faster version of decode(), doubles speed (!), + * but leave simple version for readabilty + * - Make sure invalid distances detected if pointers + * are 16 bits + * - Fix fixed codes table error + * - Provide a scanning mode for determining size of + * uncompressed data + * 1.3 20 Mar 2002 - Go back to lengths for puff() parameters [Jean-loup] + * - Add a puff.h file for the interface + * - Add braces in puff() for else do [Jean-loup] + * - Use indexes instead of pointers for readability + * 1.4 31 Mar 2002 - Simplify construct() code set check + * - Fix some comments + * - Add FIXLCODES #define + * 1.5 6 Apr 2002 - Minor comment fixes + * 1.6 7 Aug 2002 - Minor format changes + * 1.7 3 Mar 2003 - Added test code for distribution + * - Added zlib-like license + * 1.8 9 Jan 2004 - Added some comments on no distance codes case + */ + + #include /* for setjmp(), longjmp(), and jmp_buf */ + #include "puff.h" /* prototype for puff() */ + + #define local static /* for local function definitions */ + #define NIL ((unsigned char *)0) /* for no output option */ + + /* + * Maximums for allocations and loops. It is not useful to change these -- + * they are fixed by the deflate format. + */ + #define MAXBITS 15 /* maximum bits in a code */ + #define MAXLCODES 286 /* maximum number of literal/length codes */ + #define MAXDCODES 30 /* maximum number of distance codes */ + #define MAXCODES (MAXLCODES+MAXDCODES) /* maximum codes lengths to read */ + #define FIXLCODES 288 /* number of fixed literal/length codes */ + + /* input and output state */ + struct state { + /* output state */ + unsigned char *out; /* output buffer */ + unsigned long outlen; /* available space at out */ + unsigned long outcnt; /* bytes written to out so far */ + + /* input state */ + unsigned char *in; /* input buffer */ + unsigned long inlen; /* available input at in */ + unsigned long incnt; /* bytes read so far */ + int bitbuf; /* bit buffer */ + int bitcnt; /* number of bits in bit buffer */ + + /* input limit error return state for bits() and decode() */ + jmp_buf env; + }; + + /* + * Return need bits from the input stream. This always leaves less than + * eight bits in the buffer. bits() works properly for need == 0. + * + * Format notes: + * + * - Bits are stored in bytes from the least significant bit to the most + * significant bit. Therefore bits are dropped from the bottom of the bit + * buffer, using shift right, and new bytes are appended to the top of the + * bit buffer, using shift left. + */ + local int bits(struct state *s, int need) + { + long val; /* bit accumulator (can use up to 20 bits) */ + + /* load at least need bits into val */ + val = s->bitbuf; + while (s->bitcnt < need) { + if (s->incnt == s->inlen) longjmp(s->env, 1); /* out of input */ + val |= (long)(s->in[s->incnt++]) << s->bitcnt; /* load eight bits */ + s->bitcnt += 8; + } + + /* drop need bits and update buffer, always zero to seven bits left */ + s->bitbuf = (int)(val >> need); + s->bitcnt -= need; + + /* return need bits, zeroing the bits above that */ + return (int)(val & ((1L << need) - 1)); + } + + /* + * Process a stored block. + * + * Format notes: + * + * - After the two-bit stored block type (00), the stored block length and + * stored bytes are byte-aligned for fast copying. Therefore any leftover + * bits in the byte that has the last bit of the type, as many as seven, are + * discarded. The value of the discarded bits are not defined and should not + * be checked against any expectation. + * + * - The second inverted copy of the stored block length does not have to be + * checked, but it's probably a good idea to do so anyway. + * + * - A stored block can have zero length. This is sometimes used to byte-align + * subsets of the compressed data for random access or partial recovery. + */ + local int stored(struct state *s) + { + unsigned len; /* length of stored block */ + + /* discard leftover bits from current byte (assumes s->bitcnt < 8) */ + s->bitbuf = 0; + s->bitcnt = 0; + + /* get length and check against its one's complement */ + if (s->incnt + 4 > s->inlen) return 2; /* not enough input */ + len = s->in[s->incnt++]; + len |= s->in[s->incnt++] << 8; + if (s->in[s->incnt++] != (~len & 0xff) || + s->in[s->incnt++] != ((~len >> 8) & 0xff)) + return -2; /* didn't match complement! */ + + /* copy len bytes from in to out */ + if (s->incnt + len > s->inlen) return 2; /* not enough input */ + if (s->out != NIL) { + if (s->outcnt + len > s->outlen) + return 1; /* not enough output space */ + while (len--) + s->out[s->outcnt++] = s->in[s->incnt++]; + } + else { /* just scanning */ + s->outcnt += len; + s->incnt += len; + } + + /* done with a valid stored block */ + return 0; + } + + /* + * Huffman code decoding tables. count[1..MAXBITS] is the number of symbols of + * each length, which for a canonical code are stepped through in order. + * symbol[] are the symbol values in canonical order, where the number of + * entries is the sum of the counts in count[]. The decoding process can be + * seen in the function decode() below. + */ + struct huffman { + short *count; /* number of symbols of each length */ + short *symbol; /* canonically ordered symbols */ + }; + + /* + * Decode a code from the stream s using huffman table h. Return the symbol or + * a negative value if there is an error. If all of the lengths are zero, i.e. + * an empty code, or if the code is incomplete and an invalid code is received, + * then -9 is returned after reading MAXBITS bits. + * + * Format notes: + * + * - The codes as stored in the compressed data are bit-reversed relative to + * a simple integer ordering of codes of the same lengths. Hence below the + * bits are pulled from the compressed data one at a time and used to + * build the code value reversed from what is in the stream in order to + * permit simple integer comparisons for decoding. A table-based decoding + * scheme (as used in zlib) does not need to do this reversal. + * + * - The first code for the shortest length is all zeros. Subsequent codes of + * the same length are simply integer increments of the previous code. When + * moving up a length, a zero bit is appended to the code. For a complete + * code, the last code of the longest length will be all ones. + * + * - Incomplete codes are handled by this decoder, since they are permitted + * in the deflate format. See the format notes for fixed() and dynamic(). + */ + #ifdef SLOW + local int decode(struct state *s, struct huffman *h) + { + int len; /* current number of bits in code */ + int code; /* len bits being decoded */ + int first; /* first code of length len */ + int count; /* number of codes of length len */ + int index; /* index of first code of length len in symbol table */ + + code = first = index = 0; + for (len = 1; len <= MAXBITS; len++) { + code |= bits(s, 1); /* get next bit */ + count = h->count[len]; + if (code < first + count) /* if length len, return symbol */ + return h->symbol[index + (code - first)]; + index += count; /* else update for next length */ + first += count; + first <<= 1; + code <<= 1; + } + return -9; /* ran out of codes */ + } + + /* + * A faster version of decode() for real applications of this code. It's not + * as readable, but it makes puff() twice as fast. And it only makes the code + * a few percent larger. + */ + #else /* !SLOW */ + local int decode(struct state *s, struct huffman *h) + { + int len; /* current number of bits in code */ + int code; /* len bits being decoded */ + int first; /* first code of length len */ + int count; /* number of codes of length len */ + int index; /* index of first code of length len in symbol table */ + int bitbuf; /* bits from stream */ + int left; /* bits left in next or left to process */ + short *next; /* next number of codes */ + + bitbuf = s->bitbuf; + left = s->bitcnt; + code = first = index = 0; + len = 1; + next = h->count + 1; + while (1) { + while (left--) { + code |= bitbuf & 1; + bitbuf >>= 1; + count = *next++; + if (code < first + count) { /* if length len, return symbol */ + s->bitbuf = bitbuf; + s->bitcnt = (s->bitcnt - len) & 7; + return h->symbol[index + (code - first)]; + } + index += count; /* else update for next length */ + first += count; + first <<= 1; + code <<= 1; + len++; + } + left = (MAXBITS+1) - len; + if (left == 0) break; + if (s->incnt == s->inlen) longjmp(s->env, 1); /* out of input */ + bitbuf = s->in[s->incnt++]; + if (left > 8) left = 8; + } + return -9; /* ran out of codes */ + } + #endif /* SLOW */ + + /* + * Given the list of code lengths length[0..n-1] representing a canonical + * Huffman code for n symbols, construct the tables required to decode those + * codes. Those tables are the number of codes of each length, and the symbols + * sorted by length, retaining their original order within each length. The + * return value is zero for a complete code set, negative for an over- + * subscribed code set, and positive for an incomplete code set. The tables + * can be used if the return value is zero or positive, but they cannot be used + * if the return value is negative. If the return value is zero, it is not + * possible for decode() using that table to return an error--any stream of + * enough bits will resolve to a symbol. If the return value is positive, then + * it is possible for decode() using that table to return an error for received + * codes past the end of the incomplete lengths. + * + * Not used by decode(), but used for error checking, h->count[0] is the number + * of the n symbols not in the code. So n - h->count[0] is the number of + * codes. This is useful for checking for incomplete codes that have more than + * one symbol, which is an error in a dynamic block. + * + * Assumption: for all i in 0..n-1, 0 <= length[i] <= MAXBITS + * This is assured by the construction of the length arrays in dynamic() and + * fixed() and is not verified by construct(). + * + * Format notes: + * + * - Permitted and expected examples of incomplete codes are one of the fixed + * codes and any code with a single symbol which in deflate is coded as one + * bit instead of zero bits. See the format notes for fixed() and dynamic(). + * + * - Within a given code length, the symbols are kept in ascending order for + * the code bits definition. + */ + local int construct(struct huffman *h, short *length, int n) + { + int symbol; /* current symbol when stepping through length[] */ + int len; /* current length when stepping through h->count[] */ + int left; /* number of possible codes left of current length */ + short offs[MAXBITS+1]; /* offsets in symbol table for each length */ + + /* count number of codes of each length */ + for (len = 0; len <= MAXBITS; len++) + h->count[len] = 0; + for (symbol = 0; symbol < n; symbol++) + (h->count[length[symbol]])++; /* assumes lengths are within bounds */ + if (h->count[0] == n) /* no codes! */ + return 0; /* complete, but decode() will fail */ + + /* check for an over-subscribed or incomplete set of lengths */ + left = 1; /* one possible code of zero length */ + for (len = 1; len <= MAXBITS; len++) { + left <<= 1; /* one more bit, double codes left */ + left -= h->count[len]; /* deduct count from possible codes */ + if (left < 0) return left; /* over-subscribed--return negative */ + } /* left > 0 means incomplete */ + + /* generate offsets into symbol table for each length for sorting */ + offs[1] = 0; + for (len = 1; len < MAXBITS; len++) + offs[len + 1] = offs[len] + h->count[len]; + + /* + * put symbols in table sorted by length, by symbol order within each + * length + */ + for (symbol = 0; symbol < n; symbol++) + if (length[symbol] != 0) + h->symbol[offs[length[symbol]]++] = symbol; + + /* return zero for complete set, positive for incomplete set */ + return left; + } + + /* + * Decode literal/length and distance codes until an end-of-block code. + * + * Format notes: + * + * - Compressed data that is after the block type if fixed or after the code + * description if dynamic is a combination of literals and length/distance + * pairs terminated by and end-of-block code. Literals are simply Huffman + * coded bytes. A length/distance pair is a coded length followed by a + * coded distance to represent a string that occurs earlier in the + * uncompressed data that occurs again at the current location. + * + * - Literals, lengths, and the end-of-block code are combined into a single + * code of up to 286 symbols. They are 256 literals (0..255), 29 length + * symbols (257..285), and the end-of-block symbol (256). + * + * - There are 256 possible lengths (3..258), and so 29 symbols are not enough + * to represent all of those. Lengths 3..10 and 258 are in fact represented + * by just a length symbol. Lengths 11..257 are represented as a symbol and + * some number of extra bits that are added as an integer to the base length + * of the length symbol. The number of extra bits is determined by the base + * length symbol. These are in the static arrays below, lens[] for the base + * lengths and lext[] for the corresponding number of extra bits. + * + * - The reason that 258 gets its own symbol is that the longest length is used + * often in highly redundant files. Note that 258 can also be coded as the + * base value 227 plus the maximum extra value of 31. While a good deflate + * should never do this, it is not an error, and should be decoded properly. + * + * - If a length is decoded, including its extra bits if any, then it is + * followed a distance code. There are up to 30 distance symbols. Again + * there are many more possible distances (1..32768), so extra bits are added + * to a base value represented by the symbol. The distances 1..4 get their + * own symbol, but the rest require extra bits. The base distances and + * corresponding number of extra bits are below in the static arrays dist[] + * and dext[]. + * + * - Literal bytes are simply written to the output. A length/distance pair is + * an instruction to copy previously uncompressed bytes to the output. The + * copy is from distance bytes back in the output stream, copying for length + * bytes. + * + * - Distances pointing before the beginning of the output data are not + * permitted. + * + * - Overlapped copies, where the length is greater than the distance, are + * allowed and common. For example, a distance of one and a length of 258 + * simply copies the last byte 258 times. A distance of four and a length of + * twelve copies the last four bytes three times. A simple forward copy + * ignoring whether the length is greater than the distance or not implements + * this correctly. You should not use memcpy() since its behavior is not + * defined for overlapped arrays. You should not use memmove() or bcopy() + * since though their behavior -is- defined for overlapping arrays, it is + * defined to do the wrong thing in this case. + */ + local int codes(struct state *s, + struct huffman *lencode, + struct huffman *distcode) + { + int symbol; /* decoded symbol */ + int len; /* length for copy */ + unsigned dist; /* distance for copy */ + static const short lens[29] = { /* Size base for length codes 257..285 */ + 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, + 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258}; + static const short lext[29] = { /* Extra bits for length codes 257..285 */ + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, + 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0}; + static const short dists[30] = { /* Offset base for distance codes 0..29 */ + 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, + 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, + 8193, 12289, 16385, 24577}; + static const short dext[30] = { /* Extra bits for distance codes 0..29 */ + 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, + 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, + 12, 12, 13, 13}; + + /* decode literals and length/distance pairs */ + do { + symbol = decode(s, lencode); + if (symbol < 0) return symbol; /* invalid symbol */ + if (symbol < 256) { /* literal: symbol is the byte */ + /* write out the literal */ + if (s->out != NIL) { + if (s->outcnt == s->outlen) return 1; + s->out[s->outcnt] = symbol; + } + s->outcnt++; + } + else if (symbol > 256) { /* length */ + /* get and compute length */ + symbol -= 257; + if (symbol >= 29) return -9; /* invalid fixed code */ + len = lens[symbol] + bits(s, lext[symbol]); + + /* get and check distance */ + symbol = decode(s, distcode); + if (symbol < 0) return symbol; /* invalid symbol */ + dist = dists[symbol] + bits(s, dext[symbol]); + if (dist > s->outcnt) + return -10; /* distance too far back */ + + /* copy length bytes from distance bytes back */ + if (s->out != NIL) { + if (s->outcnt + len > s->outlen) return 1; + while (len--) { + s->out[s->outcnt] = s->out[s->outcnt - dist]; + s->outcnt++; + } + } + else + s->outcnt += len; + } + } while (symbol != 256); /* end of block symbol */ + + /* done with a valid fixed or dynamic block */ + return 0; + } + + /* + * Process a fixed codes block. + * + * Format notes: + * + * - This block type can be useful for compressing small amounts of data for + * which the size of the code descriptions in a dynamic block exceeds the + * benefit of custom codes for that block. For fixed codes, no bits are + * spent on code descriptions. Instead the code lengths for literal/length + * codes and distance codes are fixed. The specific lengths for each symbol + * can be seen in the "for" loops below. + * + * - The literal/length code is complete, but has two symbols that are invalid + * and should result in an error if received. This cannot be implemented + * simply as an incomplete code since those two symbols are in the "middle" + * of the code. They are eight bits long and the longest literal/length\ + * code is nine bits. Therefore the code must be constructed with those + * symbols, and the invalid symbols must be detected after decoding. + * + * - The fixed distance codes also have two invalid symbols that should result + * in an error if received. Since all of the distance codes are the same + * length, this can be implemented as an incomplete code. Then the invalid + * codes are detected while decoding. + */ + local int fixed(struct state *s) + { + static int virgin = 1; + static short lencnt[MAXBITS+1], lensym[FIXLCODES]; + static short distcnt[MAXBITS+1], distsym[MAXDCODES]; + static struct huffman lencode = {lencnt, lensym}; + static struct huffman distcode = {distcnt, distsym}; + + /* build fixed huffman tables if first call (may not be thread safe) */ + if (virgin) { + int symbol; + short lengths[FIXLCODES]; + + /* literal/length table */ + for (symbol = 0; symbol < 144; symbol++) + lengths[symbol] = 8; + for (; symbol < 256; symbol++) + lengths[symbol] = 9; + for (; symbol < 280; symbol++) + lengths[symbol] = 7; + for (; symbol < FIXLCODES; symbol++) + lengths[symbol] = 8; + construct(&lencode, lengths, FIXLCODES); + + /* distance table */ + for (symbol = 0; symbol < MAXDCODES; symbol++) + lengths[symbol] = 5; + construct(&distcode, lengths, MAXDCODES); + + /* do this just once */ + virgin = 0; + } + + /* decode data until end-of-block code */ + return codes(s, &lencode, &distcode); + } + + /* + * Process a dynamic codes block. + * + * Format notes: + * + * - A dynamic block starts with a description of the literal/length and + * distance codes for that block. New dynamic blocks allow the compressor to + * rapidly adapt to changing data with new codes optimized for that data. + * + * - The codes used by the deflate format are "canonical", which means that + * the actual bits of the codes are generated in an unambiguous way simply + * from the number of bits in each code. Therefore the code descriptions + * are simply a list of code lengths for each symbol. + * + * - The code lengths are stored in order for the symbols, so lengths are + * provided for each of the literal/length symbols, and for each of the + * distance symbols. + * + * - If a symbol is not used in the block, this is represented by a zero as + * as the code length. This does not mean a zero-length code, but rather + * that no code should be created for this symbol. There is no way in the + * deflate format to represent a zero-length code. + * + * - The maximum number of bits in a code is 15, so the possible lengths for + * any code are 1..15. + * + * - The fact that a length of zero is not permitted for a code has an + * interesting consequence. Normally if only one symbol is used for a given + * code, then in fact that code could be represented with zero bits. However + * in deflate, that code has to be at least one bit. So for example, if + * only a single distance base symbol appears in a block, then it will be + * represented by a single code of length one, in particular one 0 bit. This + * is an incomplete code, since if a 1 bit is received, it has no meaning, + * and should result in an error. So incomplete distance codes of one symbol + * should be permitted, and the receipt of invalid codes should be handled. + * + * - It is also possible to have a single literal/length code, but that code + * must be the end-of-block code, since every dynamic block has one. This + * is not the most efficient way to create an empty block (an empty fixed + * block is fewer bits), but it is allowed by the format. So incomplete + * literal/length codes of one symbol should also be permitted. + * + * - If there are only literal codes and no lengths, then there are no distance + * codes. This is represented by one distance code with zero bits. + * + * - The list of up to 286 length/literal lengths and up to 30 distance lengths + * are themselves compressed using Huffman codes and run-length encoding. In + * the list of code lengths, a 0 symbol means no code, a 1..15 symbol means + * that length, and the symbols 16, 17, and 18 are run-length instructions. + * Each of 16, 17, and 18 are follwed by extra bits to define the length of + * the run. 16 copies the last length 3 to 6 times. 17 represents 3 to 10 + * zero lengths, and 18 represents 11 to 138 zero lengths. Unused symbols + * are common, hence the special coding for zero lengths. + * + * - The symbols for 0..18 are Huffman coded, and so that code must be + * described first. This is simply a sequence of up to 19 three-bit values + * representing no code (0) or the code length for that symbol (1..7). + * + * - A dynamic block starts with three fixed-size counts from which is computed + * the number of literal/length code lengths, the number of distance code + * lengths, and the number of code length code lengths (ok, you come up with + * a better name!) in the code descriptions. For the literal/length and + * distance codes, lengths after those provided are considered zero, i.e. no + * code. The code length code lengths are received in a permuted order (see + * the order[] array below) to make a short code length code length list more + * likely. As it turns out, very short and very long codes are less likely + * to be seen in a dynamic code description, hence what may appear initially + * to be a peculiar ordering. + * + * - Given the number of literal/length code lengths (nlen) and distance code + * lengths (ndist), then they are treated as one long list of nlen + ndist + * code lengths. Therefore run-length coding can and often does cross the + * boundary between the two sets of lengths. + * + * - So to summarize, the code description at the start of a dynamic block is + * three counts for the number of code lengths for the literal/length codes, + * the distance codes, and the code length codes. This is followed by the + * code length code lengths, three bits each. This is used to construct the + * code length code which is used to read the remainder of the lengths. Then + * the literal/length code lengths and distance lengths are read as a single + * set of lengths using the code length codes. Codes are constructed from + * the resulting two sets of lengths, and then finally you can start + * decoding actual compressed data in the block. + * + * - For reference, a "typical" size for the code description in a dynamic + * block is around 80 bytes. + */ + local int dynamic(struct state *s) + { + int nlen, ndist, ncode; /* number of lengths in descriptor */ + int index; /* index of lengths[] */ + int err; /* construct() return value */ + short lengths[MAXCODES]; /* descriptor code lengths */ + short lencnt[MAXBITS+1], lensym[MAXLCODES]; /* lencode memory */ + short distcnt[MAXBITS+1], distsym[MAXDCODES]; /* distcode memory */ + struct huffman lencode = {lencnt, lensym}; /* length code */ + struct huffman distcode = {distcnt, distsym}; /* distance code */ + static const short order[19] = /* permutation of code length codes */ + {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; + + /* get number of lengths in each table, check lengths */ + nlen = bits(s, 5) + 257; + ndist = bits(s, 5) + 1; + ncode = bits(s, 4) + 4; + if (nlen > MAXLCODES || ndist > MAXDCODES) + return -3; /* bad counts */ + + /* read code length code lengths (really), missing lengths are zero */ + for (index = 0; index < ncode; index++) + lengths[order[index]] = bits(s, 3); + for (; index < 19; index++) + lengths[order[index]] = 0; + + /* build huffman table for code lengths codes (use lencode temporarily) */ + err = construct(&lencode, lengths, 19); + if (err != 0) return -4; /* require complete code set here */ + + /* read length/literal and distance code length tables */ + index = 0; + while (index < nlen + ndist) { + int symbol; /* decoded value */ + int len; /* last length to repeat */ + + symbol = decode(s, &lencode); + if (symbol < 16) /* length in 0..15 */ + lengths[index++] = symbol; + else { /* repeat instruction */ + len = 0; /* assume repeating zeros */ + if (symbol == 16) { /* repeat last length 3..6 times */ + if (index == 0) return -5; /* no last length! */ + len = lengths[index - 1]; /* last length */ + symbol = 3 + bits(s, 2); + } + else if (symbol == 17) /* repeat zero 3..10 times */ + symbol = 3 + bits(s, 3); + else /* == 18, repeat zero 11..138 times */ + symbol = 11 + bits(s, 7); + if (index + symbol > nlen + ndist) + return -6; /* too many lengths! */ + while (symbol--) /* repeat last or zero symbol times */ + lengths[index++] = len; + } + } + + /* build huffman table for literal/length codes */ + err = construct(&lencode, lengths, nlen); + if (err < 0 || (err > 0 && nlen - lencode.count[0] != 1)) + return -7; /* only allow incomplete codes if just one code */ + + /* build huffman table for distance codes */ + err = construct(&distcode, lengths + nlen, ndist); + if (err < 0 || (err > 0 && ndist - distcode.count[0] != 1)) + return -8; /* only allow incomplete codes if just one code */ + + /* decode data until end-of-block code */ + return codes(s, &lencode, &distcode); + } + + /* + * Inflate source to dest. On return, destlen and sourcelen are updated to the + * size of the uncompressed data and the size of the deflate data respectively. + * On success, the return value of puff() is zero. If there is an error in the + * source data, i.e. it is not in the deflate format, then a negative value is + * returned. If there is not enough input available or there is not enough + * output space, then a positive error is returned. In that case, destlen and + * sourcelen are not updated to facilitate retrying from the beginning with the + * provision of more input data or more output space. In the case of invalid + * inflate data (a negative error), the dest and source pointers are updated to + * facilitate the debugging of deflators. + * + * puff() also has a mode to determine the size of the uncompressed output with + * no output written. For this dest must be (unsigned char *)0. In this case, + * the input value of *destlen is ignored, and on return *destlen is set to the + * size of the uncompressed output. + * + * The return codes are: + * + * 2: available inflate data did not terminate + * 1: output space exhausted before completing inflate + * 0: successful inflate + * -1: invalid block type (type == 3) + * -2: stored block length did not match one's complement + * -3: dynamic block code description: too many length or distance codes + * -4: dynamic block code description: code lengths codes incomplete + * -5: dynamic block code description: repeat lengths with no first length + * -6: dynamic block code description: repeat more than specified lengths + * -7: dynamic block code description: invalid literal/length code lengths + * -8: dynamic block code description: invalid distance code lengths + * -9: invalid literal/length or distance code in fixed or dynamic block + * -10: distance is too far back in fixed or dynamic block + * + * Format notes: + * + * - Three bits are read for each block to determine the kind of block and + * whether or not it is the last block. Then the block is decoded and the + * process repeated if it was not the last block. + * + * - The leftover bits in the last byte of the deflate data after the last + * block (if it was a fixed or dynamic block) are undefined and have no + * expected values to check. + */ + int puff(unsigned char *dest, /* pointer to destination pointer */ + unsigned long *destlen, /* amount of output space */ + unsigned char *source, /* pointer to source data pointer */ + unsigned long *sourcelen) /* amount of input available */ + { + struct state s; /* input/output state */ + int last, type; /* block information */ + int err; /* return value */ + + /* initialize output state */ + s.out = dest; + s.outlen = *destlen; /* ignored if dest is NIL */ + s.outcnt = 0; + + /* initialize input state */ + s.in = source; + s.inlen = *sourcelen; + s.incnt = 0; + s.bitbuf = 0; + s.bitcnt = 0; + + /* return if bits() or decode() tries to read past available input */ + if (setjmp(s.env) != 0) /* if came back here via longjmp() */ + err = 2; /* then skip do-loop, return error */ + else { + /* process blocks until last block or error */ + do { + last = bits(&s, 1); /* one if last block */ + type = bits(&s, 2); /* block type 0..3 */ + err = type == 0 ? stored(&s) : + (type == 1 ? fixed(&s) : + (type == 2 ? dynamic(&s) : + -1)); /* type == 3, invalid */ + if (err != 0) break; /* return with error */ + } while (!last); + } + + /* update the lengths and return */ + if (err <= 0) { + *destlen = s.outcnt; + *sourcelen = s.incnt; + } + return err; + } + + #ifdef TEST + /* Example of how to use puff() */ + #include + #include + #include + #include + + local unsigned char *yank(char *name, unsigned long *len) + { + unsigned long size; + unsigned char *buf; + FILE *in; + struct stat s; + + *len = 0; + if (stat(name, &s)) return NULL; + if ((s.st_mode & S_IFMT) != S_IFREG) return NULL; + size = (unsigned long)(s.st_size); + if (size == 0 || (off_t)size != s.st_size) return NULL; + in = fopen(name, "r"); + if (in == NULL) return NULL; + buf = malloc(size); + if (buf != NULL && fread(buf, 1, size, in) != size) { + free(buf); + buf = NULL; + } + fclose(in); + *len = size; + return buf; + } + + int main(int argc, char **argv) + { + int ret; + unsigned char *source; + unsigned long len, sourcelen, destlen; + + if (argc < 2) return 2; + source = yank(argv[1], &len); + if (source == NULL) return 2; + sourcelen = len; + ret = puff(NIL, &destlen, source, &sourcelen); + if (ret) + printf("puff() failed with return code %d\n", ret); + else { + printf("puff() succeeded uncompressing %lu bytes\n", destlen); + if (sourcelen < len) printf("%lu compressed bytes unused\n", + len - sourcelen); + } + free(source); + return ret; + } + #endif diff -Nrcpad gcc-4.4.4/zlib/contrib/puff/puff.h gcc-4.4.5/zlib/contrib/puff/puff.h *** gcc-4.4.4/zlib/contrib/puff/puff.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/puff/puff.h Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,31 ---- + /* puff.h + Copyright (C) 2002, 2003 Mark Adler, all rights reserved + version 1.7, 3 Mar 2002 + + This software is provided 'as-is', without any express or implied + warranty. In no event will the author be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Mark Adler madler@alumni.caltech.edu + */ + + + /* + * See puff.c for purpose and usage. + */ + int puff(unsigned char *dest, /* pointer to destination pointer */ + unsigned long *destlen, /* amount of output space */ + unsigned char *source, /* pointer to source data pointer */ + unsigned long *sourcelen); /* amount of input available */ diff -Nrcpad gcc-4.4.4/zlib/contrib/puff/zeros.raw gcc-4.4.5/zlib/contrib/puff/zeros.raw *** gcc-4.4.4/zlib/contrib/puff/zeros.raw Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/puff/zeros.raw Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1 ---- + íÁàùS_áUp \ No newline at end of file diff -Nrcpad gcc-4.4.4/zlib/contrib/testzlib/testzlib.c gcc-4.4.5/zlib/contrib/testzlib/testzlib.c *** gcc-4.4.4/zlib/contrib/testzlib/testzlib.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/testzlib/testzlib.c Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,275 ---- + #include + #include + #include + + #include "zlib.h" + + + void MyDoMinus64(LARGE_INTEGER *R,LARGE_INTEGER A,LARGE_INTEGER B) + { + R->HighPart = A.HighPart - B.HighPart; + if (A.LowPart >= B.LowPart) + R->LowPart = A.LowPart - B.LowPart; + else + { + R->LowPart = A.LowPart - B.LowPart; + R->HighPart --; + } + } + + #ifdef _M_X64 + // see http://msdn2.microsoft.com/library/twchhe95(en-us,vs.80).aspx for __rdtsc + unsigned __int64 __rdtsc(void); + void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64) + { + // printf("rdtsc = %I64x\n",__rdtsc()); + pbeginTime64->QuadPart=__rdtsc(); + } + + LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf) + { + LARGE_INTEGER LIres; + unsigned _int64 res=__rdtsc()-((unsigned _int64)(beginTime64.QuadPart)); + LIres.QuadPart=res; + // printf("rdtsc = %I64x\n",__rdtsc()); + return LIres; + } + #else + #ifdef _M_IX86 + void myGetRDTSC32(LARGE_INTEGER * pbeginTime64) + { + DWORD dwEdx,dwEax; + _asm + { + rdtsc + mov dwEax,eax + mov dwEdx,edx + } + pbeginTime64->LowPart=dwEax; + pbeginTime64->HighPart=dwEdx; + } + + void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64) + { + myGetRDTSC32(pbeginTime64); + } + + LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf) + { + LARGE_INTEGER LIres,endTime64; + myGetRDTSC32(&endTime64); + + LIres.LowPart=LIres.HighPart=0; + MyDoMinus64(&LIres,endTime64,beginTime64); + return LIres; + } + #else + void myGetRDTSC32(LARGE_INTEGER * pbeginTime64) + { + } + + void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64) + { + } + + LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf) + { + LARGE_INTEGER lr; + lr.QuadPart=0; + return lr; + } + #endif + #endif + + void BeginCountPerfCounter(LARGE_INTEGER * pbeginTime64,BOOL fComputeTimeQueryPerf) + { + if ((!fComputeTimeQueryPerf) || (!QueryPerformanceCounter(pbeginTime64))) + { + pbeginTime64->LowPart = GetTickCount(); + pbeginTime64->HighPart = 0; + } + } + + DWORD GetMsecSincePerfCounter(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf) + { + LARGE_INTEGER endTime64,ticksPerSecond,ticks; + DWORDLONG ticksShifted,tickSecShifted; + DWORD dwLog=16+0; + DWORD dwRet; + if ((!fComputeTimeQueryPerf) || (!QueryPerformanceCounter(&endTime64))) + dwRet = (GetTickCount() - beginTime64.LowPart)*1; + else + { + MyDoMinus64(&ticks,endTime64,beginTime64); + QueryPerformanceFrequency(&ticksPerSecond); + + + { + ticksShifted = Int64ShrlMod32(*(DWORDLONG*)&ticks,dwLog); + tickSecShifted = Int64ShrlMod32(*(DWORDLONG*)&ticksPerSecond,dwLog); + + } + + dwRet = (DWORD)((((DWORD)ticksShifted)*1000)/(DWORD)(tickSecShifted)); + dwRet *=1; + } + return dwRet; + } + + int ReadFileMemory(const char* filename,long* plFileSize,void** pFilePtr) + { + FILE* stream; + void* ptr; + int retVal=1; + stream=fopen(filename, "rb"); + if (stream==NULL) + return 0; + + fseek(stream,0,SEEK_END); + + *plFileSize=ftell(stream); + fseek(stream,0,SEEK_SET); + ptr=malloc((*plFileSize)+1); + if (ptr==NULL) + retVal=0; + else + { + if (fread(ptr, 1, *plFileSize,stream) != (*plFileSize)) + retVal=0; + } + fclose(stream); + *pFilePtr=ptr; + return retVal; + } + + int main(int argc, char *argv[]) + { + int BlockSizeCompress=0x8000; + int BlockSizeUncompress=0x8000; + int cprLevel=Z_DEFAULT_COMPRESSION ; + long lFileSize; + unsigned char* FilePtr; + long lBufferSizeCpr; + long lBufferSizeUncpr; + long lCompressedSize=0; + unsigned char* CprPtr; + unsigned char* UncprPtr; + long lSizeCpr,lSizeUncpr; + DWORD dwGetTick,dwMsecQP; + LARGE_INTEGER li_qp,li_rdtsc,dwResRdtsc; + + if (argc<=1) + { + printf("run TestZlib [BlockSizeCompress] [BlockSizeUncompress] [compres. level]\n"); + return 0; + } + + if (ReadFileMemory(argv[1],&lFileSize,&FilePtr)==0) + { + printf("error reading %s\n",argv[1]); + return 1; + } + else printf("file %s read, %u bytes\n",argv[1],lFileSize); + + if (argc>=3) + BlockSizeCompress=atol(argv[2]); + + if (argc>=4) + BlockSizeUncompress=atol(argv[3]); + + if (argc>=5) + cprLevel=(int)atol(argv[4]); + + lBufferSizeCpr = lFileSize + (lFileSize/0x10) + 0x200; + lBufferSizeUncpr = lBufferSizeCpr; + + CprPtr=(unsigned char*)malloc(lBufferSizeCpr + BlockSizeCompress); + + BeginCountPerfCounter(&li_qp,TRUE); + dwGetTick=GetTickCount(); + BeginCountRdtsc(&li_rdtsc); + { + z_stream zcpr; + int ret=Z_OK; + long lOrigToDo = lFileSize; + long lOrigDone = 0; + int step=0; + memset(&zcpr,0,sizeof(z_stream)); + deflateInit(&zcpr,cprLevel); + + zcpr.next_in = FilePtr; + zcpr.next_out = CprPtr; + + + do + { + long all_read_before = zcpr.total_in; + zcpr.avail_in = min(lOrigToDo,BlockSizeCompress); + zcpr.avail_out = BlockSizeCompress; + ret=deflate(&zcpr,(zcpr.avail_in==lOrigToDo) ? Z_FINISH : Z_SYNC_FLUSH); + lOrigDone += (zcpr.total_in-all_read_before); + lOrigToDo -= (zcpr.total_in-all_read_before); + step++; + } while (ret==Z_OK); + + lSizeCpr=zcpr.total_out; + deflateEnd(&zcpr); + dwGetTick=GetTickCount()-dwGetTick; + dwMsecQP=GetMsecSincePerfCounter(li_qp,TRUE); + dwResRdtsc=GetResRdtsc(li_rdtsc,TRUE); + printf("total compress size = %u, in %u step\n",lSizeCpr,step); + printf("time = %u msec = %f sec\n",dwGetTick,dwGetTick/(double)1000.); + printf("defcpr time QP = %u msec = %f sec\n",dwMsecQP,dwMsecQP/(double)1000.); + printf("defcpr result rdtsc = %I64x\n\n",dwResRdtsc.QuadPart); + } + + CprPtr=(unsigned char*)realloc(CprPtr,lSizeCpr); + UncprPtr=(unsigned char*)malloc(lBufferSizeUncpr + BlockSizeUncompress); + + BeginCountPerfCounter(&li_qp,TRUE); + dwGetTick=GetTickCount(); + BeginCountRdtsc(&li_rdtsc); + { + z_stream zcpr; + int ret=Z_OK; + long lOrigToDo = lSizeCpr; + long lOrigDone = 0; + int step=0; + memset(&zcpr,0,sizeof(z_stream)); + inflateInit(&zcpr); + + zcpr.next_in = CprPtr; + zcpr.next_out = UncprPtr; + + + do + { + long all_read_before = zcpr.total_in; + zcpr.avail_in = min(lOrigToDo,BlockSizeUncompress); + zcpr.avail_out = BlockSizeUncompress; + ret=inflate(&zcpr,Z_SYNC_FLUSH); + lOrigDone += (zcpr.total_in-all_read_before); + lOrigToDo -= (zcpr.total_in-all_read_before); + step++; + } while (ret==Z_OK); + + lSizeUncpr=zcpr.total_out; + inflateEnd(&zcpr); + dwGetTick=GetTickCount()-dwGetTick; + dwMsecQP=GetMsecSincePerfCounter(li_qp,TRUE); + dwResRdtsc=GetResRdtsc(li_rdtsc,TRUE); + printf("total uncompress size = %u, in %u step\n",lSizeUncpr,step); + printf("time = %u msec = %f sec\n",dwGetTick,dwGetTick/(double)1000.); + printf("uncpr time QP = %u msec = %f sec\n",dwMsecQP,dwMsecQP/(double)1000.); + printf("uncpr result rdtsc = %I64x\n\n",dwResRdtsc.QuadPart); + } + + if (lSizeUncpr==lFileSize) + { + if (memcmp(FilePtr,UncprPtr,lFileSize)==0) + printf("compare ok\n"); + + } + + return 0; + } diff -Nrcpad gcc-4.4.4/zlib/contrib/testzlib/testzlib.txt gcc-4.4.5/zlib/contrib/testzlib/testzlib.txt *** gcc-4.4.4/zlib/contrib/testzlib/testzlib.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/testzlib/testzlib.txt Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,10 ---- + To build testzLib with Visual Studio 2005: + + copy to a directory file from : + - root of zLib tree + - contrib/testzlib + - contrib/masmx86 + - contrib/masmx64 + - contrib/vstudio/vc7 + + and open testzlib8.sln \ No newline at end of file diff -Nrcpad gcc-4.4.4/zlib/contrib/untgz/Makefile gcc-4.4.5/zlib/contrib/untgz/Makefile *** gcc-4.4.4/zlib/contrib/untgz/Makefile Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/untgz/Makefile Mon Oct 11 18:45:43 2004 *************** *** 0 **** --- 1,14 ---- + CC=cc + CFLAGS=-g + + untgz: untgz.o ../../libz.a + $(CC) $(CFLAGS) -o untgz untgz.o -L../.. -lz + + untgz.o: untgz.c ../../zlib.h + $(CC) $(CFLAGS) -c -I../.. untgz.c + + ../../libz.a: + cd ../..; ./configure; make + + clean: + rm -f untgz untgz.o *~ diff -Nrcpad gcc-4.4.4/zlib/contrib/untgz/Makefile.msc gcc-4.4.5/zlib/contrib/untgz/Makefile.msc *** gcc-4.4.4/zlib/contrib/untgz/Makefile.msc Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/untgz/Makefile.msc Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,17 ---- + CC=cl + CFLAGS=-MD + + untgz.exe: untgz.obj ..\..\zlib.lib + $(CC) $(CFLAGS) untgz.obj ..\..\zlib.lib + + untgz.obj: untgz.c ..\..\zlib.h + $(CC) $(CFLAGS) -c -I..\.. untgz.c + + ..\..\zlib.lib: + cd ..\.. + $(MAKE) -f win32\makefile.msc + cd contrib\untgz + + clean: + -del untgz.obj + -del untgz.exe diff -Nrcpad gcc-4.4.4/zlib/contrib/untgz/untgz.c gcc-4.4.5/zlib/contrib/untgz/untgz.c *** gcc-4.4.4/zlib/contrib/untgz/untgz.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/untgz/untgz.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,674 ---- + /* + * untgz.c -- Display contents and extract files from a gzip'd TAR file + * + * written by Pedro A. Aranda Gutierrez + * adaptation to Unix by Jean-loup Gailly + * various fixes by Cosmin Truta + */ + + #include + #include + #include + #include + #include + + #include "zlib.h" + + #ifdef unix + # include + #else + # include + # include + #endif + + #ifdef WIN32 + #include + # ifndef F_OK + # define F_OK 0 + # endif + # define mkdir(dirname,mode) _mkdir(dirname) + # ifdef _MSC_VER + # define access(path,mode) _access(path,mode) + # define chmod(path,mode) _chmod(path,mode) + # define strdup(str) _strdup(str) + # endif + #else + # include + #endif + + + /* values used in typeflag field */ + + #define REGTYPE '0' /* regular file */ + #define AREGTYPE '\0' /* regular file */ + #define LNKTYPE '1' /* link */ + #define SYMTYPE '2' /* reserved */ + #define CHRTYPE '3' /* character special */ + #define BLKTYPE '4' /* block special */ + #define DIRTYPE '5' /* directory */ + #define FIFOTYPE '6' /* FIFO special */ + #define CONTTYPE '7' /* reserved */ + + /* GNU tar extensions */ + + #define GNUTYPE_DUMPDIR 'D' /* file names from dumped directory */ + #define GNUTYPE_LONGLINK 'K' /* long link name */ + #define GNUTYPE_LONGNAME 'L' /* long file name */ + #define GNUTYPE_MULTIVOL 'M' /* continuation of file from another volume */ + #define GNUTYPE_NAMES 'N' /* file name that does not fit into main hdr */ + #define GNUTYPE_SPARSE 'S' /* sparse file */ + #define GNUTYPE_VOLHDR 'V' /* tape/volume header */ + + + /* tar header */ + + #define BLOCKSIZE 512 + #define SHORTNAMESIZE 100 + + struct tar_header + { /* byte offset */ + char name[100]; /* 0 */ + char mode[8]; /* 100 */ + char uid[8]; /* 108 */ + char gid[8]; /* 116 */ + char size[12]; /* 124 */ + char mtime[12]; /* 136 */ + char chksum[8]; /* 148 */ + char typeflag; /* 156 */ + char linkname[100]; /* 157 */ + char magic[6]; /* 257 */ + char version[2]; /* 263 */ + char uname[32]; /* 265 */ + char gname[32]; /* 297 */ + char devmajor[8]; /* 329 */ + char devminor[8]; /* 337 */ + char prefix[155]; /* 345 */ + /* 500 */ + }; + + union tar_buffer + { + char buffer[BLOCKSIZE]; + struct tar_header header; + }; + + struct attr_item + { + struct attr_item *next; + char *fname; + int mode; + time_t time; + }; + + enum { TGZ_EXTRACT, TGZ_LIST, TGZ_INVALID }; + + char *TGZfname OF((const char *)); + void TGZnotfound OF((const char *)); + + int getoct OF((char *, int)); + char *strtime OF((time_t *)); + int setfiletime OF((char *, time_t)); + void push_attr OF((struct attr_item **, char *, int, time_t)); + void restore_attr OF((struct attr_item **)); + + int ExprMatch OF((char *, char *)); + + int makedir OF((char *)); + int matchname OF((int, int, char **, char *)); + + void error OF((const char *)); + int tar OF((gzFile, int, int, int, char **)); + + void help OF((int)); + int main OF((int, char **)); + + char *prog; + + const char *TGZsuffix[] = { "\0", ".tar", ".tar.gz", ".taz", ".tgz", NULL }; + + /* return the file name of the TGZ archive */ + /* or NULL if it does not exist */ + + char *TGZfname (const char *arcname) + { + static char buffer[1024]; + int origlen,i; + + strcpy(buffer,arcname); + origlen = strlen(buffer); + + for (i=0; TGZsuffix[i]; i++) + { + strcpy(buffer+origlen,TGZsuffix[i]); + if (access(buffer,F_OK) == 0) + return buffer; + } + return NULL; + } + + + /* error message for the filename */ + + void TGZnotfound (const char *arcname) + { + int i; + + fprintf(stderr,"%s: Couldn't find ",prog); + for (i=0;TGZsuffix[i];i++) + fprintf(stderr,(TGZsuffix[i+1]) ? "%s%s, " : "or %s%s\n", + arcname, + TGZsuffix[i]); + exit(1); + } + + + /* convert octal digits to int */ + /* on error return -1 */ + + int getoct (char *p,int width) + { + int result = 0; + char c; + + while (width--) + { + c = *p++; + if (c == 0) + break; + if (c == ' ') + continue; + if (c < '0' || c > '7') + return -1; + result = result * 8 + (c - '0'); + } + return result; + } + + + /* convert time_t to string */ + /* use the "YYYY/MM/DD hh:mm:ss" format */ + + char *strtime (time_t *t) + { + struct tm *local; + static char result[32]; + + local = localtime(t); + sprintf(result,"%4d/%02d/%02d %02d:%02d:%02d", + local->tm_year+1900, local->tm_mon+1, local->tm_mday, + local->tm_hour, local->tm_min, local->tm_sec); + return result; + } + + + /* set file time */ + + int setfiletime (char *fname,time_t ftime) + { + #ifdef WIN32 + static int isWinNT = -1; + SYSTEMTIME st; + FILETIME locft, modft; + struct tm *loctm; + HANDLE hFile; + int result; + + loctm = localtime(&ftime); + if (loctm == NULL) + return -1; + + st.wYear = (WORD)loctm->tm_year + 1900; + st.wMonth = (WORD)loctm->tm_mon + 1; + st.wDayOfWeek = (WORD)loctm->tm_wday; + st.wDay = (WORD)loctm->tm_mday; + st.wHour = (WORD)loctm->tm_hour; + st.wMinute = (WORD)loctm->tm_min; + st.wSecond = (WORD)loctm->tm_sec; + st.wMilliseconds = 0; + if (!SystemTimeToFileTime(&st, &locft) || + !LocalFileTimeToFileTime(&locft, &modft)) + return -1; + + if (isWinNT < 0) + isWinNT = (GetVersion() < 0x80000000) ? 1 : 0; + hFile = CreateFile(fname, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, + (isWinNT ? FILE_FLAG_BACKUP_SEMANTICS : 0), + NULL); + if (hFile == INVALID_HANDLE_VALUE) + return -1; + result = SetFileTime(hFile, NULL, NULL, &modft) ? 0 : -1; + CloseHandle(hFile); + return result; + #else + struct utimbuf settime; + + settime.actime = settime.modtime = ftime; + return utime(fname,&settime); + #endif + } + + + /* push file attributes */ + + void push_attr(struct attr_item **list,char *fname,int mode,time_t time) + { + struct attr_item *item; + + item = (struct attr_item *)malloc(sizeof(struct attr_item)); + if (item == NULL) + error("Out of memory"); + item->fname = strdup(fname); + item->mode = mode; + item->time = time; + item->next = *list; + *list = item; + } + + + /* restore file attributes */ + + void restore_attr(struct attr_item **list) + { + struct attr_item *item, *prev; + + for (item = *list; item != NULL; ) + { + setfiletime(item->fname,item->time); + chmod(item->fname,item->mode); + prev = item; + item = item->next; + free(prev); + } + *list = NULL; + } + + + /* match regular expression */ + + #define ISSPECIAL(c) (((c) == '*') || ((c) == '/')) + + int ExprMatch (char *string,char *expr) + { + while (1) + { + if (ISSPECIAL(*expr)) + { + if (*expr == '/') + { + if (*string != '\\' && *string != '/') + return 0; + string ++; expr++; + } + else if (*expr == '*') + { + if (*expr ++ == 0) + return 1; + while (*++string != *expr) + if (*string == 0) + return 0; + } + } + else + { + if (*string != *expr) + return 0; + if (*expr++ == 0) + return 1; + string++; + } + } + } + + + /* recursive mkdir */ + /* abort on ENOENT; ignore other errors like "directory already exists" */ + /* return 1 if OK */ + /* 0 on error */ + + int makedir (char *newdir) + { + char *buffer = strdup(newdir); + char *p; + int len = strlen(buffer); + + if (len <= 0) { + free(buffer); + return 0; + } + if (buffer[len-1] == '/') { + buffer[len-1] = '\0'; + } + if (mkdir(buffer, 0755) == 0) + { + free(buffer); + return 1; + } + + p = buffer+1; + while (1) + { + char hold; + + while(*p && *p != '\\' && *p != '/') + p++; + hold = *p; + *p = 0; + if ((mkdir(buffer, 0755) == -1) && (errno == ENOENT)) + { + fprintf(stderr,"%s: Couldn't create directory %s\n",prog,buffer); + free(buffer); + return 0; + } + if (hold == 0) + break; + *p++ = hold; + } + free(buffer); + return 1; + } + + + int matchname (int arg,int argc,char **argv,char *fname) + { + if (arg == argc) /* no arguments given (untgz tgzarchive) */ + return 1; + + while (arg < argc) + if (ExprMatch(fname,argv[arg++])) + return 1; + + return 0; /* ignore this for the moment being */ + } + + + /* tar file list or extract */ + + int tar (gzFile in,int action,int arg,int argc,char **argv) + { + union tar_buffer buffer; + int len; + int err; + int getheader = 1; + int remaining = 0; + FILE *outfile = NULL; + char fname[BLOCKSIZE]; + int tarmode; + time_t tartime; + struct attr_item *attributes = NULL; + + if (action == TGZ_LIST) + printf(" date time size file\n" + " ---------- -------- --------- -------------------------------------\n"); + while (1) + { + len = gzread(in, &buffer, BLOCKSIZE); + if (len < 0) + error(gzerror(in, &err)); + /* + * Always expect complete blocks to process + * the tar information. + */ + if (len != BLOCKSIZE) + { + action = TGZ_INVALID; /* force error exit */ + remaining = 0; /* force I/O cleanup */ + } + + /* + * If we have to get a tar header + */ + if (getheader >= 1) + { + /* + * if we met the end of the tar + * or the end-of-tar block, + * we are done + */ + if (len == 0 || buffer.header.name[0] == 0) + break; + + tarmode = getoct(buffer.header.mode,8); + tartime = (time_t)getoct(buffer.header.mtime,12); + if (tarmode == -1 || tartime == (time_t)-1) + { + buffer.header.name[0] = 0; + action = TGZ_INVALID; + } + + if (getheader == 1) + { + strncpy(fname,buffer.header.name,SHORTNAMESIZE); + if (fname[SHORTNAMESIZE-1] != 0) + fname[SHORTNAMESIZE] = 0; + } + else + { + /* + * The file name is longer than SHORTNAMESIZE + */ + if (strncmp(fname,buffer.header.name,SHORTNAMESIZE-1) != 0) + error("bad long name"); + getheader = 1; + } + + /* + * Act according to the type flag + */ + switch (buffer.header.typeflag) + { + case DIRTYPE: + if (action == TGZ_LIST) + printf(" %s %s\n",strtime(&tartime),fname); + if (action == TGZ_EXTRACT) + { + makedir(fname); + push_attr(&attributes,fname,tarmode,tartime); + } + break; + case REGTYPE: + case AREGTYPE: + remaining = getoct(buffer.header.size,12); + if (remaining == -1) + { + action = TGZ_INVALID; + break; + } + if (action == TGZ_LIST) + printf(" %s %9d %s\n",strtime(&tartime),remaining,fname); + else if (action == TGZ_EXTRACT) + { + if (matchname(arg,argc,argv,fname)) + { + outfile = fopen(fname,"wb"); + if (outfile == NULL) { + /* try creating directory */ + char *p = strrchr(fname, '/'); + if (p != NULL) { + *p = '\0'; + makedir(fname); + *p = '/'; + outfile = fopen(fname,"wb"); + } + } + if (outfile != NULL) + printf("Extracting %s\n",fname); + else + fprintf(stderr, "%s: Couldn't create %s",prog,fname); + } + else + outfile = NULL; + } + getheader = 0; + break; + case GNUTYPE_LONGLINK: + case GNUTYPE_LONGNAME: + remaining = getoct(buffer.header.size,12); + if (remaining < 0 || remaining >= BLOCKSIZE) + { + action = TGZ_INVALID; + break; + } + len = gzread(in, fname, BLOCKSIZE); + if (len < 0) + error(gzerror(in, &err)); + if (fname[BLOCKSIZE-1] != 0 || (int)strlen(fname) > remaining) + { + action = TGZ_INVALID; + break; + } + getheader = 2; + break; + default: + if (action == TGZ_LIST) + printf(" %s <---> %s\n",strtime(&tartime),fname); + break; + } + } + else + { + unsigned int bytes = (remaining > BLOCKSIZE) ? BLOCKSIZE : remaining; + + if (outfile != NULL) + { + if (fwrite(&buffer,sizeof(char),bytes,outfile) != bytes) + { + fprintf(stderr, + "%s: Error writing %s -- skipping\n",prog,fname); + fclose(outfile); + outfile = NULL; + remove(fname); + } + } + remaining -= bytes; + } + + if (remaining == 0) + { + getheader = 1; + if (outfile != NULL) + { + fclose(outfile); + outfile = NULL; + if (action != TGZ_INVALID) + push_attr(&attributes,fname,tarmode,tartime); + } + } + + /* + * Abandon if errors are found + */ + if (action == TGZ_INVALID) + { + error("broken archive"); + break; + } + } + + /* + * Restore file modes and time stamps + */ + restore_attr(&attributes); + + if (gzclose(in) != Z_OK) + error("failed gzclose"); + + return 0; + } + + + /* ============================================================ */ + + void help(int exitval) + { + printf("untgz version 0.2.1\n" + " using zlib version %s\n\n", + zlibVersion()); + printf("Usage: untgz file.tgz extract all files\n" + " untgz file.tgz fname ... extract selected files\n" + " untgz -l file.tgz list archive contents\n" + " untgz -h display this help\n"); + exit(exitval); + } + + void error(const char *msg) + { + fprintf(stderr, "%s: %s\n", prog, msg); + exit(1); + } + + + /* ============================================================ */ + + #if defined(WIN32) && defined(__GNUC__) + int _CRT_glob = 0; /* disable argument globbing in MinGW */ + #endif + + int main(int argc,char **argv) + { + int action = TGZ_EXTRACT; + int arg = 1; + char *TGZfile; + gzFile *f; + + prog = strrchr(argv[0],'\\'); + if (prog == NULL) + { + prog = strrchr(argv[0],'/'); + if (prog == NULL) + { + prog = strrchr(argv[0],':'); + if (prog == NULL) + prog = argv[0]; + else + prog++; + } + else + prog++; + } + else + prog++; + + if (argc == 1) + help(0); + + if (strcmp(argv[arg],"-l") == 0) + { + action = TGZ_LIST; + if (argc == ++arg) + help(0); + } + else if (strcmp(argv[arg],"-h") == 0) + { + help(0); + } + + if ((TGZfile = TGZfname(argv[arg])) == NULL) + TGZnotfound(argv[arg]); + + ++arg; + if ((action == TGZ_LIST) && (arg != argc)) + help(1); + + /* + * Process the TGZ file + */ + switch(action) + { + case TGZ_LIST: + case TGZ_EXTRACT: + f = gzopen(TGZfile,"rb"); + if (f == NULL) + { + fprintf(stderr,"%s: Couldn't gzopen %s\n",prog,TGZfile); + return 1; + } + exit(tar(f, action, arg, argc, argv)); + break; + + default: + error("Unknown option"); + exit(1); + } + + return 0; + } diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/readme.txt gcc-4.4.5/zlib/contrib/vstudio/readme.txt *** gcc-4.4.4/zlib/contrib/vstudio/readme.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/readme.txt Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,73 ---- + Building instructions for the DLL versions of Zlib 1.2.3 + ======================================================== + + This directory contains projects that build zlib and minizip using + Microsoft Visual C++ 7.0/7.1, and Visual C++ . + + You don't need to build these projects yourself. You can download the + binaries from: + http://www.winimage.com/zLibDll + + More information can be found at this site. + + + Build instructions for Visual Studio 7.x (32 bits) + -------------------------------------------------- + - Uncompress current zlib, including all contrib/* files + - Download the crtdll library from + http://www.winimage.com/zLibDll/crtdll.zip + Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc7. + - Open contrib\vstudio\vc7\zlibvc.sln with Microsoft Visual C++ 7.x + (Visual Studio .Net 2002 or 2003). + + Build instructions for Visual Studio 2005 (32 bits or 64 bits) + -------------------------------------------------------------- + - Uncompress current zlib, including all contrib/* files + - For 32 bits only: download the crtdll library from + http://www.winimage.com/zLibDll/crtdll.zip + Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc8. + - Open contrib\vstudio\vc8\zlibvc.sln with Microsoft Visual C++ 8.0 + + Build instructions for Visual Studio 2005 64 bits, PSDK compiler + ---------------------------------------------------------------- + at the time of writing this text file, Visual Studio 2005 (and + Microsoft Visual C++ 8.0) is on the beta 2 stage. + Using you can get the free 64 bits compiler from Platform SDK, + which is NOT a beta, and compile using the Visual studio 2005 IDE + see http://www.winimage.com/misc/sdk64onvs2005/ for instruction + + - Uncompress current zlib, including all contrib/* files + - start Visual Studio 2005 from a platform SDK command prompt, using + the /useenv switch + - Open contrib\vstudio\vc8\zlibvc.sln with Microsoft Visual C++ 8.0 + + + Important + --------- + - To use zlibwapi.dll in your application, you must define the + macro ZLIB_WINAPI when compiling your application's source files. + + + Additional notes + ---------------- + - This DLL, named zlibwapi.dll, is compatible to the old zlib.dll built + by Gilles Vollant from the zlib 1.1.x sources, and distributed at + http://www.winimage.com/zLibDll + It uses the WINAPI calling convention for the exported functions, and + includes the minizip functionality. If your application needs that + particular build of zlib.dll, you can rename zlibwapi.dll to zlib.dll. + + - The new DLL was renamed because there exist several incompatible + versions of zlib.dll on the Internet. + + - There is also an official DLL build of zlib, named zlib1.dll. This one + is exporting the functions using the CDECL convention. See the file + win32\DLL_FAQ.txt found in this zlib distribution. + + - There used to be a ZLIB_DLL macro in zlib 1.1.x, but now this symbol + has a slightly different effect. To avoid compatibility problems, do + not define it here. + + + Gilles Vollant + info@winimage.com diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc7/miniunz.vcproj gcc-4.4.5/zlib/contrib/vstudio/vc7/miniunz.vcproj *** gcc-4.4.4/zlib/contrib/vstudio/vc7/miniunz.vcproj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc7/miniunz.vcproj Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,126 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc7/minizip.vcproj gcc-4.4.5/zlib/contrib/vstudio/vc7/minizip.vcproj *** gcc-4.4.4/zlib/contrib/vstudio/vc7/minizip.vcproj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc7/minizip.vcproj Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,126 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc7/testzlib.vcproj gcc-4.4.5/zlib/contrib/vstudio/vc7/testzlib.vcproj *** gcc-4.4.4/zlib/contrib/vstudio/vc7/testzlib.vcproj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc7/testzlib.vcproj Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,126 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc7/zlib.rc gcc-4.4.5/zlib/contrib/vstudio/vc7/zlib.rc *** gcc-4.4.4/zlib/contrib/vstudio/vc7/zlib.rc Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc7/zlib.rc Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,32 ---- + #include + + #define IDR_VERSION1 1 + IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE + FILEVERSION 1,2,3,0 + PRODUCTVERSION 1,2,3,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS 0 + FILEOS VOS_DOS_WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0 // not used + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + //language ID = U.S. English, char set = Windows, Multilingual + + BEGIN + VALUE "FileDescription", "zlib data compression library\0" + VALUE "FileVersion", "1.2.3.0\0" + VALUE "InternalName", "zlib\0" + VALUE "OriginalFilename", "zlib.dll\0" + VALUE "ProductName", "ZLib.DLL\0" + VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" + VALUE "LegalCopyright", "(C) 1995-2003 Jean-loup Gailly & Mark Adler\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1252 + END + END diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc7/zlibstat.vcproj gcc-4.4.5/zlib/contrib/vstudio/vc7/zlibstat.vcproj *** gcc-4.4.4/zlib/contrib/vstudio/vc7/zlibstat.vcproj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc7/zlibstat.vcproj Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,246 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc7/zlibvc.def gcc-4.4.5/zlib/contrib/vstudio/vc7/zlibvc.def *** gcc-4.4.4/zlib/contrib/vstudio/vc7/zlibvc.def Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc7/zlibvc.def Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,92 ---- + + VERSION 1.23 + + HEAPSIZE 1048576,8192 + + EXPORTS + adler32 @1 + compress @2 + crc32 @3 + deflate @4 + deflateCopy @5 + deflateEnd @6 + deflateInit2_ @7 + deflateInit_ @8 + deflateParams @9 + deflateReset @10 + deflateSetDictionary @11 + gzclose @12 + gzdopen @13 + gzerror @14 + gzflush @15 + gzopen @16 + gzread @17 + gzwrite @18 + inflate @19 + inflateEnd @20 + inflateInit2_ @21 + inflateInit_ @22 + inflateReset @23 + inflateSetDictionary @24 + inflateSync @25 + uncompress @26 + zlibVersion @27 + gzprintf @28 + gzputc @29 + gzgetc @30 + gzseek @31 + gzrewind @32 + gztell @33 + gzeof @34 + gzsetparams @35 + zError @36 + inflateSyncPoint @37 + get_crc_table @38 + compress2 @39 + gzputs @40 + gzgets @41 + inflateCopy @42 + inflateBackInit_ @43 + inflateBack @44 + inflateBackEnd @45 + compressBound @46 + deflateBound @47 + gzclearerr @48 + gzungetc @49 + zlibCompileFlags @50 + deflatePrime @51 + + unzOpen @61 + unzClose @62 + unzGetGlobalInfo @63 + unzGetCurrentFileInfo @64 + unzGoToFirstFile @65 + unzGoToNextFile @66 + unzOpenCurrentFile @67 + unzReadCurrentFile @68 + unzOpenCurrentFile3 @69 + unztell @70 + unzeof @71 + unzCloseCurrentFile @72 + unzGetGlobalComment @73 + unzStringFileNameCompare @74 + unzLocateFile @75 + unzGetLocalExtrafield @76 + unzOpen2 @77 + unzOpenCurrentFile2 @78 + unzOpenCurrentFilePassword @79 + + zipOpen @80 + zipOpenNewFileInZip @81 + zipWriteInFileInZip @82 + zipCloseFileInZip @83 + zipClose @84 + zipOpenNewFileInZip2 @86 + zipCloseFileInZipRaw @87 + zipOpen2 @88 + zipOpenNewFileInZip3 @89 + + unzGetFilePos @100 + unzGoToFilePos @101 + + fill_win32_filefunc @110 diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc7/zlibvc.sln gcc-4.4.5/zlib/contrib/vstudio/vc7/zlibvc.sln *** gcc-4.4.4/zlib/contrib/vstudio/vc7/zlibvc.sln Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc7/zlibvc.sln Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,78 ---- + Microsoft Visual Studio Solution File, Format Version 7.00 + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testZlibDll", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}" + EndProject + Global + GlobalSection(SolutionConfiguration) = preSolution + ConfigName.0 = Debug + ConfigName.1 = Release + ConfigName.2 = ReleaseAxp + ConfigName.3 = ReleaseWithoutAsm + ConfigName.4 = ReleaseWithoutCrtdll + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug.ActiveCfg = Debug|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug.Build.0 = Debug|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release.ActiveCfg = Release|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release.Build.0 = Release|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseAxp.ActiveCfg = ReleaseAxp|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseAxp.Build.0 = ReleaseAxp|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm.ActiveCfg = ReleaseWithoutAsm|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm.Build.0 = ReleaseWithoutAsm|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutCrtdll.ActiveCfg = ReleaseAxp|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutCrtdll.Build.0 = ReleaseAxp|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug.ActiveCfg = Debug|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug.Build.0 = Debug|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release.ActiveCfg = Release|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release.Build.0 = Release|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseAxp.ActiveCfg = ReleaseAxp|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseAxp.Build.0 = ReleaseAxp|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm.ActiveCfg = ReleaseWithoutAsm|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm.Build.0 = ReleaseWithoutAsm|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutCrtdll.ActiveCfg = ReleaseWithoutCrtdll|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutCrtdll.Build.0 = ReleaseWithoutCrtdll|Win32 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug.ActiveCfg = Debug|Win32 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug.Build.0 = Debug|Win32 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release.ActiveCfg = Release|Win32 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release.Build.0 = Release|Win32 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAxp.ActiveCfg = Release|Win32 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAxp.Build.0 = Release|Win32 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm.ActiveCfg = Release|Win32 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm.Build.0 = Release|Win32 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutCrtdll.Build.0 = Release|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug.ActiveCfg = Debug|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug.Build.0 = Debug|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release.ActiveCfg = Release|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release.Build.0 = Release|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseAxp.ActiveCfg = Release|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseAxp.Build.0 = Release|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm.ActiveCfg = Release|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm.Build.0 = Release|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutCrtdll.Build.0 = Release|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Debug.ActiveCfg = Debug|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Debug.Build.0 = Debug|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Release.ActiveCfg = Release|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Release.Build.0 = Release|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseAxp.ActiveCfg = Release|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseAxp.Build.0 = Release|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutAsm.ActiveCfg = Release|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutAsm.Build.0 = Release|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutCrtdll.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection + EndGlobal diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc7/zlibvc.vcproj gcc-4.4.5/zlib/contrib/vstudio/vc7/zlibvc.vcproj *** gcc-4.4.4/zlib/contrib/vstudio/vc7/zlibvc.vcproj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc7/zlibvc.vcproj Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,445 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc8/miniunz.vcproj gcc-4.4.5/zlib/contrib/vstudio/vc8/miniunz.vcproj *** gcc-4.4.4/zlib/contrib/vstudio/vc8/miniunz.vcproj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc8/miniunz.vcproj Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,566 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc8/minizip.vcproj gcc-4.4.5/zlib/contrib/vstudio/vc8/minizip.vcproj *** gcc-4.4.4/zlib/contrib/vstudio/vc8/minizip.vcproj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc8/minizip.vcproj Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,563 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc8/testzlib.vcproj gcc-4.4.5/zlib/contrib/vstudio/vc8/testzlib.vcproj *** gcc-4.4.4/zlib/contrib/vstudio/vc8/testzlib.vcproj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc8/testzlib.vcproj Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,948 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc8/testzlibdll.vcproj gcc-4.4.5/zlib/contrib/vstudio/vc8/testzlibdll.vcproj *** gcc-4.4.4/zlib/contrib/vstudio/vc8/testzlibdll.vcproj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc8/testzlibdll.vcproj Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,567 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc8/zlib.rc gcc-4.4.5/zlib/contrib/vstudio/vc8/zlib.rc *** gcc-4.4.4/zlib/contrib/vstudio/vc8/zlib.rc Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc8/zlib.rc Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,32 ---- + #include + + #define IDR_VERSION1 1 + IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE + FILEVERSION 1,2,3,0 + PRODUCTVERSION 1,2,3,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS 0 + FILEOS VOS_DOS_WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0 // not used + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + //language ID = U.S. English, char set = Windows, Multilingual + + BEGIN + VALUE "FileDescription", "zlib data compression library\0" + VALUE "FileVersion", "1.2.3.0\0" + VALUE "InternalName", "zlib\0" + VALUE "OriginalFilename", "zlib.dll\0" + VALUE "ProductName", "ZLib.DLL\0" + VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" + VALUE "LegalCopyright", "(C) 1995-2003 Jean-loup Gailly & Mark Adler\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1252 + END + END diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc8/zlibstat.vcproj gcc-4.4.5/zlib/contrib/vstudio/vc8/zlibstat.vcproj *** gcc-4.4.4/zlib/contrib/vstudio/vc8/zlibstat.vcproj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc8/zlibstat.vcproj Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,870 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc8/zlibvc.def gcc-4.4.5/zlib/contrib/vstudio/vc8/zlibvc.def *** gcc-4.4.4/zlib/contrib/vstudio/vc8/zlibvc.def Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc8/zlibvc.def Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,92 ---- + + VERSION 1.23 + + HEAPSIZE 1048576,8192 + + EXPORTS + adler32 @1 + compress @2 + crc32 @3 + deflate @4 + deflateCopy @5 + deflateEnd @6 + deflateInit2_ @7 + deflateInit_ @8 + deflateParams @9 + deflateReset @10 + deflateSetDictionary @11 + gzclose @12 + gzdopen @13 + gzerror @14 + gzflush @15 + gzopen @16 + gzread @17 + gzwrite @18 + inflate @19 + inflateEnd @20 + inflateInit2_ @21 + inflateInit_ @22 + inflateReset @23 + inflateSetDictionary @24 + inflateSync @25 + uncompress @26 + zlibVersion @27 + gzprintf @28 + gzputc @29 + gzgetc @30 + gzseek @31 + gzrewind @32 + gztell @33 + gzeof @34 + gzsetparams @35 + zError @36 + inflateSyncPoint @37 + get_crc_table @38 + compress2 @39 + gzputs @40 + gzgets @41 + inflateCopy @42 + inflateBackInit_ @43 + inflateBack @44 + inflateBackEnd @45 + compressBound @46 + deflateBound @47 + gzclearerr @48 + gzungetc @49 + zlibCompileFlags @50 + deflatePrime @51 + + unzOpen @61 + unzClose @62 + unzGetGlobalInfo @63 + unzGetCurrentFileInfo @64 + unzGoToFirstFile @65 + unzGoToNextFile @66 + unzOpenCurrentFile @67 + unzReadCurrentFile @68 + unzOpenCurrentFile3 @69 + unztell @70 + unzeof @71 + unzCloseCurrentFile @72 + unzGetGlobalComment @73 + unzStringFileNameCompare @74 + unzLocateFile @75 + unzGetLocalExtrafield @76 + unzOpen2 @77 + unzOpenCurrentFile2 @78 + unzOpenCurrentFilePassword @79 + + zipOpen @80 + zipOpenNewFileInZip @81 + zipWriteInFileInZip @82 + zipCloseFileInZip @83 + zipClose @84 + zipOpenNewFileInZip2 @86 + zipCloseFileInZipRaw @87 + zipOpen2 @88 + zipOpenNewFileInZip3 @89 + + unzGetFilePos @100 + unzGoToFilePos @101 + + fill_win32_filefunc @110 diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc8/zlibvc.sln gcc-4.4.5/zlib/contrib/vstudio/vc8/zlibvc.sln *** gcc-4.4.4/zlib/contrib/vstudio/vc8/zlibvc.sln Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc8/zlibvc.sln Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,144 ---- +  + Microsoft Visual Studio Solution File, Format Version 9.00 + # Visual Studio 2005 + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestZlibDll", "testzlibdll.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}" + ProjectSection(ProjectDependencies) = postProject + {8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}" + ProjectSection(ProjectDependencies) = postProject + {8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}" + ProjectSection(ProjectDependencies) = postProject + {8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D} + EndProjectSection + EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Itanium = Debug|Itanium + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Itanium = Release|Itanium + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium + ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32 + ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Itanium + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.Build.0 = Debug|Itanium + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Itanium + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = ReleaseWithoutAsm|x64 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = ReleaseWithoutAsm|x64 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Itanium + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.Build.0 = Debug|Itanium + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Itanium + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.Build.0 = Release|Itanium + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 + {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64 + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.Build.0 = Debug|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64 + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64 + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.Build.0 = Release|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64 + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64 + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64 + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium + {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.Build.0 = Release|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64 + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium + {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + EndGlobal diff -Nrcpad gcc-4.4.4/zlib/contrib/vstudio/vc8/zlibvc.vcproj gcc-4.4.5/zlib/contrib/vstudio/vc8/zlibvc.vcproj *** gcc-4.4.4/zlib/contrib/vstudio/vc8/zlibvc.vcproj Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/contrib/vstudio/vc8/zlibvc.vcproj Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,1219 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nrcpad gcc-4.4.4/zlib/crc32.c gcc-4.4.5/zlib/crc32.c *** gcc-4.4.4/zlib/crc32.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/crc32.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,423 ---- + /* crc32.c -- compute the CRC-32 of a data stream + * Copyright (C) 1995-2005 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + * + * Thanks to Rodney Brown for his contribution of faster + * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing + * tables for updating the shift register in one step with three exclusive-ors + * instead of four steps with four exclusive-ors. This results in about a + * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3. + */ + + /* @(#) $Id: crc32.c,v 1.1.1.2 2002/03/11 21:53:23 tromey Exp $ */ + + /* + Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore + protection on the static variables used to control the first-use generation + of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should + first call get_crc_table() to initialize the tables before allowing more than + one thread to use crc32(). + */ + + #ifdef MAKECRCH + # include + # ifndef DYNAMIC_CRC_TABLE + # define DYNAMIC_CRC_TABLE + # endif /* !DYNAMIC_CRC_TABLE */ + #endif /* MAKECRCH */ + + #include "zutil.h" /* for STDC and FAR definitions */ + + #define local static + + /* Find a four-byte integer type for crc32_little() and crc32_big(). */ + #ifndef NOBYFOUR + # ifdef STDC /* need ANSI C limits.h to determine sizes */ + # include + # define BYFOUR + # if (UINT_MAX == 0xffffffffUL) + typedef unsigned int u4; + # else + # if (ULONG_MAX == 0xffffffffUL) + typedef unsigned long u4; + # else + # if (USHRT_MAX == 0xffffffffUL) + typedef unsigned short u4; + # else + # undef BYFOUR /* can't find a four-byte integer type! */ + # endif + # endif + # endif + # endif /* STDC */ + #endif /* !NOBYFOUR */ + + /* Definitions for doing the crc four data bytes at a time. */ + #ifdef BYFOUR + # define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \ + (((w)&0xff00)<<8)+(((w)&0xff)<<24)) + local unsigned long crc32_little OF((unsigned long, + const unsigned char FAR *, unsigned)); + local unsigned long crc32_big OF((unsigned long, + const unsigned char FAR *, unsigned)); + # define TBLS 8 + #else + # define TBLS 1 + #endif /* BYFOUR */ + + /* Local functions for crc concatenation */ + local unsigned long gf2_matrix_times OF((unsigned long *mat, + unsigned long vec)); + local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat)); + + #ifdef DYNAMIC_CRC_TABLE + + local volatile int crc_table_empty = 1; + local unsigned long FAR crc_table[TBLS][256]; + local void make_crc_table OF((void)); + #ifdef MAKECRCH + local void write_table OF((FILE *, const unsigned long FAR *)); + #endif /* MAKECRCH */ + /* + Generate tables for a byte-wise 32-bit CRC calculation on the polynomial: + x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1. + + Polynomials over GF(2) are represented in binary, one bit per coefficient, + with the lowest powers in the most significant bit. Then adding polynomials + is just exclusive-or, and multiplying a polynomial by x is a right shift by + one. If we call the above polynomial p, and represent a byte as the + polynomial q, also with the lowest power in the most significant bit (so the + byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p, + where a mod b means the remainder after dividing a by b. + + This calculation is done using the shift-register method of multiplying and + taking the remainder. The register is initialized to zero, and for each + incoming bit, x^32 is added mod p to the register if the bit is a one (where + x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by + x (which is shifting right by one and adding x^32 mod p if the bit shifted + out is a one). We start with the highest power (least significant bit) of + q and repeat for all eight bits of q. + + The first table is simply the CRC of all possible eight bit values. This is + all the information needed to generate CRCs on data a byte at a time for all + combinations of CRC register values and incoming bytes. The remaining tables + allow for word-at-a-time CRC calculation for both big-endian and little- + endian machines, where a word is four bytes. + */ + local void make_crc_table() + { + unsigned long c; + int n, k; + unsigned long poly; /* polynomial exclusive-or pattern */ + /* terms of polynomial defining this crc (except x^32): */ + static volatile int first = 1; /* flag to limit concurrent making */ + static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26}; + + /* See if another task is already doing this (not thread-safe, but better + than nothing -- significantly reduces duration of vulnerability in + case the advice about DYNAMIC_CRC_TABLE is ignored) */ + if (first) { + first = 0; + + /* make exclusive-or pattern from polynomial (0xedb88320UL) */ + poly = 0UL; + for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++) + poly |= 1UL << (31 - p[n]); + + /* generate a crc for every 8-bit value */ + for (n = 0; n < 256; n++) { + c = (unsigned long)n; + for (k = 0; k < 8; k++) + c = c & 1 ? poly ^ (c >> 1) : c >> 1; + crc_table[0][n] = c; + } + + #ifdef BYFOUR + /* generate crc for each value followed by one, two, and three zeros, + and then the byte reversal of those as well as the first table */ + for (n = 0; n < 256; n++) { + c = crc_table[0][n]; + crc_table[4][n] = REV(c); + for (k = 1; k < 4; k++) { + c = crc_table[0][c & 0xff] ^ (c >> 8); + crc_table[k][n] = c; + crc_table[k + 4][n] = REV(c); + } + } + #endif /* BYFOUR */ + + crc_table_empty = 0; + } + else { /* not first */ + /* wait for the other guy to finish (not efficient, but rare) */ + while (crc_table_empty) + ; + } + + #ifdef MAKECRCH + /* write out CRC tables to crc32.h */ + { + FILE *out; + + out = fopen("crc32.h", "w"); + if (out == NULL) return; + fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n"); + fprintf(out, " * Generated automatically by crc32.c\n */\n\n"); + fprintf(out, "local const unsigned long FAR "); + fprintf(out, "crc_table[TBLS][256] =\n{\n {\n"); + write_table(out, crc_table[0]); + # ifdef BYFOUR + fprintf(out, "#ifdef BYFOUR\n"); + for (k = 1; k < 8; k++) { + fprintf(out, " },\n {\n"); + write_table(out, crc_table[k]); + } + fprintf(out, "#endif\n"); + # endif /* BYFOUR */ + fprintf(out, " }\n};\n"); + fclose(out); + } + #endif /* MAKECRCH */ + } + + #ifdef MAKECRCH + local void write_table(out, table) + FILE *out; + const unsigned long FAR *table; + { + int n; + + for (n = 0; n < 256; n++) + fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ", table[n], + n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", ")); + } + #endif /* MAKECRCH */ + + #else /* !DYNAMIC_CRC_TABLE */ + /* ======================================================================== + * Tables of CRC-32s of all single-byte values, made by make_crc_table(). + */ + #include "crc32.h" + #endif /* DYNAMIC_CRC_TABLE */ + + /* ========================================================================= + * This function can be used by asm versions of crc32() + */ + const unsigned long FAR * ZEXPORT get_crc_table() + { + #ifdef DYNAMIC_CRC_TABLE + if (crc_table_empty) + make_crc_table(); + #endif /* DYNAMIC_CRC_TABLE */ + return (const unsigned long FAR *)crc_table; + } + + /* ========================================================================= */ + #define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8) + #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 + + /* ========================================================================= */ + unsigned long ZEXPORT crc32(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + unsigned len; + { + if (buf == Z_NULL) return 0UL; + + #ifdef DYNAMIC_CRC_TABLE + if (crc_table_empty) + make_crc_table(); + #endif /* DYNAMIC_CRC_TABLE */ + + #ifdef BYFOUR + if (sizeof(void *) == sizeof(ptrdiff_t)) { + u4 endian; + + endian = 1; + if (*((unsigned char *)(&endian))) + return crc32_little(crc, buf, len); + else + return crc32_big(crc, buf, len); + } + #endif /* BYFOUR */ + crc = crc ^ 0xffffffffUL; + while (len >= 8) { + DO8; + len -= 8; + } + if (len) do { + DO1; + } while (--len); + return crc ^ 0xffffffffUL; + } + + #ifdef BYFOUR + + /* ========================================================================= */ + #define DOLIT4 c ^= *buf4++; \ + c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \ + crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24] + #define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4 + + /* ========================================================================= */ + local unsigned long crc32_little(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + unsigned len; + { + register u4 c; + register const u4 FAR *buf4; + + c = (u4)crc; + c = ~c; + while (len && ((ptrdiff_t)buf & 3)) { + c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); + len--; + } + + buf4 = (const u4 FAR *)(const void FAR *)buf; + while (len >= 32) { + DOLIT32; + len -= 32; + } + while (len >= 4) { + DOLIT4; + len -= 4; + } + buf = (const unsigned char FAR *)buf4; + + if (len) do { + c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); + } while (--len); + c = ~c; + return (unsigned long)c; + } + + /* ========================================================================= */ + #define DOBIG4 c ^= *++buf4; \ + c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \ + crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24] + #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4 + + /* ========================================================================= */ + local unsigned long crc32_big(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + unsigned len; + { + register u4 c; + register const u4 FAR *buf4; + + c = REV((u4)crc); + c = ~c; + while (len && ((ptrdiff_t)buf & 3)) { + c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); + len--; + } + + buf4 = (const u4 FAR *)(const void FAR *)buf; + buf4--; + while (len >= 32) { + DOBIG32; + len -= 32; + } + while (len >= 4) { + DOBIG4; + len -= 4; + } + buf4++; + buf = (const unsigned char FAR *)buf4; + + if (len) do { + c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); + } while (--len); + c = ~c; + return (unsigned long)(REV(c)); + } + + #endif /* BYFOUR */ + + #define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */ + + /* ========================================================================= */ + local unsigned long gf2_matrix_times(mat, vec) + unsigned long *mat; + unsigned long vec; + { + unsigned long sum; + + sum = 0; + while (vec) { + if (vec & 1) + sum ^= *mat; + vec >>= 1; + mat++; + } + return sum; + } + + /* ========================================================================= */ + local void gf2_matrix_square(square, mat) + unsigned long *square; + unsigned long *mat; + { + int n; + + for (n = 0; n < GF2_DIM; n++) + square[n] = gf2_matrix_times(mat, mat[n]); + } + + /* ========================================================================= */ + uLong ZEXPORT crc32_combine(crc1, crc2, len2) + uLong crc1; + uLong crc2; + z_off_t len2; + { + int n; + unsigned long row; + unsigned long even[GF2_DIM]; /* even-power-of-two zeros operator */ + unsigned long odd[GF2_DIM]; /* odd-power-of-two zeros operator */ + + /* degenerate case */ + if (len2 == 0) + return crc1; + + /* put operator for one zero bit in odd */ + odd[0] = 0xedb88320L; /* CRC-32 polynomial */ + row = 1; + for (n = 1; n < GF2_DIM; n++) { + odd[n] = row; + row <<= 1; + } + + /* put operator for two zero bits in even */ + gf2_matrix_square(even, odd); + + /* put operator for four zero bits in odd */ + gf2_matrix_square(odd, even); + + /* apply len2 zeros to crc1 (first square will put the operator for one + zero byte, eight zero bits, in even) */ + do { + /* apply zeros operator for this bit of len2 */ + gf2_matrix_square(even, odd); + if (len2 & 1) + crc1 = gf2_matrix_times(even, crc1); + len2 >>= 1; + + /* if no more bits set, then done */ + if (len2 == 0) + break; + + /* another iteration of the loop with odd and even swapped */ + gf2_matrix_square(odd, even); + if (len2 & 1) + crc1 = gf2_matrix_times(odd, crc1); + len2 >>= 1; + + /* if no more bits set, then done */ + } while (len2 != 0); + + /* return combined crc */ + crc1 ^= crc2; + return crc1; + } diff -Nrcpad gcc-4.4.4/zlib/crc32.h gcc-4.4.5/zlib/crc32.h *** gcc-4.4.4/zlib/crc32.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/crc32.h Mon Sep 12 17:02:07 2005 *************** *** 0 **** --- 1,441 ---- + /* crc32.h -- tables for rapid CRC calculation + * Generated automatically by crc32.c + */ + + local const unsigned long FAR crc_table[TBLS][256] = + { + { + 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, + 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL, + 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL, + 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL, + 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL, + 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL, + 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL, + 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL, + 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL, + 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL, + 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL, + 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL, + 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL, + 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL, + 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL, + 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL, + 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL, + 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL, + 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL, + 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL, + 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL, + 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL, + 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL, + 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL, + 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL, + 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL, + 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL, + 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL, + 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL, + 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL, + 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL, + 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL, + 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL, + 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL, + 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL, + 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL, + 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL, + 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL, + 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL, + 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL, + 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL, + 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL, + 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL, + 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL, + 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL, + 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL, + 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL, + 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL, + 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL, + 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, + 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, + 0x2d02ef8dUL + #ifdef BYFOUR + }, + { + 0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL, + 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL, + 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL, + 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL, + 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL, + 0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL, + 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL, + 0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL, + 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL, + 0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL, + 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL, + 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL, + 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL, + 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL, + 0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL, + 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL, + 0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL, + 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL, + 0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL, + 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL, + 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL, + 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL, + 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL, + 0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL, + 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL, + 0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL, + 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL, + 0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL, + 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL, + 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL, + 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL, + 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL, + 0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL, + 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL, + 0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL, + 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL, + 0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL, + 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL, + 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL, + 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL, + 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL, + 0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL, + 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL, + 0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL, + 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL, + 0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL, + 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL, + 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL, + 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL, + 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL, + 0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL, + 0x9324fd72UL + }, + { + 0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL, + 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL, + 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL, + 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL, + 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL, + 0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL, + 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL, + 0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL, + 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL, + 0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL, + 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL, + 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL, + 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL, + 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL, + 0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL, + 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL, + 0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL, + 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL, + 0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL, + 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL, + 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL, + 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL, + 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL, + 0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL, + 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL, + 0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL, + 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL, + 0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL, + 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL, + 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL, + 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL, + 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL, + 0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL, + 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL, + 0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL, + 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL, + 0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL, + 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL, + 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL, + 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL, + 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL, + 0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL, + 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL, + 0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL, + 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL, + 0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL, + 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL, + 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL, + 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL, + 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL, + 0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL, + 0xbe9834edUL + }, + { + 0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL, + 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL, + 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL, + 0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL, + 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL, + 0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL, + 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL, + 0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL, + 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL, + 0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL, + 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL, + 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL, + 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL, + 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL, + 0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL, + 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL, + 0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL, + 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL, + 0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL, + 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL, + 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL, + 0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL, + 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL, + 0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL, + 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL, + 0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL, + 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL, + 0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL, + 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL, + 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL, + 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL, + 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL, + 0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL, + 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL, + 0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL, + 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL, + 0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL, + 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL, + 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL, + 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL, + 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL, + 0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL, + 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL, + 0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL, + 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL, + 0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL, + 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL, + 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL, + 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL, + 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL, + 0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL, + 0xde0506f1UL + }, + { + 0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL, + 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL, + 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL, + 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL, + 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL, + 0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL, + 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL, + 0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL, + 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL, + 0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL, + 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL, + 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL, + 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL, + 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL, + 0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL, + 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL, + 0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL, + 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL, + 0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL, + 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL, + 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL, + 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL, + 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL, + 0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL, + 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL, + 0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL, + 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL, + 0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL, + 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL, + 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL, + 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL, + 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL, + 0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL, + 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL, + 0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL, + 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL, + 0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL, + 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL, + 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL, + 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL, + 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL, + 0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL, + 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL, + 0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL, + 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL, + 0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL, + 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL, + 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL, + 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL, + 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL, + 0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL, + 0x8def022dUL + }, + { + 0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL, + 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL, + 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL, + 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL, + 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL, + 0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL, + 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL, + 0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL, + 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL, + 0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL, + 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL, + 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL, + 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL, + 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL, + 0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL, + 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL, + 0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL, + 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL, + 0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL, + 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL, + 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL, + 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL, + 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL, + 0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL, + 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL, + 0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL, + 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL, + 0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL, + 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL, + 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL, + 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL, + 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL, + 0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL, + 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL, + 0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL, + 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL, + 0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL, + 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL, + 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL, + 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL, + 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL, + 0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL, + 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL, + 0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL, + 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL, + 0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL, + 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL, + 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL, + 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL, + 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL, + 0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL, + 0x72fd2493UL + }, + { + 0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL, + 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL, + 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL, + 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL, + 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL, + 0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL, + 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL, + 0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL, + 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL, + 0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL, + 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL, + 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL, + 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL, + 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL, + 0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL, + 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL, + 0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL, + 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL, + 0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL, + 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL, + 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL, + 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL, + 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL, + 0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL, + 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL, + 0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL, + 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL, + 0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL, + 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL, + 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL, + 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL, + 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL, + 0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL, + 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL, + 0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL, + 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL, + 0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL, + 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL, + 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL, + 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL, + 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL, + 0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL, + 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL, + 0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL, + 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL, + 0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL, + 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL, + 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL, + 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL, + 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL, + 0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL, + 0xed3498beUL + }, + { + 0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL, + 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL, + 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL, + 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL, + 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL, + 0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL, + 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL, + 0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL, + 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL, + 0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL, + 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL, + 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL, + 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL, + 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL, + 0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL, + 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL, + 0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL, + 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL, + 0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL, + 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL, + 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL, + 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL, + 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL, + 0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL, + 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL, + 0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL, + 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL, + 0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL, + 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL, + 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL, + 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL, + 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL, + 0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL, + 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL, + 0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL, + 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL, + 0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL, + 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL, + 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL, + 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL, + 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL, + 0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL, + 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL, + 0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL, + 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL, + 0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL, + 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL, + 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL, + 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL, + 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL, + 0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL, + 0xf10605deUL + #endif + } + }; diff -Nrcpad gcc-4.4.4/zlib/deflate.c gcc-4.4.5/zlib/deflate.c *** gcc-4.4.4/zlib/deflate.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/deflate.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,1736 ---- + /* deflate.c -- compress data using the deflation algorithm + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* + * ALGORITHM + * + * The "deflation" process depends on being able to identify portions + * of the input text which are identical to earlier input (within a + * sliding window trailing behind the input currently being processed). + * + * The most straightforward technique turns out to be the fastest for + * most input files: try all possible matches and select the longest. + * The key feature of this algorithm is that insertions into the string + * dictionary are very simple and thus fast, and deletions are avoided + * completely. Insertions are performed at each input character, whereas + * string matches are performed only when the previous match ends. So it + * is preferable to spend more time in matches to allow very fast string + * insertions and avoid deletions. The matching algorithm for small + * strings is inspired from that of Rabin & Karp. A brute force approach + * is used to find longer strings when a small match has been found. + * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze + * (by Leonid Broukhis). + * A previous version of this file used a more sophisticated algorithm + * (by Fiala and Greene) which is guaranteed to run in linear amortized + * time, but has a larger average cost, uses more memory and is patented. + * However the F&G algorithm may be faster for some highly redundant + * files if the parameter max_chain_length (described below) is too large. + * + * ACKNOWLEDGEMENTS + * + * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and + * I found it in 'freeze' written by Leonid Broukhis. + * Thanks to many people for bug reports and testing. + * + * REFERENCES + * + * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification". + * Available in http://www.ietf.org/rfc/rfc1951.txt + * + * A description of the Rabin and Karp algorithm is given in the book + * "Algorithms" by R. Sedgewick, Addison-Wesley, p252. + * + * Fiala,E.R., and Greene,D.H. + * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595 + * + */ + + /* @(#) $Id: deflate.c,v 1.1.1.2 2002/03/11 21:53:23 tromey Exp $ */ + + #include "deflate.h" + + const char deflate_copyright[] = + " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly "; + /* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot + include such an acknowledgment, I would appreciate that you keep this + copyright string in the executable of your product. + */ + + /* =========================================================================== + * Function prototypes. + */ + typedef enum { + need_more, /* block not completed, need more input or more output */ + block_done, /* block flush performed */ + finish_started, /* finish started, need only more output at next deflate */ + finish_done /* finish done, accept no more input or output */ + } block_state; + + typedef block_state (*compress_func) OF((deflate_state *s, int flush)); + /* Compression function. Returns the block state after the call. */ + + local void fill_window OF((deflate_state *s)); + local block_state deflate_stored OF((deflate_state *s, int flush)); + local block_state deflate_fast OF((deflate_state *s, int flush)); + #ifndef FASTEST + local block_state deflate_slow OF((deflate_state *s, int flush)); + #endif + local void lm_init OF((deflate_state *s)); + local void putShortMSB OF((deflate_state *s, uInt b)); + local void flush_pending OF((z_streamp strm)); + local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); + #ifndef FASTEST + #ifdef ASMV + void match_init OF((void)); /* asm code initialization */ + uInt longest_match OF((deflate_state *s, IPos cur_match)); + #else + local uInt longest_match OF((deflate_state *s, IPos cur_match)); + #endif + #endif + local uInt longest_match_fast OF((deflate_state *s, IPos cur_match)); + + #ifdef DEBUG + local void check_match OF((deflate_state *s, IPos start, IPos match, + int length)); + #endif + + /* =========================================================================== + * Local data + */ + + #define NIL 0 + /* Tail of hash chains */ + + #ifndef TOO_FAR + # define TOO_FAR 4096 + #endif + /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ + + #define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) + /* Minimum amount of lookahead, except at the end of the input file. + * See deflate.c for comments about the MIN_MATCH+1. + */ + + /* Values for max_lazy_match, good_match and max_chain_length, depending on + * the desired pack level (0..9). The values given below have been tuned to + * exclude worst case performance for pathological files. Better values may be + * found for specific files. + */ + typedef struct config_s { + ush good_length; /* reduce lazy search above this match length */ + ush max_lazy; /* do not perform lazy search above this match length */ + ush nice_length; /* quit search above this match length */ + ush max_chain; + compress_func func; + } config; + + #ifdef FASTEST + local const config configuration_table[2] = { + /* good lazy nice chain */ + /* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ + /* 1 */ {4, 4, 8, 4, deflate_fast}}; /* max speed, no lazy matches */ + #else + local const config configuration_table[10] = { + /* good lazy nice chain */ + /* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ + /* 1 */ {4, 4, 8, 4, deflate_fast}, /* max speed, no lazy matches */ + /* 2 */ {4, 5, 16, 8, deflate_fast}, + /* 3 */ {4, 6, 32, 32, deflate_fast}, + + /* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */ + /* 5 */ {8, 16, 32, 32, deflate_slow}, + /* 6 */ {8, 16, 128, 128, deflate_slow}, + /* 7 */ {8, 32, 128, 256, deflate_slow}, + /* 8 */ {32, 128, 258, 1024, deflate_slow}, + /* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */ + #endif + + /* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 + * For deflate_fast() (levels <= 3) good is ignored and lazy has a different + * meaning. + */ + + #define EQUAL 0 + /* result of memcmp for equal strings */ + + #ifndef NO_DUMMY_DECL + struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ + #endif + + /* =========================================================================== + * Update a hash value with the given input byte + * IN assertion: all calls to to UPDATE_HASH are made with consecutive + * input characters, so that a running hash key can be computed from the + * previous key instead of complete recalculation each time. + */ + #define UPDATE_HASH(s,h,c) (h = (((h)<hash_shift) ^ (c)) & s->hash_mask) + + + /* =========================================================================== + * Insert string str in the dictionary and set match_head to the previous head + * of the hash chain (the most recent string with same hash key). Return + * the previous length of the hash chain. + * If this file is compiled with -DFASTEST, the compression level is forced + * to 1, and no hash chains are maintained. + * IN assertion: all calls to to INSERT_STRING are made with consecutive + * input characters and the first MIN_MATCH bytes of str are valid + * (except for the last MIN_MATCH-1 bytes of the input file). + */ + #ifdef FASTEST + #define INSERT_STRING(s, str, match_head) \ + (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ + match_head = s->head[s->ins_h], \ + s->head[s->ins_h] = (Pos)(str)) + #else + #define INSERT_STRING(s, str, match_head) \ + (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ + match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \ + s->head[s->ins_h] = (Pos)(str)) + #endif + + /* =========================================================================== + * Initialize the hash table (avoiding 64K overflow for 16 bit systems). + * prev[] will be initialized on the fly. + */ + #define CLEAR_HASH(s) \ + s->head[s->hash_size-1] = NIL; \ + zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); + + /* ========================================================================= */ + int ZEXPORT deflateInit_(strm, level, version, stream_size) + z_streamp strm; + int level; + const char *version; + int stream_size; + { + return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, + Z_DEFAULT_STRATEGY, version, stream_size); + /* To do: ignore strm->next_in if we use it as window */ + } + + /* ========================================================================= */ + int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + version, stream_size) + z_streamp strm; + int level; + int method; + int windowBits; + int memLevel; + int strategy; + const char *version; + int stream_size; + { + deflate_state *s; + int wrap = 1; + static const char my_version[] = ZLIB_VERSION; + + ushf *overlay; + /* We overlay pending_buf and d_buf+l_buf. This works since the average + * output size for (length,distance) codes is <= 24 bits. + */ + + if (version == Z_NULL || version[0] != my_version[0] || + stream_size != sizeof(z_stream)) { + return Z_VERSION_ERROR; + } + if (strm == Z_NULL) return Z_STREAM_ERROR; + + strm->msg = Z_NULL; + if (strm->zalloc == (alloc_func)0) { + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; + } + if (strm->zfree == (free_func)0) strm->zfree = zcfree; + + #ifdef FASTEST + if (level != 0) level = 1; + #else + if (level == Z_DEFAULT_COMPRESSION) level = 6; + #endif + + if (windowBits < 0) { /* suppress zlib wrapper */ + wrap = 0; + windowBits = -windowBits; + } + #ifdef GZIP + else if (windowBits > 15) { + wrap = 2; /* write gzip wrapper instead */ + windowBits -= 16; + } + #endif + if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || + windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || + strategy < 0 || strategy > Z_FIXED) { + return Z_STREAM_ERROR; + } + if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */ + s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state)); + if (s == Z_NULL) return Z_MEM_ERROR; + strm->state = (struct internal_state FAR *)s; + s->strm = strm; + + s->wrap = wrap; + s->gzhead = Z_NULL; + s->w_bits = windowBits; + s->w_size = 1 << s->w_bits; + s->w_mask = s->w_size - 1; + + s->hash_bits = memLevel + 7; + s->hash_size = 1 << s->hash_bits; + s->hash_mask = s->hash_size - 1; + s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH); + + s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte)); + s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); + s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); + + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + + overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); + s->pending_buf = (uchf *) overlay; + s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); + + if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || + s->pending_buf == Z_NULL) { + s->status = FINISH_STATE; + strm->msg = (char*)ERR_MSG(Z_MEM_ERROR); + deflateEnd (strm); + return Z_MEM_ERROR; + } + s->d_buf = overlay + s->lit_bufsize/sizeof(ush); + s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; + + s->level = level; + s->strategy = strategy; + s->method = (Byte)method; + + return deflateReset(strm); + } + + /* ========================================================================= */ + int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) + z_streamp strm; + const Bytef *dictionary; + uInt dictLength; + { + deflate_state *s; + uInt length = dictLength; + uInt n; + IPos hash_head = 0; + + if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL || + strm->state->wrap == 2 || + (strm->state->wrap == 1 && strm->state->status != INIT_STATE)) + return Z_STREAM_ERROR; + + s = strm->state; + if (s->wrap) + strm->adler = adler32(strm->adler, dictionary, dictLength); + + if (length < MIN_MATCH) return Z_OK; + if (length > MAX_DIST(s)) { + length = MAX_DIST(s); + dictionary += dictLength - length; /* use the tail of the dictionary */ + } + zmemcpy(s->window, dictionary, length); + s->strstart = length; + s->block_start = (long)length; + + /* Insert all strings in the hash table (except for the last two bytes). + * s->lookahead stays null, so s->ins_h will be recomputed at the next + * call of fill_window. + */ + s->ins_h = s->window[0]; + UPDATE_HASH(s, s->ins_h, s->window[1]); + for (n = 0; n <= length - MIN_MATCH; n++) { + INSERT_STRING(s, n, hash_head); + } + if (hash_head) hash_head = 0; /* to make compiler happy */ + return Z_OK; + } + + /* ========================================================================= */ + int ZEXPORT deflateReset (strm) + z_streamp strm; + { + deflate_state *s; + + if (strm == Z_NULL || strm->state == Z_NULL || + strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) { + return Z_STREAM_ERROR; + } + + strm->total_in = strm->total_out = 0; + strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */ + strm->data_type = Z_UNKNOWN; + + s = (deflate_state *)strm->state; + s->pending = 0; + s->pending_out = s->pending_buf; + + if (s->wrap < 0) { + s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ + } + s->status = s->wrap ? INIT_STATE : BUSY_STATE; + strm->adler = + #ifdef GZIP + s->wrap == 2 ? crc32(0L, Z_NULL, 0) : + #endif + adler32(0L, Z_NULL, 0); + s->last_flush = Z_NO_FLUSH; + + _tr_init(s); + lm_init(s); + + return Z_OK; + } + + /* ========================================================================= */ + int ZEXPORT deflateSetHeader (strm, head) + z_streamp strm; + gz_headerp head; + { + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (strm->state->wrap != 2) return Z_STREAM_ERROR; + strm->state->gzhead = head; + return Z_OK; + } + + /* ========================================================================= */ + int ZEXPORT deflatePrime (strm, bits, value) + z_streamp strm; + int bits; + int value; + { + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + strm->state->bi_valid = bits; + strm->state->bi_buf = (ush)(value & ((1 << bits) - 1)); + return Z_OK; + } + + /* ========================================================================= */ + int ZEXPORT deflateParams(strm, level, strategy) + z_streamp strm; + int level; + int strategy; + { + deflate_state *s; + compress_func func; + int err = Z_OK; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + s = strm->state; + + #ifdef FASTEST + if (level != 0) level = 1; + #else + if (level == Z_DEFAULT_COMPRESSION) level = 6; + #endif + if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) { + return Z_STREAM_ERROR; + } + func = configuration_table[s->level].func; + + if (func != configuration_table[level].func && strm->total_in != 0) { + /* Flush the last buffer: */ + err = deflate(strm, Z_PARTIAL_FLUSH); + } + if (s->level != level) { + s->level = level; + s->max_lazy_match = configuration_table[level].max_lazy; + s->good_match = configuration_table[level].good_length; + s->nice_match = configuration_table[level].nice_length; + s->max_chain_length = configuration_table[level].max_chain; + } + s->strategy = strategy; + return err; + } + + /* ========================================================================= */ + int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain) + z_streamp strm; + int good_length; + int max_lazy; + int nice_length; + int max_chain; + { + deflate_state *s; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + s = strm->state; + s->good_match = good_length; + s->max_lazy_match = max_lazy; + s->nice_match = nice_length; + s->max_chain_length = max_chain; + return Z_OK; + } + + /* ========================================================================= + * For the default windowBits of 15 and memLevel of 8, this function returns + * a close to exact, as well as small, upper bound on the compressed size. + * They are coded as constants here for a reason--if the #define's are + * changed, then this function needs to be changed as well. The return + * value for 15 and 8 only works for those exact settings. + * + * For any setting other than those defaults for windowBits and memLevel, + * the value returned is a conservative worst case for the maximum expansion + * resulting from using fixed blocks instead of stored blocks, which deflate + * can emit on compressed data for some combinations of the parameters. + * + * This function could be more sophisticated to provide closer upper bounds + * for every combination of windowBits and memLevel, as well as wrap. + * But even the conservative upper bound of about 14% expansion does not + * seem onerous for output buffer allocation. + */ + uLong ZEXPORT deflateBound(strm, sourceLen) + z_streamp strm; + uLong sourceLen; + { + deflate_state *s; + uLong destLen; + + /* conservative upper bound */ + destLen = sourceLen + + ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11; + + /* if can't get parameters, return conservative bound */ + if (strm == Z_NULL || strm->state == Z_NULL) + return destLen; + + /* if not default parameters, return conservative bound */ + s = strm->state; + if (s->w_bits != 15 || s->hash_bits != 8 + 7) + return destLen; + + /* default settings: return tight bound for that case */ + return compressBound(sourceLen); + } + + /* ========================================================================= + * Put a short in the pending buffer. The 16-bit value is put in MSB order. + * IN assertion: the stream state is correct and there is enough room in + * pending_buf. + */ + local void putShortMSB (s, b) + deflate_state *s; + uInt b; + { + put_byte(s, (Byte)(b >> 8)); + put_byte(s, (Byte)(b & 0xff)); + } + + /* ========================================================================= + * Flush as much pending output as possible. All deflate() output goes + * through this function so some applications may wish to modify it + * to avoid allocating a large strm->next_out buffer and copying into it. + * (See also read_buf()). + */ + local void flush_pending(strm) + z_streamp strm; + { + unsigned len = strm->state->pending; + + if (len > strm->avail_out) len = strm->avail_out; + if (len == 0) return; + + zmemcpy(strm->next_out, strm->state->pending_out, len); + strm->next_out += len; + strm->state->pending_out += len; + strm->total_out += len; + strm->avail_out -= len; + strm->state->pending -= len; + if (strm->state->pending == 0) { + strm->state->pending_out = strm->state->pending_buf; + } + } + + /* ========================================================================= */ + int ZEXPORT deflate (strm, flush) + z_streamp strm; + int flush; + { + int old_flush; /* value of flush param for previous deflate call */ + deflate_state *s; + + if (strm == Z_NULL || strm->state == Z_NULL || + flush > Z_FINISH || flush < 0) { + return Z_STREAM_ERROR; + } + s = strm->state; + + if (strm->next_out == Z_NULL || + (strm->next_in == Z_NULL && strm->avail_in != 0) || + (s->status == FINISH_STATE && flush != Z_FINISH)) { + ERR_RETURN(strm, Z_STREAM_ERROR); + } + if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR); + + s->strm = strm; /* just in case */ + old_flush = s->last_flush; + s->last_flush = flush; + + /* Write the header */ + if (s->status == INIT_STATE) { + #ifdef GZIP + if (s->wrap == 2) { + strm->adler = crc32(0L, Z_NULL, 0); + put_byte(s, 31); + put_byte(s, 139); + put_byte(s, 8); + if (s->gzhead == NULL) { + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, s->level == 9 ? 2 : + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, OS_CODE); + s->status = BUSY_STATE; + } + else { + put_byte(s, (s->gzhead->text ? 1 : 0) + + (s->gzhead->hcrc ? 2 : 0) + + (s->gzhead->extra == Z_NULL ? 0 : 4) + + (s->gzhead->name == Z_NULL ? 0 : 8) + + (s->gzhead->comment == Z_NULL ? 0 : 16) + ); + put_byte(s, (Byte)(s->gzhead->time & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff)); + put_byte(s, s->level == 9 ? 2 : + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, s->gzhead->os & 0xff); + if (s->gzhead->extra != NULL) { + put_byte(s, s->gzhead->extra_len & 0xff); + put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); + } + if (s->gzhead->hcrc) + strm->adler = crc32(strm->adler, s->pending_buf, + s->pending); + s->gzindex = 0; + s->status = EXTRA_STATE; + } + } + else + #endif + { + uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; + uInt level_flags; + + if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) + level_flags = 0; + else if (s->level < 6) + level_flags = 1; + else if (s->level == 6) + level_flags = 2; + else + level_flags = 3; + header |= (level_flags << 6); + if (s->strstart != 0) header |= PRESET_DICT; + header += 31 - (header % 31); + + s->status = BUSY_STATE; + putShortMSB(s, header); + + /* Save the adler32 of the preset dictionary: */ + if (s->strstart != 0) { + putShortMSB(s, (uInt)(strm->adler >> 16)); + putShortMSB(s, (uInt)(strm->adler & 0xffff)); + } + strm->adler = adler32(0L, Z_NULL, 0); + } + } + #ifdef GZIP + if (s->status == EXTRA_STATE) { + if (s->gzhead->extra != NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + + while (s->gzindex < (s->gzhead->extra_len & 0xffff)) { + if (s->pending == s->pending_buf_size) { + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + flush_pending(strm); + beg = s->pending; + if (s->pending == s->pending_buf_size) + break; + } + put_byte(s, s->gzhead->extra[s->gzindex]); + s->gzindex++; + } + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (s->gzindex == s->gzhead->extra_len) { + s->gzindex = 0; + s->status = NAME_STATE; + } + } + else + s->status = NAME_STATE; + } + if (s->status == NAME_STATE) { + if (s->gzhead->name != NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + int val; + + do { + if (s->pending == s->pending_buf_size) { + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + flush_pending(strm); + beg = s->pending; + if (s->pending == s->pending_buf_size) { + val = 1; + break; + } + } + val = s->gzhead->name[s->gzindex++]; + put_byte(s, val); + } while (val != 0); + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (val == 0) { + s->gzindex = 0; + s->status = COMMENT_STATE; + } + } + else + s->status = COMMENT_STATE; + } + if (s->status == COMMENT_STATE) { + if (s->gzhead->comment != NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + int val; + + do { + if (s->pending == s->pending_buf_size) { + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + flush_pending(strm); + beg = s->pending; + if (s->pending == s->pending_buf_size) { + val = 1; + break; + } + } + val = s->gzhead->comment[s->gzindex++]; + put_byte(s, val); + } while (val != 0); + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (val == 0) + s->status = HCRC_STATE; + } + else + s->status = HCRC_STATE; + } + if (s->status == HCRC_STATE) { + if (s->gzhead->hcrc) { + if (s->pending + 2 > s->pending_buf_size) + flush_pending(strm); + if (s->pending + 2 <= s->pending_buf_size) { + put_byte(s, (Byte)(strm->adler & 0xff)); + put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); + strm->adler = crc32(0L, Z_NULL, 0); + s->status = BUSY_STATE; + } + } + else + s->status = BUSY_STATE; + } + #endif + + /* Flush as much pending output as possible */ + if (s->pending != 0) { + flush_pending(strm); + if (strm->avail_out == 0) { + /* Since avail_out is 0, deflate will be called again with + * more output space, but possibly with both pending and + * avail_in equal to zero. There won't be anything to do, + * but this is not an error situation so make sure we + * return OK instead of BUF_ERROR at next call of deflate: + */ + s->last_flush = -1; + return Z_OK; + } + + /* Make sure there is something to do and avoid duplicate consecutive + * flushes. For repeated and useless calls with Z_FINISH, we keep + * returning Z_STREAM_END instead of Z_BUF_ERROR. + */ + } else if (strm->avail_in == 0 && flush <= old_flush && + flush != Z_FINISH) { + ERR_RETURN(strm, Z_BUF_ERROR); + } + + /* User must not provide more input after the first FINISH: */ + if (s->status == FINISH_STATE && strm->avail_in != 0) { + ERR_RETURN(strm, Z_BUF_ERROR); + } + + /* Start a new block or continue the current one. + */ + if (strm->avail_in != 0 || s->lookahead != 0 || + (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) { + block_state bstate; + + bstate = (*(configuration_table[s->level].func))(s, flush); + + if (bstate == finish_started || bstate == finish_done) { + s->status = FINISH_STATE; + } + if (bstate == need_more || bstate == finish_started) { + if (strm->avail_out == 0) { + s->last_flush = -1; /* avoid BUF_ERROR next call, see above */ + } + return Z_OK; + /* If flush != Z_NO_FLUSH && avail_out == 0, the next call + * of deflate should use the same flush parameter to make sure + * that the flush is complete. So we don't have to output an + * empty block here, this will be done at next call. This also + * ensures that for a very small output buffer, we emit at most + * one empty block. + */ + } + if (bstate == block_done) { + if (flush == Z_PARTIAL_FLUSH) { + _tr_align(s); + } else { /* FULL_FLUSH or SYNC_FLUSH */ + _tr_stored_block(s, (char*)0, 0L, 0); + /* For a full flush, this empty block will be recognized + * as a special marker by inflate_sync(). + */ + if (flush == Z_FULL_FLUSH) { + CLEAR_HASH(s); /* forget history */ + } + } + flush_pending(strm); + if (strm->avail_out == 0) { + s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */ + return Z_OK; + } + } + } + Assert(strm->avail_out > 0, "bug2"); + + if (flush != Z_FINISH) return Z_OK; + if (s->wrap <= 0) return Z_STREAM_END; + + /* Write the trailer */ + #ifdef GZIP + if (s->wrap == 2) { + put_byte(s, (Byte)(strm->adler & 0xff)); + put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); + put_byte(s, (Byte)((strm->adler >> 16) & 0xff)); + put_byte(s, (Byte)((strm->adler >> 24) & 0xff)); + put_byte(s, (Byte)(strm->total_in & 0xff)); + put_byte(s, (Byte)((strm->total_in >> 8) & 0xff)); + put_byte(s, (Byte)((strm->total_in >> 16) & 0xff)); + put_byte(s, (Byte)((strm->total_in >> 24) & 0xff)); + } + else + #endif + { + putShortMSB(s, (uInt)(strm->adler >> 16)); + putShortMSB(s, (uInt)(strm->adler & 0xffff)); + } + flush_pending(strm); + /* If avail_out is zero, the application will call deflate again + * to flush the rest. + */ + if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */ + return s->pending != 0 ? Z_OK : Z_STREAM_END; + } + + /* ========================================================================= */ + int ZEXPORT deflateEnd (strm) + z_streamp strm; + { + int status; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + + status = strm->state->status; + if (status != INIT_STATE && + status != EXTRA_STATE && + status != NAME_STATE && + status != COMMENT_STATE && + status != HCRC_STATE && + status != BUSY_STATE && + status != FINISH_STATE) { + return Z_STREAM_ERROR; + } + + /* Deallocate in reverse order of allocations: */ + TRY_FREE(strm, strm->state->pending_buf); + TRY_FREE(strm, strm->state->head); + TRY_FREE(strm, strm->state->prev); + TRY_FREE(strm, strm->state->window); + + ZFREE(strm, strm->state); + strm->state = Z_NULL; + + return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK; + } + + /* ========================================================================= + * Copy the source state to the destination state. + * To simplify the source, this is not supported for 16-bit MSDOS (which + * doesn't have enough memory anyway to duplicate compression states). + */ + int ZEXPORT deflateCopy (dest, source) + z_streamp dest; + z_streamp source; + { + #ifdef MAXSEG_64K + return Z_STREAM_ERROR; + #else + deflate_state *ds; + deflate_state *ss; + ushf *overlay; + + + if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) { + return Z_STREAM_ERROR; + } + + ss = source->state; + + zmemcpy(dest, source, sizeof(z_stream)); + + ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state)); + if (ds == Z_NULL) return Z_MEM_ERROR; + dest->state = (struct internal_state FAR *) ds; + zmemcpy(ds, ss, sizeof(deflate_state)); + ds->strm = dest; + + ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); + ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); + ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); + overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); + ds->pending_buf = (uchf *) overlay; + + if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || + ds->pending_buf == Z_NULL) { + deflateEnd (dest); + return Z_MEM_ERROR; + } + /* following zmemcpy do not work for 16-bit MSDOS */ + zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte)); + zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos)); + zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos)); + zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); + + ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); + ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); + ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; + + ds->l_desc.dyn_tree = ds->dyn_ltree; + ds->d_desc.dyn_tree = ds->dyn_dtree; + ds->bl_desc.dyn_tree = ds->bl_tree; + + return Z_OK; + #endif /* MAXSEG_64K */ + } + + /* =========================================================================== + * Read a new buffer from the current input stream, update the adler32 + * and total number of bytes read. All deflate() input goes through + * this function so some applications may wish to modify it to avoid + * allocating a large strm->next_in buffer and copying from it. + * (See also flush_pending()). + */ + local int read_buf(strm, buf, size) + z_streamp strm; + Bytef *buf; + unsigned size; + { + unsigned len = strm->avail_in; + + if (len > size) len = size; + if (len == 0) return 0; + + strm->avail_in -= len; + + if (strm->state->wrap == 1) { + strm->adler = adler32(strm->adler, strm->next_in, len); + } + #ifdef GZIP + else if (strm->state->wrap == 2) { + strm->adler = crc32(strm->adler, strm->next_in, len); + } + #endif + zmemcpy(buf, strm->next_in, len); + strm->next_in += len; + strm->total_in += len; + + return (int)len; + } + + /* =========================================================================== + * Initialize the "longest match" routines for a new zlib stream + */ + local void lm_init (s) + deflate_state *s; + { + s->window_size = (ulg)2L*s->w_size; + + CLEAR_HASH(s); + + /* Set the default configuration parameters: + */ + s->max_lazy_match = configuration_table[s->level].max_lazy; + s->good_match = configuration_table[s->level].good_length; + s->nice_match = configuration_table[s->level].nice_length; + s->max_chain_length = configuration_table[s->level].max_chain; + + s->strstart = 0; + s->block_start = 0L; + s->lookahead = 0; + s->match_length = s->prev_length = MIN_MATCH-1; + s->match_available = 0; + s->ins_h = 0; + #ifndef FASTEST + #ifdef ASMV + match_init(); /* initialize the asm code */ + #endif + #endif + } + + #ifndef FASTEST + /* =========================================================================== + * Set match_start to the longest match starting at the given string and + * return its length. Matches shorter or equal to prev_length are discarded, + * in which case the result is equal to prev_length and match_start is + * garbage. + * IN assertions: cur_match is the head of the hash chain for the current + * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1 + * OUT assertion: the match length is not greater than s->lookahead. + */ + #ifndef ASMV + /* For 80x86 and 680x0, an optimized version will be provided in match.asm or + * match.S. The code will be functionally equivalent. + */ + local uInt longest_match(s, cur_match) + deflate_state *s; + IPos cur_match; /* current match */ + { + unsigned chain_length = s->max_chain_length;/* max hash chain length */ + register Bytef *scan = s->window + s->strstart; /* current string */ + register Bytef *match; /* matched string */ + register int len; /* length of current match */ + int best_len = s->prev_length; /* best match length so far */ + int nice_match = s->nice_match; /* stop if match long enough */ + IPos limit = s->strstart > (IPos)MAX_DIST(s) ? + s->strstart - (IPos)MAX_DIST(s) : NIL; + /* Stop when cur_match becomes <= limit. To simplify the code, + * we prevent matches with the string of window index 0. + */ + Posf *prev = s->prev; + uInt wmask = s->w_mask; + + #ifdef UNALIGNED_OK + /* Compare two bytes at a time. Note: this is not always beneficial. + * Try with and without -DUNALIGNED_OK to check. + */ + register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1; + register ush scan_start = *(ushf*)scan; + register ush scan_end = *(ushf*)(scan+best_len-1); + #else + register Bytef *strend = s->window + s->strstart + MAX_MATCH; + register Byte scan_end1 = scan[best_len-1]; + register Byte scan_end = scan[best_len]; + #endif + + /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. + * It is easy to get rid of this optimization if necessary. + */ + Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); + + /* Do not waste too much time if we already have a good match: */ + if (s->prev_length >= s->good_match) { + chain_length >>= 2; + } + /* Do not look for matches beyond the end of the input. This is necessary + * to make deflate deterministic. + */ + if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; + + Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); + + do { + Assert(cur_match < s->strstart, "no future"); + match = s->window + cur_match; + + /* Skip to next match if the match length cannot increase + * or if the match length is less than 2. Note that the checks below + * for insufficient lookahead only occur occasionally for performance + * reasons. Therefore uninitialized memory will be accessed, and + * conditional jumps will be made that depend on those values. + * However the length of the match is limited to the lookahead, so + * the output of deflate is not affected by the uninitialized values. + */ + #if (defined(UNALIGNED_OK) && MAX_MATCH == 258) + /* This code assumes sizeof(unsigned short) == 2. Do not use + * UNALIGNED_OK if your compiler uses a different size. + */ + if (*(ushf*)(match+best_len-1) != scan_end || + *(ushf*)match != scan_start) continue; + + /* It is not necessary to compare scan[2] and match[2] since they are + * always equal when the other bytes match, given that the hash keys + * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at + * strstart+3, +5, ... up to strstart+257. We check for insufficient + * lookahead only every 4th comparison; the 128th check will be made + * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is + * necessary to put more guard bytes at the end of the window, or + * to check more often for insufficient lookahead. + */ + Assert(scan[2] == match[2], "scan[2]?"); + scan++, match++; + do { + } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) && + *(ushf*)(scan+=2) == *(ushf*)(match+=2) && + *(ushf*)(scan+=2) == *(ushf*)(match+=2) && + *(ushf*)(scan+=2) == *(ushf*)(match+=2) && + scan < strend); + /* The funny "do {}" generates better code on most compilers */ + + /* Here, scan <= window+strstart+257 */ + Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); + if (*scan == *match) scan++; + + len = (MAX_MATCH - 1) - (int)(strend-scan); + scan = strend - (MAX_MATCH-1); + + #else /* UNALIGNED_OK */ + + if (match[best_len] != scan_end || + match[best_len-1] != scan_end1 || + *match != *scan || + *++match != scan[1]) continue; + + /* The check at best_len-1 can be removed because it will be made + * again later. (This heuristic is not always a win.) + * It is not necessary to compare scan[2] and match[2] since they + * are always equal when the other bytes match, given that + * the hash keys are equal and that HASH_BITS >= 8. + */ + scan += 2, match++; + Assert(*scan == *match, "match[2]?"); + + /* We check for insufficient lookahead only every 8th comparison; + * the 256th check will be made at strstart+258. + */ + do { + } while (*++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + scan < strend); + + Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); + + len = MAX_MATCH - (int)(strend - scan); + scan = strend - MAX_MATCH; + + #endif /* UNALIGNED_OK */ + + if (len > best_len) { + s->match_start = cur_match; + best_len = len; + if (len >= nice_match) break; + #ifdef UNALIGNED_OK + scan_end = *(ushf*)(scan+best_len-1); + #else + scan_end1 = scan[best_len-1]; + scan_end = scan[best_len]; + #endif + } + } while ((cur_match = prev[cur_match & wmask]) > limit + && --chain_length != 0); + + if ((uInt)best_len <= s->lookahead) return (uInt)best_len; + return s->lookahead; + } + #endif /* ASMV */ + #endif /* FASTEST */ + + /* --------------------------------------------------------------------------- + * Optimized version for level == 1 or strategy == Z_RLE only + */ + local uInt longest_match_fast(s, cur_match) + deflate_state *s; + IPos cur_match; /* current match */ + { + register Bytef *scan = s->window + s->strstart; /* current string */ + register Bytef *match; /* matched string */ + register int len; /* length of current match */ + register Bytef *strend = s->window + s->strstart + MAX_MATCH; + + /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. + * It is easy to get rid of this optimization if necessary. + */ + Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); + + Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); + + Assert(cur_match < s->strstart, "no future"); + + match = s->window + cur_match; + + /* Return failure if the match length is less than 2: + */ + if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1; + + /* The check at best_len-1 can be removed because it will be made + * again later. (This heuristic is not always a win.) + * It is not necessary to compare scan[2] and match[2] since they + * are always equal when the other bytes match, given that + * the hash keys are equal and that HASH_BITS >= 8. + */ + scan += 2, match += 2; + Assert(*scan == *match, "match[2]?"); + + /* We check for insufficient lookahead only every 8th comparison; + * the 256th check will be made at strstart+258. + */ + do { + } while (*++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + scan < strend); + + Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); + + len = MAX_MATCH - (int)(strend - scan); + + if (len < MIN_MATCH) return MIN_MATCH - 1; + + s->match_start = cur_match; + return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead; + } + + #ifdef DEBUG + /* =========================================================================== + * Check that the match at match_start is indeed a match. + */ + local void check_match(s, start, match, length) + deflate_state *s; + IPos start, match; + int length; + { + /* check that the match is indeed a match */ + if (zmemcmp(s->window + match, + s->window + start, length) != EQUAL) { + fprintf(stderr, " start %u, match %u, length %d\n", + start, match, length); + do { + fprintf(stderr, "%c%c", s->window[match++], s->window[start++]); + } while (--length != 0); + z_error("invalid match"); + } + if (z_verbose > 1) { + fprintf(stderr,"\\[%d,%d]", start-match, length); + do { putc(s->window[start++], stderr); } while (--length != 0); + } + } + #else + # define check_match(s, start, match, length) + #endif /* DEBUG */ + + /* =========================================================================== + * Fill the window when the lookahead becomes insufficient. + * Updates strstart and lookahead. + * + * IN assertion: lookahead < MIN_LOOKAHEAD + * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD + * At least one byte has been read, or avail_in == 0; reads are + * performed for at least two bytes (required for the zip translate_eol + * option -- not supported here). + */ + local void fill_window(s) + deflate_state *s; + { + register unsigned n, m; + register Posf *p; + unsigned more; /* Amount of free space at the end of the window. */ + uInt wsize = s->w_size; + + do { + more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); + + /* Deal with !@#$% 64K limit: */ + if (sizeof(int) <= 2) { + if (more == 0 && s->strstart == 0 && s->lookahead == 0) { + more = wsize; + + } else if (more == (unsigned)(-1)) { + /* Very unlikely, but possible on 16 bit machine if + * strstart == 0 && lookahead == 1 (input done a byte at time) + */ + more--; + } + } + + /* If the window is almost full and there is insufficient lookahead, + * move the upper half to the lower one to make room in the upper half. + */ + if (s->strstart >= wsize+MAX_DIST(s)) { + + zmemcpy(s->window, s->window+wsize, (unsigned)wsize); + s->match_start -= wsize; + s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ + s->block_start -= (long) wsize; + + /* Slide the hash table (could be avoided with 32 bit values + at the expense of memory usage). We slide even when level == 0 + to keep the hash table consistent if we switch back to level > 0 + later. (Using level 0 permanently is not an optimal usage of + zlib, so we don't care about this pathological case.) + */ + /* %%% avoid this when Z_RLE */ + n = s->hash_size; + p = &s->head[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m-wsize : NIL); + } while (--n); + + n = wsize; + #ifndef FASTEST + p = &s->prev[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m-wsize : NIL); + /* If n is not on any hash chain, prev[n] is garbage but + * its value will never be used. + */ + } while (--n); + #endif + more += wsize; + } + if (s->strm->avail_in == 0) return; + + /* If there was no sliding: + * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && + * more == window_size - lookahead - strstart + * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1) + * => more >= window_size - 2*WSIZE + 2 + * In the BIG_MEM or MMAP case (not yet supported), + * window_size == input_size + MIN_LOOKAHEAD && + * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD. + * Otherwise, window_size == 2*WSIZE so more >= 2. + * If there was sliding, more >= WSIZE. So in all cases, more >= 2. + */ + Assert(more >= 2, "more < 2"); + + n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more); + s->lookahead += n; + + /* Initialize the hash value now that we have some input: */ + if (s->lookahead >= MIN_MATCH) { + s->ins_h = s->window[s->strstart]; + UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]); + #if MIN_MATCH != 3 + Call UPDATE_HASH() MIN_MATCH-3 more times + #endif + } + /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage, + * but this is not important since only literal bytes will be emitted. + */ + + } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); + } + + /* =========================================================================== + * Flush the current block, with given end-of-file flag. + * IN assertion: strstart is set to the end of the current match. + */ + #define FLUSH_BLOCK_ONLY(s, eof) { \ + _tr_flush_block(s, (s->block_start >= 0L ? \ + (charf *)&s->window[(unsigned)s->block_start] : \ + (charf *)Z_NULL), \ + (ulg)((long)s->strstart - s->block_start), \ + (eof)); \ + s->block_start = s->strstart; \ + flush_pending(s->strm); \ + Tracev((stderr,"[FLUSH]")); \ + } + + /* Same but force premature exit if necessary. */ + #define FLUSH_BLOCK(s, eof) { \ + FLUSH_BLOCK_ONLY(s, eof); \ + if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \ + } + + /* =========================================================================== + * Copy without compression as much as possible from the input stream, return + * the current block state. + * This function does not insert new strings in the dictionary since + * uncompressible data is probably not useful. This function is used + * only for the level=0 compression option. + * NOTE: this function should be optimized to avoid extra copying from + * window to pending_buf. + */ + local block_state deflate_stored(s, flush) + deflate_state *s; + int flush; + { + /* Stored blocks are limited to 0xffff bytes, pending_buf is limited + * to pending_buf_size, and each stored block has a 5 byte header: + */ + ulg max_block_size = 0xffff; + ulg max_start; + + if (max_block_size > s->pending_buf_size - 5) { + max_block_size = s->pending_buf_size - 5; + } + + /* Copy as much as possible from input to output: */ + for (;;) { + /* Fill the window as much as possible: */ + if (s->lookahead <= 1) { + + Assert(s->strstart < s->w_size+MAX_DIST(s) || + s->block_start >= (long)s->w_size, "slide too late"); + + fill_window(s); + if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more; + + if (s->lookahead == 0) break; /* flush the current block */ + } + Assert(s->block_start >= 0L, "block gone"); + + s->strstart += s->lookahead; + s->lookahead = 0; + + /* Emit a stored block if pending_buf will be full: */ + max_start = s->block_start + max_block_size; + if (s->strstart == 0 || (ulg)s->strstart >= max_start) { + /* strstart == 0 is possible when wraparound on 16-bit machine */ + s->lookahead = (uInt)(s->strstart - max_start); + s->strstart = (uInt)max_start; + FLUSH_BLOCK(s, 0); + } + /* Flush if we may have to slide, otherwise block_start may become + * negative and the data will be gone: + */ + if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) { + FLUSH_BLOCK(s, 0); + } + } + FLUSH_BLOCK(s, flush == Z_FINISH); + return flush == Z_FINISH ? finish_done : block_done; + } + + /* =========================================================================== + * Compress as much as possible from the input stream, return the current + * block state. + * This function does not perform lazy evaluation of matches and inserts + * new strings in the dictionary only for unmatched strings or for short + * matches. It is used only for the fast compression options. + */ + local block_state deflate_fast(s, flush) + deflate_state *s; + int flush; + { + IPos hash_head = NIL; /* head of the hash chain */ + int bflush; /* set if current block must be flushed */ + + for (;;) { + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes + * for the next match, plus MIN_MATCH bytes to insert the + * string following the next match. + */ + if (s->lookahead < MIN_LOOKAHEAD) { + fill_window(s); + if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { + return need_more; + } + if (s->lookahead == 0) break; /* flush the current block */ + } + + /* Insert the string window[strstart .. strstart+2] in the + * dictionary, and set hash_head to the head of the hash chain: + */ + if (s->lookahead >= MIN_MATCH) { + INSERT_STRING(s, s->strstart, hash_head); + } + + /* Find the longest match, discarding those <= prev_length. + * At this point we have always match_length < MIN_MATCH + */ + if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) { + /* To simplify the code, we prevent matches with the string + * of window index 0 (in particular we have to avoid a match + * of the string with itself at the start of the input file). + */ + #ifdef FASTEST + if ((s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) || + (s->strategy == Z_RLE && s->strstart - hash_head == 1)) { + s->match_length = longest_match_fast (s, hash_head); + } + #else + if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) { + s->match_length = longest_match (s, hash_head); + } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) { + s->match_length = longest_match_fast (s, hash_head); + } + #endif + /* longest_match() or longest_match_fast() sets match_start */ + } + if (s->match_length >= MIN_MATCH) { + check_match(s, s->strstart, s->match_start, s->match_length); + + _tr_tally_dist(s, s->strstart - s->match_start, + s->match_length - MIN_MATCH, bflush); + + s->lookahead -= s->match_length; + + /* Insert new strings in the hash table only if the match length + * is not too large. This saves time but degrades compression. + */ + #ifndef FASTEST + if (s->match_length <= s->max_insert_length && + s->lookahead >= MIN_MATCH) { + s->match_length--; /* string at strstart already in table */ + do { + s->strstart++; + INSERT_STRING(s, s->strstart, hash_head); + /* strstart never exceeds WSIZE-MAX_MATCH, so there are + * always MIN_MATCH bytes ahead. + */ + } while (--s->match_length != 0); + s->strstart++; + } else + #endif + { + s->strstart += s->match_length; + s->match_length = 0; + s->ins_h = s->window[s->strstart]; + UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]); + #if MIN_MATCH != 3 + Call UPDATE_HASH() MIN_MATCH-3 more times + #endif + /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not + * matter since it will be recomputed at next deflate call. + */ + } + } else { + /* No match, output a literal byte */ + Tracevv((stderr,"%c", s->window[s->strstart])); + _tr_tally_lit (s, s->window[s->strstart], bflush); + s->lookahead--; + s->strstart++; + } + if (bflush) FLUSH_BLOCK(s, 0); + } + FLUSH_BLOCK(s, flush == Z_FINISH); + return flush == Z_FINISH ? finish_done : block_done; + } + + #ifndef FASTEST + /* =========================================================================== + * Same as above, but achieves better compression. We use a lazy + * evaluation for matches: a match is finally adopted only if there is + * no better match at the next window position. + */ + local block_state deflate_slow(s, flush) + deflate_state *s; + int flush; + { + IPos hash_head = NIL; /* head of hash chain */ + int bflush; /* set if current block must be flushed */ + + /* Process the input block. */ + for (;;) { + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes + * for the next match, plus MIN_MATCH bytes to insert the + * string following the next match. + */ + if (s->lookahead < MIN_LOOKAHEAD) { + fill_window(s); + if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { + return need_more; + } + if (s->lookahead == 0) break; /* flush the current block */ + } + + /* Insert the string window[strstart .. strstart+2] in the + * dictionary, and set hash_head to the head of the hash chain: + */ + if (s->lookahead >= MIN_MATCH) { + INSERT_STRING(s, s->strstart, hash_head); + } + + /* Find the longest match, discarding those <= prev_length. + */ + s->prev_length = s->match_length, s->prev_match = s->match_start; + s->match_length = MIN_MATCH-1; + + if (hash_head != NIL && s->prev_length < s->max_lazy_match && + s->strstart - hash_head <= MAX_DIST(s)) { + /* To simplify the code, we prevent matches with the string + * of window index 0 (in particular we have to avoid a match + * of the string with itself at the start of the input file). + */ + if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) { + s->match_length = longest_match (s, hash_head); + } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) { + s->match_length = longest_match_fast (s, hash_head); + } + /* longest_match() or longest_match_fast() sets match_start */ + + if (s->match_length <= 5 && (s->strategy == Z_FILTERED + #if TOO_FAR <= 32767 + || (s->match_length == MIN_MATCH && + s->strstart - s->match_start > TOO_FAR) + #endif + )) { + + /* If prev_match is also MIN_MATCH, match_start is garbage + * but we will ignore the current match anyway. + */ + s->match_length = MIN_MATCH-1; + } + } + /* If there was a match at the previous step and the current + * match is not better, output the previous match: + */ + if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) { + uInt max_insert = s->strstart + s->lookahead - MIN_MATCH; + /* Do not insert strings in hash table beyond this. */ + + check_match(s, s->strstart-1, s->prev_match, s->prev_length); + + _tr_tally_dist(s, s->strstart -1 - s->prev_match, + s->prev_length - MIN_MATCH, bflush); + + /* Insert in hash table all strings up to the end of the match. + * strstart-1 and strstart are already inserted. If there is not + * enough lookahead, the last two strings are not inserted in + * the hash table. + */ + s->lookahead -= s->prev_length-1; + s->prev_length -= 2; + do { + if (++s->strstart <= max_insert) { + INSERT_STRING(s, s->strstart, hash_head); + } + } while (--s->prev_length != 0); + s->match_available = 0; + s->match_length = MIN_MATCH-1; + s->strstart++; + + if (bflush) FLUSH_BLOCK(s, 0); + + } else if (s->match_available) { + /* If there was no match at the previous position, output a + * single literal. If there was a match but the current match + * is longer, truncate the previous match to a single literal. + */ + Tracevv((stderr,"%c", s->window[s->strstart-1])); + _tr_tally_lit(s, s->window[s->strstart-1], bflush); + if (bflush) { + FLUSH_BLOCK_ONLY(s, 0); + } + s->strstart++; + s->lookahead--; + if (s->strm->avail_out == 0) return need_more; + } else { + /* There is no previous match to compare with, wait for + * the next step to decide. + */ + s->match_available = 1; + s->strstart++; + s->lookahead--; + } + } + Assert (flush != Z_NO_FLUSH, "no flush?"); + if (s->match_available) { + Tracevv((stderr,"%c", s->window[s->strstart-1])); + _tr_tally_lit(s, s->window[s->strstart-1], bflush); + s->match_available = 0; + } + FLUSH_BLOCK(s, flush == Z_FINISH); + return flush == Z_FINISH ? finish_done : block_done; + } + #endif /* FASTEST */ + + #if 0 + /* =========================================================================== + * For Z_RLE, simply look for runs of bytes, generate matches only of distance + * one. Do not maintain a hash table. (It will be regenerated if this run of + * deflate switches away from Z_RLE.) + */ + local block_state deflate_rle(s, flush) + deflate_state *s; + int flush; + { + int bflush; /* set if current block must be flushed */ + uInt run; /* length of run */ + uInt max; /* maximum length of run */ + uInt prev; /* byte at distance one to match */ + Bytef *scan; /* scan for end of run */ + + for (;;) { + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes + * for the longest encodable run. + */ + if (s->lookahead < MAX_MATCH) { + fill_window(s); + if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) { + return need_more; + } + if (s->lookahead == 0) break; /* flush the current block */ + } + + /* See how many times the previous byte repeats */ + run = 0; + if (s->strstart > 0) { /* if there is a previous byte, that is */ + max = s->lookahead < MAX_MATCH ? s->lookahead : MAX_MATCH; + scan = s->window + s->strstart - 1; + prev = *scan++; + do { + if (*scan++ != prev) + break; + } while (++run < max); + } + + /* Emit match if have run of MIN_MATCH or longer, else emit literal */ + if (run >= MIN_MATCH) { + check_match(s, s->strstart, s->strstart - 1, run); + _tr_tally_dist(s, 1, run - MIN_MATCH, bflush); + s->lookahead -= run; + s->strstart += run; + } else { + /* No match, output a literal byte */ + Tracevv((stderr,"%c", s->window[s->strstart])); + _tr_tally_lit (s, s->window[s->strstart], bflush); + s->lookahead--; + s->strstart++; + } + if (bflush) FLUSH_BLOCK(s, 0); + } + FLUSH_BLOCK(s, flush == Z_FINISH); + return flush == Z_FINISH ? finish_done : block_done; + } + #endif diff -Nrcpad gcc-4.4.4/zlib/deflate.h gcc-4.4.5/zlib/deflate.h *** gcc-4.4.4/zlib/deflate.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/deflate.h Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,331 ---- + /* deflate.h -- internal compression state + * Copyright (C) 1995-2004 Jean-loup Gailly + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + + /* @(#) $Id: deflate.h,v 1.1.1.2 2002/03/11 21:53:23 tromey Exp $ */ + + #ifndef DEFLATE_H + #define DEFLATE_H + + #include "zutil.h" + + /* define NO_GZIP when compiling if you want to disable gzip header and + trailer creation by deflate(). NO_GZIP would be used to avoid linking in + the crc code when it is not needed. For shared libraries, gzip encoding + should be left enabled. */ + #ifndef NO_GZIP + # define GZIP + #endif + + /* =========================================================================== + * Internal compression state. + */ + + #define LENGTH_CODES 29 + /* number of length codes, not counting the special END_BLOCK code */ + + #define LITERALS 256 + /* number of literal bytes 0..255 */ + + #define L_CODES (LITERALS+1+LENGTH_CODES) + /* number of Literal or Length codes, including the END_BLOCK code */ + + #define D_CODES 30 + /* number of distance codes */ + + #define BL_CODES 19 + /* number of codes used to transfer the bit lengths */ + + #define HEAP_SIZE (2*L_CODES+1) + /* maximum heap size */ + + #define MAX_BITS 15 + /* All codes must not exceed MAX_BITS bits */ + + #define INIT_STATE 42 + #define EXTRA_STATE 69 + #define NAME_STATE 73 + #define COMMENT_STATE 91 + #define HCRC_STATE 103 + #define BUSY_STATE 113 + #define FINISH_STATE 666 + /* Stream status */ + + + /* Data structure describing a single value and its code string. */ + typedef struct ct_data_s { + union { + ush freq; /* frequency count */ + ush code; /* bit string */ + } fc; + union { + ush dad; /* father node in Huffman tree */ + ush len; /* length of bit string */ + } dl; + } FAR ct_data; + + #define Freq fc.freq + #define Code fc.code + #define Dad dl.dad + #define Len dl.len + + typedef struct static_tree_desc_s static_tree_desc; + + typedef struct tree_desc_s { + ct_data *dyn_tree; /* the dynamic tree */ + int max_code; /* largest code with non zero frequency */ + static_tree_desc *stat_desc; /* the corresponding static tree */ + } FAR tree_desc; + + typedef ush Pos; + typedef Pos FAR Posf; + typedef unsigned IPos; + + /* A Pos is an index in the character window. We use short instead of int to + * save space in the various tables. IPos is used only for parameter passing. + */ + + typedef struct internal_state { + z_streamp strm; /* pointer back to this zlib stream */ + int status; /* as the name implies */ + Bytef *pending_buf; /* output still pending */ + ulg pending_buf_size; /* size of pending_buf */ + Bytef *pending_out; /* next pending byte to output to the stream */ + uInt pending; /* nb of bytes in the pending buffer */ + int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ + gz_headerp gzhead; /* gzip header information to write */ + uInt gzindex; /* where in extra, name, or comment */ + Byte method; /* STORED (for zip only) or DEFLATED */ + int last_flush; /* value of flush param for previous deflate call */ + + /* used by deflate.c: */ + + uInt w_size; /* LZ77 window size (32K by default) */ + uInt w_bits; /* log2(w_size) (8..16) */ + uInt w_mask; /* w_size - 1 */ + + Bytef *window; + /* Sliding window. Input bytes are read into the second half of the window, + * and move to the first half later to keep a dictionary of at least wSize + * bytes. With this organization, matches are limited to a distance of + * wSize-MAX_MATCH bytes, but this ensures that IO is always + * performed with a length multiple of the block size. Also, it limits + * the window size to 64K, which is quite useful on MSDOS. + * To do: use the user input buffer as sliding window. + */ + + ulg window_size; + /* Actual size of window: 2*wSize, except when the user input buffer + * is directly used as sliding window. + */ + + Posf *prev; + /* Link to older string with same hash index. To limit the size of this + * array to 64K, this link is maintained only for the last 32K strings. + * An index in this array is thus a window index modulo 32K. + */ + + Posf *head; /* Heads of the hash chains or NIL. */ + + uInt ins_h; /* hash index of string to be inserted */ + uInt hash_size; /* number of elements in hash table */ + uInt hash_bits; /* log2(hash_size) */ + uInt hash_mask; /* hash_size-1 */ + + uInt hash_shift; + /* Number of bits by which ins_h must be shifted at each input + * step. It must be such that after MIN_MATCH steps, the oldest + * byte no longer takes part in the hash key, that is: + * hash_shift * MIN_MATCH >= hash_bits + */ + + long block_start; + /* Window position at the beginning of the current output block. Gets + * negative when the window is moved backwards. + */ + + uInt match_length; /* length of best match */ + IPos prev_match; /* previous match */ + int match_available; /* set if previous match exists */ + uInt strstart; /* start of string to insert */ + uInt match_start; /* start of matching string */ + uInt lookahead; /* number of valid bytes ahead in window */ + + uInt prev_length; + /* Length of the best match at previous step. Matches not greater than this + * are discarded. This is used in the lazy match evaluation. + */ + + uInt max_chain_length; + /* To speed up deflation, hash chains are never searched beyond this + * length. A higher limit improves compression ratio but degrades the + * speed. + */ + + uInt max_lazy_match; + /* Attempt to find a better match only when the current match is strictly + * smaller than this value. This mechanism is used only for compression + * levels >= 4. + */ + # define max_insert_length max_lazy_match + /* Insert new strings in the hash table only if the match length is not + * greater than this length. This saves time but degrades compression. + * max_insert_length is used only for compression levels <= 3. + */ + + int level; /* compression level (1..9) */ + int strategy; /* favor or force Huffman coding*/ + + uInt good_match; + /* Use a faster search when the previous match is longer than this */ + + int nice_match; /* Stop searching when current match exceeds this */ + + /* used by trees.c: */ + /* Didn't use ct_data typedef below to supress compiler warning */ + struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ + struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ + struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ + + struct tree_desc_s l_desc; /* desc. for literal tree */ + struct tree_desc_s d_desc; /* desc. for distance tree */ + struct tree_desc_s bl_desc; /* desc. for bit length tree */ + + ush bl_count[MAX_BITS+1]; + /* number of codes at each bit length for an optimal tree */ + + int heap[2*L_CODES+1]; /* heap used to build the Huffman trees */ + int heap_len; /* number of elements in the heap */ + int heap_max; /* element of largest frequency */ + /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used. + * The same heap array is used to build all trees. + */ + + uch depth[2*L_CODES+1]; + /* Depth of each subtree used as tie breaker for trees of equal frequency + */ + + uchf *l_buf; /* buffer for literals or lengths */ + + uInt lit_bufsize; + /* Size of match buffer for literals/lengths. There are 4 reasons for + * limiting lit_bufsize to 64K: + * - frequencies can be kept in 16 bit counters + * - if compression is not successful for the first block, all input + * data is still in the window so we can still emit a stored block even + * when input comes from standard input. (This can also be done for + * all blocks if lit_bufsize is not greater than 32K.) + * - if compression is not successful for a file smaller than 64K, we can + * even emit a stored file instead of a stored block (saving 5 bytes). + * This is applicable only for zip (not gzip or zlib). + * - creating new Huffman trees less frequently may not provide fast + * adaptation to changes in the input data statistics. (Take for + * example a binary file with poorly compressible code followed by + * a highly compressible string table.) Smaller buffer sizes give + * fast adaptation but have of course the overhead of transmitting + * trees more frequently. + * - I can't count above 4 + */ + + uInt last_lit; /* running index in l_buf */ + + ushf *d_buf; + /* Buffer for distances. To simplify the code, d_buf and l_buf have + * the same number of elements. To use different lengths, an extra flag + * array would be necessary. + */ + + ulg opt_len; /* bit length of current block with optimal trees */ + ulg static_len; /* bit length of current block with static trees */ + uInt matches; /* number of string matches in current block */ + int last_eob_len; /* bit length of EOB code for last block */ + + #ifdef DEBUG + ulg compressed_len; /* total bit length of compressed file mod 2^32 */ + ulg bits_sent; /* bit length of compressed data sent mod 2^32 */ + #endif + + ush bi_buf; + /* Output buffer. bits are inserted starting at the bottom (least + * significant bits). + */ + int bi_valid; + /* Number of valid bits in bi_buf. All bits above the last valid bit + * are always zero. + */ + + } FAR deflate_state; + + /* Output a byte on the stream. + * IN assertion: there is enough room in pending_buf. + */ + #define put_byte(s, c) {s->pending_buf[s->pending++] = (c);} + + + #define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) + /* Minimum amount of lookahead, except at the end of the input file. + * See deflate.c for comments about the MIN_MATCH+1. + */ + + #define MAX_DIST(s) ((s)->w_size-MIN_LOOKAHEAD) + /* In order to simplify the code, particularly on 16 bit machines, match + * distances are limited to MAX_DIST instead of WSIZE. + */ + + /* in trees.c */ + void _tr_init OF((deflate_state *s)); + int _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); + void _tr_flush_block OF((deflate_state *s, charf *buf, ulg stored_len, + int eof)); + void _tr_align OF((deflate_state *s)); + void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len, + int eof)); + + #define d_code(dist) \ + ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)]) + /* Mapping from a distance to a distance code. dist is the distance - 1 and + * must not have side effects. _dist_code[256] and _dist_code[257] are never + * used. + */ + + #ifndef DEBUG + /* Inline versions of _tr_tally for speed: */ + + #if defined(GEN_TREES_H) || !defined(STDC) + extern uch _length_code[]; + extern uch _dist_code[]; + #else + extern const uch _length_code[]; + extern const uch _dist_code[]; + #endif + + # define _tr_tally_lit(s, c, flush) \ + { uch cc = (c); \ + s->d_buf[s->last_lit] = 0; \ + s->l_buf[s->last_lit++] = cc; \ + s->dyn_ltree[cc].Freq++; \ + flush = (s->last_lit == s->lit_bufsize-1); \ + } + # define _tr_tally_dist(s, distance, length, flush) \ + { uch len = (length); \ + ush dist = (distance); \ + s->d_buf[s->last_lit] = dist; \ + s->l_buf[s->last_lit++] = len; \ + dist--; \ + s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ + s->dyn_dtree[d_code(dist)].Freq++; \ + flush = (s->last_lit == s->lit_bufsize-1); \ + } + #else + # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) + # define _tr_tally_dist(s, distance, length, flush) \ + flush = _tr_tally(s, distance, length) + #endif + + #endif /* DEFLATE_H */ diff -Nrcpad gcc-4.4.4/zlib/example.c gcc-4.4.5/zlib/example.c *** gcc-4.4.4/zlib/example.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/example.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,565 ---- + /* example.c -- usage example of the zlib compression library + * Copyright (C) 1995-2004 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* @(#) $Id: example.c,v 1.1.1.2 2002/03/11 21:53:23 tromey Exp $ */ + + #include + #include "zlib.h" + + #ifdef STDC + # include + # include + #endif + + #if defined(VMS) || defined(RISCOS) + # define TESTFILE "foo-gz" + #else + # define TESTFILE "foo.gz" + #endif + + #define CHECK_ERR(err, msg) { \ + if (err != Z_OK) { \ + fprintf(stderr, "%s error: %d\n", msg, err); \ + exit(1); \ + } \ + } + + const char hello[] = "hello, hello!"; + /* "hello world" would be more standard, but the repeated "hello" + * stresses the compression code better, sorry... + */ + + const char dictionary[] = "hello"; + uLong dictId; /* Adler32 value of the dictionary */ + + void test_compress OF((Byte *compr, uLong comprLen, + Byte *uncompr, uLong uncomprLen)); + void test_gzio OF((const char *fname, + Byte *uncompr, uLong uncomprLen)); + void test_deflate OF((Byte *compr, uLong comprLen)); + void test_inflate OF((Byte *compr, uLong comprLen, + Byte *uncompr, uLong uncomprLen)); + void test_large_deflate OF((Byte *compr, uLong comprLen, + Byte *uncompr, uLong uncomprLen)); + void test_large_inflate OF((Byte *compr, uLong comprLen, + Byte *uncompr, uLong uncomprLen)); + void test_flush OF((Byte *compr, uLong *comprLen)); + void test_sync OF((Byte *compr, uLong comprLen, + Byte *uncompr, uLong uncomprLen)); + void test_dict_deflate OF((Byte *compr, uLong comprLen)); + void test_dict_inflate OF((Byte *compr, uLong comprLen, + Byte *uncompr, uLong uncomprLen)); + int main OF((int argc, char *argv[])); + + /* =========================================================================== + * Test compress() and uncompress() + */ + void test_compress(compr, comprLen, uncompr, uncomprLen) + Byte *compr, *uncompr; + uLong comprLen, uncomprLen; + { + int err; + uLong len = (uLong)strlen(hello)+1; + + err = compress(compr, &comprLen, (const Bytef*)hello, len); + CHECK_ERR(err, "compress"); + + strcpy((char*)uncompr, "garbage"); + + err = uncompress(uncompr, &uncomprLen, compr, comprLen); + CHECK_ERR(err, "uncompress"); + + if (strcmp((char*)uncompr, hello)) { + fprintf(stderr, "bad uncompress\n"); + exit(1); + } else { + printf("uncompress(): %s\n", (char *)uncompr); + } + } + + /* =========================================================================== + * Test read/write of .gz files + */ + void test_gzio(fname, uncompr, uncomprLen) + const char *fname; /* compressed file name */ + Byte *uncompr; + uLong uncomprLen; + { + #ifdef NO_GZCOMPRESS + fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n"); + #else + int err; + int len = (int)strlen(hello)+1; + gzFile file; + z_off_t pos; + + file = gzopen(fname, "wb"); + if (file == NULL) { + fprintf(stderr, "gzopen error\n"); + exit(1); + } + gzputc(file, 'h'); + if (gzputs(file, "ello") != 4) { + fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err)); + exit(1); + } + if (gzprintf(file, ", %s!", "hello") != 8) { + fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err)); + exit(1); + } + gzseek(file, 1L, SEEK_CUR); /* add one zero byte */ + gzclose(file); + + file = gzopen(fname, "rb"); + if (file == NULL) { + fprintf(stderr, "gzopen error\n"); + exit(1); + } + strcpy((char*)uncompr, "garbage"); + + if (gzread(file, uncompr, (unsigned)uncomprLen) != len) { + fprintf(stderr, "gzread err: %s\n", gzerror(file, &err)); + exit(1); + } + if (strcmp((char*)uncompr, hello)) { + fprintf(stderr, "bad gzread: %s\n", (char*)uncompr); + exit(1); + } else { + printf("gzread(): %s\n", (char*)uncompr); + } + + pos = gzseek(file, -8L, SEEK_CUR); + if (pos != 6 || gztell(file) != pos) { + fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n", + (long)pos, (long)gztell(file)); + exit(1); + } + + if (gzgetc(file) != ' ') { + fprintf(stderr, "gzgetc error\n"); + exit(1); + } + + if (gzungetc(' ', file) != ' ') { + fprintf(stderr, "gzungetc error\n"); + exit(1); + } + + gzgets(file, (char*)uncompr, (int)uncomprLen); + if (strlen((char*)uncompr) != 7) { /* " hello!" */ + fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err)); + exit(1); + } + if (strcmp((char*)uncompr, hello + 6)) { + fprintf(stderr, "bad gzgets after gzseek\n"); + exit(1); + } else { + printf("gzgets() after gzseek: %s\n", (char*)uncompr); + } + + gzclose(file); + #endif + } + + /* =========================================================================== + * Test deflate() with small buffers + */ + void test_deflate(compr, comprLen) + Byte *compr; + uLong comprLen; + { + z_stream c_stream; /* compression stream */ + int err; + uLong len = (uLong)strlen(hello)+1; + + c_stream.zalloc = (alloc_func)0; + c_stream.zfree = (free_func)0; + c_stream.opaque = (voidpf)0; + + err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION); + CHECK_ERR(err, "deflateInit"); + + c_stream.next_in = (Bytef*)hello; + c_stream.next_out = compr; + + while (c_stream.total_in != len && c_stream.total_out < comprLen) { + c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */ + err = deflate(&c_stream, Z_NO_FLUSH); + CHECK_ERR(err, "deflate"); + } + /* Finish the stream, still forcing small buffers: */ + for (;;) { + c_stream.avail_out = 1; + err = deflate(&c_stream, Z_FINISH); + if (err == Z_STREAM_END) break; + CHECK_ERR(err, "deflate"); + } + + err = deflateEnd(&c_stream); + CHECK_ERR(err, "deflateEnd"); + } + + /* =========================================================================== + * Test inflate() with small buffers + */ + void test_inflate(compr, comprLen, uncompr, uncomprLen) + Byte *compr, *uncompr; + uLong comprLen, uncomprLen; + { + int err; + z_stream d_stream; /* decompression stream */ + + strcpy((char*)uncompr, "garbage"); + + d_stream.zalloc = (alloc_func)0; + d_stream.zfree = (free_func)0; + d_stream.opaque = (voidpf)0; + + d_stream.next_in = compr; + d_stream.avail_in = 0; + d_stream.next_out = uncompr; + + err = inflateInit(&d_stream); + CHECK_ERR(err, "inflateInit"); + + while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) { + d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */ + err = inflate(&d_stream, Z_NO_FLUSH); + if (err == Z_STREAM_END) break; + CHECK_ERR(err, "inflate"); + } + + err = inflateEnd(&d_stream); + CHECK_ERR(err, "inflateEnd"); + + if (strcmp((char*)uncompr, hello)) { + fprintf(stderr, "bad inflate\n"); + exit(1); + } else { + printf("inflate(): %s\n", (char *)uncompr); + } + } + + /* =========================================================================== + * Test deflate() with large buffers and dynamic change of compression level + */ + void test_large_deflate(compr, comprLen, uncompr, uncomprLen) + Byte *compr, *uncompr; + uLong comprLen, uncomprLen; + { + z_stream c_stream; /* compression stream */ + int err; + + c_stream.zalloc = (alloc_func)0; + c_stream.zfree = (free_func)0; + c_stream.opaque = (voidpf)0; + + err = deflateInit(&c_stream, Z_BEST_SPEED); + CHECK_ERR(err, "deflateInit"); + + c_stream.next_out = compr; + c_stream.avail_out = (uInt)comprLen; + + /* At this point, uncompr is still mostly zeroes, so it should compress + * very well: + */ + c_stream.next_in = uncompr; + c_stream.avail_in = (uInt)uncomprLen; + err = deflate(&c_stream, Z_NO_FLUSH); + CHECK_ERR(err, "deflate"); + if (c_stream.avail_in != 0) { + fprintf(stderr, "deflate not greedy\n"); + exit(1); + } + + /* Feed in already compressed data and switch to no compression: */ + deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY); + c_stream.next_in = compr; + c_stream.avail_in = (uInt)comprLen/2; + err = deflate(&c_stream, Z_NO_FLUSH); + CHECK_ERR(err, "deflate"); + + /* Switch back to compressing mode: */ + deflateParams(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED); + c_stream.next_in = uncompr; + c_stream.avail_in = (uInt)uncomprLen; + err = deflate(&c_stream, Z_NO_FLUSH); + CHECK_ERR(err, "deflate"); + + err = deflate(&c_stream, Z_FINISH); + if (err != Z_STREAM_END) { + fprintf(stderr, "deflate should report Z_STREAM_END\n"); + exit(1); + } + err = deflateEnd(&c_stream); + CHECK_ERR(err, "deflateEnd"); + } + + /* =========================================================================== + * Test inflate() with large buffers + */ + void test_large_inflate(compr, comprLen, uncompr, uncomprLen) + Byte *compr, *uncompr; + uLong comprLen, uncomprLen; + { + int err; + z_stream d_stream; /* decompression stream */ + + strcpy((char*)uncompr, "garbage"); + + d_stream.zalloc = (alloc_func)0; + d_stream.zfree = (free_func)0; + d_stream.opaque = (voidpf)0; + + d_stream.next_in = compr; + d_stream.avail_in = (uInt)comprLen; + + err = inflateInit(&d_stream); + CHECK_ERR(err, "inflateInit"); + + for (;;) { + d_stream.next_out = uncompr; /* discard the output */ + d_stream.avail_out = (uInt)uncomprLen; + err = inflate(&d_stream, Z_NO_FLUSH); + if (err == Z_STREAM_END) break; + CHECK_ERR(err, "large inflate"); + } + + err = inflateEnd(&d_stream); + CHECK_ERR(err, "inflateEnd"); + + if (d_stream.total_out != 2*uncomprLen + comprLen/2) { + fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out); + exit(1); + } else { + printf("large_inflate(): OK\n"); + } + } + + /* =========================================================================== + * Test deflate() with full flush + */ + void test_flush(compr, comprLen) + Byte *compr; + uLong *comprLen; + { + z_stream c_stream; /* compression stream */ + int err; + uInt len = (uInt)strlen(hello)+1; + + c_stream.zalloc = (alloc_func)0; + c_stream.zfree = (free_func)0; + c_stream.opaque = (voidpf)0; + + err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION); + CHECK_ERR(err, "deflateInit"); + + c_stream.next_in = (Bytef*)hello; + c_stream.next_out = compr; + c_stream.avail_in = 3; + c_stream.avail_out = (uInt)*comprLen; + err = deflate(&c_stream, Z_FULL_FLUSH); + CHECK_ERR(err, "deflate"); + + compr[3]++; /* force an error in first compressed block */ + c_stream.avail_in = len - 3; + + err = deflate(&c_stream, Z_FINISH); + if (err != Z_STREAM_END) { + CHECK_ERR(err, "deflate"); + } + err = deflateEnd(&c_stream); + CHECK_ERR(err, "deflateEnd"); + + *comprLen = c_stream.total_out; + } + + /* =========================================================================== + * Test inflateSync() + */ + void test_sync(compr, comprLen, uncompr, uncomprLen) + Byte *compr, *uncompr; + uLong comprLen, uncomprLen; + { + int err; + z_stream d_stream; /* decompression stream */ + + strcpy((char*)uncompr, "garbage"); + + d_stream.zalloc = (alloc_func)0; + d_stream.zfree = (free_func)0; + d_stream.opaque = (voidpf)0; + + d_stream.next_in = compr; + d_stream.avail_in = 2; /* just read the zlib header */ + + err = inflateInit(&d_stream); + CHECK_ERR(err, "inflateInit"); + + d_stream.next_out = uncompr; + d_stream.avail_out = (uInt)uncomprLen; + + inflate(&d_stream, Z_NO_FLUSH); + CHECK_ERR(err, "inflate"); + + d_stream.avail_in = (uInt)comprLen-2; /* read all compressed data */ + err = inflateSync(&d_stream); /* but skip the damaged part */ + CHECK_ERR(err, "inflateSync"); + + err = inflate(&d_stream, Z_FINISH); + if (err != Z_DATA_ERROR) { + fprintf(stderr, "inflate should report DATA_ERROR\n"); + /* Because of incorrect adler32 */ + exit(1); + } + err = inflateEnd(&d_stream); + CHECK_ERR(err, "inflateEnd"); + + printf("after inflateSync(): hel%s\n", (char *)uncompr); + } + + /* =========================================================================== + * Test deflate() with preset dictionary + */ + void test_dict_deflate(compr, comprLen) + Byte *compr; + uLong comprLen; + { + z_stream c_stream; /* compression stream */ + int err; + + c_stream.zalloc = (alloc_func)0; + c_stream.zfree = (free_func)0; + c_stream.opaque = (voidpf)0; + + err = deflateInit(&c_stream, Z_BEST_COMPRESSION); + CHECK_ERR(err, "deflateInit"); + + err = deflateSetDictionary(&c_stream, + (const Bytef*)dictionary, sizeof(dictionary)); + CHECK_ERR(err, "deflateSetDictionary"); + + dictId = c_stream.adler; + c_stream.next_out = compr; + c_stream.avail_out = (uInt)comprLen; + + c_stream.next_in = (Bytef*)hello; + c_stream.avail_in = (uInt)strlen(hello)+1; + + err = deflate(&c_stream, Z_FINISH); + if (err != Z_STREAM_END) { + fprintf(stderr, "deflate should report Z_STREAM_END\n"); + exit(1); + } + err = deflateEnd(&c_stream); + CHECK_ERR(err, "deflateEnd"); + } + + /* =========================================================================== + * Test inflate() with a preset dictionary + */ + void test_dict_inflate(compr, comprLen, uncompr, uncomprLen) + Byte *compr, *uncompr; + uLong comprLen, uncomprLen; + { + int err; + z_stream d_stream; /* decompression stream */ + + strcpy((char*)uncompr, "garbage"); + + d_stream.zalloc = (alloc_func)0; + d_stream.zfree = (free_func)0; + d_stream.opaque = (voidpf)0; + + d_stream.next_in = compr; + d_stream.avail_in = (uInt)comprLen; + + err = inflateInit(&d_stream); + CHECK_ERR(err, "inflateInit"); + + d_stream.next_out = uncompr; + d_stream.avail_out = (uInt)uncomprLen; + + for (;;) { + err = inflate(&d_stream, Z_NO_FLUSH); + if (err == Z_STREAM_END) break; + if (err == Z_NEED_DICT) { + if (d_stream.adler != dictId) { + fprintf(stderr, "unexpected dictionary"); + exit(1); + } + err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary, + sizeof(dictionary)); + } + CHECK_ERR(err, "inflate with dict"); + } + + err = inflateEnd(&d_stream); + CHECK_ERR(err, "inflateEnd"); + + if (strcmp((char*)uncompr, hello)) { + fprintf(stderr, "bad inflate with dict\n"); + exit(1); + } else { + printf("inflate with dictionary: %s\n", (char *)uncompr); + } + } + + /* =========================================================================== + * Usage: example [output.gz [input.gz]] + */ + + int main(argc, argv) + int argc; + char *argv[]; + { + Byte *compr, *uncompr; + uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */ + uLong uncomprLen = comprLen; + static const char* myVersion = ZLIB_VERSION; + + if (zlibVersion()[0] != myVersion[0]) { + fprintf(stderr, "incompatible zlib version\n"); + exit(1); + + } else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) { + fprintf(stderr, "warning: different zlib version\n"); + } + + printf("zlib version %s = 0x%04x, compile flags = 0x%lx\n", + ZLIB_VERSION, ZLIB_VERNUM, zlibCompileFlags()); + + compr = (Byte*)calloc((uInt)comprLen, 1); + uncompr = (Byte*)calloc((uInt)uncomprLen, 1); + /* compr and uncompr are cleared to avoid reading uninitialized + * data and to ensure that uncompr compresses well. + */ + if (compr == Z_NULL || uncompr == Z_NULL) { + printf("out of memory\n"); + exit(1); + } + test_compress(compr, comprLen, uncompr, uncomprLen); + + test_gzio((argc > 1 ? argv[1] : TESTFILE), + uncompr, uncomprLen); + + test_deflate(compr, comprLen); + test_inflate(compr, comprLen, uncompr, uncomprLen); + + test_large_deflate(compr, comprLen, uncompr, uncomprLen); + test_large_inflate(compr, comprLen, uncompr, uncomprLen); + + test_flush(compr, &comprLen); + test_sync(compr, comprLen, uncompr, uncomprLen); + comprLen = uncomprLen; + + test_dict_deflate(compr, comprLen); + test_dict_inflate(compr, comprLen, uncompr, uncomprLen); + + free(compr); + free(uncompr); + + return 0; + } diff -Nrcpad gcc-4.4.4/zlib/examples/README.examples gcc-4.4.5/zlib/examples/README.examples *** gcc-4.4.4/zlib/examples/README.examples Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/examples/README.examples Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,42 ---- + This directory contains examples of the use of zlib. + + fitblk.c + compress just enough input to nearly fill a requested output size + - zlib isn't designed to do this, but fitblk does it anyway + + gun.c + uncompress a gzip file + - illustrates the use of inflateBack() for high speed file-to-file + decompression using call-back functions + - is approximately twice as fast as gzip -d + - also provides Unix uncompress functionality, again twice as fast + + gzappend.c + append to a gzip file + - illustrates the use of the Z_BLOCK flush parameter for inflate() + - illustrates the use of deflatePrime() to start at any bit + + gzjoin.c + join gzip files without recalculating the crc or recompressing + - illustrates the use of the Z_BLOCK flush parameter for inflate() + - illustrates the use of crc32_combine() + + gzlog.c + gzlog.h + efficiently maintain a message log file in gzip format + - illustrates use of raw deflate and Z_SYNC_FLUSH + - illustrates use of gzip header extra field + + zlib_how.html + painfully comprehensive description of zpipe.c (see below) + - describes in excruciating detail the use of deflate() and inflate() + + zpipe.c + reads and writes zlib streams from stdin to stdout + - illustrates the proper use of deflate() and inflate() + - deeply commented in zlib_how.html (see above) + + zran.c + index a zlib or gzip stream and randomly access it + - illustrates the use of Z_BLOCK, inflatePrime(), and + inflateSetDictionary() to provide random access diff -Nrcpad gcc-4.4.4/zlib/examples/fitblk.c gcc-4.4.5/zlib/examples/fitblk.c *** gcc-4.4.4/zlib/examples/fitblk.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/examples/fitblk.c Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,233 ---- + /* fitblk.c: example of fitting compressed output to a specified size + Not copyrighted -- provided to the public domain + Version 1.1 25 November 2004 Mark Adler */ + + /* Version history: + 1.0 24 Nov 2004 First version + 1.1 25 Nov 2004 Change deflateInit2() to deflateInit() + Use fixed-size, stack-allocated raw buffers + Simplify code moving compression to subroutines + Use assert() for internal errors + Add detailed description of approach + */ + + /* Approach to just fitting a requested compressed size: + + fitblk performs three compression passes on a portion of the input + data in order to determine how much of that input will compress to + nearly the requested output block size. The first pass generates + enough deflate blocks to produce output to fill the requested + output size plus a specfied excess amount (see the EXCESS define + below). The last deflate block may go quite a bit past that, but + is discarded. The second pass decompresses and recompresses just + the compressed data that fit in the requested plus excess sized + buffer. The deflate process is terminated after that amount of + input, which is less than the amount consumed on the first pass. + The last deflate block of the result will be of a comparable size + to the final product, so that the header for that deflate block and + the compression ratio for that block will be about the same as in + the final product. The third compression pass decompresses the + result of the second step, but only the compressed data up to the + requested size minus an amount to allow the compressed stream to + complete (see the MARGIN define below). That will result in a + final compressed stream whose length is less than or equal to the + requested size. Assuming sufficient input and a requested size + greater than a few hundred bytes, the shortfall will typically be + less than ten bytes. + + If the input is short enough that the first compression completes + before filling the requested output size, then that compressed + stream is return with no recompression. + + EXCESS is chosen to be just greater than the shortfall seen in a + two pass approach similar to the above. That shortfall is due to + the last deflate block compressing more efficiently with a smaller + header on the second pass. EXCESS is set to be large enough so + that there is enough uncompressed data for the second pass to fill + out the requested size, and small enough so that the final deflate + block of the second pass will be close in size to the final deflate + block of the third and final pass. MARGIN is chosen to be just + large enough to assure that the final compression has enough room + to complete in all cases. + */ + + #include + #include + #include + #include "zlib.h" + + #define local static + + /* print nastygram and leave */ + local void quit(char *why) + { + fprintf(stderr, "fitblk abort: %s\n", why); + exit(1); + } + + #define RAWLEN 4096 /* intermediate uncompressed buffer size */ + + /* compress from file to def until provided buffer is full or end of + input reached; return last deflate() return value, or Z_ERRNO if + there was read error on the file */ + local int partcompress(FILE *in, z_streamp def) + { + int ret, flush; + unsigned char raw[RAWLEN]; + + flush = Z_NO_FLUSH; + do { + def->avail_in = fread(raw, 1, RAWLEN, in); + if (ferror(in)) + return Z_ERRNO; + def->next_in = raw; + if (feof(in)) + flush = Z_FINISH; + ret = deflate(def, flush); + assert(ret != Z_STREAM_ERROR); + } while (def->avail_out != 0 && flush == Z_NO_FLUSH); + return ret; + } + + /* recompress from inf's input to def's output; the input for inf and + the output for def are set in those structures before calling; + return last deflate() return value, or Z_MEM_ERROR if inflate() + was not able to allocate enough memory when it needed to */ + local int recompress(z_streamp inf, z_streamp def) + { + int ret, flush; + unsigned char raw[RAWLEN]; + + flush = Z_NO_FLUSH; + do { + /* decompress */ + inf->avail_out = RAWLEN; + inf->next_out = raw; + ret = inflate(inf, Z_NO_FLUSH); + assert(ret != Z_STREAM_ERROR && ret != Z_DATA_ERROR && + ret != Z_NEED_DICT); + if (ret == Z_MEM_ERROR) + return ret; + + /* compress what was decompresed until done or no room */ + def->avail_in = RAWLEN - inf->avail_out; + def->next_in = raw; + if (inf->avail_out != 0) + flush = Z_FINISH; + ret = deflate(def, flush); + assert(ret != Z_STREAM_ERROR); + } while (ret != Z_STREAM_END && def->avail_out != 0); + return ret; + } + + #define EXCESS 256 /* empirically determined stream overage */ + #define MARGIN 8 /* amount to back off for completion */ + + /* compress from stdin to fixed-size block on stdout */ + int main(int argc, char **argv) + { + int ret; /* return code */ + unsigned size; /* requested fixed output block size */ + unsigned have; /* bytes written by deflate() call */ + unsigned char *blk; /* intermediate and final stream */ + unsigned char *tmp; /* close to desired size stream */ + z_stream def, inf; /* zlib deflate and inflate states */ + + /* get requested output size */ + if (argc != 2) + quit("need one argument: size of output block"); + ret = strtol(argv[1], argv + 1, 10); + if (argv[1][0] != 0) + quit("argument must be a number"); + if (ret < 8) /* 8 is minimum zlib stream size */ + quit("need positive size of 8 or greater"); + size = (unsigned)ret; + + /* allocate memory for buffers and compression engine */ + blk = malloc(size + EXCESS); + def.zalloc = Z_NULL; + def.zfree = Z_NULL; + def.opaque = Z_NULL; + ret = deflateInit(&def, Z_DEFAULT_COMPRESSION); + if (ret != Z_OK || blk == NULL) + quit("out of memory"); + + /* compress from stdin until output full, or no more input */ + def.avail_out = size + EXCESS; + def.next_out = blk; + ret = partcompress(stdin, &def); + if (ret == Z_ERRNO) + quit("error reading input"); + + /* if it all fit, then size was undersubscribed -- done! */ + if (ret == Z_STREAM_END && def.avail_out >= EXCESS) { + /* write block to stdout */ + have = size + EXCESS - def.avail_out; + if (fwrite(blk, 1, have, stdout) != have || ferror(stdout)) + quit("error writing output"); + + /* clean up and print results to stderr */ + ret = deflateEnd(&def); + assert(ret != Z_STREAM_ERROR); + free(blk); + fprintf(stderr, + "%u bytes unused out of %u requested (all input)\n", + size - have, size); + return 0; + } + + /* it didn't all fit -- set up for recompression */ + inf.zalloc = Z_NULL; + inf.zfree = Z_NULL; + inf.opaque = Z_NULL; + inf.avail_in = 0; + inf.next_in = Z_NULL; + ret = inflateInit(&inf); + tmp = malloc(size + EXCESS); + if (ret != Z_OK || tmp == NULL) + quit("out of memory"); + ret = deflateReset(&def); + assert(ret != Z_STREAM_ERROR); + + /* do first recompression close to the right amount */ + inf.avail_in = size + EXCESS; + inf.next_in = blk; + def.avail_out = size + EXCESS; + def.next_out = tmp; + ret = recompress(&inf, &def); + if (ret == Z_MEM_ERROR) + quit("out of memory"); + + /* set up for next reocmpression */ + ret = inflateReset(&inf); + assert(ret != Z_STREAM_ERROR); + ret = deflateReset(&def); + assert(ret != Z_STREAM_ERROR); + + /* do second and final recompression (third compression) */ + inf.avail_in = size - MARGIN; /* assure stream will complete */ + inf.next_in = tmp; + def.avail_out = size; + def.next_out = blk; + ret = recompress(&inf, &def); + if (ret == Z_MEM_ERROR) + quit("out of memory"); + assert(ret == Z_STREAM_END); /* otherwise MARGIN too small */ + + /* done -- write block to stdout */ + have = size - def.avail_out; + if (fwrite(blk, 1, have, stdout) != have || ferror(stdout)) + quit("error writing output"); + + /* clean up and print results to stderr */ + free(tmp); + ret = inflateEnd(&inf); + assert(ret != Z_STREAM_ERROR); + ret = deflateEnd(&def); + assert(ret != Z_STREAM_ERROR); + free(blk); + fprintf(stderr, + "%u bytes unused out of %u requested (%lu input)\n", + size - have, size, def.total_in); + return 0; + } diff -Nrcpad gcc-4.4.4/zlib/examples/gun.c gcc-4.4.5/zlib/examples/gun.c *** gcc-4.4.4/zlib/examples/gun.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/examples/gun.c Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,693 ---- + /* gun.c -- simple gunzip to give an example of the use of inflateBack() + * Copyright (C) 2003, 2005 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + Version 1.3 12 June 2005 Mark Adler */ + + /* Version history: + 1.0 16 Feb 2003 First version for testing of inflateBack() + 1.1 21 Feb 2005 Decompress concatenated gzip streams + Remove use of "this" variable (C++ keyword) + Fix return value for in() + Improve allocation failure checking + Add typecasting for void * structures + Add -h option for command version and usage + Add a bunch of comments + 1.2 20 Mar 2005 Add Unix compress (LZW) decompression + Copy file attributes from input file to output file + 1.3 12 Jun 2005 Add casts for error messages [Oberhumer] + */ + + /* + gun [ -t ] [ name ... ] + + decompresses the data in the named gzip files. If no arguments are given, + gun will decompress from stdin to stdout. The names must end in .gz, -gz, + .z, -z, _z, or .Z. The uncompressed data will be written to a file name + with the suffix stripped. On success, the original file is deleted. On + failure, the output file is deleted. For most failures, the command will + continue to process the remaining names on the command line. A memory + allocation failure will abort the command. If -t is specified, then the + listed files or stdin will be tested as gzip files for integrity (without + checking for a proper suffix), no output will be written, and no files + will be deleted. + + Like gzip, gun allows concatenated gzip streams and will decompress them, + writing all of the uncompressed data to the output. Unlike gzip, gun allows + an empty file on input, and will produce no error writing an empty output + file. + + gun will also decompress files made by Unix compress, which uses LZW + compression. These files are automatically detected by virtue of their + magic header bytes. Since the end of Unix compress stream is marked by the + end-of-file, they cannot be concantenated. If a Unix compress stream is + encountered in an input file, it is the last stream in that file. + + Like gunzip and uncompress, the file attributes of the orignal compressed + file are maintained in the final uncompressed file, to the extent that the + user permissions allow it. + + On my Mac OS X PowerPC G4, gun is almost twice as fast as gunzip (version + 1.2.4) is on the same file, when gun is linked with zlib 1.2.2. Also the + LZW decompression provided by gun is about twice as fast as the standard + Unix uncompress command. + */ + + /* external functions and related types and constants */ + #include /* fprintf() */ + #include /* malloc(), free() */ + #include /* strerror(), strcmp(), strlen(), memcpy() */ + #include /* errno */ + #include /* open() */ + #include /* read(), write(), close(), chown(), unlink() */ + #include + #include /* stat(), chmod() */ + #include /* utime() */ + #include "zlib.h" /* inflateBackInit(), inflateBack(), */ + /* inflateBackEnd(), crc32() */ + + /* function declaration */ + #define local static + + /* buffer constants */ + #define SIZE 32768U /* input and output buffer sizes */ + #define PIECE 16384 /* limits i/o chunks for 16-bit int case */ + + /* structure for infback() to pass to input function in() -- it maintains the + input file and a buffer of size SIZE */ + struct ind { + int infile; + unsigned char *inbuf; + }; + + /* Load input buffer, assumed to be empty, and return bytes loaded and a + pointer to them. read() is called until the buffer is full, or until it + returns end-of-file or error. Return 0 on error. */ + local unsigned in(void *in_desc, unsigned char **buf) + { + int ret; + unsigned len; + unsigned char *next; + struct ind *me = (struct ind *)in_desc; + + next = me->inbuf; + *buf = next; + len = 0; + do { + ret = PIECE; + if ((unsigned)ret > SIZE - len) + ret = (int)(SIZE - len); + ret = (int)read(me->infile, next, ret); + if (ret == -1) { + len = 0; + break; + } + next += ret; + len += ret; + } while (ret != 0 && len < SIZE); + return len; + } + + /* structure for infback() to pass to output function out() -- it maintains the + output file, a running CRC-32 check on the output and the total number of + bytes output, both for checking against the gzip trailer. (The length in + the gzip trailer is stored modulo 2^32, so it's ok if a long is 32 bits and + the output is greater than 4 GB.) */ + struct outd { + int outfile; + int check; /* true if checking crc and total */ + unsigned long crc; + unsigned long total; + }; + + /* Write output buffer and update the CRC-32 and total bytes written. write() + is called until all of the output is written or an error is encountered. + On success out() returns 0. For a write failure, out() returns 1. If the + output file descriptor is -1, then nothing is written. + */ + local int out(void *out_desc, unsigned char *buf, unsigned len) + { + int ret; + struct outd *me = (struct outd *)out_desc; + + if (me->check) { + me->crc = crc32(me->crc, buf, len); + me->total += len; + } + if (me->outfile != -1) + do { + ret = PIECE; + if ((unsigned)ret > len) + ret = (int)len; + ret = (int)write(me->outfile, buf, ret); + if (ret == -1) + return 1; + buf += ret; + len -= ret; + } while (len != 0); + return 0; + } + + /* next input byte macro for use inside lunpipe() and gunpipe() */ + #define NEXT() (have ? 0 : (have = in(indp, &next)), \ + last = have ? (have--, (int)(*next++)) : -1) + + /* memory for gunpipe() and lunpipe() -- + the first 256 entries of prefix[] and suffix[] are never used, could + have offset the index, but it's faster to waste the memory */ + unsigned char inbuf[SIZE]; /* input buffer */ + unsigned char outbuf[SIZE]; /* output buffer */ + unsigned short prefix[65536]; /* index to LZW prefix string */ + unsigned char suffix[65536]; /* one-character LZW suffix */ + unsigned char match[65280 + 2]; /* buffer for reversed match or gzip + 32K sliding window */ + + /* throw out what's left in the current bits byte buffer (this is a vestigial + aspect of the compressed data format derived from an implementation that + made use of a special VAX machine instruction!) */ + #define FLUSHCODE() \ + do { \ + left = 0; \ + rem = 0; \ + if (chunk > have) { \ + chunk -= have; \ + have = 0; \ + if (NEXT() == -1) \ + break; \ + chunk--; \ + if (chunk > have) { \ + chunk = have = 0; \ + break; \ + } \ + } \ + have -= chunk; \ + next += chunk; \ + chunk = 0; \ + } while (0) + + /* Decompress a compress (LZW) file from indp to outfile. The compress magic + header (two bytes) has already been read and verified. There are have bytes + of buffered input at next. strm is used for passing error information back + to gunpipe(). + + lunpipe() will return Z_OK on success, Z_BUF_ERROR for an unexpected end of + file, read error, or write error (a write error indicated by strm->next_in + not equal to Z_NULL), or Z_DATA_ERROR for invalid input. + */ + local int lunpipe(unsigned have, unsigned char *next, struct ind *indp, + int outfile, z_stream *strm) + { + int last; /* last byte read by NEXT(), or -1 if EOF */ + int chunk; /* bytes left in current chunk */ + int left; /* bits left in rem */ + unsigned rem; /* unused bits from input */ + int bits; /* current bits per code */ + unsigned code; /* code, table traversal index */ + unsigned mask; /* mask for current bits codes */ + int max; /* maximum bits per code for this stream */ + int flags; /* compress flags, then block compress flag */ + unsigned end; /* last valid entry in prefix/suffix tables */ + unsigned temp; /* current code */ + unsigned prev; /* previous code */ + unsigned final; /* last character written for previous code */ + unsigned stack; /* next position for reversed string */ + unsigned outcnt; /* bytes in output buffer */ + struct outd outd; /* output structure */ + + /* set up output */ + outd.outfile = outfile; + outd.check = 0; + + /* process remainder of compress header -- a flags byte */ + flags = NEXT(); + if (last == -1) + return Z_BUF_ERROR; + if (flags & 0x60) { + strm->msg = (char *)"unknown lzw flags set"; + return Z_DATA_ERROR; + } + max = flags & 0x1f; + if (max < 9 || max > 16) { + strm->msg = (char *)"lzw bits out of range"; + return Z_DATA_ERROR; + } + if (max == 9) /* 9 doesn't really mean 9 */ + max = 10; + flags &= 0x80; /* true if block compress */ + + /* clear table */ + bits = 9; + mask = 0x1ff; + end = flags ? 256 : 255; + + /* set up: get first 9-bit code, which is the first decompressed byte, but + don't create a table entry until the next code */ + if (NEXT() == -1) /* no compressed data is ok */ + return Z_OK; + final = prev = (unsigned)last; /* low 8 bits of code */ + if (NEXT() == -1) /* missing a bit */ + return Z_BUF_ERROR; + if (last & 1) { /* code must be < 256 */ + strm->msg = (char *)"invalid lzw code"; + return Z_DATA_ERROR; + } + rem = (unsigned)last >> 1; /* remaining 7 bits */ + left = 7; + chunk = bits - 2; /* 7 bytes left in this chunk */ + outbuf[0] = (unsigned char)final; /* write first decompressed byte */ + outcnt = 1; + + /* decode codes */ + stack = 0; + for (;;) { + /* if the table will be full after this, increment the code size */ + if (end >= mask && bits < max) { + FLUSHCODE(); + bits++; + mask <<= 1; + mask++; + } + + /* get a code of length bits */ + if (chunk == 0) /* decrement chunk modulo bits */ + chunk = bits; + code = rem; /* low bits of code */ + if (NEXT() == -1) { /* EOF is end of compressed data */ + /* write remaining buffered output */ + if (outcnt && out(&outd, outbuf, outcnt)) { + strm->next_in = outbuf; /* signal write error */ + return Z_BUF_ERROR; + } + return Z_OK; + } + code += (unsigned)last << left; /* middle (or high) bits of code */ + left += 8; + chunk--; + if (bits > left) { /* need more bits */ + if (NEXT() == -1) /* can't end in middle of code */ + return Z_BUF_ERROR; + code += (unsigned)last << left; /* high bits of code */ + left += 8; + chunk--; + } + code &= mask; /* mask to current code length */ + left -= bits; /* number of unused bits */ + rem = (unsigned)last >> (8 - left); /* unused bits from last byte */ + + /* process clear code (256) */ + if (code == 256 && flags) { + FLUSHCODE(); + bits = 9; /* initialize bits and mask */ + mask = 0x1ff; + end = 255; /* empty table */ + continue; /* get next code */ + } + + /* special code to reuse last match */ + temp = code; /* save the current code */ + if (code > end) { + /* Be picky on the allowed code here, and make sure that the code + we drop through (prev) will be a valid index so that random + input does not cause an exception. The code != end + 1 check is + empirically derived, and not checked in the original uncompress + code. If this ever causes a problem, that check could be safely + removed. Leaving this check in greatly improves gun's ability + to detect random or corrupted input after a compress header. + In any case, the prev > end check must be retained. */ + if (code != end + 1 || prev > end) { + strm->msg = (char *)"invalid lzw code"; + return Z_DATA_ERROR; + } + match[stack++] = (unsigned char)final; + code = prev; + } + + /* walk through linked list to generate output in reverse order */ + while (code >= 256) { + match[stack++] = suffix[code]; + code = prefix[code]; + } + match[stack++] = (unsigned char)code; + final = code; + + /* link new table entry */ + if (end < mask) { + end++; + prefix[end] = (unsigned short)prev; + suffix[end] = (unsigned char)final; + } + + /* set previous code for next iteration */ + prev = temp; + + /* write output in forward order */ + while (stack > SIZE - outcnt) { + while (outcnt < SIZE) + outbuf[outcnt++] = match[--stack]; + if (out(&outd, outbuf, outcnt)) { + strm->next_in = outbuf; /* signal write error */ + return Z_BUF_ERROR; + } + outcnt = 0; + } + do { + outbuf[outcnt++] = match[--stack]; + } while (stack); + + /* loop for next code with final and prev as the last match, rem and + left provide the first 0..7 bits of the next code, end is the last + valid table entry */ + } + } + + /* Decompress a gzip file from infile to outfile. strm is assumed to have been + successfully initialized with inflateBackInit(). The input file may consist + of a series of gzip streams, in which case all of them will be decompressed + to the output file. If outfile is -1, then the gzip stream(s) integrity is + checked and nothing is written. + + The return value is a zlib error code: Z_MEM_ERROR if out of memory, + Z_DATA_ERROR if the header or the compressed data is invalid, or if the + trailer CRC-32 check or length doesn't match, Z_BUF_ERROR if the input ends + prematurely or a write error occurs, or Z_ERRNO if junk (not a another gzip + stream) follows a valid gzip stream. + */ + local int gunpipe(z_stream *strm, int infile, int outfile) + { + int ret, first, last; + unsigned have, flags, len; + unsigned char *next; + struct ind ind, *indp; + struct outd outd; + + /* setup input buffer */ + ind.infile = infile; + ind.inbuf = inbuf; + indp = &ind; + + /* decompress concatenated gzip streams */ + have = 0; /* no input data read in yet */ + first = 1; /* looking for first gzip header */ + strm->next_in = Z_NULL; /* so Z_BUF_ERROR means EOF */ + for (;;) { + /* look for the two magic header bytes for a gzip stream */ + if (NEXT() == -1) { + ret = Z_OK; + break; /* empty gzip stream is ok */ + } + if (last != 31 || (NEXT() != 139 && last != 157)) { + strm->msg = (char *)"incorrect header check"; + ret = first ? Z_DATA_ERROR : Z_ERRNO; + break; /* not a gzip or compress header */ + } + first = 0; /* next non-header is junk */ + + /* process a compress (LZW) file -- can't be concatenated after this */ + if (last == 157) { + ret = lunpipe(have, next, indp, outfile, strm); + break; + } + + /* process remainder of gzip header */ + ret = Z_BUF_ERROR; + if (NEXT() != 8) { /* only deflate method allowed */ + if (last == -1) break; + strm->msg = (char *)"unknown compression method"; + ret = Z_DATA_ERROR; + break; + } + flags = NEXT(); /* header flags */ + NEXT(); /* discard mod time, xflgs, os */ + NEXT(); + NEXT(); + NEXT(); + NEXT(); + NEXT(); + if (last == -1) break; + if (flags & 0xe0) { + strm->msg = (char *)"unknown header flags set"; + ret = Z_DATA_ERROR; + break; + } + if (flags & 4) { /* extra field */ + len = NEXT(); + len += (unsigned)(NEXT()) << 8; + if (last == -1) break; + while (len > have) { + len -= have; + have = 0; + if (NEXT() == -1) break; + len--; + } + if (last == -1) break; + have -= len; + next += len; + } + if (flags & 8) /* file name */ + while (NEXT() != 0 && last != -1) + ; + if (flags & 16) /* comment */ + while (NEXT() != 0 && last != -1) + ; + if (flags & 2) { /* header crc */ + NEXT(); + NEXT(); + } + if (last == -1) break; + + /* set up output */ + outd.outfile = outfile; + outd.check = 1; + outd.crc = crc32(0L, Z_NULL, 0); + outd.total = 0; + + /* decompress data to output */ + strm->next_in = next; + strm->avail_in = have; + ret = inflateBack(strm, in, indp, out, &outd); + if (ret != Z_STREAM_END) break; + next = strm->next_in; + have = strm->avail_in; + strm->next_in = Z_NULL; /* so Z_BUF_ERROR means EOF */ + + /* check trailer */ + ret = Z_BUF_ERROR; + if (NEXT() != (outd.crc & 0xff) || + NEXT() != ((outd.crc >> 8) & 0xff) || + NEXT() != ((outd.crc >> 16) & 0xff) || + NEXT() != ((outd.crc >> 24) & 0xff)) { + /* crc error */ + if (last != -1) { + strm->msg = (char *)"incorrect data check"; + ret = Z_DATA_ERROR; + } + break; + } + if (NEXT() != (outd.total & 0xff) || + NEXT() != ((outd.total >> 8) & 0xff) || + NEXT() != ((outd.total >> 16) & 0xff) || + NEXT() != ((outd.total >> 24) & 0xff)) { + /* length error */ + if (last != -1) { + strm->msg = (char *)"incorrect length check"; + ret = Z_DATA_ERROR; + } + break; + } + + /* go back and look for another gzip stream */ + } + + /* clean up and return */ + return ret; + } + + /* Copy file attributes, from -> to, as best we can. This is best effort, so + no errors are reported. The mode bits, including suid, sgid, and the sticky + bit are copied (if allowed), the owner's user id and group id are copied + (again if allowed), and the access and modify times are copied. */ + local void copymeta(char *from, char *to) + { + struct stat was; + struct utimbuf when; + + /* get all of from's Unix meta data, return if not a regular file */ + if (stat(from, &was) != 0 || (was.st_mode & S_IFMT) != S_IFREG) + return; + + /* set to's mode bits, ignore errors */ + (void)chmod(to, was.st_mode & 07777); + + /* copy owner's user and group, ignore errors */ + (void)chown(to, was.st_uid, was.st_gid); + + /* copy access and modify times, ignore errors */ + when.actime = was.st_atime; + when.modtime = was.st_mtime; + (void)utime(to, &when); + } + + /* Decompress the file inname to the file outnname, of if test is true, just + decompress without writing and check the gzip trailer for integrity. If + inname is NULL or an empty string, read from stdin. If outname is NULL or + an empty string, write to stdout. strm is a pre-initialized inflateBack + structure. When appropriate, copy the file attributes from inname to + outname. + + gunzip() returns 1 if there is an out-of-memory error or an unexpected + return code from gunpipe(). Otherwise it returns 0. + */ + local int gunzip(z_stream *strm, char *inname, char *outname, int test) + { + int ret; + int infile, outfile; + + /* open files */ + if (inname == NULL || *inname == 0) { + inname = "-"; + infile = 0; /* stdin */ + } + else { + infile = open(inname, O_RDONLY, 0); + if (infile == -1) { + fprintf(stderr, "gun cannot open %s\n", inname); + return 0; + } + } + if (test) + outfile = -1; + else if (outname == NULL || *outname == 0) { + outname = "-"; + outfile = 1; /* stdout */ + } + else { + outfile = open(outname, O_CREAT | O_TRUNC | O_WRONLY, 0666); + if (outfile == -1) { + close(infile); + fprintf(stderr, "gun cannot create %s\n", outname); + return 0; + } + } + errno = 0; + + /* decompress */ + ret = gunpipe(strm, infile, outfile); + if (outfile > 2) close(outfile); + if (infile > 2) close(infile); + + /* interpret result */ + switch (ret) { + case Z_OK: + case Z_ERRNO: + if (infile > 2 && outfile > 2) { + copymeta(inname, outname); /* copy attributes */ + unlink(inname); + } + if (ret == Z_ERRNO) + fprintf(stderr, "gun warning: trailing garbage ignored in %s\n", + inname); + break; + case Z_DATA_ERROR: + if (outfile > 2) unlink(outname); + fprintf(stderr, "gun data error on %s: %s\n", inname, strm->msg); + break; + case Z_MEM_ERROR: + if (outfile > 2) unlink(outname); + fprintf(stderr, "gun out of memory error--aborting\n"); + return 1; + case Z_BUF_ERROR: + if (outfile > 2) unlink(outname); + if (strm->next_in != Z_NULL) { + fprintf(stderr, "gun write error on %s: %s\n", + outname, strerror(errno)); + } + else if (errno) { + fprintf(stderr, "gun read error on %s: %s\n", + inname, strerror(errno)); + } + else { + fprintf(stderr, "gun unexpected end of file on %s\n", + inname); + } + break; + default: + if (outfile > 2) unlink(outname); + fprintf(stderr, "gun internal error--aborting\n"); + return 1; + } + return 0; + } + + /* Process the gun command line arguments. See the command syntax near the + beginning of this source file. */ + int main(int argc, char **argv) + { + int ret, len, test; + char *outname; + unsigned char *window; + z_stream strm; + + /* initialize inflateBack state for repeated use */ + window = match; /* reuse LZW match buffer */ + strm.zalloc = Z_NULL; + strm.zfree = Z_NULL; + strm.opaque = Z_NULL; + ret = inflateBackInit(&strm, 15, window); + if (ret != Z_OK) { + fprintf(stderr, "gun out of memory error--aborting\n"); + return 1; + } + + /* decompress each file to the same name with the suffix removed */ + argc--; + argv++; + test = 0; + if (argc && strcmp(*argv, "-h") == 0) { + fprintf(stderr, "gun 1.3 (12 Jun 2005)\n"); + fprintf(stderr, "Copyright (c) 2005 Mark Adler\n"); + fprintf(stderr, "usage: gun [-t] [file1.gz [file2.Z ...]]\n"); + return 0; + } + if (argc && strcmp(*argv, "-t") == 0) { + test = 1; + argc--; + argv++; + } + if (argc) + do { + if (test) + outname = NULL; + else { + len = (int)strlen(*argv); + if (strcmp(*argv + len - 3, ".gz") == 0 || + strcmp(*argv + len - 3, "-gz") == 0) + len -= 3; + else if (strcmp(*argv + len - 2, ".z") == 0 || + strcmp(*argv + len - 2, "-z") == 0 || + strcmp(*argv + len - 2, "_z") == 0 || + strcmp(*argv + len - 2, ".Z") == 0) + len -= 2; + else { + fprintf(stderr, "gun error: no gz type on %s--skipping\n", + *argv); + continue; + } + outname = malloc(len + 1); + if (outname == NULL) { + fprintf(stderr, "gun out of memory error--aborting\n"); + ret = 1; + break; + } + memcpy(outname, *argv, len); + outname[len] = 0; + } + ret = gunzip(&strm, *argv, outname, test); + if (outname != NULL) free(outname); + if (ret) break; + } while (argv++, --argc); + else + ret = gunzip(&strm, NULL, NULL, test); + + /* clean up */ + inflateBackEnd(&strm); + return ret; + } diff -Nrcpad gcc-4.4.4/zlib/examples/gzappend.c gcc-4.4.5/zlib/examples/gzappend.c *** gcc-4.4.4/zlib/examples/gzappend.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/examples/gzappend.c Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,500 ---- + /* gzappend -- command to append to a gzip file + + Copyright (C) 2003 Mark Adler, all rights reserved + version 1.1, 4 Nov 2003 + + This software is provided 'as-is', without any express or implied + warranty. In no event will the author be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Mark Adler madler@alumni.caltech.edu + */ + + /* + * Change history: + * + * 1.0 19 Oct 2003 - First version + * 1.1 4 Nov 2003 - Expand and clarify some comments and notes + * - Add version and copyright to help + * - Send help to stdout instead of stderr + * - Add some preemptive typecasts + * - Add L to constants in lseek() calls + * - Remove some debugging information in error messages + * - Use new data_type definition for zlib 1.2.1 + * - Simplfy and unify file operations + * - Finish off gzip file in gztack() + * - Use deflatePrime() instead of adding empty blocks + * - Keep gzip file clean on appended file read errors + * - Use in-place rotate instead of auxiliary buffer + * (Why you ask? Because it was fun to write!) + */ + + /* + gzappend takes a gzip file and appends to it, compressing files from the + command line or data from stdin. The gzip file is written to directly, to + avoid copying that file, in case it's large. Note that this results in the + unfriendly behavior that if gzappend fails, the gzip file is corrupted. + + This program was written to illustrate the use of the new Z_BLOCK option of + zlib 1.2.x's inflate() function. This option returns from inflate() at each + block boundary to facilitate locating and modifying the last block bit at + the start of the final deflate block. Also whether using Z_BLOCK or not, + another required feature of zlib 1.2.x is that inflate() now provides the + number of unusued bits in the last input byte used. gzappend will not work + with versions of zlib earlier than 1.2.1. + + gzappend first decompresses the gzip file internally, discarding all but + the last 32K of uncompressed data, and noting the location of the last block + bit and the number of unused bits in the last byte of the compressed data. + The gzip trailer containing the CRC-32 and length of the uncompressed data + is verified. This trailer will be later overwritten. + + Then the last block bit is cleared by seeking back in the file and rewriting + the byte that contains it. Seeking forward, the last byte of the compressed + data is saved along with the number of unused bits to initialize deflate. + + A deflate process is initialized, using the last 32K of the uncompressed + data from the gzip file to initialize the dictionary. If the total + uncompressed data was less than 32K, then all of it is used to initialize + the dictionary. The deflate output bit buffer is also initialized with the + last bits from the original deflate stream. From here on, the data to + append is simply compressed using deflate, and written to the gzip file. + When that is complete, the new CRC-32 and uncompressed length are written + as the trailer of the gzip file. + */ + + #include + #include + #include + #include + #include + #include "zlib.h" + + #define local static + #define LGCHUNK 14 + #define CHUNK (1U << LGCHUNK) + #define DSIZE 32768U + + /* print an error message and terminate with extreme prejudice */ + local void bye(char *msg1, char *msg2) + { + fprintf(stderr, "gzappend error: %s%s\n", msg1, msg2); + exit(1); + } + + /* return the greatest common divisor of a and b using Euclid's algorithm, + modified to be fast when one argument much greater than the other, and + coded to avoid unnecessary swapping */ + local unsigned gcd(unsigned a, unsigned b) + { + unsigned c; + + while (a && b) + if (a > b) { + c = b; + while (a - c >= c) + c <<= 1; + a -= c; + } + else { + c = a; + while (b - c >= c) + c <<= 1; + b -= c; + } + return a + b; + } + + /* rotate list[0..len-1] left by rot positions, in place */ + local void rotate(unsigned char *list, unsigned len, unsigned rot) + { + unsigned char tmp; + unsigned cycles; + unsigned char *start, *last, *to, *from; + + /* normalize rot and handle degenerate cases */ + if (len < 2) return; + if (rot >= len) rot %= len; + if (rot == 0) return; + + /* pointer to last entry in list */ + last = list + (len - 1); + + /* do simple left shift by one */ + if (rot == 1) { + tmp = *list; + memcpy(list, list + 1, len - 1); + *last = tmp; + return; + } + + /* do simple right shift by one */ + if (rot == len - 1) { + tmp = *last; + memmove(list + 1, list, len - 1); + *list = tmp; + return; + } + + /* otherwise do rotate as a set of cycles in place */ + cycles = gcd(len, rot); /* number of cycles */ + do { + start = from = list + cycles; /* start index is arbitrary */ + tmp = *from; /* save entry to be overwritten */ + for (;;) { + to = from; /* next step in cycle */ + from += rot; /* go right rot positions */ + if (from > last) from -= len; /* (pointer better not wrap) */ + if (from == start) break; /* all but one shifted */ + *to = *from; /* shift left */ + } + *to = tmp; /* complete the circle */ + } while (--cycles); + } + + /* structure for gzip file read operations */ + typedef struct { + int fd; /* file descriptor */ + int size; /* 1 << size is bytes in buf */ + unsigned left; /* bytes available at next */ + unsigned char *buf; /* buffer */ + unsigned char *next; /* next byte in buffer */ + char *name; /* file name for error messages */ + } file; + + /* reload buffer */ + local int readin(file *in) + { + int len; + + len = read(in->fd, in->buf, 1 << in->size); + if (len == -1) bye("error reading ", in->name); + in->left = (unsigned)len; + in->next = in->buf; + return len; + } + + /* read from file in, exit if end-of-file */ + local int readmore(file *in) + { + if (readin(in) == 0) bye("unexpected end of ", in->name); + return 0; + } + + #define read1(in) (in->left == 0 ? readmore(in) : 0, \ + in->left--, *(in->next)++) + + /* skip over n bytes of in */ + local void skip(file *in, unsigned n) + { + unsigned bypass; + + if (n > in->left) { + n -= in->left; + bypass = n & ~((1U << in->size) - 1); + if (bypass) { + if (lseek(in->fd, (off_t)bypass, SEEK_CUR) == -1) + bye("seeking ", in->name); + n -= bypass; + } + readmore(in); + if (n > in->left) + bye("unexpected end of ", in->name); + } + in->left -= n; + in->next += n; + } + + /* read a four-byte unsigned integer, little-endian, from in */ + unsigned long read4(file *in) + { + unsigned long val; + + val = read1(in); + val += (unsigned)read1(in) << 8; + val += (unsigned long)read1(in) << 16; + val += (unsigned long)read1(in) << 24; + return val; + } + + /* skip over gzip header */ + local void gzheader(file *in) + { + int flags; + unsigned n; + + if (read1(in) != 31 || read1(in) != 139) bye(in->name, " not a gzip file"); + if (read1(in) != 8) bye("unknown compression method in", in->name); + flags = read1(in); + if (flags & 0xe0) bye("unknown header flags set in", in->name); + skip(in, 6); + if (flags & 4) { + n = read1(in); + n += (unsigned)(read1(in)) << 8; + skip(in, n); + } + if (flags & 8) while (read1(in) != 0) ; + if (flags & 16) while (read1(in) != 0) ; + if (flags & 2) skip(in, 2); + } + + /* decompress gzip file "name", return strm with a deflate stream ready to + continue compression of the data in the gzip file, and return a file + descriptor pointing to where to write the compressed data -- the deflate + stream is initialized to compress using level "level" */ + local int gzscan(char *name, z_stream *strm, int level) + { + int ret, lastbit, left, full; + unsigned have; + unsigned long crc, tot; + unsigned char *window; + off_t lastoff, end; + file gz; + + /* open gzip file */ + gz.name = name; + gz.fd = open(name, O_RDWR, 0); + if (gz.fd == -1) bye("cannot open ", name); + gz.buf = malloc(CHUNK); + if (gz.buf == NULL) bye("out of memory", ""); + gz.size = LGCHUNK; + gz.left = 0; + + /* skip gzip header */ + gzheader(&gz); + + /* prepare to decompress */ + window = malloc(DSIZE); + if (window == NULL) bye("out of memory", ""); + strm->zalloc = Z_NULL; + strm->zfree = Z_NULL; + strm->opaque = Z_NULL; + ret = inflateInit2(strm, -15); + if (ret != Z_OK) bye("out of memory", " or library mismatch"); + + /* decompress the deflate stream, saving append information */ + lastbit = 0; + lastoff = lseek(gz.fd, 0L, SEEK_CUR) - gz.left; + left = 0; + strm->avail_in = gz.left; + strm->next_in = gz.next; + crc = crc32(0L, Z_NULL, 0); + have = full = 0; + do { + /* if needed, get more input */ + if (strm->avail_in == 0) { + readmore(&gz); + strm->avail_in = gz.left; + strm->next_in = gz.next; + } + + /* set up output to next available section of sliding window */ + strm->avail_out = DSIZE - have; + strm->next_out = window + have; + + /* inflate and check for errors */ + ret = inflate(strm, Z_BLOCK); + if (ret == Z_STREAM_ERROR) bye("internal stream error!", ""); + if (ret == Z_MEM_ERROR) bye("out of memory", ""); + if (ret == Z_DATA_ERROR) + bye("invalid compressed data--format violated in", name); + + /* update crc and sliding window pointer */ + crc = crc32(crc, window + have, DSIZE - have - strm->avail_out); + if (strm->avail_out) + have = DSIZE - strm->avail_out; + else { + have = 0; + full = 1; + } + + /* process end of block */ + if (strm->data_type & 128) { + if (strm->data_type & 64) + left = strm->data_type & 0x1f; + else { + lastbit = strm->data_type & 0x1f; + lastoff = lseek(gz.fd, 0L, SEEK_CUR) - strm->avail_in; + } + } + } while (ret != Z_STREAM_END); + inflateEnd(strm); + gz.left = strm->avail_in; + gz.next = strm->next_in; + + /* save the location of the end of the compressed data */ + end = lseek(gz.fd, 0L, SEEK_CUR) - gz.left; + + /* check gzip trailer and save total for deflate */ + if (crc != read4(&gz)) + bye("invalid compressed data--crc mismatch in ", name); + tot = strm->total_out; + if ((tot & 0xffffffffUL) != read4(&gz)) + bye("invalid compressed data--length mismatch in", name); + + /* if not at end of file, warn */ + if (gz.left || readin(&gz)) + fprintf(stderr, + "gzappend warning: junk at end of gzip file overwritten\n"); + + /* clear last block bit */ + lseek(gz.fd, lastoff - (lastbit != 0), SEEK_SET); + if (read(gz.fd, gz.buf, 1) != 1) bye("reading after seek on ", name); + *gz.buf = (unsigned char)(*gz.buf ^ (1 << ((8 - lastbit) & 7))); + lseek(gz.fd, -1L, SEEK_CUR); + if (write(gz.fd, gz.buf, 1) != 1) bye("writing after seek to ", name); + + /* if window wrapped, build dictionary from window by rotating */ + if (full) { + rotate(window, DSIZE, have); + have = DSIZE; + } + + /* set up deflate stream with window, crc, total_in, and leftover bits */ + ret = deflateInit2(strm, level, Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY); + if (ret != Z_OK) bye("out of memory", ""); + deflateSetDictionary(strm, window, have); + strm->adler = crc; + strm->total_in = tot; + if (left) { + lseek(gz.fd, --end, SEEK_SET); + if (read(gz.fd, gz.buf, 1) != 1) bye("reading after seek on ", name); + deflatePrime(strm, 8 - left, *gz.buf); + } + lseek(gz.fd, end, SEEK_SET); + + /* clean up and return */ + free(window); + free(gz.buf); + return gz.fd; + } + + /* append file "name" to gzip file gd using deflate stream strm -- if last + is true, then finish off the deflate stream at the end */ + local void gztack(char *name, int gd, z_stream *strm, int last) + { + int fd, len, ret; + unsigned left; + unsigned char *in, *out; + + /* open file to compress and append */ + fd = 0; + if (name != NULL) { + fd = open(name, O_RDONLY, 0); + if (fd == -1) + fprintf(stderr, "gzappend warning: %s not found, skipping ...\n", + name); + } + + /* allocate buffers */ + in = fd == -1 ? NULL : malloc(CHUNK); + out = malloc(CHUNK); + if (out == NULL) bye("out of memory", ""); + + /* compress input file and append to gzip file */ + do { + /* get more input */ + len = fd == -1 ? 0 : read(fd, in, CHUNK); + if (len == -1) { + fprintf(stderr, + "gzappend warning: error reading %s, skipping rest ...\n", + name); + len = 0; + } + strm->avail_in = (unsigned)len; + strm->next_in = in; + if (len) strm->adler = crc32(strm->adler, in, (unsigned)len); + + /* compress and write all available output */ + do { + strm->avail_out = CHUNK; + strm->next_out = out; + ret = deflate(strm, last && len == 0 ? Z_FINISH : Z_NO_FLUSH); + left = CHUNK - strm->avail_out; + while (left) { + len = write(gd, out + CHUNK - strm->avail_out - left, left); + if (len == -1) bye("writing gzip file", ""); + left -= (unsigned)len; + } + } while (strm->avail_out == 0 && ret != Z_STREAM_END); + } while (len != 0); + + /* write trailer after last entry */ + if (last) { + deflateEnd(strm); + out[0] = (unsigned char)(strm->adler); + out[1] = (unsigned char)(strm->adler >> 8); + out[2] = (unsigned char)(strm->adler >> 16); + out[3] = (unsigned char)(strm->adler >> 24); + out[4] = (unsigned char)(strm->total_in); + out[5] = (unsigned char)(strm->total_in >> 8); + out[6] = (unsigned char)(strm->total_in >> 16); + out[7] = (unsigned char)(strm->total_in >> 24); + len = 8; + do { + ret = write(gd, out + 8 - len, len); + if (ret == -1) bye("writing gzip file", ""); + len -= ret; + } while (len); + close(gd); + } + + /* clean up and return */ + free(out); + if (in != NULL) free(in); + if (fd > 0) close(fd); + } + + /* process the compression level option if present, scan the gzip file, and + append the specified files, or append the data from stdin if no other file + names are provided on the command line -- the gzip file must be writable + and seekable */ + int main(int argc, char **argv) + { + int gd, level; + z_stream strm; + + /* ignore command name */ + argv++; + + /* provide usage if no arguments */ + if (*argv == NULL) { + printf("gzappend 1.1 (4 Nov 2003) Copyright (C) 2003 Mark Adler\n"); + printf( + "usage: gzappend [-level] file.gz [ addthis [ andthis ... ]]\n"); + return 0; + } + + /* set compression level */ + level = Z_DEFAULT_COMPRESSION; + if (argv[0][0] == '-') { + if (argv[0][1] < '0' || argv[0][1] > '9' || argv[0][2] != 0) + bye("invalid compression level", ""); + level = argv[0][1] - '0'; + if (*++argv == NULL) bye("no gzip file name after options", ""); + } + + /* prepare to append to gzip file */ + gd = gzscan(*argv++, &strm, level); + + /* append files on command line, or from stdin if none */ + if (*argv == NULL) + gztack(NULL, gd, &strm, 1); + else + do { + gztack(*argv, gd, &strm, argv[1] == NULL); + } while (*++argv != NULL); + return 0; + } diff -Nrcpad gcc-4.4.4/zlib/examples/gzjoin.c gcc-4.4.5/zlib/examples/gzjoin.c *** gcc-4.4.4/zlib/examples/gzjoin.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/examples/gzjoin.c Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,448 ---- + /* gzjoin -- command to join gzip files into one gzip file + + Copyright (C) 2004 Mark Adler, all rights reserved + version 1.0, 11 Dec 2004 + + This software is provided 'as-is', without any express or implied + warranty. In no event will the author be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Mark Adler madler@alumni.caltech.edu + */ + + /* + * Change history: + * + * 1.0 11 Dec 2004 - First version + * 1.1 12 Jun 2005 - Changed ssize_t to long for portability + */ + + /* + gzjoin takes one or more gzip files on the command line and writes out a + single gzip file that will uncompress to the concatenation of the + uncompressed data from the individual gzip files. gzjoin does this without + having to recompress any of the data and without having to calculate a new + crc32 for the concatenated uncompressed data. gzjoin does however have to + decompress all of the input data in order to find the bits in the compressed + data that need to be modified to concatenate the streams. + + gzjoin does not do an integrity check on the input gzip files other than + checking the gzip header and decompressing the compressed data. They are + otherwise assumed to be complete and correct. + + Each joint between gzip files removes at least 18 bytes of previous trailer + and subsequent header, and inserts an average of about three bytes to the + compressed data in order to connect the streams. The output gzip file + has a minimal ten-byte gzip header with no file name or modification time. + + This program was written to illustrate the use of the Z_BLOCK option of + inflate() and the crc32_combine() function. gzjoin will not compile with + versions of zlib earlier than 1.2.3. + */ + + #include /* fputs(), fprintf(), fwrite(), putc() */ + #include /* exit(), malloc(), free() */ + #include /* open() */ + #include /* close(), read(), lseek() */ + #include "zlib.h" + /* crc32(), crc32_combine(), inflateInit2(), inflate(), inflateEnd() */ + + #define local static + + /* exit with an error (return a value to allow use in an expression) */ + local int bail(char *why1, char *why2) + { + fprintf(stderr, "gzjoin error: %s%s, output incomplete\n", why1, why2); + exit(1); + return 0; + } + + /* -- simple buffered file input with access to the buffer -- */ + + #define CHUNK 32768 /* must be a power of two and fit in unsigned */ + + /* bin buffered input file type */ + typedef struct { + char *name; /* name of file for error messages */ + int fd; /* file descriptor */ + unsigned left; /* bytes remaining at next */ + unsigned char *next; /* next byte to read */ + unsigned char *buf; /* allocated buffer of length CHUNK */ + } bin; + + /* close a buffered file and free allocated memory */ + local void bclose(bin *in) + { + if (in != NULL) { + if (in->fd != -1) + close(in->fd); + if (in->buf != NULL) + free(in->buf); + free(in); + } + } + + /* open a buffered file for input, return a pointer to type bin, or NULL on + failure */ + local bin *bopen(char *name) + { + bin *in; + + in = malloc(sizeof(bin)); + if (in == NULL) + return NULL; + in->buf = malloc(CHUNK); + in->fd = open(name, O_RDONLY, 0); + if (in->buf == NULL || in->fd == -1) { + bclose(in); + return NULL; + } + in->left = 0; + in->next = in->buf; + in->name = name; + return in; + } + + /* load buffer from file, return -1 on read error, 0 or 1 on success, with + 1 indicating that end-of-file was reached */ + local int bload(bin *in) + { + long len; + + if (in == NULL) + return -1; + if (in->left != 0) + return 0; + in->next = in->buf; + do { + len = (long)read(in->fd, in->buf + in->left, CHUNK - in->left); + if (len < 0) + return -1; + in->left += (unsigned)len; + } while (len != 0 && in->left < CHUNK); + return len == 0 ? 1 : 0; + } + + /* get a byte from the file, bail if end of file */ + #define bget(in) (in->left ? 0 : bload(in), \ + in->left ? (in->left--, *(in->next)++) : \ + bail("unexpected end of file on ", in->name)) + + /* get a four-byte little-endian unsigned integer from file */ + local unsigned long bget4(bin *in) + { + unsigned long val; + + val = bget(in); + val += (unsigned long)(bget(in)) << 8; + val += (unsigned long)(bget(in)) << 16; + val += (unsigned long)(bget(in)) << 24; + return val; + } + + /* skip bytes in file */ + local void bskip(bin *in, unsigned skip) + { + /* check pointer */ + if (in == NULL) + return; + + /* easy case -- skip bytes in buffer */ + if (skip <= in->left) { + in->left -= skip; + in->next += skip; + return; + } + + /* skip what's in buffer, discard buffer contents */ + skip -= in->left; + in->left = 0; + + /* seek past multiples of CHUNK bytes */ + if (skip > CHUNK) { + unsigned left; + + left = skip & (CHUNK - 1); + if (left == 0) { + /* exact number of chunks: seek all the way minus one byte to check + for end-of-file with a read */ + lseek(in->fd, skip - 1, SEEK_CUR); + if (read(in->fd, in->buf, 1) != 1) + bail("unexpected end of file on ", in->name); + return; + } + + /* skip the integral chunks, update skip with remainder */ + lseek(in->fd, skip - left, SEEK_CUR); + skip = left; + } + + /* read more input and skip remainder */ + bload(in); + if (skip > in->left) + bail("unexpected end of file on ", in->name); + in->left -= skip; + in->next += skip; + } + + /* -- end of buffered input functions -- */ + + /* skip the gzip header from file in */ + local void gzhead(bin *in) + { + int flags; + + /* verify gzip magic header and compression method */ + if (bget(in) != 0x1f || bget(in) != 0x8b || bget(in) != 8) + bail(in->name, " is not a valid gzip file"); + + /* get and verify flags */ + flags = bget(in); + if ((flags & 0xe0) != 0) + bail("unknown reserved bits set in ", in->name); + + /* skip modification time, extra flags, and os */ + bskip(in, 6); + + /* skip extra field if present */ + if (flags & 4) { + unsigned len; + + len = bget(in); + len += (unsigned)(bget(in)) << 8; + bskip(in, len); + } + + /* skip file name if present */ + if (flags & 8) + while (bget(in) != 0) + ; + + /* skip comment if present */ + if (flags & 16) + while (bget(in) != 0) + ; + + /* skip header crc if present */ + if (flags & 2) + bskip(in, 2); + } + + /* write a four-byte little-endian unsigned integer to out */ + local void put4(unsigned long val, FILE *out) + { + putc(val & 0xff, out); + putc((val >> 8) & 0xff, out); + putc((val >> 16) & 0xff, out); + putc((val >> 24) & 0xff, out); + } + + /* Load up zlib stream from buffered input, bail if end of file */ + local void zpull(z_streamp strm, bin *in) + { + if (in->left == 0) + bload(in); + if (in->left == 0) + bail("unexpected end of file on ", in->name); + strm->avail_in = in->left; + strm->next_in = in->next; + } + + /* Write header for gzip file to out and initialize trailer. */ + local void gzinit(unsigned long *crc, unsigned long *tot, FILE *out) + { + fwrite("\x1f\x8b\x08\0\0\0\0\0\0\xff", 1, 10, out); + *crc = crc32(0L, Z_NULL, 0); + *tot = 0; + } + + /* Copy the compressed data from name, zeroing the last block bit of the last + block if clr is true, and adding empty blocks as needed to get to a byte + boundary. If clr is false, then the last block becomes the last block of + the output, and the gzip trailer is written. crc and tot maintains the + crc and length (modulo 2^32) of the output for the trailer. The resulting + gzip file is written to out. gzinit() must be called before the first call + of gzcopy() to write the gzip header and to initialize crc and tot. */ + local void gzcopy(char *name, int clr, unsigned long *crc, unsigned long *tot, + FILE *out) + { + int ret; /* return value from zlib functions */ + int pos; /* where the "last block" bit is in byte */ + int last; /* true if processing the last block */ + bin *in; /* buffered input file */ + unsigned char *start; /* start of compressed data in buffer */ + unsigned char *junk; /* buffer for uncompressed data -- discarded */ + z_off_t len; /* length of uncompressed data (support > 4 GB) */ + z_stream strm; /* zlib inflate stream */ + + /* open gzip file and skip header */ + in = bopen(name); + if (in == NULL) + bail("could not open ", name); + gzhead(in); + + /* allocate buffer for uncompressed data and initialize raw inflate + stream */ + junk = malloc(CHUNK); + strm.zalloc = Z_NULL; + strm.zfree = Z_NULL; + strm.opaque = Z_NULL; + strm.avail_in = 0; + strm.next_in = Z_NULL; + ret = inflateInit2(&strm, -15); + if (junk == NULL || ret != Z_OK) + bail("out of memory", ""); + + /* inflate and copy compressed data, clear last-block bit if requested */ + len = 0; + zpull(&strm, in); + start = strm.next_in; + last = start[0] & 1; + if (last && clr) + start[0] &= ~1; + strm.avail_out = 0; + for (;;) { + /* if input used and output done, write used input and get more */ + if (strm.avail_in == 0 && strm.avail_out != 0) { + fwrite(start, 1, strm.next_in - start, out); + start = in->buf; + in->left = 0; + zpull(&strm, in); + } + + /* decompress -- return early when end-of-block reached */ + strm.avail_out = CHUNK; + strm.next_out = junk; + ret = inflate(&strm, Z_BLOCK); + switch (ret) { + case Z_MEM_ERROR: + bail("out of memory", ""); + case Z_DATA_ERROR: + bail("invalid compressed data in ", in->name); + } + + /* update length of uncompressed data */ + len += CHUNK - strm.avail_out; + + /* check for block boundary (only get this when block copied out) */ + if (strm.data_type & 128) { + /* if that was the last block, then done */ + if (last) + break; + + /* number of unused bits in last byte */ + pos = strm.data_type & 7; + + /* find the next last-block bit */ + if (pos != 0) { + /* next last-block bit is in last used byte */ + pos = 0x100 >> pos; + last = strm.next_in[-1] & pos; + if (last && clr) + strm.next_in[-1] &= ~pos; + } + else { + /* next last-block bit is in next unused byte */ + if (strm.avail_in == 0) { + /* don't have that byte yet -- get it */ + fwrite(start, 1, strm.next_in - start, out); + start = in->buf; + in->left = 0; + zpull(&strm, in); + } + last = strm.next_in[0] & 1; + if (last && clr) + strm.next_in[0] &= ~1; + } + } + } + + /* update buffer with unused input */ + in->left = strm.avail_in; + in->next = strm.next_in; + + /* copy used input, write empty blocks to get to byte boundary */ + pos = strm.data_type & 7; + fwrite(start, 1, in->next - start - 1, out); + last = in->next[-1]; + if (pos == 0 || !clr) + /* already at byte boundary, or last file: write last byte */ + putc(last, out); + else { + /* append empty blocks to last byte */ + last &= ((0x100 >> pos) - 1); /* assure unused bits are zero */ + if (pos & 1) { + /* odd -- append an empty stored block */ + putc(last, out); + if (pos == 1) + putc(0, out); /* two more bits in block header */ + fwrite("\0\0\xff\xff", 1, 4, out); + } + else { + /* even -- append 1, 2, or 3 empty fixed blocks */ + switch (pos) { + case 6: + putc(last | 8, out); + last = 0; + case 4: + putc(last | 0x20, out); + last = 0; + case 2: + putc(last | 0x80, out); + putc(0, out); + } + } + } + + /* update crc and tot */ + *crc = crc32_combine(*crc, bget4(in), len); + *tot += (unsigned long)len; + + /* clean up */ + inflateEnd(&strm); + free(junk); + bclose(in); + + /* write trailer if this is the last gzip file */ + if (!clr) { + put4(*crc, out); + put4(*tot, out); + } + } + + /* join the gzip files on the command line, write result to stdout */ + int main(int argc, char **argv) + { + unsigned long crc, tot; /* running crc and total uncompressed length */ + + /* skip command name */ + argc--; + argv++; + + /* show usage if no arguments */ + if (argc == 0) { + fputs("gzjoin usage: gzjoin f1.gz [f2.gz [f3.gz ...]] > fjoin.gz\n", + stderr); + return 0; + } + + /* join gzip files on command line and write to stdout */ + gzinit(&crc, &tot, stdout); + while (argc--) + gzcopy(*argv++, argc, &crc, &tot, stdout); + + /* done */ + return 0; + } diff -Nrcpad gcc-4.4.4/zlib/examples/gzlog.c gcc-4.4.5/zlib/examples/gzlog.c *** gcc-4.4.4/zlib/examples/gzlog.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/examples/gzlog.c Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,413 ---- + /* + * gzlog.c + * Copyright (C) 2004 Mark Adler + * For conditions of distribution and use, see copyright notice in gzlog.h + * version 1.0, 26 Nov 2004 + * + */ + + #include /* memcmp() */ + #include /* malloc(), free(), NULL */ + #include /* size_t, off_t */ + #include /* read(), close(), sleep(), ftruncate(), */ + /* lseek() */ + #include /* open() */ + #include /* flock() */ + #include "zlib.h" /* deflateInit2(), deflate(), deflateEnd() */ + + #include "gzlog.h" /* interface */ + #define local static + + /* log object structure */ + typedef struct { + int id; /* object identifier */ + int fd; /* log file descriptor */ + off_t extra; /* offset of extra "ap" subfield */ + off_t mark_off; /* offset of marked data */ + off_t last_off; /* offset of last block */ + unsigned long crc; /* uncompressed crc */ + unsigned long len; /* uncompressed length (modulo 2^32) */ + unsigned stored; /* length of current stored block */ + } gz_log; + + #define GZLOGID 19334 /* gz_log object identifier */ + + #define LOCK_RETRY 1 /* retry lock once a second */ + #define LOCK_PATIENCE 1200 /* try about twenty minutes before forcing */ + + /* acquire a lock on a file */ + local int lock(int fd) + { + int patience; + + /* try to lock every LOCK_RETRY seconds for LOCK_PATIENCE seconds */ + patience = LOCK_PATIENCE; + do { + if (flock(fd, LOCK_EX + LOCK_NB) == 0) + return 0; + (void)sleep(LOCK_RETRY); + patience -= LOCK_RETRY; + } while (patience > 0); + + /* we've run out of patience -- give up */ + return -1; + } + + /* release lock */ + local void unlock(int fd) + { + (void)flock(fd, LOCK_UN); + } + + /* release a log object */ + local void log_clean(gz_log *log) + { + unlock(log->fd); + (void)close(log->fd); + free(log); + } + + /* read an unsigned long from a byte buffer little-endian */ + local unsigned long make_ulg(unsigned char *buf) + { + int n; + unsigned long val; + + val = (unsigned long)(*buf++); + for (n = 8; n < 32; n += 8) + val += (unsigned long)(*buf++) << n; + return val; + } + + /* read an off_t from a byte buffer little-endian */ + local off_t make_off(unsigned char *buf) + { + int n; + off_t val; + + val = (off_t)(*buf++); + for (n = 8; n < 64; n += 8) + val += (off_t)(*buf++) << n; + return val; + } + + /* write an unsigned long little-endian to byte buffer */ + local void dice_ulg(unsigned long val, unsigned char *buf) + { + int n; + + for (n = 0; n < 4; n++) { + *buf++ = val & 0xff; + val >>= 8; + } + } + + /* write an off_t little-endian to byte buffer */ + local void dice_off(off_t val, unsigned char *buf) + { + int n; + + for (n = 0; n < 8; n++) { + *buf++ = val & 0xff; + val >>= 8; + } + } + + /* initial, empty gzip file for appending */ + local char empty_gz[] = { + 0x1f, 0x8b, /* magic gzip id */ + 8, /* compression method is deflate */ + 4, /* there is an extra field */ + 0, 0, 0, 0, /* no modification time provided */ + 0, 0xff, /* no extra flags, no OS */ + 20, 0, 'a', 'p', 16, 0, /* extra field with "ap" subfield */ + 32, 0, 0, 0, 0, 0, 0, 0, /* offset of uncompressed data */ + 32, 0, 0, 0, 0, 0, 0, 0, /* offset of last block */ + 1, 0, 0, 0xff, 0xff, /* empty stored block (last) */ + 0, 0, 0, 0, /* crc */ + 0, 0, 0, 0 /* uncompressed length */ + }; + + /* initialize a log object with locking */ + void *gzlog_open(char *path) + { + unsigned xlen; + unsigned char temp[20]; + unsigned sub_len; + int good; + gz_log *log; + + /* allocate log structure */ + log = malloc(sizeof(gz_log)); + if (log == NULL) + return NULL; + log->id = GZLOGID; + + /* open file, creating it if necessary, and locking it */ + log->fd = open(path, O_RDWR | O_CREAT, 0600); + if (log->fd < 0) { + free(log); + return NULL; + } + if (lock(log->fd)) { + close(log->fd); + free(log); + return NULL; + } + + /* if file is empty, write new gzip stream */ + if (lseek(log->fd, 0, SEEK_END) == 0) { + if (write(log->fd, empty_gz, sizeof(empty_gz)) != sizeof(empty_gz)) { + log_clean(log); + return NULL; + } + } + + /* check gzip header */ + (void)lseek(log->fd, 0, SEEK_SET); + if (read(log->fd, temp, 12) != 12 || temp[0] != 0x1f || + temp[1] != 0x8b || temp[2] != 8 || (temp[3] & 4) == 0) { + log_clean(log); + return NULL; + } + + /* process extra field to find "ap" sub-field */ + xlen = temp[10] + (temp[11] << 8); + good = 0; + while (xlen) { + if (xlen < 4 || read(log->fd, temp, 4) != 4) + break; + sub_len = temp[2]; + sub_len += temp[3] << 8; + xlen -= 4; + if (memcmp(temp, "ap", 2) == 0 && sub_len == 16) { + good = 1; + break; + } + if (xlen < sub_len) + break; + (void)lseek(log->fd, sub_len, SEEK_CUR); + xlen -= sub_len; + } + if (!good) { + log_clean(log); + return NULL; + } + + /* read in "ap" sub-field */ + log->extra = lseek(log->fd, 0, SEEK_CUR); + if (read(log->fd, temp, 16) != 16) { + log_clean(log); + return NULL; + } + log->mark_off = make_off(temp); + log->last_off = make_off(temp + 8); + + /* get crc, length of gzip file */ + (void)lseek(log->fd, log->last_off, SEEK_SET); + if (read(log->fd, temp, 13) != 13 || + memcmp(temp, "\001\000\000\377\377", 5) != 0) { + log_clean(log); + return NULL; + } + log->crc = make_ulg(temp + 5); + log->len = make_ulg(temp + 9); + + /* set up to write over empty last block */ + (void)lseek(log->fd, log->last_off + 5, SEEK_SET); + log->stored = 0; + return (void *)log; + } + + /* maximum amount to put in a stored block before starting a new one */ + #define MAX_BLOCK 16384 + + /* write a block to a log object */ + int gzlog_write(void *obj, char *data, size_t len) + { + size_t some; + unsigned char temp[5]; + gz_log *log; + + /* check object */ + log = (gz_log *)obj; + if (log == NULL || log->id != GZLOGID) + return 1; + + /* write stored blocks until all of the input is written */ + do { + some = MAX_BLOCK - log->stored; + if (some > len) + some = len; + if (write(log->fd, data, some) != some) + return 1; + log->crc = crc32(log->crc, data, some); + log->len += some; + len -= some; + data += some; + log->stored += some; + + /* if the stored block is full, end it and start another */ + if (log->stored == MAX_BLOCK) { + (void)lseek(log->fd, log->last_off, SEEK_SET); + temp[0] = 0; + dice_ulg(log->stored + ((unsigned long)(~log->stored) << 16), + temp + 1); + if (write(log->fd, temp, 5) != 5) + return 1; + log->last_off = lseek(log->fd, log->stored, SEEK_CUR); + (void)lseek(log->fd, 5, SEEK_CUR); + log->stored = 0; + } + } while (len); + return 0; + } + + /* recompress the remaining stored deflate data in place */ + local int recomp(gz_log *log) + { + z_stream strm; + size_t len, max; + unsigned char *in; + unsigned char *out; + unsigned char temp[16]; + + /* allocate space and read it all in (it's around 1 MB) */ + len = log->last_off - log->mark_off; + max = len + (len >> 12) + (len >> 14) + 11; + out = malloc(max); + if (out == NULL) + return 1; + in = malloc(len); + if (in == NULL) { + free(out); + return 1; + } + (void)lseek(log->fd, log->mark_off, SEEK_SET); + if (read(log->fd, in, len) != len) { + free(in); + free(out); + return 1; + } + + /* recompress in memory, decoding stored data as we go */ + /* note: this assumes that unsigned is four bytes or more */ + /* consider not making that assumption */ + strm.zalloc = Z_NULL; + strm.zfree = Z_NULL; + strm.opaque = Z_NULL; + if (deflateInit2(&strm, Z_BEST_COMPRESSION, Z_DEFLATED, -15, 8, + Z_DEFAULT_STRATEGY) != Z_OK) { + free(in); + free(out); + return 1; + } + strm.next_in = in; + strm.avail_out = max; + strm.next_out = out; + while (len >= 5) { + if (strm.next_in[0] != 0) + break; + strm.avail_in = strm.next_in[1] + (strm.next_in[2] << 8); + strm.next_in += 5; + len -= 5; + if (strm.avail_in != 0) { + if (len < strm.avail_in) + break; + len -= strm.avail_in; + (void)deflate(&strm, Z_NO_FLUSH); + if (strm.avail_in != 0 || strm.avail_out == 0) + break; + } + } + (void)deflate(&strm, Z_SYNC_FLUSH); + (void)deflateEnd(&strm); + free(in); + if (len != 0 || strm.avail_out == 0) { + free(out); + return 1; + } + + /* overwrite stored data with compressed data */ + (void)lseek(log->fd, log->mark_off, SEEK_SET); + len = max - strm.avail_out; + if (write(log->fd, out, len) != len) { + free(out); + return 1; + } + free(out); + + /* write last empty block, crc, and length */ + log->mark_off = log->last_off = lseek(log->fd, 0, SEEK_CUR); + temp[0] = 1; + dice_ulg(0xffffL << 16, temp + 1); + dice_ulg(log->crc, temp + 5); + dice_ulg(log->len, temp + 9); + if (write(log->fd, temp, 13) != 13) + return 1; + + /* truncate file to discard remaining stored data and old trailer */ + ftruncate(log->fd, lseek(log->fd, 0, SEEK_CUR)); + + /* update extra field to point to new last empty block */ + (void)lseek(log->fd, log->extra, SEEK_SET); + dice_off(log->mark_off, temp); + dice_off(log->last_off, temp + 8); + if (write(log->fd, temp, 16) != 16) + return 1; + return 0; + } + + /* maximum accumulation of stored blocks before compressing */ + #define MAX_STORED 1048576 + + /* close log object */ + int gzlog_close(void *obj) + { + unsigned char temp[8]; + gz_log *log; + + /* check object */ + log = (gz_log *)obj; + if (log == NULL || log->id != GZLOGID) + return 1; + + /* go to start of most recent block being written */ + (void)lseek(log->fd, log->last_off, SEEK_SET); + + /* if some stuff was put there, update block */ + if (log->stored) { + temp[0] = 0; + dice_ulg(log->stored + ((unsigned long)(~log->stored) << 16), + temp + 1); + if (write(log->fd, temp, 5) != 5) + return 1; + log->last_off = lseek(log->fd, log->stored, SEEK_CUR); + } + + /* write last block (empty) */ + if (write(log->fd, "\001\000\000\377\377", 5) != 5) + return 1; + + /* write updated crc and uncompressed length */ + dice_ulg(log->crc, temp); + dice_ulg(log->len, temp + 4); + if (write(log->fd, temp, 8) != 8) + return 1; + + /* put offset of that last block in gzip extra block */ + (void)lseek(log->fd, log->extra + 8, SEEK_SET); + dice_off(log->last_off, temp); + if (write(log->fd, temp, 8) != 8) + return 1; + + /* if more than 1 MB stored, then time to compress it */ + if (log->last_off - log->mark_off > MAX_STORED) { + if (recomp(log)) + return 1; + } + + /* unlock and close file */ + log_clean(log); + return 0; + } diff -Nrcpad gcc-4.4.4/zlib/examples/gzlog.h gcc-4.4.5/zlib/examples/gzlog.h *** gcc-4.4.4/zlib/examples/gzlog.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/examples/gzlog.h Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,58 ---- + /* gzlog.h + Copyright (C) 2004 Mark Adler, all rights reserved + version 1.0, 26 Nov 2004 + + This software is provided 'as-is', without any express or implied + warranty. In no event will the author be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Mark Adler madler@alumni.caltech.edu + */ + + /* + The gzlog object allows writing short messages to a gzipped log file, + opening the log file locked for small bursts, and then closing it. The log + object works by appending stored data to the gzip file until 1 MB has been + accumulated. At that time, the stored data is compressed, and replaces the + uncompressed data in the file. The log file is truncated to its new size at + that time. After closing, the log file is always valid gzip file that can + decompressed to recover what was written. + + A gzip header "extra" field contains two file offsets for appending. The + first points to just after the last compressed data. The second points to + the last stored block in the deflate stream, which is empty. All of the + data between those pointers is uncompressed. + */ + + /* Open a gzlog object, creating the log file if it does not exist. Return + NULL on error. Note that gzlog_open() could take a long time to return if + there is difficulty in locking the file. */ + void *gzlog_open(char *path); + + /* Write to a gzlog object. Return non-zero on error. This function will + simply write data to the file uncompressed. Compression of the data + will not occur until gzlog_close() is called. It is expected that + gzlog_write() is used for a short message, and then gzlog_close() is + called. If a large amount of data is to be written, then the application + should write no more than 1 MB at a time with gzlog_write() before + calling gzlog_close() and then gzlog_open() again. */ + int gzlog_write(void *log, char *data, size_t len); + + /* Close a gzlog object. Return non-zero on error. The log file is locked + until this function is called. This function will compress stored data + at the end of the gzip file if at least 1 MB has been accumulated. Note + that the file will not be a valid gzip file until this function completes. + */ + int gzlog_close(void *log); diff -Nrcpad gcc-4.4.4/zlib/examples/zlib_how.html gcc-4.4.5/zlib/examples/zlib_how.html *** gcc-4.4.4/zlib/examples/zlib_how.html Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/examples/zlib_how.html Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,523 ---- + + + + + zlib Usage Example + + + +

    zlib Usage Example

    + We often get questions about how the deflate() and inflate() functions should be used. + Users wonder when they should provide more input, when they should use more output, + what to do with a Z_BUF_ERROR, how to make sure the process terminates properly, and + so on. So for those who have read zlib.h (a few times), and + would like further edification, below is an annotated example in C of simple routines to compress and decompress + from an input file to an output file using deflate() and inflate() respectively. The + annotations are interspersed between lines of the code. So please read between the lines. + We hope this helps explain some of the intricacies of zlib. +

    + Without further adieu, here is the program zpipe.c: +

    
    + /* zpipe.c: example of proper use of zlib's inflate() and deflate()
    +    Not copyrighted -- provided to the public domain
    +    Version 1.2  9 November 2004  Mark Adler */
    + 
    + /* Version history:
    +    1.0  30 Oct 2004  First version
    +    1.1   8 Nov 2004  Add void casting for unused return values
    +                      Use switch statement for inflate() return values
    +    1.2   9 Nov 2004  Add assertions to document zlib guarantees
    +  */
    + 
    + We now include the header files for the required definitions. From + stdio.h we use fopen(), fread(), fwrite(), + feof(), ferror(), and fclose() for file i/o, and + fputs() for error messages. From string.h we use + strcmp() for command line argument processing. + From assert.h we use the assert() macro. + From zlib.h + we use the basic compression functions deflateInit(), + deflate(), and deflateEnd(), and the basic decompression + functions inflateInit(), inflate(), and + inflateEnd(). +
    
    + #include <stdio.h>
    + #include <string.h>
    + #include <assert.h>
    + #include "zlib.h"
    + 
    + CHUNK is simply the buffer size for feeding data to and pulling data + from the zlib routines. Larger buffer sizes would be more efficient, + especially for inflate(). If the memory is available, buffers sizes + on the order of 128K or 256K bytes should be used. +
    
    + #define CHUNK 16384
    + 
    + The def() routine compresses data from an input file to an output file. The output data + will be in the zlib format, which is different from the gzip or zip + formats. The zlib format has a very small header of only two bytes to identify it as + a zlib stream and to provide decoding information, and a four-byte trailer with a fast + check value to verify the integrity of the uncompressed data after decoding. +
    
    + /* Compress from file source to file dest until EOF on source.
    +    def() returns Z_OK on success, Z_MEM_ERROR if memory could not be
    +    allocated for processing, Z_STREAM_ERROR if an invalid compression
    +    level is supplied, Z_VERSION_ERROR if the version of zlib.h and the
    +    version of the library linked do not match, or Z_ERRNO if there is
    +    an error reading or writing the files. */
    + int def(FILE *source, FILE *dest, int level)
    + {
    + 
    + Here are the local variables for def(). ret will be used for zlib + return codes. flush will keep track of the current flushing state for deflate(), + which is either no flushing, or flush to completion after the end of the input file is reached. + have is the amount of data returned from deflate(). The strm structure + is used to pass information to and from the zlib routines, and to maintain the + deflate() state. in and out are the input and output buffers for + deflate(). +
    
    +     int ret, flush;
    +     unsigned have;
    +     z_stream strm;
    +     char in[CHUNK];
    +     char out[CHUNK];
    + 
    + The first thing we do is to initialize the zlib state for compression using + deflateInit(). This must be done before the first use of deflate(). + The zalloc, zfree, and opaque fields in the strm + structure must be initialized before calling deflateInit(). Here they are + set to the zlib constant Z_NULL to request that zlib use + the default memory allocation routines. An application may also choose to provide + custom memory allocation routines here. deflateInit() will allocate on the + order of 256K bytes for the internal state. + (See zlib Technical Details.) +

    + deflateInit() is called with a pointer to the structure to be initialized and + the compression level, which is an integer in the range of -1 to 9. Lower compression + levels result in faster execution, but less compression. Higher levels result in + greater compression, but slower execution. The zlib constant Z_DEFAULT_COMPRESSION, + equal to -1, + provides a good compromise between compression and speed and is equivalent to level 6. + Level 0 actually does no compression at all, and in fact expands the data slightly to produce + the zlib format (it is not a byte-for-byte copy of the input). + More advanced applications of zlib + may use deflateInit2() here instead. Such an application may want to reduce how + much memory will be used, at some price in compression. Or it may need to request a + gzip header and trailer instead of a zlib header and trailer, or raw + encoding with no header or trailer at all. +

    + We must check the return value of deflateInit() against the zlib constant + Z_OK to make sure that it was able to + allocate memory for the internal state, and that the provided arguments were valid. + deflateInit() will also check that the version of zlib that the zlib.h + file came from matches the version of zlib actually linked with the program. This + is especially important for environments in which zlib is a shared library. +

    + Note that an application can initialize multiple, independent zlib streams, which can + operate in parallel. The state information maintained in the structure allows the zlib + routines to be reentrant. +

    
    +     /* allocate deflate state */
    +     strm.zalloc = Z_NULL;
    +     strm.zfree = Z_NULL;
    +     strm.opaque = Z_NULL;
    +     ret = deflateInit(&strm, level);
    +     if (ret != Z_OK)
    +         return ret;
    + 
    + With the pleasantries out of the way, now we can get down to business. The outer do-loop + reads all of the input file and exits at the bottom of the loop once end-of-file is reached. + This loop contains the only call of deflate(). So we must make sure that all of the + input data has been processed and that all of the output data has been generated and consumed + before we fall out of the loop at the bottom. +
    
    +     /* compress until end of file */
    +     do {
    + 
    + We start off by reading data from the input file. The number of bytes read is put directly + into avail_in, and a pointer to those bytes is put into next_in. We also + check to see if end-of-file on the input has been reached. If we are at the end of file, then flush is set to the + zlib constant Z_FINISH, which is later passed to deflate() to + indicate that this is the last chunk of input data to compress. We need to use feof() + to check for end-of-file as opposed to seeing if fewer than CHUNK bytes have been read. The + reason is that if the input file length is an exact multiple of CHUNK, we will miss + the fact that we got to the end-of-file, and not know to tell deflate() to finish + up the compressed stream. If we are not yet at the end of the input, then the zlib + constant Z_NO_FLUSH will be passed to deflate to indicate that we are still + in the middle of the uncompressed data. +

    + If there is an error in reading from the input file, the process is aborted with + deflateEnd() being called to free the allocated zlib state before returning + the error. We wouldn't want a memory leak, now would we? deflateEnd() can be called + at any time after the state has been initialized. Once that's done, deflateInit() (or + deflateInit2()) would have to be called to start a new compression process. There is + no point here in checking the deflateEnd() return code. The deallocation can't fail. +

    
    +         strm.avail_in = fread(in, 1, CHUNK, source);
    +         if (ferror(source)) {
    +             (void)deflateEnd(&strm);
    +             return Z_ERRNO;
    +         }
    +         flush = feof(source) ? Z_FINISH : Z_NO_FLUSH;
    +         strm.next_in = in;
    + 
    + The inner do-loop passes our chunk of input data to deflate(), and then + keeps calling deflate() until it is done producing output. Once there is no more + new output, deflate() is guaranteed to have consumed all of the input, i.e., + avail_in will be zero. +
    
    +         /* run deflate() on input until output buffer not full, finish
    +            compression if all of source has been read in */
    +         do {
    + 
    + Output space is provided to deflate() by setting avail_out to the number + of available output bytes and next_out to a pointer to that space. +
    
    +             strm.avail_out = CHUNK;
    +             strm.next_out = out;
    + 
    + Now we call the compression engine itself, deflate(). It takes as many of the + avail_in bytes at next_in as it can process, and writes as many as + avail_out bytes to next_out. Those counters and pointers are then + updated past the input data consumed and the output data written. It is the amount of + output space available that may limit how much input is consumed. + Hence the inner loop to make sure that + all of the input is consumed by providing more output space each time. Since avail_in + and next_in are updated by deflate(), we don't have to mess with those + between deflate() calls until it's all used up. +

    + The parameters to deflate() are a pointer to the strm structure containing + the input and output information and the internal compression engine state, and a parameter + indicating whether and how to flush data to the output. Normally deflate will consume + several K bytes of input data before producing any output (except for the header), in order + to accumulate statistics on the data for optimum compression. It will then put out a burst of + compressed data, and proceed to consume more input before the next burst. Eventually, + deflate() + must be told to terminate the stream, complete the compression with provided input data, and + write out the trailer check value. deflate() will continue to compress normally as long + as the flush parameter is Z_NO_FLUSH. Once the Z_FINISH parameter is provided, + deflate() will begin to complete the compressed output stream. However depending on how + much output space is provided, deflate() may have to be called several times until it + has provided the complete compressed stream, even after it has consumed all of the input. The flush + parameter must continue to be Z_FINISH for those subsequent calls. +

    + There are other values of the flush parameter that are used in more advanced applications. You can + force deflate() to produce a burst of output that encodes all of the input data provided + so far, even if it wouldn't have otherwise, for example to control data latency on a link with + compressed data. You can also ask that deflate() do that as well as erase any history up to + that point so that what follows can be decompressed independently, for example for random access + applications. Both requests will degrade compression by an amount depending on how often such + requests are made. +

    + deflate() has a return value that can indicate errors, yet we do not check it here. Why + not? Well, it turns out that deflate() can do no wrong here. Let's go through + deflate()'s return values and dispense with them one by one. The possible values are + Z_OK, Z_STREAM_END, Z_STREAM_ERROR, or Z_BUF_ERROR. Z_OK + is, well, ok. Z_STREAM_END is also ok and will be returned for the last call of + deflate(). This is already guaranteed by calling deflate() with Z_FINISH + until it has no more output. Z_STREAM_ERROR is only possible if the stream is not + initialized properly, but we did initialize it properly. There is no harm in checking for + Z_STREAM_ERROR here, for example to check for the possibility that some + other part of the application inadvertently clobbered the memory containing the zlib state. + Z_BUF_ERROR will be explained further below, but + suffice it to say that this is simply an indication that deflate() could not consume + more input or produce more output. deflate() can be called again with more output space + or more available input, which it will be in this code. +

    
    +             ret = deflate(&strm, flush);    /* no bad return value */
    +             assert(ret != Z_STREAM_ERROR);  /* state not clobbered */
    + 
    + Now we compute how much output deflate() provided on the last call, which is the + difference between how much space was provided before the call, and how much output space + is still available after the call. Then that data, if any, is written to the output file. + We can then reuse the output buffer for the next call of deflate(). Again if there + is a file i/o error, we call deflateEnd() before returning to avoid a memory leak. +
    
    +             have = CHUNK - strm.avail_out;
    +             if (fwrite(out, 1, have, dest) != have || ferror(dest)) {
    +                 (void)deflateEnd(&strm);
    +                 return Z_ERRNO;
    +             }
    + 
    + The inner do-loop is repeated until the last deflate() call fails to fill the + provided output buffer. Then we know that deflate() has done as much as it can with + the provided input, and that all of that input has been consumed. We can then fall out of this + loop and reuse the input buffer. +

    + The way we tell that deflate() has no more output is by seeing that it did not fill + the output buffer, leaving avail_out greater than zero. However suppose that + deflate() has no more output, but just so happened to exactly fill the output buffer! + avail_out is zero, and we can't tell that deflate() has done all it can. + As far as we know, deflate() + has more output for us. So we call it again. But now deflate() produces no output + at all, and avail_out remains unchanged as CHUNK. That deflate() call + wasn't able to do anything, either consume input or produce output, and so it returns + Z_BUF_ERROR. (See, I told you I'd cover this later.) However this is not a problem at + all. Now we finally have the desired indication that deflate() is really done, + and so we drop out of the inner loop to provide more input to deflate(). +

    + With flush set to Z_FINISH, this final set of deflate() calls will + complete the output stream. Once that is done, subsequent calls of deflate() would return + Z_STREAM_ERROR if the flush parameter is not Z_FINISH, and do no more processing + until the state is reinitialized. +

    + Some applications of zlib have two loops that call deflate() + instead of the single inner loop we have here. The first loop would call + without flushing and feed all of the data to deflate(). The second loop would call + deflate() with no more + data and the Z_FINISH parameter to complete the process. As you can see from this + example, that can be avoided by simply keeping track of the current flush state. +

    
    +         } while (strm.avail_out == 0);
    +         assert(strm.avail_in == 0);     /* all input will be used */
    + 
    + Now we check to see if we have already processed all of the input file. That information was + saved in the flush variable, so we see if that was set to Z_FINISH. If so, + then we're done and we fall out of the outer loop. We're guaranteed to get Z_STREAM_END + from the last deflate() call, since we ran it until the last chunk of input was + consumed and all of the output was generated. +
    
    +         /* done when last data in file processed */
    +     } while (flush != Z_FINISH);
    +     assert(ret == Z_STREAM_END);        /* stream will be complete */
    + 
    + The process is complete, but we still need to deallocate the state to avoid a memory leak + (or rather more like a memory hemorrhage if you didn't do this). Then + finally we can return with a happy return value. +
    
    +     /* clean up and return */
    +     (void)deflateEnd(&strm);
    +     return Z_OK;
    + }
    + 
    + Now we do the same thing for decompression in the inf() routine. inf() + decompresses what is hopefully a valid zlib stream from the input file and writes the + uncompressed data to the output file. Much of the discussion above for def() + applies to inf() as well, so the discussion here will focus on the differences between + the two. +
    
    + /* Decompress from file source to file dest until stream ends or EOF.
    +    inf() returns Z_OK on success, Z_MEM_ERROR if memory could not be
    +    allocated for processing, Z_DATA_ERROR if the deflate data is
    +    invalid or incomplete, Z_VERSION_ERROR if the version of zlib.h and
    +    the version of the library linked do not match, or Z_ERRNO if there
    +    is an error reading or writing the files. */
    + int inf(FILE *source, FILE *dest)
    + {
    + 
    + The local variables have the same functionality as they do for def(). The + only difference is that there is no flush variable, since inflate() + can tell from the zlib stream itself when the stream is complete. +
    
    +     int ret;
    +     unsigned have;
    +     z_stream strm;
    +     char in[CHUNK];
    +     char out[CHUNK];
    + 
    + The initialization of the state is the same, except that there is no compression level, + of course, and two more elements of the structure are initialized. avail_in + and next_in must be initialized before calling inflateInit(). This + is because the application has the option to provide the start of the zlib stream in + order for inflateInit() to have access to information about the compression + method to aid in memory allocation. In the current implementation of zlib + (up through versions 1.2.x), the method-dependent memory allocations are deferred to the first call of + inflate() anyway. However those fields must be initialized since later versions + of zlib that provide more compression methods may take advantage of this interface. + In any case, no decompression is performed by inflateInit(), so the + avail_out and next_out fields do not need to be initialized before calling. +

    + Here avail_in is set to zero and next_in is set to Z_NULL to + indicate that no input data is being provided. +

    
    +     /* allocate inflate state */
    +     strm.zalloc = Z_NULL;
    +     strm.zfree = Z_NULL;
    +     strm.opaque = Z_NULL;
    +     strm.avail_in = 0;
    +     strm.next_in = Z_NULL;
    +     ret = inflateInit(&strm);
    +     if (ret != Z_OK)
    +         return ret;
    + 
    + The outer do-loop decompresses input until inflate() indicates + that it has reached the end of the compressed data and has produced all of the uncompressed + output. This is in contrast to def() which processes all of the input file. + If end-of-file is reached before the compressed data self-terminates, then the compressed + data is incomplete and an error is returned. +
    
    +     /* decompress until deflate stream ends or end of file */
    +     do {
    + 
    + We read input data and set the strm structure accordingly. If we've reached the + end of the input file, then we leave the outer loop and report an error, since the + compressed data is incomplete. Note that we may read more data than is eventually consumed + by inflate(), if the input file continues past the zlib stream. + For applications where zlib streams are embedded in other data, this routine would + need to be modified to return the unused data, or at least indicate how much of the input + data was not used, so the application would know where to pick up after the zlib stream. +
    
    +         strm.avail_in = fread(in, 1, CHUNK, source);
    +         if (ferror(source)) {
    +             (void)inflateEnd(&strm);
    +             return Z_ERRNO;
    +         }
    +         if (strm.avail_in == 0)
    +             break;
    +         strm.next_in = in;
    + 
    + The inner do-loop has the same function it did in def(), which is to + keep calling inflate() until has generated all of the output it can with the + provided input. +
    
    +         /* run inflate() on input until output buffer not full */
    +         do {
    + 
    + Just like in def(), the same output space is provided for each call of inflate(). +
    
    +             strm.avail_out = CHUNK;
    +             strm.next_out = out;
    + 
    + Now we run the decompression engine itself. There is no need to adjust the flush parameter, since + the zlib format is self-terminating. The main difference here is that there are + return values that we need to pay attention to. Z_DATA_ERROR + indicates that inflate() detected an error in the zlib compressed data format, + which means that either the data is not a zlib stream to begin with, or that the data was + corrupted somewhere along the way since it was compressed. The other error to be processed is + Z_MEM_ERROR, which can occur since memory allocation is deferred until inflate() + needs it, unlike deflate(), whose memory is allocated at the start by deflateInit(). +

    + Advanced applications may use + deflateSetDictionary() to prime deflate() with a set of likely data to improve the + first 32K or so of compression. This is noted in the zlib header, so inflate() + requests that that dictionary be provided before it can start to decompress. Without the dictionary, + correct decompression is not possible. For this routine, we have no idea what the dictionary is, + so the Z_NEED_DICT indication is converted to a Z_DATA_ERROR. +

    + inflate() can also return Z_STREAM_ERROR, which should not be possible here, + but could be checked for as noted above for def(). Z_BUF_ERROR does not need to be + checked for here, for the same reasons noted for def(). Z_STREAM_END will be + checked for later. +

    
    +             ret = inflate(&strm, Z_NO_FLUSH);
    +             assert(ret != Z_STREAM_ERROR);  /* state not clobbered */
    +             switch (ret) {
    +             case Z_NEED_DICT:
    +                 ret = Z_DATA_ERROR;     /* and fall through */
    +             case Z_DATA_ERROR:
    +             case Z_MEM_ERROR:
    +                 (void)inflateEnd(&strm);
    +                 return ret;
    +             }
    + 
    + The output of inflate() is handled identically to that of deflate(). +
    
    +             have = CHUNK - strm.avail_out;
    +             if (fwrite(out, 1, have, dest) != have || ferror(dest)) {
    +                 (void)inflateEnd(&strm);
    +                 return Z_ERRNO;
    +             }
    + 
    + The inner do-loop ends when inflate() has no more output as indicated + by not filling the output buffer, just as for deflate(). In this case, we cannot + assert that strm.avail_in will be zero, since the deflate stream may end before the file + does. +
    
    +         } while (strm.avail_out == 0);
    + 
    + The outer do-loop ends when inflate() reports that it has reached the + end of the input zlib stream, has completed the decompression and integrity + check, and has provided all of the output. This is indicated by the inflate() + return value Z_STREAM_END. The inner loop is guaranteed to leave ret + equal to Z_STREAM_END if the last chunk of the input file read contained the end + of the zlib stream. So if the return value is not Z_STREAM_END, the + loop continues to read more input. +
    
    +         /* done when inflate() says it's done */
    +     } while (ret != Z_STREAM_END);
    + 
    + At this point, decompression successfully completed, or we broke out of the loop due to no + more data being available from the input file. If the last inflate() return value + is not Z_STREAM_END, then the zlib stream was incomplete and a data error + is returned. Otherwise, we return with a happy return value. Of course, inflateEnd() + is called first to avoid a memory leak. +
    
    +     /* clean up and return */
    +     (void)inflateEnd(&strm);
    +     return ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR;
    + }
    + 
    + That ends the routines that directly use zlib. The following routines make this + a command-line program by running data through the above routines from stdin to + stdout, and handling any errors reported by def() or inf(). +

    + zerr() is used to interpret the possible error codes from def() + and inf(), as detailed in their comments above, and print out an error message. + Note that these are only a subset of the possible return values from deflate() + and inflate(). +

    
    + /* report a zlib or i/o error */
    + void zerr(int ret)
    + {
    +     fputs("zpipe: ", stderr);
    +     switch (ret) {
    +     case Z_ERRNO:
    +         if (ferror(stdin))
    +             fputs("error reading stdin\n", stderr);
    +         if (ferror(stdout))
    +             fputs("error writing stdout\n", stderr);
    +         break;
    +     case Z_STREAM_ERROR:
    +         fputs("invalid compression level\n", stderr);
    +         break;
    +     case Z_DATA_ERROR:
    +         fputs("invalid or incomplete deflate data\n", stderr);
    +         break;
    +     case Z_MEM_ERROR:
    +         fputs("out of memory\n", stderr);
    +         break;
    +     case Z_VERSION_ERROR:
    +         fputs("zlib version mismatch!\n", stderr);
    +     }
    + }
    + 
    + Here is the main() routine used to test def() and inf(). The + zpipe command is simply a compression pipe from stdin to stdout, if + no arguments are given, or it is a decompression pipe if zpipe -d is used. If any other + arguments are provided, no compression or decompression is performed. Instead a usage + message is displayed. Examples are zpipe < foo.txt > foo.txt.z to compress, and + zpipe -d < foo.txt.z > foo.txt to decompress. +
    
    + /* compress or decompress from stdin to stdout */
    + int main(int argc, char **argv)
    + {
    +     int ret;
    + 
    +     /* do compression if no arguments */
    +     if (argc == 1) {
    +         ret = def(stdin, stdout, Z_DEFAULT_COMPRESSION);
    +         if (ret != Z_OK)
    +             zerr(ret);
    +         return ret;
    +     }
    + 
    +     /* do decompression if -d specified */
    +     else if (argc == 2 && strcmp(argv[1], "-d") == 0) {
    +         ret = inf(stdin, stdout);
    +         if (ret != Z_OK)
    +             zerr(ret);
    +         return ret;
    +     }
    + 
    +     /* otherwise, report usage */
    +     else {
    +         fputs("zpipe usage: zpipe [-d] < source > dest\n", stderr);
    +         return 1;
    +     }
    + }
    + 
    +
    + Copyright (c) 2004 by Mark Adler
    Last modified 13 November 2004
    + + diff -Nrcpad gcc-4.4.4/zlib/examples/zpipe.c gcc-4.4.5/zlib/examples/zpipe.c *** gcc-4.4.4/zlib/examples/zpipe.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/examples/zpipe.c Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,191 ---- + /* zpipe.c: example of proper use of zlib's inflate() and deflate() + Not copyrighted -- provided to the public domain + Version 1.2 9 November 2004 Mark Adler */ + + /* Version history: + 1.0 30 Oct 2004 First version + 1.1 8 Nov 2004 Add void casting for unused return values + Use switch statement for inflate() return values + 1.2 9 Nov 2004 Add assertions to document zlib guarantees + 1.3 6 Apr 2005 Remove incorrect assertion in inf() + */ + + #include + #include + #include + #include "zlib.h" + + #define CHUNK 16384 + + /* Compress from file source to file dest until EOF on source. + def() returns Z_OK on success, Z_MEM_ERROR if memory could not be + allocated for processing, Z_STREAM_ERROR if an invalid compression + level is supplied, Z_VERSION_ERROR if the version of zlib.h and the + version of the library linked do not match, or Z_ERRNO if there is + an error reading or writing the files. */ + int def(FILE *source, FILE *dest, int level) + { + int ret, flush; + unsigned have; + z_stream strm; + char in[CHUNK]; + char out[CHUNK]; + + /* allocate deflate state */ + strm.zalloc = Z_NULL; + strm.zfree = Z_NULL; + strm.opaque = Z_NULL; + ret = deflateInit(&strm, level); + if (ret != Z_OK) + return ret; + + /* compress until end of file */ + do { + strm.avail_in = fread(in, 1, CHUNK, source); + if (ferror(source)) { + (void)deflateEnd(&strm); + return Z_ERRNO; + } + flush = feof(source) ? Z_FINISH : Z_NO_FLUSH; + strm.next_in = in; + + /* run deflate() on input until output buffer not full, finish + compression if all of source has been read in */ + do { + strm.avail_out = CHUNK; + strm.next_out = out; + ret = deflate(&strm, flush); /* no bad return value */ + assert(ret != Z_STREAM_ERROR); /* state not clobbered */ + have = CHUNK - strm.avail_out; + if (fwrite(out, 1, have, dest) != have || ferror(dest)) { + (void)deflateEnd(&strm); + return Z_ERRNO; + } + } while (strm.avail_out == 0); + assert(strm.avail_in == 0); /* all input will be used */ + + /* done when last data in file processed */ + } while (flush != Z_FINISH); + assert(ret == Z_STREAM_END); /* stream will be complete */ + + /* clean up and return */ + (void)deflateEnd(&strm); + return Z_OK; + } + + /* Decompress from file source to file dest until stream ends or EOF. + inf() returns Z_OK on success, Z_MEM_ERROR if memory could not be + allocated for processing, Z_DATA_ERROR if the deflate data is + invalid or incomplete, Z_VERSION_ERROR if the version of zlib.h and + the version of the library linked do not match, or Z_ERRNO if there + is an error reading or writing the files. */ + int inf(FILE *source, FILE *dest) + { + int ret; + unsigned have; + z_stream strm; + char in[CHUNK]; + char out[CHUNK]; + + /* allocate inflate state */ + strm.zalloc = Z_NULL; + strm.zfree = Z_NULL; + strm.opaque = Z_NULL; + strm.avail_in = 0; + strm.next_in = Z_NULL; + ret = inflateInit(&strm); + if (ret != Z_OK) + return ret; + + /* decompress until deflate stream ends or end of file */ + do { + strm.avail_in = fread(in, 1, CHUNK, source); + if (ferror(source)) { + (void)inflateEnd(&strm); + return Z_ERRNO; + } + if (strm.avail_in == 0) + break; + strm.next_in = in; + + /* run inflate() on input until output buffer not full */ + do { + strm.avail_out = CHUNK; + strm.next_out = out; + ret = inflate(&strm, Z_NO_FLUSH); + assert(ret != Z_STREAM_ERROR); /* state not clobbered */ + switch (ret) { + case Z_NEED_DICT: + ret = Z_DATA_ERROR; /* and fall through */ + case Z_DATA_ERROR: + case Z_MEM_ERROR: + (void)inflateEnd(&strm); + return ret; + } + have = CHUNK - strm.avail_out; + if (fwrite(out, 1, have, dest) != have || ferror(dest)) { + (void)inflateEnd(&strm); + return Z_ERRNO; + } + } while (strm.avail_out == 0); + + /* done when inflate() says it's done */ + } while (ret != Z_STREAM_END); + + /* clean up and return */ + (void)inflateEnd(&strm); + return ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR; + } + + /* report a zlib or i/o error */ + void zerr(int ret) + { + fputs("zpipe: ", stderr); + switch (ret) { + case Z_ERRNO: + if (ferror(stdin)) + fputs("error reading stdin\n", stderr); + if (ferror(stdout)) + fputs("error writing stdout\n", stderr); + break; + case Z_STREAM_ERROR: + fputs("invalid compression level\n", stderr); + break; + case Z_DATA_ERROR: + fputs("invalid or incomplete deflate data\n", stderr); + break; + case Z_MEM_ERROR: + fputs("out of memory\n", stderr); + break; + case Z_VERSION_ERROR: + fputs("zlib version mismatch!\n", stderr); + } + } + + /* compress or decompress from stdin to stdout */ + int main(int argc, char **argv) + { + int ret; + + /* do compression if no arguments */ + if (argc == 1) { + ret = def(stdin, stdout, Z_DEFAULT_COMPRESSION); + if (ret != Z_OK) + zerr(ret); + return ret; + } + + /* do decompression if -d specified */ + else if (argc == 2 && strcmp(argv[1], "-d") == 0) { + ret = inf(stdin, stdout); + if (ret != Z_OK) + zerr(ret); + return ret; + } + + /* otherwise, report usage */ + else { + fputs("zpipe usage: zpipe [-d] < source > dest\n", stderr); + return 1; + } + } diff -Nrcpad gcc-4.4.4/zlib/examples/zran.c gcc-4.4.5/zlib/examples/zran.c *** gcc-4.4.4/zlib/examples/zran.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/examples/zran.c Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,404 ---- + /* zran.c -- example of zlib/gzip stream indexing and random access + * Copyright (C) 2005 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + Version 1.0 29 May 2005 Mark Adler */ + + /* Illustrate the use of Z_BLOCK, inflatePrime(), and inflateSetDictionary() + for random access of a compressed file. A file containing a zlib or gzip + stream is provided on the command line. The compressed stream is decoded in + its entirety, and an index built with access points about every SPAN bytes + in the uncompressed output. The compressed file is left open, and can then + be read randomly, having to decompress on the average SPAN/2 uncompressed + bytes before getting to the desired block of data. + + An access point can be created at the start of any deflate block, by saving + the starting file offset and bit of that block, and the 32K bytes of + uncompressed data that precede that block. Also the uncompressed offset of + that block is saved to provide a referece for locating a desired starting + point in the uncompressed stream. build_index() works by decompressing the + input zlib or gzip stream a block at a time, and at the end of each block + deciding if enough uncompressed data has gone by to justify the creation of + a new access point. If so, that point is saved in a data structure that + grows as needed to accommodate the points. + + To use the index, an offset in the uncompressed data is provided, for which + the latest accees point at or preceding that offset is located in the index. + The input file is positioned to the specified location in the index, and if + necessary the first few bits of the compressed data is read from the file. + inflate is initialized with those bits and the 32K of uncompressed data, and + the decompression then proceeds until the desired offset in the file is + reached. Then the decompression continues to read the desired uncompressed + data from the file. + + Another approach would be to generate the index on demand. In that case, + requests for random access reads from the compressed data would try to use + the index, but if a read far enough past the end of the index is required, + then further index entries would be generated and added. + + There is some fair bit of overhead to starting inflation for the random + access, mainly copying the 32K byte dictionary. So if small pieces of the + file are being accessed, it would make sense to implement a cache to hold + some lookahead and avoid many calls to extract() for small lengths. + + Another way to build an index would be to use inflateCopy(). That would + not be constrained to have access points at block boundaries, but requires + more memory per access point, and also cannot be saved to file due to the + use of pointers in the state. The approach here allows for storage of the + index in a file. + */ + + #include + #include + #include + #include "zlib.h" + + #define local static + + #define SPAN 1048576L /* desired distance between access points */ + #define WINSIZE 32768U /* sliding window size */ + #define CHUNK 16384 /* file input buffer size */ + + /* access point entry */ + struct point { + off_t out; /* corresponding offset in uncompressed data */ + off_t in; /* offset in input file of first full byte */ + int bits; /* number of bits (1-7) from byte at in - 1, or 0 */ + unsigned char window[WINSIZE]; /* preceding 32K of uncompressed data */ + }; + + /* access point list */ + struct access { + int have; /* number of list entries filled in */ + int size; /* number of list entries allocated */ + struct point *list; /* allocated list */ + }; + + /* Deallocate an index built by build_index() */ + local void free_index(struct access *index) + { + if (index != NULL) { + free(index->list); + free(index); + } + } + + /* Add an entry to the access point list. If out of memory, deallocate the + existing list and return NULL. */ + local struct access *addpoint(struct access *index, int bits, + off_t in, off_t out, unsigned left, unsigned char *window) + { + struct point *next; + + /* if list is empty, create it (start with eight points) */ + if (index == NULL) { + index = malloc(sizeof(struct access)); + if (index == NULL) return NULL; + index->list = malloc(sizeof(struct point) << 3); + if (index->list == NULL) { + free(index); + return NULL; + } + index->size = 8; + index->have = 0; + } + + /* if list is full, make it bigger */ + else if (index->have == index->size) { + index->size <<= 1; + next = realloc(index->list, sizeof(struct point) * index->size); + if (next == NULL) { + free_index(index); + return NULL; + } + index->list = next; + } + + /* fill in entry and increment how many we have */ + next = index->list + index->have; + next->bits = bits; + next->in = in; + next->out = out; + if (left) + memcpy(next->window, window + WINSIZE - left, left); + if (left < WINSIZE) + memcpy(next->window + left, window, WINSIZE - left); + index->have++; + + /* return list, possibly reallocated */ + return index; + } + + /* Make one entire pass through the compressed stream and build an index, with + access points about every span bytes of uncompressed output -- span is + chosen to balance the speed of random access against the memory requirements + of the list, about 32K bytes per access point. Note that data after the end + of the first zlib or gzip stream in the file is ignored. build_index() + returns the number of access points on success (>= 1), Z_MEM_ERROR for out + of memory, Z_DATA_ERROR for an error in the input file, or Z_ERRNO for a + file read error. On success, *built points to the resulting index. */ + local int build_index(FILE *in, off_t span, struct access **built) + { + int ret; + off_t totin, totout; /* our own total counters to avoid 4GB limit */ + off_t last; /* totout value of last access point */ + struct access *index; /* access points being generated */ + z_stream strm; + unsigned char input[CHUNK]; + unsigned char window[WINSIZE]; + + /* initialize inflate */ + strm.zalloc = Z_NULL; + strm.zfree = Z_NULL; + strm.opaque = Z_NULL; + strm.avail_in = 0; + strm.next_in = Z_NULL; + ret = inflateInit2(&strm, 47); /* automatic zlib or gzip decoding */ + if (ret != Z_OK) + return ret; + + /* inflate the input, maintain a sliding window, and build an index -- this + also validates the integrity of the compressed data using the check + information at the end of the gzip or zlib stream */ + totin = totout = last = 0; + index = NULL; /* will be allocated by first addpoint() */ + strm.avail_out = 0; + do { + /* get some compressed data from input file */ + strm.avail_in = fread(input, 1, CHUNK, in); + if (ferror(in)) { + ret = Z_ERRNO; + goto build_index_error; + } + if (strm.avail_in == 0) { + ret = Z_DATA_ERROR; + goto build_index_error; + } + strm.next_in = input; + + /* process all of that, or until end of stream */ + do { + /* reset sliding window if necessary */ + if (strm.avail_out == 0) { + strm.avail_out = WINSIZE; + strm.next_out = window; + } + + /* inflate until out of input, output, or at end of block -- + update the total input and output counters */ + totin += strm.avail_in; + totout += strm.avail_out; + ret = inflate(&strm, Z_BLOCK); /* return at end of block */ + totin -= strm.avail_in; + totout -= strm.avail_out; + if (ret == Z_NEED_DICT) + ret = Z_DATA_ERROR; + if (ret == Z_MEM_ERROR || ret == Z_DATA_ERROR) + goto build_index_error; + if (ret == Z_STREAM_END) + break; + + /* if at end of block, consider adding an index entry (note that if + data_type indicates an end-of-block, then all of the + uncompressed data from that block has been delivered, and none + of the compressed data after that block has been consumed, + except for up to seven bits) -- the totout == 0 provides an + entry point after the zlib or gzip header, and assures that the + index always has at least one access point; we avoid creating an + access point after the last block by checking bit 6 of data_type + */ + if ((strm.data_type & 128) && !(strm.data_type & 64) && + (totout == 0 || totout - last > span)) { + index = addpoint(index, strm.data_type & 7, totin, + totout, strm.avail_out, window); + if (index == NULL) { + ret = Z_MEM_ERROR; + goto build_index_error; + } + last = totout; + } + } while (strm.avail_in != 0); + } while (ret != Z_STREAM_END); + + /* clean up and return index (release unused entries in list) */ + (void)inflateEnd(&strm); + index = realloc(index, sizeof(struct point) * index->have); + index->size = index->have; + *built = index; + return index->size; + + /* return error */ + build_index_error: + (void)inflateEnd(&strm); + if (index != NULL) + free_index(index); + return ret; + } + + /* Use the index to read len bytes from offset into buf, return bytes read or + negative for error (Z_DATA_ERROR or Z_MEM_ERROR). If data is requested past + the end of the uncompressed data, then extract() will return a value less + than len, indicating how much as actually read into buf. This function + should not return a data error unless the file was modified since the index + was generated. extract() may also return Z_ERRNO if there is an error on + reading or seeking the input file. */ + local int extract(FILE *in, struct access *index, off_t offset, + unsigned char *buf, int len) + { + int ret, skip; + z_stream strm; + struct point *here; + unsigned char input[CHUNK]; + unsigned char discard[WINSIZE]; + + /* proceed only if something reasonable to do */ + if (len < 0) + return 0; + + /* find where in stream to start */ + here = index->list; + ret = index->have; + while (--ret && here[1].out <= offset) + here++; + + /* initialize file and inflate state to start there */ + strm.zalloc = Z_NULL; + strm.zfree = Z_NULL; + strm.opaque = Z_NULL; + strm.avail_in = 0; + strm.next_in = Z_NULL; + ret = inflateInit2(&strm, -15); /* raw inflate */ + if (ret != Z_OK) + return ret; + ret = fseeko(in, here->in - (here->bits ? 1 : 0), SEEK_SET); + if (ret == -1) + goto extract_ret; + if (here->bits) { + ret = getc(in); + if (ret == -1) { + ret = ferror(in) ? Z_ERRNO : Z_DATA_ERROR; + goto extract_ret; + } + (void)inflatePrime(&strm, here->bits, ret >> (8 - here->bits)); + } + (void)inflateSetDictionary(&strm, here->window, WINSIZE); + + /* skip uncompressed bytes until offset reached, then satisfy request */ + offset -= here->out; + strm.avail_in = 0; + skip = 1; /* while skipping to offset */ + do { + /* define where to put uncompressed data, and how much */ + if (offset == 0 && skip) { /* at offset now */ + strm.avail_out = len; + strm.next_out = buf; + skip = 0; /* only do this once */ + } + if (offset > WINSIZE) { /* skip WINSIZE bytes */ + strm.avail_out = WINSIZE; + strm.next_out = discard; + offset -= WINSIZE; + } + else if (offset != 0) { /* last skip */ + strm.avail_out = (unsigned)offset; + strm.next_out = discard; + offset = 0; + } + + /* uncompress until avail_out filled, or end of stream */ + do { + if (strm.avail_in == 0) { + strm.avail_in = fread(input, 1, CHUNK, in); + if (ferror(in)) { + ret = Z_ERRNO; + goto extract_ret; + } + if (strm.avail_in == 0) { + ret = Z_DATA_ERROR; + goto extract_ret; + } + strm.next_in = input; + } + ret = inflate(&strm, Z_NO_FLUSH); /* normal inflate */ + if (ret == Z_NEED_DICT) + ret = Z_DATA_ERROR; + if (ret == Z_MEM_ERROR || ret == Z_DATA_ERROR) + goto extract_ret; + if (ret == Z_STREAM_END) + break; + } while (strm.avail_out != 0); + + /* if reach end of stream, then don't keep trying to get more */ + if (ret == Z_STREAM_END) + break; + + /* do until offset reached and requested data read, or stream ends */ + } while (skip); + + /* compute number of uncompressed bytes read after offset */ + ret = skip ? 0 : len - strm.avail_out; + + /* clean up and return bytes read or error */ + extract_ret: + (void)inflateEnd(&strm); + return ret; + } + + /* Demonstrate the use of build_index() and extract() by processing the file + provided on the command line, and the extracting 16K from about 2/3rds of + the way through the uncompressed output, and writing that to stdout. */ + int main(int argc, char **argv) + { + int len; + off_t offset; + FILE *in; + struct access *index; + unsigned char buf[CHUNK]; + + /* open input file */ + if (argc != 2) { + fprintf(stderr, "usage: zran file.gz\n"); + return 1; + } + in = fopen(argv[1], "rb"); + if (in == NULL) { + fprintf(stderr, "zran: could not open %s for reading\n", argv[1]); + return 1; + } + + /* build index */ + len = build_index(in, SPAN, &index); + if (len < 0) { + fclose(in); + switch (len) { + case Z_MEM_ERROR: + fprintf(stderr, "zran: out of memory\n"); + break; + case Z_DATA_ERROR: + fprintf(stderr, "zran: compressed data error in %s\n", argv[1]); + break; + case Z_ERRNO: + fprintf(stderr, "zran: read error on %s\n", argv[1]); + break; + default: + fprintf(stderr, "zran: error %d while building index\n", len); + } + return 1; + } + fprintf(stderr, "zran: built index with %d access points\n", len); + + /* use index by reading some bytes from an arbitrary offset */ + offset = (index->list[index->have - 1].out << 1) / 3; + len = extract(in, index, offset, buf, CHUNK); + if (len < 0) + fprintf(stderr, "zran: extraction failed: %s error\n", + len == Z_MEM_ERROR ? "out of memory" : "input corrupted"); + else { + fwrite(buf, 1, len, stdout); + fprintf(stderr, "zran: extracted %d bytes at %llu\n", len, offset); + } + + /* clean up and exit */ + free_index(index); + fclose(in); + return 0; + } diff -Nrcpad gcc-4.4.4/zlib/gzio.c gcc-4.4.5/zlib/gzio.c *** gcc-4.4.4/zlib/gzio.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/gzio.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,1026 ---- + /* gzio.c -- IO on .gz files + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + * + * Compile this file with -DNO_GZCOMPRESS to avoid the compression code. + */ + + /* @(#) $Id: gzio.c,v 1.1.1.2 2002/03/11 21:53:24 tromey Exp $ */ + + #include + + #include "zutil.h" + + #ifdef NO_DEFLATE /* for compatibility with old definition */ + # define NO_GZCOMPRESS + #endif + + #ifndef NO_DUMMY_DECL + struct internal_state {int dummy;}; /* for buggy compilers */ + #endif + + #ifndef Z_BUFSIZE + # ifdef MAXSEG_64K + # define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */ + # else + # define Z_BUFSIZE 16384 + # endif + #endif + #ifndef Z_PRINTF_BUFSIZE + # define Z_PRINTF_BUFSIZE 4096 + #endif + + #ifdef __MVS__ + # pragma map (fdopen , "\174\174FDOPEN") + FILE *fdopen(int, const char *); + #endif + + #ifndef STDC + extern voidp malloc OF((uInt size)); + extern void free OF((voidpf ptr)); + #endif + + #define ALLOC(size) malloc(size) + #define TRYFREE(p) {if (p) free(p);} + + static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ + + /* gzip flag byte */ + #define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ + #define HEAD_CRC 0x02 /* bit 1 set: header CRC present */ + #define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ + #define ORIG_NAME 0x08 /* bit 3 set: original file name present */ + #define COMMENT 0x10 /* bit 4 set: file comment present */ + #define RESERVED 0xE0 /* bits 5..7: reserved */ + + typedef struct gz_stream { + z_stream stream; + int z_err; /* error code for last stream operation */ + int z_eof; /* set if end of input file */ + FILE *file; /* .gz file */ + Byte *inbuf; /* input buffer */ + Byte *outbuf; /* output buffer */ + uLong crc; /* crc32 of uncompressed data */ + char *msg; /* error message */ + char *path; /* path name for debugging only */ + int transparent; /* 1 if input file is not a .gz file */ + char mode; /* 'w' or 'r' */ + z_off_t start; /* start of compressed data in file (header skipped) */ + z_off_t in; /* bytes into deflate or inflate */ + z_off_t out; /* bytes out of deflate or inflate */ + int back; /* one character push-back */ + int last; /* true if push-back is last character */ + } gz_stream; + + + local gzFile gz_open OF((const char *path, const char *mode, int fd)); + local int do_flush OF((gzFile file, int flush)); + local int get_byte OF((gz_stream *s)); + local void check_header OF((gz_stream *s)); + local int destroy OF((gz_stream *s)); + local void putLong OF((FILE *file, uLong x)); + local uLong getLong OF((gz_stream *s)); + + /* =========================================================================== + Opens a gzip (.gz) file for reading or writing. The mode parameter + is as in fopen ("rb" or "wb"). The file is given either by file descriptor + or path name (if fd == -1). + gz_open returns NULL if the file could not be opened or if there was + insufficient memory to allocate the (de)compression state; errno + can be checked to distinguish the two cases (if errno is zero, the + zlib error is Z_MEM_ERROR). + */ + local gzFile gz_open (path, mode, fd) + const char *path; + const char *mode; + int fd; + { + int err; + int level = Z_DEFAULT_COMPRESSION; /* compression level */ + int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */ + char *p = (char*)mode; + gz_stream *s; + char fmode[80]; /* copy of mode, without the compression level */ + char *m = fmode; + + if (!path || !mode) return Z_NULL; + + s = (gz_stream *)ALLOC(sizeof(gz_stream)); + if (!s) return Z_NULL; + + s->stream.zalloc = (alloc_func)0; + s->stream.zfree = (free_func)0; + s->stream.opaque = (voidpf)0; + s->stream.next_in = s->inbuf = Z_NULL; + s->stream.next_out = s->outbuf = Z_NULL; + s->stream.avail_in = s->stream.avail_out = 0; + s->file = NULL; + s->z_err = Z_OK; + s->z_eof = 0; + s->in = 0; + s->out = 0; + s->back = EOF; + s->crc = crc32(0L, Z_NULL, 0); + s->msg = NULL; + s->transparent = 0; + + s->path = (char*)ALLOC(strlen(path)+1); + if (s->path == NULL) { + return destroy(s), (gzFile)Z_NULL; + } + strcpy(s->path, path); /* do this early for debugging */ + + s->mode = '\0'; + do { + if (*p == 'r') s->mode = 'r'; + if (*p == 'w' || *p == 'a') s->mode = 'w'; + if (*p >= '0' && *p <= '9') { + level = *p - '0'; + } else if (*p == 'f') { + strategy = Z_FILTERED; + } else if (*p == 'h') { + strategy = Z_HUFFMAN_ONLY; + } else if (*p == 'R') { + strategy = Z_RLE; + } else { + *m++ = *p; /* copy the mode */ + } + } while (*p++ && m != fmode + sizeof(fmode)); + if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL; + + if (s->mode == 'w') { + #ifdef NO_GZCOMPRESS + err = Z_STREAM_ERROR; + #else + err = deflateInit2(&(s->stream), level, + Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy); + /* windowBits is passed < 0 to suppress zlib header */ + + s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); + #endif + if (err != Z_OK || s->outbuf == Z_NULL) { + return destroy(s), (gzFile)Z_NULL; + } + } else { + s->stream.next_in = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); + + err = inflateInit2(&(s->stream), -MAX_WBITS); + /* windowBits is passed < 0 to tell that there is no zlib header. + * Note that in this case inflate *requires* an extra "dummy" byte + * after the compressed stream in order to complete decompression and + * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are + * present after the compressed stream. + */ + if (err != Z_OK || s->inbuf == Z_NULL) { + return destroy(s), (gzFile)Z_NULL; + } + } + s->stream.avail_out = Z_BUFSIZE; + + errno = 0; + s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode); + + if (s->file == NULL) { + return destroy(s), (gzFile)Z_NULL; + } + if (s->mode == 'w') { + /* Write a very simple .gz header: + */ + fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1], + Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE); + s->start = 10L; + /* We use 10L instead of ftell(s->file) to because ftell causes an + * fflush on some systems. This version of the library doesn't use + * start anyway in write mode, so this initialization is not + * necessary. + */ + } else { + check_header(s); /* skip the .gz header */ + s->start = ftell(s->file) - s->stream.avail_in; + } + + return (gzFile)s; + } + + /* =========================================================================== + Opens a gzip (.gz) file for reading or writing. + */ + gzFile ZEXPORT gzopen (path, mode) + const char *path; + const char *mode; + { + return gz_open (path, mode, -1); + } + + /* =========================================================================== + Associate a gzFile with the file descriptor fd. fd is not dup'ed here + to mimic the behavio(u)r of fdopen. + */ + gzFile ZEXPORT gzdopen (fd, mode) + int fd; + const char *mode; + { + char name[46]; /* allow for up to 128-bit integers */ + + if (fd < 0) return (gzFile)Z_NULL; + sprintf(name, "", fd); /* for debugging */ + + return gz_open (name, mode, fd); + } + + /* =========================================================================== + * Update the compression level and strategy + */ + int ZEXPORT gzsetparams (file, level, strategy) + gzFile file; + int level; + int strategy; + { + gz_stream *s = (gz_stream*)file; + + if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; + + /* Make room to allow flushing */ + if (s->stream.avail_out == 0) { + + s->stream.next_out = s->outbuf; + if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { + s->z_err = Z_ERRNO; + } + s->stream.avail_out = Z_BUFSIZE; + } + + return deflateParams (&(s->stream), level, strategy); + } + + /* =========================================================================== + Read a byte from a gz_stream; update next_in and avail_in. Return EOF + for end of file. + IN assertion: the stream s has been sucessfully opened for reading. + */ + local int get_byte(s) + gz_stream *s; + { + if (s->z_eof) return EOF; + if (s->stream.avail_in == 0) { + errno = 0; + s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file); + if (s->stream.avail_in == 0) { + s->z_eof = 1; + if (ferror(s->file)) s->z_err = Z_ERRNO; + return EOF; + } + s->stream.next_in = s->inbuf; + } + s->stream.avail_in--; + return *(s->stream.next_in)++; + } + + /* =========================================================================== + Check the gzip header of a gz_stream opened for reading. Set the stream + mode to transparent if the gzip magic header is not present; set s->err + to Z_DATA_ERROR if the magic header is present but the rest of the header + is incorrect. + IN assertion: the stream s has already been created sucessfully; + s->stream.avail_in is zero for the first time, but may be non-zero + for concatenated .gz files. + */ + local void check_header(s) + gz_stream *s; + { + int method; /* method byte */ + int flags; /* flags byte */ + uInt len; + int c; + + /* Assure two bytes in the buffer so we can peek ahead -- handle case + where first byte of header is at the end of the buffer after the last + gzip segment */ + len = s->stream.avail_in; + if (len < 2) { + if (len) s->inbuf[0] = s->stream.next_in[0]; + errno = 0; + len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file); + if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO; + s->stream.avail_in += len; + s->stream.next_in = s->inbuf; + if (s->stream.avail_in < 2) { + s->transparent = s->stream.avail_in; + return; + } + } + + /* Peek ahead to check the gzip magic header */ + if (s->stream.next_in[0] != gz_magic[0] || + s->stream.next_in[1] != gz_magic[1]) { + s->transparent = 1; + return; + } + s->stream.avail_in -= 2; + s->stream.next_in += 2; + + /* Check the rest of the gzip header */ + method = get_byte(s); + flags = get_byte(s); + if (method != Z_DEFLATED || (flags & RESERVED) != 0) { + s->z_err = Z_DATA_ERROR; + return; + } + + /* Discard time, xflags and OS code: */ + for (len = 0; len < 6; len++) (void)get_byte(s); + + if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */ + len = (uInt)get_byte(s); + len += ((uInt)get_byte(s))<<8; + /* len is garbage if EOF but the loop below will quit anyway */ + while (len-- != 0 && get_byte(s) != EOF) ; + } + if ((flags & ORIG_NAME) != 0) { /* skip the original file name */ + while ((c = get_byte(s)) != 0 && c != EOF) ; + } + if ((flags & COMMENT) != 0) { /* skip the .gz file comment */ + while ((c = get_byte(s)) != 0 && c != EOF) ; + } + if ((flags & HEAD_CRC) != 0) { /* skip the header crc */ + for (len = 0; len < 2; len++) (void)get_byte(s); + } + s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK; + } + + /* =========================================================================== + * Cleanup then free the given gz_stream. Return a zlib error code. + Try freeing in the reverse order of allocations. + */ + local int destroy (s) + gz_stream *s; + { + int err = Z_OK; + + if (!s) return Z_STREAM_ERROR; + + TRYFREE(s->msg); + + if (s->stream.state != NULL) { + if (s->mode == 'w') { + #ifdef NO_GZCOMPRESS + err = Z_STREAM_ERROR; + #else + err = deflateEnd(&(s->stream)); + #endif + } else if (s->mode == 'r') { + err = inflateEnd(&(s->stream)); + } + } + if (s->file != NULL && fclose(s->file)) { + #ifdef ESPIPE + if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */ + #endif + err = Z_ERRNO; + } + if (s->z_err < 0) err = s->z_err; + + TRYFREE(s->inbuf); + TRYFREE(s->outbuf); + TRYFREE(s->path); + TRYFREE(s); + return err; + } + + /* =========================================================================== + Reads the given number of uncompressed bytes from the compressed file. + gzread returns the number of bytes actually read (0 for end of file). + */ + int ZEXPORT gzread (file, buf, len) + gzFile file; + voidp buf; + unsigned len; + { + gz_stream *s = (gz_stream*)file; + Bytef *start = (Bytef*)buf; /* starting point for crc computation */ + Byte *next_out; /* == stream.next_out but not forced far (for MSDOS) */ + + if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR; + + if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1; + if (s->z_err == Z_STREAM_END) return 0; /* EOF */ + + next_out = (Byte*)buf; + s->stream.next_out = (Bytef*)buf; + s->stream.avail_out = len; + + if (s->stream.avail_out && s->back != EOF) { + *next_out++ = s->back; + s->stream.next_out++; + s->stream.avail_out--; + s->back = EOF; + s->out++; + start++; + if (s->last) { + s->z_err = Z_STREAM_END; + return 1; + } + } + + while (s->stream.avail_out != 0) { + + if (s->transparent) { + /* Copy first the lookahead bytes: */ + uInt n = s->stream.avail_in; + if (n > s->stream.avail_out) n = s->stream.avail_out; + if (n > 0) { + zmemcpy(s->stream.next_out, s->stream.next_in, n); + next_out += n; + s->stream.next_out = next_out; + s->stream.next_in += n; + s->stream.avail_out -= n; + s->stream.avail_in -= n; + } + if (s->stream.avail_out > 0) { + s->stream.avail_out -= + (uInt)fread(next_out, 1, s->stream.avail_out, s->file); + } + len -= s->stream.avail_out; + s->in += len; + s->out += len; + if (len == 0) s->z_eof = 1; + return (int)len; + } + if (s->stream.avail_in == 0 && !s->z_eof) { + + errno = 0; + s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file); + if (s->stream.avail_in == 0) { + s->z_eof = 1; + if (ferror(s->file)) { + s->z_err = Z_ERRNO; + break; + } + } + s->stream.next_in = s->inbuf; + } + s->in += s->stream.avail_in; + s->out += s->stream.avail_out; + s->z_err = inflate(&(s->stream), Z_NO_FLUSH); + s->in -= s->stream.avail_in; + s->out -= s->stream.avail_out; + + if (s->z_err == Z_STREAM_END) { + /* Check CRC and original size */ + s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); + start = s->stream.next_out; + + if (getLong(s) != s->crc) { + s->z_err = Z_DATA_ERROR; + } else { + (void)getLong(s); + /* The uncompressed length returned by above getlong() may be + * different from s->out in case of concatenated .gz files. + * Check for such files: + */ + check_header(s); + if (s->z_err == Z_OK) { + inflateReset(&(s->stream)); + s->crc = crc32(0L, Z_NULL, 0); + } + } + } + if (s->z_err != Z_OK || s->z_eof) break; + } + s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); + + if (len == s->stream.avail_out && + (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO)) + return -1; + return (int)(len - s->stream.avail_out); + } + + + /* =========================================================================== + Reads one byte from the compressed file. gzgetc returns this byte + or -1 in case of end of file or error. + */ + int ZEXPORT gzgetc(file) + gzFile file; + { + unsigned char c; + + return gzread(file, &c, 1) == 1 ? c : -1; + } + + + /* =========================================================================== + Push one byte back onto the stream. + */ + int ZEXPORT gzungetc(c, file) + int c; + gzFile file; + { + gz_stream *s = (gz_stream*)file; + + if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF; + s->back = c; + s->out--; + s->last = (s->z_err == Z_STREAM_END); + if (s->last) s->z_err = Z_OK; + s->z_eof = 0; + return c; + } + + + /* =========================================================================== + Reads bytes from the compressed file until len-1 characters are + read, or a newline character is read and transferred to buf, or an + end-of-file condition is encountered. The string is then terminated + with a null character. + gzgets returns buf, or Z_NULL in case of error. + + The current implementation is not optimized at all. + */ + char * ZEXPORT gzgets(file, buf, len) + gzFile file; + char *buf; + int len; + { + char *b = buf; + if (buf == Z_NULL || len <= 0) return Z_NULL; + + while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ; + *buf = '\0'; + return b == buf && len > 0 ? Z_NULL : b; + } + + + #ifndef NO_GZCOMPRESS + /* =========================================================================== + Writes the given number of uncompressed bytes into the compressed file. + gzwrite returns the number of bytes actually written (0 in case of error). + */ + int ZEXPORT gzwrite (file, buf, len) + gzFile file; + voidpc buf; + unsigned len; + { + gz_stream *s = (gz_stream*)file; + + if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; + + s->stream.next_in = (Bytef*)buf; + s->stream.avail_in = len; + + while (s->stream.avail_in != 0) { + + if (s->stream.avail_out == 0) { + + s->stream.next_out = s->outbuf; + if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { + s->z_err = Z_ERRNO; + break; + } + s->stream.avail_out = Z_BUFSIZE; + } + s->in += s->stream.avail_in; + s->out += s->stream.avail_out; + s->z_err = deflate(&(s->stream), Z_NO_FLUSH); + s->in -= s->stream.avail_in; + s->out -= s->stream.avail_out; + if (s->z_err != Z_OK) break; + } + s->crc = crc32(s->crc, (const Bytef *)buf, len); + + return (int)(len - s->stream.avail_in); + } + + + /* =========================================================================== + Converts, formats, and writes the args to the compressed file under + control of the format string, as in fprintf. gzprintf returns the number of + uncompressed bytes actually written (0 in case of error). + */ + #ifdef STDC + #include + + int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...) + { + char buf[Z_PRINTF_BUFSIZE]; + va_list va; + int len; + + buf[sizeof(buf) - 1] = 0; + va_start(va, format); + #ifdef NO_vsnprintf + # ifdef HAS_vsprintf_void + (void)vsprintf(buf, format, va); + va_end(va); + for (len = 0; len < sizeof(buf); len++) + if (buf[len] == 0) break; + # else + len = vsprintf(buf, format, va); + va_end(va); + # endif + #else + # ifdef HAS_vsnprintf_void + (void)vsnprintf(buf, sizeof(buf), format, va); + va_end(va); + len = strlen(buf); + # else + len = vsnprintf(buf, sizeof(buf), format, va); + va_end(va); + # endif + #endif + if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0) + return 0; + return gzwrite(file, buf, (unsigned)len); + } + #else /* not ANSI C */ + + int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, + a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) + gzFile file; + const char *format; + int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, + a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; + { + char buf[Z_PRINTF_BUFSIZE]; + int len; + + buf[sizeof(buf) - 1] = 0; + #ifdef NO_snprintf + # ifdef HAS_sprintf_void + sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + for (len = 0; len < sizeof(buf); len++) + if (buf[len] == 0) break; + # else + len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + # endif + #else + # ifdef HAS_snprintf_void + snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + len = strlen(buf); + # else + len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + # endif + #endif + if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0) + return 0; + return gzwrite(file, buf, len); + } + #endif + + /* =========================================================================== + Writes c, converted to an unsigned char, into the compressed file. + gzputc returns the value that was written, or -1 in case of error. + */ + int ZEXPORT gzputc(file, c) + gzFile file; + int c; + { + unsigned char cc = (unsigned char) c; /* required for big endian systems */ + + return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1; + } + + + /* =========================================================================== + Writes the given null-terminated string to the compressed file, excluding + the terminating null character. + gzputs returns the number of characters written, or -1 in case of error. + */ + int ZEXPORT gzputs(file, s) + gzFile file; + const char *s; + { + return gzwrite(file, (char*)s, (unsigned)strlen(s)); + } + + + /* =========================================================================== + Flushes all pending output into the compressed file. The parameter + flush is as in the deflate() function. + */ + local int do_flush (file, flush) + gzFile file; + int flush; + { + uInt len; + int done = 0; + gz_stream *s = (gz_stream*)file; + + if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; + + s->stream.avail_in = 0; /* should be zero already anyway */ + + for (;;) { + len = Z_BUFSIZE - s->stream.avail_out; + + if (len != 0) { + if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) { + s->z_err = Z_ERRNO; + return Z_ERRNO; + } + s->stream.next_out = s->outbuf; + s->stream.avail_out = Z_BUFSIZE; + } + if (done) break; + s->out += s->stream.avail_out; + s->z_err = deflate(&(s->stream), flush); + s->out -= s->stream.avail_out; + + /* Ignore the second of two consecutive flushes: */ + if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK; + + /* deflate has finished flushing only when it hasn't used up + * all the available space in the output buffer: + */ + done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END); + + if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break; + } + return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; + } + + int ZEXPORT gzflush (file, flush) + gzFile file; + int flush; + { + gz_stream *s = (gz_stream*)file; + int err = do_flush (file, flush); + + if (err) return err; + fflush(s->file); + return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; + } + #endif /* NO_GZCOMPRESS */ + + /* =========================================================================== + Sets the starting position for the next gzread or gzwrite on the given + compressed file. The offset represents a number of bytes in the + gzseek returns the resulting offset location as measured in bytes from + the beginning of the uncompressed stream, or -1 in case of error. + SEEK_END is not implemented, returns error. + In this version of the library, gzseek can be extremely slow. + */ + z_off_t ZEXPORT gzseek (file, offset, whence) + gzFile file; + z_off_t offset; + int whence; + { + gz_stream *s = (gz_stream*)file; + + if (s == NULL || whence == SEEK_END || + s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) { + return -1L; + } + + if (s->mode == 'w') { + #ifdef NO_GZCOMPRESS + return -1L; + #else + if (whence == SEEK_SET) { + offset -= s->in; + } + if (offset < 0) return -1L; + + /* At this point, offset is the number of zero bytes to write. */ + if (s->inbuf == Z_NULL) { + s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */ + if (s->inbuf == Z_NULL) return -1L; + zmemzero(s->inbuf, Z_BUFSIZE); + } + while (offset > 0) { + uInt size = Z_BUFSIZE; + if (offset < Z_BUFSIZE) size = (uInt)offset; + + size = gzwrite(file, s->inbuf, size); + if (size == 0) return -1L; + + offset -= size; + } + return s->in; + #endif + } + /* Rest of function is for reading only */ + + /* compute absolute position */ + if (whence == SEEK_CUR) { + offset += s->out; + } + if (offset < 0) return -1L; + + if (s->transparent) { + /* map to fseek */ + s->back = EOF; + s->stream.avail_in = 0; + s->stream.next_in = s->inbuf; + if (fseek(s->file, offset, SEEK_SET) < 0) return -1L; + + s->in = s->out = offset; + return offset; + } + + /* For a negative seek, rewind and use positive seek */ + if (offset >= s->out) { + offset -= s->out; + } else if (gzrewind(file) < 0) { + return -1L; + } + /* offset is now the number of bytes to skip. */ + + if (offset != 0 && s->outbuf == Z_NULL) { + s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); + if (s->outbuf == Z_NULL) return -1L; + } + if (offset && s->back != EOF) { + s->back = EOF; + s->out++; + offset--; + if (s->last) s->z_err = Z_STREAM_END; + } + while (offset > 0) { + int size = Z_BUFSIZE; + if (offset < Z_BUFSIZE) size = (int)offset; + + size = gzread(file, s->outbuf, (uInt)size); + if (size <= 0) return -1L; + offset -= size; + } + return s->out; + } + + /* =========================================================================== + Rewinds input file. + */ + int ZEXPORT gzrewind (file) + gzFile file; + { + gz_stream *s = (gz_stream*)file; + + if (s == NULL || s->mode != 'r') return -1; + + s->z_err = Z_OK; + s->z_eof = 0; + s->back = EOF; + s->stream.avail_in = 0; + s->stream.next_in = s->inbuf; + s->crc = crc32(0L, Z_NULL, 0); + if (!s->transparent) (void)inflateReset(&s->stream); + s->in = 0; + s->out = 0; + return fseek(s->file, s->start, SEEK_SET); + } + + /* =========================================================================== + Returns the starting position for the next gzread or gzwrite on the + given compressed file. This position represents a number of bytes in the + uncompressed data stream. + */ + z_off_t ZEXPORT gztell (file) + gzFile file; + { + return gzseek(file, 0L, SEEK_CUR); + } + + /* =========================================================================== + Returns 1 when EOF has previously been detected reading the given + input stream, otherwise zero. + */ + int ZEXPORT gzeof (file) + gzFile file; + { + gz_stream *s = (gz_stream*)file; + + /* With concatenated compressed files that can have embedded + * crc trailers, z_eof is no longer the only/best indicator of EOF + * on a gz_stream. Handle end-of-stream error explicitly here. + */ + if (s == NULL || s->mode != 'r') return 0; + if (s->z_eof) return 1; + return s->z_err == Z_STREAM_END; + } + + /* =========================================================================== + Returns 1 if reading and doing so transparently, otherwise zero. + */ + int ZEXPORT gzdirect (file) + gzFile file; + { + gz_stream *s = (gz_stream*)file; + + if (s == NULL || s->mode != 'r') return 0; + return s->transparent; + } + + /* =========================================================================== + Outputs a long in LSB order to the given file + */ + local void putLong (file, x) + FILE *file; + uLong x; + { + int n; + for (n = 0; n < 4; n++) { + fputc((int)(x & 0xff), file); + x >>= 8; + } + } + + /* =========================================================================== + Reads a long in LSB order from the given gz_stream. Sets z_err in case + of error. + */ + local uLong getLong (s) + gz_stream *s; + { + uLong x = (uLong)get_byte(s); + int c; + + x += ((uLong)get_byte(s))<<8; + x += ((uLong)get_byte(s))<<16; + c = get_byte(s); + if (c == EOF) s->z_err = Z_DATA_ERROR; + x += ((uLong)c)<<24; + return x; + } + + /* =========================================================================== + Flushes all pending output if necessary, closes the compressed file + and deallocates all the (de)compression state. + */ + int ZEXPORT gzclose (file) + gzFile file; + { + gz_stream *s = (gz_stream*)file; + + if (s == NULL) return Z_STREAM_ERROR; + + if (s->mode == 'w') { + #ifdef NO_GZCOMPRESS + return Z_STREAM_ERROR; + #else + if (do_flush (file, Z_FINISH) != Z_OK) + return destroy((gz_stream*)file); + + putLong (s->file, s->crc); + putLong (s->file, (uLong)(s->in & 0xffffffff)); + #endif + } + return destroy((gz_stream*)file); + } + + #ifdef STDC + # define zstrerror(errnum) strerror(errnum) + #else + # define zstrerror(errnum) "" + #endif + + /* =========================================================================== + Returns the error message for the last error which occurred on the + given compressed file. errnum is set to zlib error number. If an + error occurred in the file system and not in the compression library, + errnum is set to Z_ERRNO and the application may consult errno + to get the exact error code. + */ + const char * ZEXPORT gzerror (file, errnum) + gzFile file; + int *errnum; + { + char *m; + gz_stream *s = (gz_stream*)file; + + if (s == NULL) { + *errnum = Z_STREAM_ERROR; + return (const char*)ERR_MSG(Z_STREAM_ERROR); + } + *errnum = s->z_err; + if (*errnum == Z_OK) return (const char*)""; + + m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg); + + if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err); + + TRYFREE(s->msg); + s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3); + if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR); + strcpy(s->msg, s->path); + strcat(s->msg, ": "); + strcat(s->msg, m); + return (const char*)s->msg; + } + + /* =========================================================================== + Clear the error and end-of-file flags, and do the same for the real file. + */ + void ZEXPORT gzclearerr (file) + gzFile file; + { + gz_stream *s = (gz_stream*)file; + + if (s == NULL) return; + if (s->z_err != Z_STREAM_END) s->z_err = Z_OK; + s->z_eof = 0; + clearerr(s->file); + } diff -Nrcpad gcc-4.4.4/zlib/infback.c gcc-4.4.5/zlib/infback.c *** gcc-4.4.4/zlib/infback.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/infback.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,623 ---- + /* infback.c -- inflate using a call-back interface + * Copyright (C) 1995-2005 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* + This code is largely copied from inflate.c. Normally either infback.o or + inflate.o would be linked into an application--not both. The interface + with inffast.c is retained so that optimized assembler-coded versions of + inflate_fast() can be used with either inflate.c or infback.c. + */ + + #include "zutil.h" + #include "inftrees.h" + #include "inflate.h" + #include "inffast.h" + + /* function prototypes */ + local void fixedtables OF((struct inflate_state FAR *state)); + + /* + strm provides memory allocation functions in zalloc and zfree, or + Z_NULL to use the library memory allocation functions. + + windowBits is in the range 8..15, and window is a user-supplied + window and output buffer that is 2**windowBits bytes. + */ + int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) + z_streamp strm; + int windowBits; + unsigned char FAR *window; + const char *version; + int stream_size; + { + struct inflate_state FAR *state; + + if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || + stream_size != (int)(sizeof(z_stream))) + return Z_VERSION_ERROR; + if (strm == Z_NULL || window == Z_NULL || + windowBits < 8 || windowBits > 15) + return Z_STREAM_ERROR; + strm->msg = Z_NULL; /* in case we return an error */ + if (strm->zalloc == (alloc_func)0) { + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; + } + if (strm->zfree == (free_func)0) strm->zfree = zcfree; + state = (struct inflate_state FAR *)ZALLOC(strm, 1, + sizeof(struct inflate_state)); + if (state == Z_NULL) return Z_MEM_ERROR; + Tracev((stderr, "inflate: allocated\n")); + strm->state = (struct internal_state FAR *)state; + state->dmax = 32768U; + state->wbits = windowBits; + state->wsize = 1U << windowBits; + state->window = window; + state->write = 0; + state->whave = 0; + return Z_OK; + } + + /* + Return state with length and distance decoding tables and index sizes set to + fixed code decoding. Normally this returns fixed tables from inffixed.h. + If BUILDFIXED is defined, then instead this routine builds the tables the + first time it's called, and returns those tables the first time and + thereafter. This reduces the size of the code by about 2K bytes, in + exchange for a little execution time. However, BUILDFIXED should not be + used for threaded applications, since the rewriting of the tables and virgin + may not be thread-safe. + */ + local void fixedtables(state) + struct inflate_state FAR *state; + { + #ifdef BUILDFIXED + static int virgin = 1; + static code *lenfix, *distfix; + static code fixed[544]; + + /* build fixed huffman tables if first call (may not be thread safe) */ + if (virgin) { + unsigned sym, bits; + static code *next; + + /* literal/length table */ + sym = 0; + while (sym < 144) state->lens[sym++] = 8; + while (sym < 256) state->lens[sym++] = 9; + while (sym < 280) state->lens[sym++] = 7; + while (sym < 288) state->lens[sym++] = 8; + next = fixed; + lenfix = next; + bits = 9; + inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); + + /* distance table */ + sym = 0; + while (sym < 32) state->lens[sym++] = 5; + distfix = next; + bits = 5; + inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); + + /* do this just once */ + virgin = 0; + } + #else /* !BUILDFIXED */ + # include "inffixed.h" + #endif /* BUILDFIXED */ + state->lencode = lenfix; + state->lenbits = 9; + state->distcode = distfix; + state->distbits = 5; + } + + /* Macros for inflateBack(): */ + + /* Load returned state from inflate_fast() */ + #define LOAD() \ + do { \ + put = strm->next_out; \ + left = strm->avail_out; \ + next = strm->next_in; \ + have = strm->avail_in; \ + hold = state->hold; \ + bits = state->bits; \ + } while (0) + + /* Set state from registers for inflate_fast() */ + #define RESTORE() \ + do { \ + strm->next_out = put; \ + strm->avail_out = left; \ + strm->next_in = next; \ + strm->avail_in = have; \ + state->hold = hold; \ + state->bits = bits; \ + } while (0) + + /* Clear the input bit accumulator */ + #define INITBITS() \ + do { \ + hold = 0; \ + bits = 0; \ + } while (0) + + /* Assure that some input is available. If input is requested, but denied, + then return a Z_BUF_ERROR from inflateBack(). */ + #define PULL() \ + do { \ + if (have == 0) { \ + have = in(in_desc, &next); \ + if (have == 0) { \ + next = Z_NULL; \ + ret = Z_BUF_ERROR; \ + goto inf_leave; \ + } \ + } \ + } while (0) + + /* Get a byte of input into the bit accumulator, or return from inflateBack() + with an error if there is no input available. */ + #define PULLBYTE() \ + do { \ + PULL(); \ + have--; \ + hold += (unsigned long)(*next++) << bits; \ + bits += 8; \ + } while (0) + + /* Assure that there are at least n bits in the bit accumulator. If there is + not enough available input to do that, then return from inflateBack() with + an error. */ + #define NEEDBITS(n) \ + do { \ + while (bits < (unsigned)(n)) \ + PULLBYTE(); \ + } while (0) + + /* Return the low n bits of the bit accumulator (n < 16) */ + #define BITS(n) \ + ((unsigned)hold & ((1U << (n)) - 1)) + + /* Remove n bits from the bit accumulator */ + #define DROPBITS(n) \ + do { \ + hold >>= (n); \ + bits -= (unsigned)(n); \ + } while (0) + + /* Remove zero to seven bits as needed to go to a byte boundary */ + #define BYTEBITS() \ + do { \ + hold >>= bits & 7; \ + bits -= bits & 7; \ + } while (0) + + /* Assure that some output space is available, by writing out the window + if it's full. If the write fails, return from inflateBack() with a + Z_BUF_ERROR. */ + #define ROOM() \ + do { \ + if (left == 0) { \ + put = state->window; \ + left = state->wsize; \ + state->whave = left; \ + if (out(out_desc, put, left)) { \ + ret = Z_BUF_ERROR; \ + goto inf_leave; \ + } \ + } \ + } while (0) + + /* + strm provides the memory allocation functions and window buffer on input, + and provides information on the unused input on return. For Z_DATA_ERROR + returns, strm will also provide an error message. + + in() and out() are the call-back input and output functions. When + inflateBack() needs more input, it calls in(). When inflateBack() has + filled the window with output, or when it completes with data in the + window, it calls out() to write out the data. The application must not + change the provided input until in() is called again or inflateBack() + returns. The application must not change the window/output buffer until + inflateBack() returns. + + in() and out() are called with a descriptor parameter provided in the + inflateBack() call. This parameter can be a structure that provides the + information required to do the read or write, as well as accumulated + information on the input and output such as totals and check values. + + in() should return zero on failure. out() should return non-zero on + failure. If either in() or out() fails, than inflateBack() returns a + Z_BUF_ERROR. strm->next_in can be checked for Z_NULL to see whether it + was in() or out() that caused in the error. Otherwise, inflateBack() + returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format + error, or Z_MEM_ERROR if it could not allocate memory for the state. + inflateBack() can also return Z_STREAM_ERROR if the input parameters + are not correct, i.e. strm is Z_NULL or the state was not initialized. + */ + int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) + z_streamp strm; + in_func in; + void FAR *in_desc; + out_func out; + void FAR *out_desc; + { + struct inflate_state FAR *state; + unsigned char FAR *next; /* next input */ + unsigned char FAR *put; /* next output */ + unsigned have, left; /* available input and output */ + unsigned long hold; /* bit buffer */ + unsigned bits; /* bits in bit buffer */ + unsigned copy; /* number of stored or match bytes to copy */ + unsigned char FAR *from; /* where to copy match bytes from */ + code this; /* current decoding table entry */ + code last; /* parent table entry */ + unsigned len; /* length to copy for repeats, bits to drop */ + int ret; /* return code */ + static const unsigned short order[19] = /* permutation of code lengths */ + {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; + + /* Check that the strm exists and that the state was initialized */ + if (strm == Z_NULL || strm->state == Z_NULL) + return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + + /* Reset the state */ + strm->msg = Z_NULL; + state->mode = TYPE; + state->last = 0; + state->whave = 0; + next = strm->next_in; + have = next != Z_NULL ? strm->avail_in : 0; + hold = 0; + bits = 0; + put = state->window; + left = state->wsize; + + /* Inflate until end of block marked as last */ + for (;;) + switch (state->mode) { + case TYPE: + /* determine and dispatch block type */ + if (state->last) { + BYTEBITS(); + state->mode = DONE; + break; + } + NEEDBITS(3); + state->last = BITS(1); + DROPBITS(1); + switch (BITS(2)) { + case 0: /* stored block */ + Tracev((stderr, "inflate: stored block%s\n", + state->last ? " (last)" : "")); + state->mode = STORED; + break; + case 1: /* fixed block */ + fixedtables(state); + Tracev((stderr, "inflate: fixed codes block%s\n", + state->last ? " (last)" : "")); + state->mode = LEN; /* decode codes */ + break; + case 2: /* dynamic block */ + Tracev((stderr, "inflate: dynamic codes block%s\n", + state->last ? " (last)" : "")); + state->mode = TABLE; + break; + case 3: + strm->msg = (char *)"invalid block type"; + state->mode = BAD; + } + DROPBITS(2); + break; + + case STORED: + /* get and verify stored block length */ + BYTEBITS(); /* go to byte boundary */ + NEEDBITS(32); + if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { + strm->msg = (char *)"invalid stored block lengths"; + state->mode = BAD; + break; + } + state->length = (unsigned)hold & 0xffff; + Tracev((stderr, "inflate: stored length %u\n", + state->length)); + INITBITS(); + + /* copy stored block from input to output */ + while (state->length != 0) { + copy = state->length; + PULL(); + ROOM(); + if (copy > have) copy = have; + if (copy > left) copy = left; + zmemcpy(put, next, copy); + have -= copy; + next += copy; + left -= copy; + put += copy; + state->length -= copy; + } + Tracev((stderr, "inflate: stored end\n")); + state->mode = TYPE; + break; + + case TABLE: + /* get dynamic table entries descriptor */ + NEEDBITS(14); + state->nlen = BITS(5) + 257; + DROPBITS(5); + state->ndist = BITS(5) + 1; + DROPBITS(5); + state->ncode = BITS(4) + 4; + DROPBITS(4); + #ifndef PKZIP_BUG_WORKAROUND + if (state->nlen > 286 || state->ndist > 30) { + strm->msg = (char *)"too many length or distance symbols"; + state->mode = BAD; + break; + } + #endif + Tracev((stderr, "inflate: table sizes ok\n")); + + /* get code length code lengths (not a typo) */ + state->have = 0; + while (state->have < state->ncode) { + NEEDBITS(3); + state->lens[order[state->have++]] = (unsigned short)BITS(3); + DROPBITS(3); + } + while (state->have < 19) + state->lens[order[state->have++]] = 0; + state->next = state->codes; + state->lencode = (code const FAR *)(state->next); + state->lenbits = 7; + ret = inflate_table(CODES, state->lens, 19, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid code lengths set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: code lengths ok\n")); + + /* get length and distance code code lengths */ + state->have = 0; + while (state->have < state->nlen + state->ndist) { + for (;;) { + this = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if (this.val < 16) { + NEEDBITS(this.bits); + DROPBITS(this.bits); + state->lens[state->have++] = this.val; + } + else { + if (this.val == 16) { + NEEDBITS(this.bits + 2); + DROPBITS(this.bits); + if (state->have == 0) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + len = (unsigned)(state->lens[state->have - 1]); + copy = 3 + BITS(2); + DROPBITS(2); + } + else if (this.val == 17) { + NEEDBITS(this.bits + 3); + DROPBITS(this.bits); + len = 0; + copy = 3 + BITS(3); + DROPBITS(3); + } + else { + NEEDBITS(this.bits + 7); + DROPBITS(this.bits); + len = 0; + copy = 11 + BITS(7); + DROPBITS(7); + } + if (state->have + copy > state->nlen + state->ndist) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + while (copy--) + state->lens[state->have++] = (unsigned short)len; + } + } + + /* handle error breaks in while */ + if (state->mode == BAD) break; + + /* build code tables */ + state->next = state->codes; + state->lencode = (code const FAR *)(state->next); + state->lenbits = 9; + ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid literal/lengths set"; + state->mode = BAD; + break; + } + state->distcode = (code const FAR *)(state->next); + state->distbits = 6; + ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, + &(state->next), &(state->distbits), state->work); + if (ret) { + strm->msg = (char *)"invalid distances set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: codes ok\n")); + state->mode = LEN; + + case LEN: + /* use inflate_fast() if we have enough input and output */ + if (have >= 6 && left >= 258) { + RESTORE(); + if (state->whave < state->wsize) + state->whave = state->wsize - left; + inflate_fast(strm, state->wsize); + LOAD(); + break; + } + + /* get a literal, length, or end-of-block code */ + for (;;) { + this = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if (this.op && (this.op & 0xf0) == 0) { + last = this; + for (;;) { + this = state->lencode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + this.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } + DROPBITS(this.bits); + state->length = (unsigned)this.val; + + /* process literal */ + if (this.op == 0) { + Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? + "inflate: literal '%c'\n" : + "inflate: literal 0x%02x\n", this.val)); + ROOM(); + *put++ = (unsigned char)(state->length); + left--; + state->mode = LEN; + break; + } + + /* process end of block */ + if (this.op & 32) { + Tracevv((stderr, "inflate: end of block\n")); + state->mode = TYPE; + break; + } + + /* invalid code */ + if (this.op & 64) { + strm->msg = (char *)"invalid literal/length code"; + state->mode = BAD; + break; + } + + /* length code -- get extra bits, if any */ + state->extra = (unsigned)(this.op) & 15; + if (state->extra != 0) { + NEEDBITS(state->extra); + state->length += BITS(state->extra); + DROPBITS(state->extra); + } + Tracevv((stderr, "inflate: length %u\n", state->length)); + + /* get distance code */ + for (;;) { + this = state->distcode[BITS(state->distbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if ((this.op & 0xf0) == 0) { + last = this; + for (;;) { + this = state->distcode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + this.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } + DROPBITS(this.bits); + if (this.op & 64) { + strm->msg = (char *)"invalid distance code"; + state->mode = BAD; + break; + } + state->offset = (unsigned)this.val; + + /* get distance extra bits, if any */ + state->extra = (unsigned)(this.op) & 15; + if (state->extra != 0) { + NEEDBITS(state->extra); + state->offset += BITS(state->extra); + DROPBITS(state->extra); + } + if (state->offset > state->wsize - (state->whave < state->wsize ? + left : 0)) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } + Tracevv((stderr, "inflate: distance %u\n", state->offset)); + + /* copy match from window to output */ + do { + ROOM(); + copy = state->wsize - state->offset; + if (copy < left) { + from = put + copy; + copy = left - copy; + } + else { + from = put - state->offset; + copy = left; + } + if (copy > state->length) copy = state->length; + state->length -= copy; + left -= copy; + do { + *put++ = *from++; + } while (--copy); + } while (state->length != 0); + break; + + case DONE: + /* inflate stream terminated properly -- write leftover output */ + ret = Z_STREAM_END; + if (left < state->wsize) { + if (out(out_desc, state->window, state->wsize - left)) + ret = Z_BUF_ERROR; + } + goto inf_leave; + + case BAD: + ret = Z_DATA_ERROR; + goto inf_leave; + + default: /* can't happen, but makes compilers happy */ + ret = Z_STREAM_ERROR; + goto inf_leave; + } + + /* Return unused input */ + inf_leave: + strm->next_in = next; + strm->avail_in = have; + return ret; + } + + int ZEXPORT inflateBackEnd(strm) + z_streamp strm; + { + if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) + return Z_STREAM_ERROR; + ZFREE(strm, strm->state); + strm->state = Z_NULL; + Tracev((stderr, "inflate: end\n")); + return Z_OK; + } diff -Nrcpad gcc-4.4.4/zlib/inffast.c gcc-4.4.5/zlib/inffast.c *** gcc-4.4.4/zlib/inffast.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/inffast.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,318 ---- + /* inffast.c -- fast decoding + * Copyright (C) 1995-2004 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + #include "zutil.h" + #include "inftrees.h" + #include "inflate.h" + #include "inffast.h" + + #ifndef ASMINF + + /* Allow machine dependent optimization for post-increment or pre-increment. + Based on testing to date, + Pre-increment preferred for: + - PowerPC G3 (Adler) + - MIPS R5000 (Randers-Pehrson) + Post-increment preferred for: + - none + No measurable difference: + - Pentium III (Anderson) + - M68060 (Nikl) + */ + #ifdef POSTINC + # define OFF 0 + # define PUP(a) *(a)++ + #else + # define OFF 1 + # define PUP(a) *++(a) + #endif + + /* + Decode literal, length, and distance codes and write out the resulting + literal and match bytes until either not enough input or output is + available, an end-of-block is encountered, or a data error is encountered. + When large enough input and output buffers are supplied to inflate(), for + example, a 16K input buffer and a 64K output buffer, more than 95% of the + inflate execution time is spent in this routine. + + Entry assumptions: + + state->mode == LEN + strm->avail_in >= 6 + strm->avail_out >= 258 + start >= strm->avail_out + state->bits < 8 + + On return, state->mode is one of: + + LEN -- ran out of enough output space or enough available input + TYPE -- reached end of block code, inflate() to interpret next block + BAD -- error in block data + + Notes: + + - The maximum input bits used by a length/distance pair is 15 bits for the + length code, 5 bits for the length extra, 15 bits for the distance code, + and 13 bits for the distance extra. This totals 48 bits, or six bytes. + Therefore if strm->avail_in >= 6, then there is enough input to avoid + checking for available input while decoding. + + - The maximum bytes that a single length/distance pair can output is 258 + bytes, which is the maximum length that can be coded. inflate_fast() + requires strm->avail_out >= 258 for each loop to avoid checking for + output space. + */ + void inflate_fast(strm, start) + z_streamp strm; + unsigned start; /* inflate()'s starting value for strm->avail_out */ + { + struct inflate_state FAR *state; + unsigned char FAR *in; /* local strm->next_in */ + unsigned char FAR *last; /* while in < last, enough input available */ + unsigned char FAR *out; /* local strm->next_out */ + unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ + unsigned char FAR *end; /* while out < end, enough space available */ + #ifdef INFLATE_STRICT + unsigned dmax; /* maximum distance from zlib header */ + #endif + unsigned wsize; /* window size or zero if not using window */ + unsigned whave; /* valid bytes in the window */ + unsigned write; /* window write index */ + unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */ + unsigned long hold; /* local strm->hold */ + unsigned bits; /* local strm->bits */ + code const FAR *lcode; /* local strm->lencode */ + code const FAR *dcode; /* local strm->distcode */ + unsigned lmask; /* mask for first level of length codes */ + unsigned dmask; /* mask for first level of distance codes */ + code this; /* retrieved table entry */ + unsigned op; /* code bits, operation, extra bits, or */ + /* window position, window bytes to copy */ + unsigned len; /* match length, unused bytes */ + unsigned dist; /* match distance */ + unsigned char FAR *from; /* where to copy match from */ + + /* copy state to local variables */ + state = (struct inflate_state FAR *)strm->state; + in = strm->next_in - OFF; + last = in + (strm->avail_in - 5); + out = strm->next_out - OFF; + beg = out - (start - strm->avail_out); + end = out + (strm->avail_out - 257); + #ifdef INFLATE_STRICT + dmax = state->dmax; + #endif + wsize = state->wsize; + whave = state->whave; + write = state->write; + window = state->window; + hold = state->hold; + bits = state->bits; + lcode = state->lencode; + dcode = state->distcode; + lmask = (1U << state->lenbits) - 1; + dmask = (1U << state->distbits) - 1; + + /* decode literals and length/distances until end-of-block or not enough + input data or output space */ + do { + if (bits < 15) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + this = lcode[hold & lmask]; + dolen: + op = (unsigned)(this.bits); + hold >>= op; + bits -= op; + op = (unsigned)(this.op); + if (op == 0) { /* literal */ + Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? + "inflate: literal '%c'\n" : + "inflate: literal 0x%02x\n", this.val)); + PUP(out) = (unsigned char)(this.val); + } + else if (op & 16) { /* length base */ + len = (unsigned)(this.val); + op &= 15; /* number of extra bits */ + if (op) { + if (bits < op) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + len += (unsigned)hold & ((1U << op) - 1); + hold >>= op; + bits -= op; + } + Tracevv((stderr, "inflate: length %u\n", len)); + if (bits < 15) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + this = dcode[hold & dmask]; + dodist: + op = (unsigned)(this.bits); + hold >>= op; + bits -= op; + op = (unsigned)(this.op); + if (op & 16) { /* distance base */ + dist = (unsigned)(this.val); + op &= 15; /* number of extra bits */ + if (bits < op) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + if (bits < op) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + } + dist += (unsigned)hold & ((1U << op) - 1); + #ifdef INFLATE_STRICT + if (dist > dmax) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } + #endif + hold >>= op; + bits -= op; + Tracevv((stderr, "inflate: distance %u\n", dist)); + op = (unsigned)(out - beg); /* max distance in output */ + if (dist > op) { /* see if copy from window */ + op = dist - op; /* distance back in window */ + if (op > whave) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } + from = window - OFF; + if (write == 0) { /* very common case */ + from += wsize - op; + if (op < len) { /* some from window */ + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = out - dist; /* rest from output */ + } + } + else if (write < op) { /* wrap around window */ + from += wsize + write - op; + op -= write; + if (op < len) { /* some from end of window */ + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = window - OFF; + if (write < len) { /* some from start of window */ + op = write; + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = out - dist; /* rest from output */ + } + } + } + else { /* contiguous in window */ + from += write - op; + if (op < len) { /* some from window */ + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = out - dist; /* rest from output */ + } + } + while (len > 2) { + PUP(out) = PUP(from); + PUP(out) = PUP(from); + PUP(out) = PUP(from); + len -= 3; + } + if (len) { + PUP(out) = PUP(from); + if (len > 1) + PUP(out) = PUP(from); + } + } + else { + from = out - dist; /* copy direct from output */ + do { /* minimum length is three */ + PUP(out) = PUP(from); + PUP(out) = PUP(from); + PUP(out) = PUP(from); + len -= 3; + } while (len > 2); + if (len) { + PUP(out) = PUP(from); + if (len > 1) + PUP(out) = PUP(from); + } + } + } + else if ((op & 64) == 0) { /* 2nd level distance code */ + this = dcode[this.val + (hold & ((1U << op) - 1))]; + goto dodist; + } + else { + strm->msg = (char *)"invalid distance code"; + state->mode = BAD; + break; + } + } + else if ((op & 64) == 0) { /* 2nd level length code */ + this = lcode[this.val + (hold & ((1U << op) - 1))]; + goto dolen; + } + else if (op & 32) { /* end-of-block */ + Tracevv((stderr, "inflate: end of block\n")); + state->mode = TYPE; + break; + } + else { + strm->msg = (char *)"invalid literal/length code"; + state->mode = BAD; + break; + } + } while (in < last && out < end); + + /* return unused bytes (on entry, bits < 8, so in won't go too far back) */ + len = bits >> 3; + in -= len; + bits -= len << 3; + hold &= (1U << bits) - 1; + + /* update state and return */ + strm->next_in = in + OFF; + strm->next_out = out + OFF; + strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last)); + strm->avail_out = (unsigned)(out < end ? + 257 + (end - out) : 257 - (out - end)); + state->hold = hold; + state->bits = bits; + return; + } + + /* + inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe): + - Using bit fields for code structure + - Different op definition to avoid & for extra bits (do & for table bits) + - Three separate decoding do-loops for direct, window, and write == 0 + - Special case for distance > 1 copies to do overlapped load and store copy + - Explicit branch predictions (based on measured branch probabilities) + - Deferring match copy and interspersed it with decoding subsequent codes + - Swapping literal/length else + - Swapping window/direct else + - Larger unrolled copy loops (three is about right) + - Moving len -= 3 statement into middle of loop + */ + + #endif /* !ASMINF */ diff -Nrcpad gcc-4.4.4/zlib/inffast.h gcc-4.4.5/zlib/inffast.h *** gcc-4.4.4/zlib/inffast.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/inffast.h Mon Sep 12 17:02:07 2005 *************** *** 0 **** --- 1,11 ---- + /* inffast.h -- header to use inffast.c + * Copyright (C) 1995-2003 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + + void inflate_fast OF((z_streamp strm, unsigned start)); diff -Nrcpad gcc-4.4.4/zlib/inffixed.h gcc-4.4.5/zlib/inffixed.h *** gcc-4.4.4/zlib/inffixed.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/inffixed.h Mon Sep 12 17:02:07 2005 *************** *** 0 **** --- 1,94 ---- + /* inffixed.h -- table for decoding fixed codes + * Generated automatically by makefixed(). + */ + + /* WARNING: this file should *not* be used by applications. It + is part of the implementation of the compression library and + is subject to change. Applications should only use zlib.h. + */ + + static const code lenfix[512] = { + {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48}, + {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128}, + {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59}, + {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176}, + {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20}, + {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100}, + {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8}, + {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216}, + {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76}, + {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114}, + {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2}, + {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148}, + {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42}, + {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86}, + {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15}, + {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236}, + {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62}, + {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142}, + {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31}, + {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162}, + {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25}, + {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105}, + {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4}, + {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202}, + {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69}, + {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125}, + {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13}, + {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195}, + {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35}, + {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91}, + {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19}, + {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246}, + {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55}, + {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135}, + {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99}, + {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190}, + {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16}, + {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96}, + {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6}, + {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209}, + {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72}, + {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116}, + {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4}, + {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153}, + {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44}, + {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82}, + {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11}, + {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229}, + {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58}, + {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138}, + {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51}, + {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173}, + {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30}, + {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110}, + {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0}, + {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195}, + {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65}, + {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121}, + {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9}, + {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258}, + {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37}, + {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93}, + {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23}, + {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251}, + {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51}, + {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131}, + {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67}, + {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183}, + {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23}, + {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103}, + {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9}, + {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223}, + {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79}, + {0,9,255} + }; + + static const code distfix[32] = { + {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025}, + {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193}, + {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385}, + {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577}, + {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073}, + {22,5,193},{64,5,0} + }; diff -Nrcpad gcc-4.4.4/zlib/inflate.c gcc-4.4.5/zlib/inflate.c *** gcc-4.4.4/zlib/inflate.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/inflate.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,1368 ---- + /* inflate.c -- zlib decompression + * Copyright (C) 1995-2005 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* + * Change history: + * + * 1.2.beta0 24 Nov 2002 + * - First version -- complete rewrite of inflate to simplify code, avoid + * creation of window when not needed, minimize use of window when it is + * needed, make inffast.c even faster, implement gzip decoding, and to + * improve code readability and style over the previous zlib inflate code + * + * 1.2.beta1 25 Nov 2002 + * - Use pointers for available input and output checking in inffast.c + * - Remove input and output counters in inffast.c + * - Change inffast.c entry and loop from avail_in >= 7 to >= 6 + * - Remove unnecessary second byte pull from length extra in inffast.c + * - Unroll direct copy to three copies per loop in inffast.c + * + * 1.2.beta2 4 Dec 2002 + * - Change external routine names to reduce potential conflicts + * - Correct filename to inffixed.h for fixed tables in inflate.c + * - Make hbuf[] unsigned char to match parameter type in inflate.c + * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset) + * to avoid negation problem on Alphas (64 bit) in inflate.c + * + * 1.2.beta3 22 Dec 2002 + * - Add comments on state->bits assertion in inffast.c + * - Add comments on op field in inftrees.h + * - Fix bug in reuse of allocated window after inflateReset() + * - Remove bit fields--back to byte structure for speed + * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths + * - Change post-increments to pre-increments in inflate_fast(), PPC biased? + * - Add compile time option, POSTINC, to use post-increments instead (Intel?) + * - Make MATCH copy in inflate() much faster for when inflate_fast() not used + * - Use local copies of stream next and avail values, as well as local bit + * buffer and bit count in inflate()--for speed when inflate_fast() not used + * + * 1.2.beta4 1 Jan 2003 + * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings + * - Move a comment on output buffer sizes from inffast.c to inflate.c + * - Add comments in inffast.c to introduce the inflate_fast() routine + * - Rearrange window copies in inflate_fast() for speed and simplification + * - Unroll last copy for window match in inflate_fast() + * - Use local copies of window variables in inflate_fast() for speed + * - Pull out common write == 0 case for speed in inflate_fast() + * - Make op and len in inflate_fast() unsigned for consistency + * - Add FAR to lcode and dcode declarations in inflate_fast() + * - Simplified bad distance check in inflate_fast() + * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new + * source file infback.c to provide a call-back interface to inflate for + * programs like gzip and unzip -- uses window as output buffer to avoid + * window copying + * + * 1.2.beta5 1 Jan 2003 + * - Improved inflateBack() interface to allow the caller to provide initial + * input in strm. + * - Fixed stored blocks bug in inflateBack() + * + * 1.2.beta6 4 Jan 2003 + * - Added comments in inffast.c on effectiveness of POSTINC + * - Typecasting all around to reduce compiler warnings + * - Changed loops from while (1) or do {} while (1) to for (;;), again to + * make compilers happy + * - Changed type of window in inflateBackInit() to unsigned char * + * + * 1.2.beta7 27 Jan 2003 + * - Changed many types to unsigned or unsigned short to avoid warnings + * - Added inflateCopy() function + * + * 1.2.0 9 Mar 2003 + * - Changed inflateBack() interface to provide separate opaque descriptors + * for the in() and out() functions + * - Changed inflateBack() argument and in_func typedef to swap the length + * and buffer address return values for the input function + * - Check next_in and next_out for Z_NULL on entry to inflate() + * + * The history for versions after 1.2.0 are in ChangeLog in zlib distribution. + */ + + #include "zutil.h" + #include "inftrees.h" + #include "inflate.h" + #include "inffast.h" + + #ifdef MAKEFIXED + # ifndef BUILDFIXED + # define BUILDFIXED + # endif + #endif + + /* function prototypes */ + local void fixedtables OF((struct inflate_state FAR *state)); + local int updatewindow OF((z_streamp strm, unsigned out)); + #ifdef BUILDFIXED + void makefixed OF((void)); + #endif + local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf, + unsigned len)); + + int ZEXPORT inflateReset(strm) + z_streamp strm; + { + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + strm->total_in = strm->total_out = state->total = 0; + strm->msg = Z_NULL; + strm->adler = 1; /* to support ill-conceived Java test suite */ + state->mode = HEAD; + state->last = 0; + state->havedict = 0; + state->dmax = 32768U; + state->head = Z_NULL; + state->wsize = 0; + state->whave = 0; + state->write = 0; + state->hold = 0; + state->bits = 0; + state->lencode = state->distcode = state->next = state->codes; + Tracev((stderr, "inflate: reset\n")); + return Z_OK; + } + + int ZEXPORT inflatePrime(strm, bits, value) + z_streamp strm; + int bits; + int value; + { + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR; + value &= (1L << bits) - 1; + state->hold += value << state->bits; + state->bits += bits; + return Z_OK; + } + + int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) + z_streamp strm; + int windowBits; + const char *version; + int stream_size; + { + struct inflate_state FAR *state; + + if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || + stream_size != (int)(sizeof(z_stream))) + return Z_VERSION_ERROR; + if (strm == Z_NULL) return Z_STREAM_ERROR; + strm->msg = Z_NULL; /* in case we return an error */ + if (strm->zalloc == (alloc_func)0) { + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; + } + if (strm->zfree == (free_func)0) strm->zfree = zcfree; + state = (struct inflate_state FAR *) + ZALLOC(strm, 1, sizeof(struct inflate_state)); + if (state == Z_NULL) return Z_MEM_ERROR; + Tracev((stderr, "inflate: allocated\n")); + strm->state = (struct internal_state FAR *)state; + if (windowBits < 0) { + state->wrap = 0; + windowBits = -windowBits; + } + else { + state->wrap = (windowBits >> 4) + 1; + #ifdef GUNZIP + if (windowBits < 48) windowBits &= 15; + #endif + } + if (windowBits < 8 || windowBits > 15) { + ZFREE(strm, state); + strm->state = Z_NULL; + return Z_STREAM_ERROR; + } + state->wbits = (unsigned)windowBits; + state->window = Z_NULL; + return inflateReset(strm); + } + + int ZEXPORT inflateInit_(strm, version, stream_size) + z_streamp strm; + const char *version; + int stream_size; + { + return inflateInit2_(strm, DEF_WBITS, version, stream_size); + } + + /* + Return state with length and distance decoding tables and index sizes set to + fixed code decoding. Normally this returns fixed tables from inffixed.h. + If BUILDFIXED is defined, then instead this routine builds the tables the + first time it's called, and returns those tables the first time and + thereafter. This reduces the size of the code by about 2K bytes, in + exchange for a little execution time. However, BUILDFIXED should not be + used for threaded applications, since the rewriting of the tables and virgin + may not be thread-safe. + */ + local void fixedtables(state) + struct inflate_state FAR *state; + { + #ifdef BUILDFIXED + static int virgin = 1; + static code *lenfix, *distfix; + static code fixed[544]; + + /* build fixed huffman tables if first call (may not be thread safe) */ + if (virgin) { + unsigned sym, bits; + static code *next; + + /* literal/length table */ + sym = 0; + while (sym < 144) state->lens[sym++] = 8; + while (sym < 256) state->lens[sym++] = 9; + while (sym < 280) state->lens[sym++] = 7; + while (sym < 288) state->lens[sym++] = 8; + next = fixed; + lenfix = next; + bits = 9; + inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); + + /* distance table */ + sym = 0; + while (sym < 32) state->lens[sym++] = 5; + distfix = next; + bits = 5; + inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); + + /* do this just once */ + virgin = 0; + } + #else /* !BUILDFIXED */ + # include "inffixed.h" + #endif /* BUILDFIXED */ + state->lencode = lenfix; + state->lenbits = 9; + state->distcode = distfix; + state->distbits = 5; + } + + #ifdef MAKEFIXED + #include + + /* + Write out the inffixed.h that is #include'd above. Defining MAKEFIXED also + defines BUILDFIXED, so the tables are built on the fly. makefixed() writes + those tables to stdout, which would be piped to inffixed.h. A small program + can simply call makefixed to do this: + + void makefixed(void); + + int main(void) + { + makefixed(); + return 0; + } + + Then that can be linked with zlib built with MAKEFIXED defined and run: + + a.out > inffixed.h + */ + void makefixed() + { + unsigned low, size; + struct inflate_state state; + + fixedtables(&state); + puts(" /* inffixed.h -- table for decoding fixed codes"); + puts(" * Generated automatically by makefixed()."); + puts(" */"); + puts(""); + puts(" /* WARNING: this file should *not* be used by applications."); + puts(" It is part of the implementation of this library and is"); + puts(" subject to change. Applications should only use zlib.h."); + puts(" */"); + puts(""); + size = 1U << 9; + printf(" static const code lenfix[%u] = {", size); + low = 0; + for (;;) { + if ((low % 7) == 0) printf("\n "); + printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits, + state.lencode[low].val); + if (++low == size) break; + putchar(','); + } + puts("\n };"); + size = 1U << 5; + printf("\n static const code distfix[%u] = {", size); + low = 0; + for (;;) { + if ((low % 6) == 0) printf("\n "); + printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits, + state.distcode[low].val); + if (++low == size) break; + putchar(','); + } + puts("\n };"); + } + #endif /* MAKEFIXED */ + + /* + Update the window with the last wsize (normally 32K) bytes written before + returning. If window does not exist yet, create it. This is only called + when a window is already in use, or when output has been written during this + inflate call, but the end of the deflate stream has not been reached yet. + It is also called to create a window for dictionary data when a dictionary + is loaded. + + Providing output buffers larger than 32K to inflate() should provide a speed + advantage, since only the last 32K of output is copied to the sliding window + upon return from inflate(), and since all distances after the first 32K of + output will fall in the output data, making match copies simpler and faster. + The advantage may be dependent on the size of the processor's data caches. + */ + local int updatewindow(strm, out) + z_streamp strm; + unsigned out; + { + struct inflate_state FAR *state; + unsigned copy, dist; + + state = (struct inflate_state FAR *)strm->state; + + /* if it hasn't been done already, allocate space for the window */ + if (state->window == Z_NULL) { + state->window = (unsigned char FAR *) + ZALLOC(strm, 1U << state->wbits, + sizeof(unsigned char)); + if (state->window == Z_NULL) return 1; + } + + /* if window not in use yet, initialize */ + if (state->wsize == 0) { + state->wsize = 1U << state->wbits; + state->write = 0; + state->whave = 0; + } + + /* copy state->wsize or less output bytes into the circular window */ + copy = out - strm->avail_out; + if (copy >= state->wsize) { + zmemcpy(state->window, strm->next_out - state->wsize, state->wsize); + state->write = 0; + state->whave = state->wsize; + } + else { + dist = state->wsize - state->write; + if (dist > copy) dist = copy; + zmemcpy(state->window + state->write, strm->next_out - copy, dist); + copy -= dist; + if (copy) { + zmemcpy(state->window, strm->next_out - copy, copy); + state->write = copy; + state->whave = state->wsize; + } + else { + state->write += dist; + if (state->write == state->wsize) state->write = 0; + if (state->whave < state->wsize) state->whave += dist; + } + } + return 0; + } + + /* Macros for inflate(): */ + + /* check function to use adler32() for zlib or crc32() for gzip */ + #ifdef GUNZIP + # define UPDATE(check, buf, len) \ + (state->flags ? crc32(check, buf, len) : adler32(check, buf, len)) + #else + # define UPDATE(check, buf, len) adler32(check, buf, len) + #endif + + /* check macros for header crc */ + #ifdef GUNZIP + # define CRC2(check, word) \ + do { \ + hbuf[0] = (unsigned char)(word); \ + hbuf[1] = (unsigned char)((word) >> 8); \ + check = crc32(check, hbuf, 2); \ + } while (0) + + # define CRC4(check, word) \ + do { \ + hbuf[0] = (unsigned char)(word); \ + hbuf[1] = (unsigned char)((word) >> 8); \ + hbuf[2] = (unsigned char)((word) >> 16); \ + hbuf[3] = (unsigned char)((word) >> 24); \ + check = crc32(check, hbuf, 4); \ + } while (0) + #endif + + /* Load registers with state in inflate() for speed */ + #define LOAD() \ + do { \ + put = strm->next_out; \ + left = strm->avail_out; \ + next = strm->next_in; \ + have = strm->avail_in; \ + hold = state->hold; \ + bits = state->bits; \ + } while (0) + + /* Restore state from registers in inflate() */ + #define RESTORE() \ + do { \ + strm->next_out = put; \ + strm->avail_out = left; \ + strm->next_in = next; \ + strm->avail_in = have; \ + state->hold = hold; \ + state->bits = bits; \ + } while (0) + + /* Clear the input bit accumulator */ + #define INITBITS() \ + do { \ + hold = 0; \ + bits = 0; \ + } while (0) + + /* Get a byte of input into the bit accumulator, or return from inflate() + if there is no input available. */ + #define PULLBYTE() \ + do { \ + if (have == 0) goto inf_leave; \ + have--; \ + hold += (unsigned long)(*next++) << bits; \ + bits += 8; \ + } while (0) + + /* Assure that there are at least n bits in the bit accumulator. If there is + not enough available input to do that, then return from inflate(). */ + #define NEEDBITS(n) \ + do { \ + while (bits < (unsigned)(n)) \ + PULLBYTE(); \ + } while (0) + + /* Return the low n bits of the bit accumulator (n < 16) */ + #define BITS(n) \ + ((unsigned)hold & ((1U << (n)) - 1)) + + /* Remove n bits from the bit accumulator */ + #define DROPBITS(n) \ + do { \ + hold >>= (n); \ + bits -= (unsigned)(n); \ + } while (0) + + /* Remove zero to seven bits as needed to go to a byte boundary */ + #define BYTEBITS() \ + do { \ + hold >>= bits & 7; \ + bits -= bits & 7; \ + } while (0) + + /* Reverse the bytes in a 32-bit value */ + #define REVERSE(q) \ + ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \ + (((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) + + /* + inflate() uses a state machine to process as much input data and generate as + much output data as possible before returning. The state machine is + structured roughly as follows: + + for (;;) switch (state) { + ... + case STATEn: + if (not enough input data or output space to make progress) + return; + ... make progress ... + state = STATEm; + break; + ... + } + + so when inflate() is called again, the same case is attempted again, and + if the appropriate resources are provided, the machine proceeds to the + next state. The NEEDBITS() macro is usually the way the state evaluates + whether it can proceed or should return. NEEDBITS() does the return if + the requested bits are not available. The typical use of the BITS macros + is: + + NEEDBITS(n); + ... do something with BITS(n) ... + DROPBITS(n); + + where NEEDBITS(n) either returns from inflate() if there isn't enough + input left to load n bits into the accumulator, or it continues. BITS(n) + gives the low n bits in the accumulator. When done, DROPBITS(n) drops + the low n bits off the accumulator. INITBITS() clears the accumulator + and sets the number of available bits to zero. BYTEBITS() discards just + enough bits to put the accumulator on a byte boundary. After BYTEBITS() + and a NEEDBITS(8), then BITS(8) would return the next byte in the stream. + + NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return + if there is no input available. The decoding of variable length codes uses + PULLBYTE() directly in order to pull just enough bytes to decode the next + code, and no more. + + Some states loop until they get enough input, making sure that enough + state information is maintained to continue the loop where it left off + if NEEDBITS() returns in the loop. For example, want, need, and keep + would all have to actually be part of the saved state in case NEEDBITS() + returns: + + case STATEw: + while (want < need) { + NEEDBITS(n); + keep[want++] = BITS(n); + DROPBITS(n); + } + state = STATEx; + case STATEx: + + As shown above, if the next state is also the next case, then the break + is omitted. + + A state may also return if there is not enough output space available to + complete that state. Those states are copying stored data, writing a + literal byte, and copying a matching string. + + When returning, a "goto inf_leave" is used to update the total counters, + update the check value, and determine whether any progress has been made + during that inflate() call in order to return the proper return code. + Progress is defined as a change in either strm->avail_in or strm->avail_out. + When there is a window, goto inf_leave will update the window with the last + output written. If a goto inf_leave occurs in the middle of decompression + and there is no window currently, goto inf_leave will create one and copy + output to the window for the next call of inflate(). + + In this implementation, the flush parameter of inflate() only affects the + return code (per zlib.h). inflate() always writes as much as possible to + strm->next_out, given the space available and the provided input--the effect + documented in zlib.h of Z_SYNC_FLUSH. Furthermore, inflate() always defers + the allocation of and copying into a sliding window until necessary, which + provides the effect documented in zlib.h for Z_FINISH when the entire input + stream available. So the only thing the flush parameter actually does is: + when flush is set to Z_FINISH, inflate() cannot return Z_OK. Instead it + will return Z_BUF_ERROR if it has not reached the end of the stream. + */ + + int ZEXPORT inflate(strm, flush) + z_streamp strm; + int flush; + { + struct inflate_state FAR *state; + unsigned char FAR *next; /* next input */ + unsigned char FAR *put; /* next output */ + unsigned have, left; /* available input and output */ + unsigned long hold; /* bit buffer */ + unsigned bits; /* bits in bit buffer */ + unsigned in, out; /* save starting available input and output */ + unsigned copy; /* number of stored or match bytes to copy */ + unsigned char FAR *from; /* where to copy match bytes from */ + code this; /* current decoding table entry */ + code last; /* parent table entry */ + unsigned len; /* length to copy for repeats, bits to drop */ + int ret; /* return code */ + #ifdef GUNZIP + unsigned char hbuf[4]; /* buffer for gzip header crc calculation */ + #endif + static const unsigned short order[19] = /* permutation of code lengths */ + {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; + + if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL || + (strm->next_in == Z_NULL && strm->avail_in != 0)) + return Z_STREAM_ERROR; + + state = (struct inflate_state FAR *)strm->state; + if (state->mode == TYPE) state->mode = TYPEDO; /* skip check */ + LOAD(); + in = have; + out = left; + ret = Z_OK; + for (;;) + switch (state->mode) { + case HEAD: + if (state->wrap == 0) { + state->mode = TYPEDO; + break; + } + NEEDBITS(16); + #ifdef GUNZIP + if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */ + state->check = crc32(0L, Z_NULL, 0); + CRC2(state->check, hold); + INITBITS(); + state->mode = FLAGS; + break; + } + state->flags = 0; /* expect zlib header */ + if (state->head != Z_NULL) + state->head->done = -1; + if (!(state->wrap & 1) || /* check if zlib header allowed */ + #else + if ( + #endif + ((BITS(8) << 8) + (hold >> 8)) % 31) { + strm->msg = (char *)"incorrect header check"; + state->mode = BAD; + break; + } + if (BITS(4) != Z_DEFLATED) { + strm->msg = (char *)"unknown compression method"; + state->mode = BAD; + break; + } + DROPBITS(4); + len = BITS(4) + 8; + if (len > state->wbits) { + strm->msg = (char *)"invalid window size"; + state->mode = BAD; + break; + } + state->dmax = 1U << len; + Tracev((stderr, "inflate: zlib header ok\n")); + strm->adler = state->check = adler32(0L, Z_NULL, 0); + state->mode = hold & 0x200 ? DICTID : TYPE; + INITBITS(); + break; + #ifdef GUNZIP + case FLAGS: + NEEDBITS(16); + state->flags = (int)(hold); + if ((state->flags & 0xff) != Z_DEFLATED) { + strm->msg = (char *)"unknown compression method"; + state->mode = BAD; + break; + } + if (state->flags & 0xe000) { + strm->msg = (char *)"unknown header flags set"; + state->mode = BAD; + break; + } + if (state->head != Z_NULL) + state->head->text = (int)((hold >> 8) & 1); + if (state->flags & 0x0200) CRC2(state->check, hold); + INITBITS(); + state->mode = TIME; + case TIME: + NEEDBITS(32); + if (state->head != Z_NULL) + state->head->time = hold; + if (state->flags & 0x0200) CRC4(state->check, hold); + INITBITS(); + state->mode = OS; + case OS: + NEEDBITS(16); + if (state->head != Z_NULL) { + state->head->xflags = (int)(hold & 0xff); + state->head->os = (int)(hold >> 8); + } + if (state->flags & 0x0200) CRC2(state->check, hold); + INITBITS(); + state->mode = EXLEN; + case EXLEN: + if (state->flags & 0x0400) { + NEEDBITS(16); + state->length = (unsigned)(hold); + if (state->head != Z_NULL) + state->head->extra_len = (unsigned)hold; + if (state->flags & 0x0200) CRC2(state->check, hold); + INITBITS(); + } + else if (state->head != Z_NULL) + state->head->extra = Z_NULL; + state->mode = EXTRA; + case EXTRA: + if (state->flags & 0x0400) { + copy = state->length; + if (copy > have) copy = have; + if (copy) { + if (state->head != Z_NULL && + state->head->extra != Z_NULL) { + len = state->head->extra_len - state->length; + zmemcpy(state->head->extra + len, next, + len + copy > state->head->extra_max ? + state->head->extra_max - len : copy); + } + if (state->flags & 0x0200) + state->check = crc32(state->check, next, copy); + have -= copy; + next += copy; + state->length -= copy; + } + if (state->length) goto inf_leave; + } + state->length = 0; + state->mode = NAME; + case NAME: + if (state->flags & 0x0800) { + if (have == 0) goto inf_leave; + copy = 0; + do { + len = (unsigned)(next[copy++]); + if (state->head != Z_NULL && + state->head->name != Z_NULL && + state->length < state->head->name_max) + state->head->name[state->length++] = len; + } while (len && copy < have); + if (state->flags & 0x0200) + state->check = crc32(state->check, next, copy); + have -= copy; + next += copy; + if (len) goto inf_leave; + } + else if (state->head != Z_NULL) + state->head->name = Z_NULL; + state->length = 0; + state->mode = COMMENT; + case COMMENT: + if (state->flags & 0x1000) { + if (have == 0) goto inf_leave; + copy = 0; + do { + len = (unsigned)(next[copy++]); + if (state->head != Z_NULL && + state->head->comment != Z_NULL && + state->length < state->head->comm_max) + state->head->comment[state->length++] = len; + } while (len && copy < have); + if (state->flags & 0x0200) + state->check = crc32(state->check, next, copy); + have -= copy; + next += copy; + if (len) goto inf_leave; + } + else if (state->head != Z_NULL) + state->head->comment = Z_NULL; + state->mode = HCRC; + case HCRC: + if (state->flags & 0x0200) { + NEEDBITS(16); + if (hold != (state->check & 0xffff)) { + strm->msg = (char *)"header crc mismatch"; + state->mode = BAD; + break; + } + INITBITS(); + } + if (state->head != Z_NULL) { + state->head->hcrc = (int)((state->flags >> 9) & 1); + state->head->done = 1; + } + strm->adler = state->check = crc32(0L, Z_NULL, 0); + state->mode = TYPE; + break; + #endif + case DICTID: + NEEDBITS(32); + strm->adler = state->check = REVERSE(hold); + INITBITS(); + state->mode = DICT; + case DICT: + if (state->havedict == 0) { + RESTORE(); + return Z_NEED_DICT; + } + strm->adler = state->check = adler32(0L, Z_NULL, 0); + state->mode = TYPE; + case TYPE: + if (flush == Z_BLOCK) goto inf_leave; + case TYPEDO: + if (state->last) { + BYTEBITS(); + state->mode = CHECK; + break; + } + NEEDBITS(3); + state->last = BITS(1); + DROPBITS(1); + switch (BITS(2)) { + case 0: /* stored block */ + Tracev((stderr, "inflate: stored block%s\n", + state->last ? " (last)" : "")); + state->mode = STORED; + break; + case 1: /* fixed block */ + fixedtables(state); + Tracev((stderr, "inflate: fixed codes block%s\n", + state->last ? " (last)" : "")); + state->mode = LEN; /* decode codes */ + break; + case 2: /* dynamic block */ + Tracev((stderr, "inflate: dynamic codes block%s\n", + state->last ? " (last)" : "")); + state->mode = TABLE; + break; + case 3: + strm->msg = (char *)"invalid block type"; + state->mode = BAD; + } + DROPBITS(2); + break; + case STORED: + BYTEBITS(); /* go to byte boundary */ + NEEDBITS(32); + if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { + strm->msg = (char *)"invalid stored block lengths"; + state->mode = BAD; + break; + } + state->length = (unsigned)hold & 0xffff; + Tracev((stderr, "inflate: stored length %u\n", + state->length)); + INITBITS(); + state->mode = COPY; + case COPY: + copy = state->length; + if (copy) { + if (copy > have) copy = have; + if (copy > left) copy = left; + if (copy == 0) goto inf_leave; + zmemcpy(put, next, copy); + have -= copy; + next += copy; + left -= copy; + put += copy; + state->length -= copy; + break; + } + Tracev((stderr, "inflate: stored end\n")); + state->mode = TYPE; + break; + case TABLE: + NEEDBITS(14); + state->nlen = BITS(5) + 257; + DROPBITS(5); + state->ndist = BITS(5) + 1; + DROPBITS(5); + state->ncode = BITS(4) + 4; + DROPBITS(4); + #ifndef PKZIP_BUG_WORKAROUND + if (state->nlen > 286 || state->ndist > 30) { + strm->msg = (char *)"too many length or distance symbols"; + state->mode = BAD; + break; + } + #endif + Tracev((stderr, "inflate: table sizes ok\n")); + state->have = 0; + state->mode = LENLENS; + case LENLENS: + while (state->have < state->ncode) { + NEEDBITS(3); + state->lens[order[state->have++]] = (unsigned short)BITS(3); + DROPBITS(3); + } + while (state->have < 19) + state->lens[order[state->have++]] = 0; + state->next = state->codes; + state->lencode = (code const FAR *)(state->next); + state->lenbits = 7; + ret = inflate_table(CODES, state->lens, 19, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid code lengths set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: code lengths ok\n")); + state->have = 0; + state->mode = CODELENS; + case CODELENS: + while (state->have < state->nlen + state->ndist) { + for (;;) { + this = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if (this.val < 16) { + NEEDBITS(this.bits); + DROPBITS(this.bits); + state->lens[state->have++] = this.val; + } + else { + if (this.val == 16) { + NEEDBITS(this.bits + 2); + DROPBITS(this.bits); + if (state->have == 0) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + len = state->lens[state->have - 1]; + copy = 3 + BITS(2); + DROPBITS(2); + } + else if (this.val == 17) { + NEEDBITS(this.bits + 3); + DROPBITS(this.bits); + len = 0; + copy = 3 + BITS(3); + DROPBITS(3); + } + else { + NEEDBITS(this.bits + 7); + DROPBITS(this.bits); + len = 0; + copy = 11 + BITS(7); + DROPBITS(7); + } + if (state->have + copy > state->nlen + state->ndist) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + while (copy--) + state->lens[state->have++] = (unsigned short)len; + } + } + + /* handle error breaks in while */ + if (state->mode == BAD) break; + + /* build code tables */ + state->next = state->codes; + state->lencode = (code const FAR *)(state->next); + state->lenbits = 9; + ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid literal/lengths set"; + state->mode = BAD; + break; + } + state->distcode = (code const FAR *)(state->next); + state->distbits = 6; + ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, + &(state->next), &(state->distbits), state->work); + if (ret) { + strm->msg = (char *)"invalid distances set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: codes ok\n")); + state->mode = LEN; + case LEN: + if (have >= 6 && left >= 258) { + RESTORE(); + inflate_fast(strm, out); + LOAD(); + break; + } + for (;;) { + this = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if (this.op && (this.op & 0xf0) == 0) { + last = this; + for (;;) { + this = state->lencode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + this.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } + DROPBITS(this.bits); + state->length = (unsigned)this.val; + if ((int)(this.op) == 0) { + Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? + "inflate: literal '%c'\n" : + "inflate: literal 0x%02x\n", this.val)); + state->mode = LIT; + break; + } + if (this.op & 32) { + Tracevv((stderr, "inflate: end of block\n")); + state->mode = TYPE; + break; + } + if (this.op & 64) { + strm->msg = (char *)"invalid literal/length code"; + state->mode = BAD; + break; + } + state->extra = (unsigned)(this.op) & 15; + state->mode = LENEXT; + case LENEXT: + if (state->extra) { + NEEDBITS(state->extra); + state->length += BITS(state->extra); + DROPBITS(state->extra); + } + Tracevv((stderr, "inflate: length %u\n", state->length)); + state->mode = DIST; + case DIST: + for (;;) { + this = state->distcode[BITS(state->distbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if ((this.op & 0xf0) == 0) { + last = this; + for (;;) { + this = state->distcode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + this.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } + DROPBITS(this.bits); + if (this.op & 64) { + strm->msg = (char *)"invalid distance code"; + state->mode = BAD; + break; + } + state->offset = (unsigned)this.val; + state->extra = (unsigned)(this.op) & 15; + state->mode = DISTEXT; + case DISTEXT: + if (state->extra) { + NEEDBITS(state->extra); + state->offset += BITS(state->extra); + DROPBITS(state->extra); + } + #ifdef INFLATE_STRICT + if (state->offset > state->dmax) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } + #endif + if (state->offset > state->whave + out - left) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } + Tracevv((stderr, "inflate: distance %u\n", state->offset)); + state->mode = MATCH; + case MATCH: + if (left == 0) goto inf_leave; + copy = out - left; + if (state->offset > copy) { /* copy from window */ + copy = state->offset - copy; + if (copy > state->write) { + copy -= state->write; + from = state->window + (state->wsize - copy); + } + else + from = state->window + (state->write - copy); + if (copy > state->length) copy = state->length; + } + else { /* copy from output */ + from = put - state->offset; + copy = state->length; + } + if (copy > left) copy = left; + left -= copy; + state->length -= copy; + do { + *put++ = *from++; + } while (--copy); + if (state->length == 0) state->mode = LEN; + break; + case LIT: + if (left == 0) goto inf_leave; + *put++ = (unsigned char)(state->length); + left--; + state->mode = LEN; + break; + case CHECK: + if (state->wrap) { + NEEDBITS(32); + out -= left; + strm->total_out += out; + state->total += out; + if (out) + strm->adler = state->check = + UPDATE(state->check, put - out, out); + out = left; + if (( + #ifdef GUNZIP + state->flags ? hold : + #endif + REVERSE(hold)) != state->check) { + strm->msg = (char *)"incorrect data check"; + state->mode = BAD; + break; + } + INITBITS(); + Tracev((stderr, "inflate: check matches trailer\n")); + } + #ifdef GUNZIP + state->mode = LENGTH; + case LENGTH: + if (state->wrap && state->flags) { + NEEDBITS(32); + if (hold != (state->total & 0xffffffffUL)) { + strm->msg = (char *)"incorrect length check"; + state->mode = BAD; + break; + } + INITBITS(); + Tracev((stderr, "inflate: length matches trailer\n")); + } + #endif + state->mode = DONE; + case DONE: + ret = Z_STREAM_END; + goto inf_leave; + case BAD: + ret = Z_DATA_ERROR; + goto inf_leave; + case MEM: + return Z_MEM_ERROR; + case SYNC: + default: + return Z_STREAM_ERROR; + } + + /* + Return from inflate(), updating the total counts and the check value. + If there was no progress during the inflate() call, return a buffer + error. Call updatewindow() to create and/or update the window state. + Note: a memory error from inflate() is non-recoverable. + */ + inf_leave: + RESTORE(); + if (state->wsize || (state->mode < CHECK && out != strm->avail_out)) + if (updatewindow(strm, out)) { + state->mode = MEM; + return Z_MEM_ERROR; + } + in -= strm->avail_in; + out -= strm->avail_out; + strm->total_in += in; + strm->total_out += out; + state->total += out; + if (state->wrap && out) + strm->adler = state->check = + UPDATE(state->check, strm->next_out - out, out); + strm->data_type = state->bits + (state->last ? 64 : 0) + + (state->mode == TYPE ? 128 : 0); + if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) + ret = Z_BUF_ERROR; + return ret; + } + + int ZEXPORT inflateEnd(strm) + z_streamp strm; + { + struct inflate_state FAR *state; + if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) + return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (state->window != Z_NULL) ZFREE(strm, state->window); + ZFREE(strm, strm->state); + strm->state = Z_NULL; + Tracev((stderr, "inflate: end\n")); + return Z_OK; + } + + int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength) + z_streamp strm; + const Bytef *dictionary; + uInt dictLength; + { + struct inflate_state FAR *state; + unsigned long id; + + /* check state */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (state->wrap != 0 && state->mode != DICT) + return Z_STREAM_ERROR; + + /* check for correct dictionary id */ + if (state->mode == DICT) { + id = adler32(0L, Z_NULL, 0); + id = adler32(id, dictionary, dictLength); + if (id != state->check) + return Z_DATA_ERROR; + } + + /* copy dictionary to window */ + if (updatewindow(strm, strm->avail_out)) { + state->mode = MEM; + return Z_MEM_ERROR; + } + if (dictLength > state->wsize) { + zmemcpy(state->window, dictionary + dictLength - state->wsize, + state->wsize); + state->whave = state->wsize; + } + else { + zmemcpy(state->window + state->wsize - dictLength, dictionary, + dictLength); + state->whave = dictLength; + } + state->havedict = 1; + Tracev((stderr, "inflate: dictionary set\n")); + return Z_OK; + } + + int ZEXPORT inflateGetHeader(strm, head) + z_streamp strm; + gz_headerp head; + { + struct inflate_state FAR *state; + + /* check state */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if ((state->wrap & 2) == 0) return Z_STREAM_ERROR; + + /* save header structure */ + state->head = head; + head->done = 0; + return Z_OK; + } + + /* + Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff. Return when found + or when out of input. When called, *have is the number of pattern bytes + found in order so far, in 0..3. On return *have is updated to the new + state. If on return *have equals four, then the pattern was found and the + return value is how many bytes were read including the last byte of the + pattern. If *have is less than four, then the pattern has not been found + yet and the return value is len. In the latter case, syncsearch() can be + called again with more data and the *have state. *have is initialized to + zero for the first call. + */ + local unsigned syncsearch(have, buf, len) + unsigned FAR *have; + unsigned char FAR *buf; + unsigned len; + { + unsigned got; + unsigned next; + + got = *have; + next = 0; + while (next < len && got < 4) { + if ((int)(buf[next]) == (got < 2 ? 0 : 0xff)) + got++; + else if (buf[next]) + got = 0; + else + got = 4 - got; + next++; + } + *have = got; + return next; + } + + int ZEXPORT inflateSync(strm) + z_streamp strm; + { + unsigned len; /* number of bytes to look at or looked at */ + unsigned long in, out; /* temporary to save total_in and total_out */ + unsigned char buf[4]; /* to restore bit buffer to byte string */ + struct inflate_state FAR *state; + + /* check parameters */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR; + + /* if first time, start search in bit buffer */ + if (state->mode != SYNC) { + state->mode = SYNC; + state->hold <<= state->bits & 7; + state->bits -= state->bits & 7; + len = 0; + while (state->bits >= 8) { + buf[len++] = (unsigned char)(state->hold); + state->hold >>= 8; + state->bits -= 8; + } + state->have = 0; + syncsearch(&(state->have), buf, len); + } + + /* search available input */ + len = syncsearch(&(state->have), strm->next_in, strm->avail_in); + strm->avail_in -= len; + strm->next_in += len; + strm->total_in += len; + + /* return no joy or set up to restart inflate() on a new block */ + if (state->have != 4) return Z_DATA_ERROR; + in = strm->total_in; out = strm->total_out; + inflateReset(strm); + strm->total_in = in; strm->total_out = out; + state->mode = TYPE; + return Z_OK; + } + + /* + Returns true if inflate is currently at the end of a block generated by + Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP + implementation to provide an additional safety check. PPP uses + Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored + block. When decompressing, PPP checks that at the end of input packet, + inflate is waiting for these length bytes. + */ + int ZEXPORT inflateSyncPoint(strm) + z_streamp strm; + { + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + return state->mode == STORED && state->bits == 0; + } + + int ZEXPORT inflateCopy(dest, source) + z_streamp dest; + z_streamp source; + { + struct inflate_state FAR *state; + struct inflate_state FAR *copy; + unsigned char FAR *window; + unsigned wsize; + + /* check input */ + if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL || + source->zalloc == (alloc_func)0 || source->zfree == (free_func)0) + return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)source->state; + + /* allocate space */ + copy = (struct inflate_state FAR *) + ZALLOC(source, 1, sizeof(struct inflate_state)); + if (copy == Z_NULL) return Z_MEM_ERROR; + window = Z_NULL; + if (state->window != Z_NULL) { + window = (unsigned char FAR *) + ZALLOC(source, 1U << state->wbits, sizeof(unsigned char)); + if (window == Z_NULL) { + ZFREE(source, copy); + return Z_MEM_ERROR; + } + } + + /* copy state */ + zmemcpy(dest, source, sizeof(z_stream)); + zmemcpy(copy, state, sizeof(struct inflate_state)); + if (state->lencode >= state->codes && + state->lencode <= state->codes + ENOUGH - 1) { + copy->lencode = copy->codes + (state->lencode - state->codes); + copy->distcode = copy->codes + (state->distcode - state->codes); + } + copy->next = copy->codes + (state->next - state->codes); + if (window != Z_NULL) { + wsize = 1U << state->wbits; + zmemcpy(window, state->window, wsize); + } + copy->window = window; + dest->state = (struct internal_state FAR *)copy; + return Z_OK; + } diff -Nrcpad gcc-4.4.4/zlib/inflate.h gcc-4.4.5/zlib/inflate.h *** gcc-4.4.4/zlib/inflate.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/inflate.h Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,115 ---- + /* inflate.h -- internal inflate state definition + * Copyright (C) 1995-2004 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + + /* define NO_GZIP when compiling if you want to disable gzip header and + trailer decoding by inflate(). NO_GZIP would be used to avoid linking in + the crc code when it is not needed. For shared libraries, gzip decoding + should be left enabled. */ + #ifndef NO_GZIP + # define GUNZIP + #endif + + /* Possible inflate modes between inflate() calls */ + typedef enum { + HEAD, /* i: waiting for magic header */ + FLAGS, /* i: waiting for method and flags (gzip) */ + TIME, /* i: waiting for modification time (gzip) */ + OS, /* i: waiting for extra flags and operating system (gzip) */ + EXLEN, /* i: waiting for extra length (gzip) */ + EXTRA, /* i: waiting for extra bytes (gzip) */ + NAME, /* i: waiting for end of file name (gzip) */ + COMMENT, /* i: waiting for end of comment (gzip) */ + HCRC, /* i: waiting for header crc (gzip) */ + DICTID, /* i: waiting for dictionary check value */ + DICT, /* waiting for inflateSetDictionary() call */ + TYPE, /* i: waiting for type bits, including last-flag bit */ + TYPEDO, /* i: same, but skip check to exit inflate on new block */ + STORED, /* i: waiting for stored size (length and complement) */ + COPY, /* i/o: waiting for input or output to copy stored block */ + TABLE, /* i: waiting for dynamic block table lengths */ + LENLENS, /* i: waiting for code length code lengths */ + CODELENS, /* i: waiting for length/lit and distance code lengths */ + LEN, /* i: waiting for length/lit code */ + LENEXT, /* i: waiting for length extra bits */ + DIST, /* i: waiting for distance code */ + DISTEXT, /* i: waiting for distance extra bits */ + MATCH, /* o: waiting for output space to copy string */ + LIT, /* o: waiting for output space to write literal */ + CHECK, /* i: waiting for 32-bit check value */ + LENGTH, /* i: waiting for 32-bit length (gzip) */ + DONE, /* finished check, done -- remain here until reset */ + BAD, /* got a data error -- remain here until reset */ + MEM, /* got an inflate() memory error -- remain here until reset */ + SYNC /* looking for synchronization bytes to restart inflate() */ + } inflate_mode; + + /* + State transitions between above modes - + + (most modes can go to the BAD or MEM mode -- not shown for clarity) + + Process header: + HEAD -> (gzip) or (zlib) + (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME + NAME -> COMMENT -> HCRC -> TYPE + (zlib) -> DICTID or TYPE + DICTID -> DICT -> TYPE + Read deflate blocks: + TYPE -> STORED or TABLE or LEN or CHECK + STORED -> COPY -> TYPE + TABLE -> LENLENS -> CODELENS -> LEN + Read deflate codes: + LEN -> LENEXT or LIT or TYPE + LENEXT -> DIST -> DISTEXT -> MATCH -> LEN + LIT -> LEN + Process trailer: + CHECK -> LENGTH -> DONE + */ + + /* state maintained between inflate() calls. Approximately 7K bytes. */ + struct inflate_state { + inflate_mode mode; /* current inflate mode */ + int last; /* true if processing last block */ + int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ + int havedict; /* true if dictionary provided */ + int flags; /* gzip header method and flags (0 if zlib) */ + unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */ + unsigned long check; /* protected copy of check value */ + unsigned long total; /* protected copy of output count */ + gz_headerp head; /* where to save gzip header information */ + /* sliding window */ + unsigned wbits; /* log base 2 of requested window size */ + unsigned wsize; /* window size or zero if not using window */ + unsigned whave; /* valid bytes in the window */ + unsigned write; /* window write index */ + unsigned char FAR *window; /* allocated sliding window, if needed */ + /* bit accumulator */ + unsigned long hold; /* input bit accumulator */ + unsigned bits; /* number of bits in "in" */ + /* for string and stored block copying */ + unsigned length; /* literal or length of data to copy */ + unsigned offset; /* distance back to copy string from */ + /* for table and code decoding */ + unsigned extra; /* extra bits needed */ + /* fixed and dynamic code tables */ + code const FAR *lencode; /* starting table for length/literal codes */ + code const FAR *distcode; /* starting table for distance codes */ + unsigned lenbits; /* index bits for lencode */ + unsigned distbits; /* index bits for distcode */ + /* dynamic table building */ + unsigned ncode; /* number of code length code lengths */ + unsigned nlen; /* number of length code lengths */ + unsigned ndist; /* number of distance code lengths */ + unsigned have; /* number of code lengths in lens[] */ + code FAR *next; /* next available space in codes[] */ + unsigned short lens[320]; /* temporary storage for code lengths */ + unsigned short work[288]; /* work area for code table building */ + code codes[ENOUGH]; /* space for code tables */ + }; diff -Nrcpad gcc-4.4.4/zlib/inftrees.c gcc-4.4.5/zlib/inftrees.c *** gcc-4.4.4/zlib/inftrees.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/inftrees.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,329 ---- + /* inftrees.c -- generate Huffman trees for efficient decoding + * Copyright (C) 1995-2005 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + #include "zutil.h" + #include "inftrees.h" + + #define MAXBITS 15 + + const char inflate_copyright[] = + " inflate 1.2.3 Copyright 1995-2005 Mark Adler "; + /* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot + include such an acknowledgment, I would appreciate that you keep this + copyright string in the executable of your product. + */ + + /* + Build a set of tables to decode the provided canonical Huffman code. + The code lengths are lens[0..codes-1]. The result starts at *table, + whose indices are 0..2^bits-1. work is a writable array of at least + lens shorts, which is used as a work area. type is the type of code + to be generated, CODES, LENS, or DISTS. On return, zero is success, + -1 is an invalid code, and +1 means that ENOUGH isn't enough. table + on return points to the next available entry's address. bits is the + requested root table index bits, and on return it is the actual root + table index bits. It will differ if the request is greater than the + longest code or if it is less than the shortest code. + */ + int inflate_table(type, lens, codes, table, bits, work) + codetype type; + unsigned short FAR *lens; + unsigned codes; + code FAR * FAR *table; + unsigned FAR *bits; + unsigned short FAR *work; + { + unsigned len; /* a code's length in bits */ + unsigned sym; /* index of code symbols */ + unsigned min, max; /* minimum and maximum code lengths */ + unsigned root; /* number of index bits for root table */ + unsigned curr; /* number of index bits for current table */ + unsigned drop; /* code bits to drop for sub-table */ + int left; /* number of prefix codes available */ + unsigned used; /* code entries in table used */ + unsigned huff; /* Huffman code */ + unsigned incr; /* for incrementing code, index */ + unsigned fill; /* index for replicating entries */ + unsigned low; /* low bits for current root entry */ + unsigned mask; /* mask for low root bits */ + code this; /* table entry for duplication */ + code FAR *next; /* next available space in table */ + const unsigned short FAR *base; /* base value table to use */ + const unsigned short FAR *extra; /* extra bits table to use */ + int end; /* use base and extra for symbol > end */ + unsigned short count[MAXBITS+1]; /* number of codes of each length */ + unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ + static const unsigned short lbase[31] = { /* Length codes 257..285 base */ + 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, + 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; + static const unsigned short lext[31] = { /* Length codes 257..285 extra */ + 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196}; + static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ + 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, + 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, + 8193, 12289, 16385, 24577, 0, 0}; + static const unsigned short dext[32] = { /* Distance codes 0..29 extra */ + 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, + 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, + 28, 28, 29, 29, 64, 64}; + + /* + Process a set of code lengths to create a canonical Huffman code. The + code lengths are lens[0..codes-1]. Each length corresponds to the + symbols 0..codes-1. The Huffman code is generated by first sorting the + symbols by length from short to long, and retaining the symbol order + for codes with equal lengths. Then the code starts with all zero bits + for the first code of the shortest length, and the codes are integer + increments for the same length, and zeros are appended as the length + increases. For the deflate format, these bits are stored backwards + from their more natural integer increment ordering, and so when the + decoding tables are built in the large loop below, the integer codes + are incremented backwards. + + This routine assumes, but does not check, that all of the entries in + lens[] are in the range 0..MAXBITS. The caller must assure this. + 1..MAXBITS is interpreted as that code length. zero means that that + symbol does not occur in this code. + + The codes are sorted by computing a count of codes for each length, + creating from that a table of starting indices for each length in the + sorted table, and then entering the symbols in order in the sorted + table. The sorted table is work[], with that space being provided by + the caller. + + The length counts are used for other purposes as well, i.e. finding + the minimum and maximum length codes, determining if there are any + codes at all, checking for a valid set of lengths, and looking ahead + at length counts to determine sub-table sizes when building the + decoding tables. + */ + + /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */ + for (len = 0; len <= MAXBITS; len++) + count[len] = 0; + for (sym = 0; sym < codes; sym++) + count[lens[sym]]++; + + /* bound code lengths, force root to be within code lengths */ + root = *bits; + for (max = MAXBITS; max >= 1; max--) + if (count[max] != 0) break; + if (root > max) root = max; + if (max == 0) { /* no symbols to code at all */ + this.op = (unsigned char)64; /* invalid code marker */ + this.bits = (unsigned char)1; + this.val = (unsigned short)0; + *(*table)++ = this; /* make a table to force an error */ + *(*table)++ = this; + *bits = 1; + return 0; /* no symbols, but wait for decoding to report error */ + } + for (min = 1; min <= MAXBITS; min++) + if (count[min] != 0) break; + if (root < min) root = min; + + /* check for an over-subscribed or incomplete set of lengths */ + left = 1; + for (len = 1; len <= MAXBITS; len++) { + left <<= 1; + left -= count[len]; + if (left < 0) return -1; /* over-subscribed */ + } + if (left > 0 && (type == CODES || max != 1)) + return -1; /* incomplete set */ + + /* generate offsets into symbol table for each length for sorting */ + offs[1] = 0; + for (len = 1; len < MAXBITS; len++) + offs[len + 1] = offs[len] + count[len]; + + /* sort symbols by length, by symbol order within each length */ + for (sym = 0; sym < codes; sym++) + if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym; + + /* + Create and fill in decoding tables. In this loop, the table being + filled is at next and has curr index bits. The code being used is huff + with length len. That code is converted to an index by dropping drop + bits off of the bottom. For codes where len is less than drop + curr, + those top drop + curr - len bits are incremented through all values to + fill the table with replicated entries. + + root is the number of index bits for the root table. When len exceeds + root, sub-tables are created pointed to by the root entry with an index + of the low root bits of huff. This is saved in low to check for when a + new sub-table should be started. drop is zero when the root table is + being filled, and drop is root when sub-tables are being filled. + + When a new sub-table is needed, it is necessary to look ahead in the + code lengths to determine what size sub-table is needed. The length + counts are used for this, and so count[] is decremented as codes are + entered in the tables. + + used keeps track of how many table entries have been allocated from the + provided *table space. It is checked when a LENS table is being made + against the space in *table, ENOUGH, minus the maximum space needed by + the worst case distance code, MAXD. This should never happen, but the + sufficiency of ENOUGH has not been proven exhaustively, hence the check. + This assumes that when type == LENS, bits == 9. + + sym increments through all symbols, and the loop terminates when + all codes of length max, i.e. all codes, have been processed. This + routine permits incomplete codes, so another loop after this one fills + in the rest of the decoding tables with invalid code markers. + */ + + /* set up for code type */ + switch (type) { + case CODES: + base = extra = work; /* dummy value--not used */ + end = 19; + break; + case LENS: + base = lbase; + base -= 257; + extra = lext; + extra -= 257; + end = 256; + break; + default: /* DISTS */ + base = dbase; + extra = dext; + end = -1; + } + + /* initialize state for loop */ + huff = 0; /* starting code */ + sym = 0; /* starting code symbol */ + len = min; /* starting code length */ + next = *table; /* current table to fill in */ + curr = root; /* current table index bits */ + drop = 0; /* current bits to drop from code for index */ + low = (unsigned)(-1); /* trigger new sub-table when len > root */ + used = 1U << root; /* use root table entries */ + mask = used - 1; /* mask for comparing low */ + + /* check available table space */ + if (type == LENS && used >= ENOUGH - MAXD) + return 1; + + /* process all codes and make table entries */ + for (;;) { + /* create table entry */ + this.bits = (unsigned char)(len - drop); + if ((int)(work[sym]) < end) { + this.op = (unsigned char)0; + this.val = work[sym]; + } + else if ((int)(work[sym]) > end) { + this.op = (unsigned char)(extra[work[sym]]); + this.val = base[work[sym]]; + } + else { + this.op = (unsigned char)(32 + 64); /* end of block */ + this.val = 0; + } + + /* replicate for those indices with low len bits equal to huff */ + incr = 1U << (len - drop); + fill = 1U << curr; + min = fill; /* save offset to next table */ + do { + fill -= incr; + next[(huff >> drop) + fill] = this; + } while (fill != 0); + + /* backwards increment the len-bit code huff */ + incr = 1U << (len - 1); + while (huff & incr) + incr >>= 1; + if (incr != 0) { + huff &= incr - 1; + huff += incr; + } + else + huff = 0; + + /* go to next symbol, update count, len */ + sym++; + if (--(count[len]) == 0) { + if (len == max) break; + len = lens[work[sym]]; + } + + /* create new sub-table if needed */ + if (len > root && (huff & mask) != low) { + /* if first time, transition to sub-tables */ + if (drop == 0) + drop = root; + + /* increment past last table */ + next += min; /* here min is 1 << curr */ + + /* determine length of next table */ + curr = len - drop; + left = (int)(1 << curr); + while (curr + drop < max) { + left -= count[curr + drop]; + if (left <= 0) break; + curr++; + left <<= 1; + } + + /* check for enough space */ + used += 1U << curr; + if (type == LENS && used >= ENOUGH - MAXD) + return 1; + + /* point entry in root table to sub-table */ + low = huff & mask; + (*table)[low].op = (unsigned char)curr; + (*table)[low].bits = (unsigned char)root; + (*table)[low].val = (unsigned short)(next - *table); + } + } + + /* + Fill in rest of table for incomplete codes. This loop is similar to the + loop above in incrementing huff for table indices. It is assumed that + len is equal to curr + drop, so there is no loop needed to increment + through high index bits. When the current sub-table is filled, the loop + drops back to the root table to fill in any remaining entries there. + */ + this.op = (unsigned char)64; /* invalid code marker */ + this.bits = (unsigned char)(len - drop); + this.val = (unsigned short)0; + while (huff != 0) { + /* when done with sub-table, drop back to root table */ + if (drop != 0 && (huff & mask) != low) { + drop = 0; + len = root; + next = *table; + this.bits = (unsigned char)len; + } + + /* put invalid code marker in table */ + next[huff >> drop] = this; + + /* backwards increment the len-bit code huff */ + incr = 1U << (len - 1); + while (huff & incr) + incr >>= 1; + if (incr != 0) { + huff &= incr - 1; + huff += incr; + } + else + huff = 0; + } + + /* set return parameters */ + *table += used; + *bits = root; + return 0; + } diff -Nrcpad gcc-4.4.4/zlib/inftrees.h gcc-4.4.5/zlib/inftrees.h *** gcc-4.4.4/zlib/inftrees.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/inftrees.h Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,55 ---- + /* inftrees.h -- header to use inftrees.c + * Copyright (C) 1995-2005 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + + /* Structure for decoding tables. Each entry provides either the + information needed to do the operation requested by the code that + indexed that table entry, or it provides a pointer to another + table that indexes more bits of the code. op indicates whether + the entry is a pointer to another table, a literal, a length or + distance, an end-of-block, or an invalid code. For a table + pointer, the low four bits of op is the number of index bits of + that table. For a length or distance, the low four bits of op + is the number of extra bits to get after the code. bits is + the number of bits in this code or part of the code to drop off + of the bit buffer. val is the actual byte to output in the case + of a literal, the base length or distance, or the offset from + the current table to the next table. Each entry is four bytes. */ + typedef struct { + unsigned char op; /* operation, extra bits, table bits */ + unsigned char bits; /* bits in this part of the code */ + unsigned short val; /* offset in table or code value */ + } code; + + /* op values as set by inflate_table(): + 00000000 - literal + 0000tttt - table link, tttt != 0 is the number of table index bits + 0001eeee - length or distance, eeee is the number of extra bits + 01100000 - end of block + 01000000 - invalid code + */ + + /* Maximum size of dynamic tree. The maximum found in a long but non- + exhaustive search was 1444 code structures (852 for length/literals + and 592 for distances, the latter actually the result of an + exhaustive search). The true maximum is not known, but the value + below is more than safe. */ + #define ENOUGH 2048 + #define MAXD 592 + + /* Type of code to build for inftable() */ + typedef enum { + CODES, + LENS, + DISTS + } codetype; + + extern int inflate_table OF((codetype type, unsigned short FAR *lens, + unsigned codes, code FAR * FAR *table, + unsigned FAR *bits, unsigned short FAR *work)); diff -Nrcpad gcc-4.4.4/zlib/make_vms.com gcc-4.4.5/zlib/make_vms.com *** gcc-4.4.4/zlib/make_vms.com Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/make_vms.com Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,461 ---- + $! make libz under VMS written by + $! Martin P.J. Zinser + $! + $! + $ on error then goto err_exit + $! + $! + $! Just some general constants... + $! + $ true = 1 + $ false = 0 + $ tmpnam = "temp_" + f$getjpi("","pid") + $ SAY = "WRITE SYS$OUTPUT" + $! + $! Setup variables holding "config" information + $! + $ Make = "" + $ name = "Zlib" + $ version = "?.?.?" + $ v_string = "ZLIB_VERSION" + $ v_file = "zlib.h" + $ ccopt = "" + $ lopts = "" + $ linkonly = false + $ optfile = name + ".opt" + $ its_decc = false + $ its_vaxc = false + $ its_gnuc = false + $ axp = f$getsyi("HW_MODEL").ge.1024 + $ s_case = false + $! Check for MMK/MMS + $! + $ If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS" + $ If F$Type (MMK) .eqs. "STRING" Then Make = "MMK" + $! + $! + $ gosub find_version + $! + $ gosub check_opts + $! + $! Look for the compiler used + $! + $ gosub check_compiler + $ if its_decc + $ then + $ ccopt = "/prefix=all" + ccopt + $ if f$trnlnm("SYS") .eqs. "" + $ then + $ if axp + $ then + $ define sys sys$library: + $ else + $ ccopt = "/decc" + ccopt + $ define sys decc$library_include: + $ endif + $ endif + $ endif + $ if its_vaxc .or. its_gnuc + $ then + $ if f$trnlnm("SYS").eqs."" then define sys sys$library: + $ endif + $! + $! Build the thing plain or with mms + $! + $ write sys$output "Compiling Zlib sources ..." + $ if make.eqs."" + $ then + $ dele example.obj;*,minigzip.obj;* + $ CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" - + adler32.c zlib.h zconf.h + $ CALL MAKE compress.OBJ "CC ''CCOPT' compress" - + compress.c zlib.h zconf.h + $ CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" - + crc32.c zlib.h zconf.h + $ CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" - + deflate.c deflate.h zutil.h zlib.h zconf.h + $ CALL MAKE gzio.OBJ "CC ''CCOPT' gzio" - + gzio.c zutil.h zlib.h zconf.h + $ CALL MAKE infback.OBJ "CC ''CCOPT' infback" - + infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h + $ CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" - + inffast.c zutil.h zlib.h zconf.h inffast.h + $ CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" - + inflate.c zutil.h zlib.h zconf.h infblock.h + $ CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" - + inftrees.c zutil.h zlib.h zconf.h inftrees.h + $ CALL MAKE trees.OBJ "CC ''CCOPT' trees" - + trees.c deflate.h zutil.h zlib.h zconf.h + $ CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" - + uncompr.c zlib.h zconf.h + $ CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" - + zutil.c zutil.h zlib.h zconf.h + $ write sys$output "Building Zlib ..." + $ CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ + $ write sys$output "Building example..." + $ CALL MAKE example.OBJ "CC ''CCOPT' example" - + example.c zlib.h zconf.h + $ call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb + $ if f$search("x11vms:xvmsutils.olb") .nes. "" + $ then + $ write sys$output "Building minigzip..." + $ CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" - + minigzip.c zlib.h zconf.h + $ call make minigzip.exe - + "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" - + minigzip.obj libz.olb + $ endif + $ else + $ gosub crea_mms + $ SAY "Make ''name' ''version' with ''Make' " + $ 'make' + $ endif + $! + $! Alpha gets a shareable image + $! + $ If axp + $ Then + $ gosub crea_olist + $ write sys$output "Creating libzshr.exe" + $ call anal_obj_axp modules.opt _link.opt + $ if s_case + $ then + $ open/append optf modules.opt + $ write optf "case_sensitive=YES" + $ close optf + $ endif + $ LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,_link.opt/opt + $ endif + $ write sys$output "Zlib build completed" + $ exit + $CC_ERR: + $ write sys$output "C compiler required to build ''name'" + $ goto err_exit + $ERR_EXIT: + $ set message/facil/ident/sever/text + $ write sys$output "Exiting..." + $ exit 2 + $! + $! + $MAKE: SUBROUTINE !SUBROUTINE TO CHECK DEPENDENCIES + $ V = 'F$Verify(0) + $! P1 = What we are trying to make + $! P2 = Command to make it + $! P3 - P8 What it depends on + $ + $ If F$Search(P1) .Eqs. "" Then Goto Makeit + $ Time = F$CvTime(F$File(P1,"RDT")) + $arg=3 + $Loop: + $ Argument = P'arg + $ If Argument .Eqs. "" Then Goto Exit + $ El=0 + $Loop2: + $ File = F$Element(El," ",Argument) + $ If File .Eqs. " " Then Goto Endl + $ AFile = "" + $Loop3: + $ OFile = AFile + $ AFile = F$Search(File) + $ If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl + $ If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit + $ Goto Loop3 + $NextEL: + $ El = El + 1 + $ Goto Loop2 + $EndL: + $ arg=arg+1 + $ If arg .Le. 8 Then Goto Loop + $ Goto Exit + $ + $Makeit: + $ VV=F$VERIFY(0) + $ write sys$output P2 + $ 'P2 + $ VV='F$Verify(VV) + $Exit: + $ If V Then Set Verify + $ENDSUBROUTINE + $!------------------------------------------------------------------------------ + $! + $! Check command line options and set symbols accordingly + $! + $ CHECK_OPTS: + $ i = 1 + $ OPT_LOOP: + $ if i .lt. 9 + $ then + $ cparm = f$edit(p'i',"upcase") + $ if cparm .eqs. "DEBUG" + $ then + $ ccopt = ccopt + "/noopt/deb" + $ lopts = lopts + "/deb" + $ endif + $ if f$locate("CCOPT=",cparm) .lt. f$length(cparm) + $ then + $ start = f$locate("=",cparm) + 1 + $ len = f$length(cparm) - start + $ ccopt = ccopt + f$extract(start,len,cparm) + $ if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) - + then s_case = true + $ endif + $ if cparm .eqs. "LINK" then linkonly = true + $ if f$locate("LOPTS=",cparm) .lt. f$length(cparm) + $ then + $ start = f$locate("=",cparm) + 1 + $ len = f$length(cparm) - start + $ lopts = lopts + f$extract(start,len,cparm) + $ endif + $ if f$locate("CC=",cparm) .lt. f$length(cparm) + $ then + $ start = f$locate("=",cparm) + 1 + $ len = f$length(cparm) - start + $ cc_com = f$extract(start,len,cparm) + if (cc_com .nes. "DECC") .and. - + (cc_com .nes. "VAXC") .and. - + (cc_com .nes. "GNUC") + $ then + $ write sys$output "Unsupported compiler choice ''cc_com' ignored" + $ write sys$output "Use DECC, VAXC, or GNUC instead" + $ else + $ if cc_com .eqs. "DECC" then its_decc = true + $ if cc_com .eqs. "VAXC" then its_vaxc = true + $ if cc_com .eqs. "GNUC" then its_gnuc = true + $ endif + $ endif + $ if f$locate("MAKE=",cparm) .lt. f$length(cparm) + $ then + $ start = f$locate("=",cparm) + 1 + $ len = f$length(cparm) - start + $ mmks = f$extract(start,len,cparm) + $ if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS") + $ then + $ make = mmks + $ else + $ write sys$output "Unsupported make choice ''mmks' ignored" + $ write sys$output "Use MMK or MMS instead" + $ endif + $ endif + $ i = i + 1 + $ goto opt_loop + $ endif + $ return + $!------------------------------------------------------------------------------ + $! + $! Look for the compiler used + $! + $CHECK_COMPILER: + $ if (.not. (its_decc .or. its_vaxc .or. its_gnuc)) + $ then + $ its_decc = (f$search("SYS$SYSTEM:DECC$COMPILER.EXE") .nes. "") + $ its_vaxc = .not. its_decc .and. (F$Search("SYS$System:VAXC.Exe") .nes. "") + $ its_gnuc = .not. (its_decc .or. its_vaxc) .and. (f$trnlnm("gnu_cc") .nes. "") + $ endif + $! + $! Exit if no compiler available + $! + $ if (.not. (its_decc .or. its_vaxc .or. its_gnuc)) + $ then goto CC_ERR + $ else + $ if its_decc then write sys$output "CC compiler check ... Compaq C" + $ if its_vaxc then write sys$output "CC compiler check ... VAX C" + $ if its_gnuc then write sys$output "CC compiler check ... GNU C" + $ endif + $ return + $!------------------------------------------------------------------------------ + $! + $! If MMS/MMK are available dump out the descrip.mms if required + $! + $CREA_MMS: + $ write sys$output "Creating descrip.mms..." + $ create descrip.mms + $ open/append out descrip.mms + $ copy sys$input: out + $ deck + # descrip.mms: MMS description file for building zlib on VMS + # written by Martin P.J. Zinser + # + + OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj, infback.obj\ + deflate.obj, trees.obj, zutil.obj, inflate.obj, \ + inftrees.obj, inffast.obj + + $ eod + $ write out "CFLAGS=", ccopt + $ write out "LOPTS=", lopts + $ copy sys$input: out + $ deck + + all : example.exe minigzip.exe libz.olb + @ write sys$output " Example applications available" + + libz.olb : libz.olb($(OBJS)) + @ write sys$output " libz available" + + example.exe : example.obj libz.olb + link $(LOPTS) example,libz.olb/lib + + minigzip.exe : minigzip.obj libz.olb + link $(LOPTS) minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib + + clean : + delete *.obj;*,libz.olb;*,*.opt;*,*.exe;* + + + # Other dependencies. + adler32.obj : adler32.c zutil.h zlib.h zconf.h + compress.obj : compress.c zlib.h zconf.h + crc32.obj : crc32.c zutil.h zlib.h zconf.h + deflate.obj : deflate.c deflate.h zutil.h zlib.h zconf.h + example.obj : example.c zlib.h zconf.h + gzio.obj : gzio.c zutil.h zlib.h zconf.h + inffast.obj : inffast.c zutil.h zlib.h zconf.h inftrees.h inffast.h + inflate.obj : inflate.c zutil.h zlib.h zconf.h + inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h + minigzip.obj : minigzip.c zlib.h zconf.h + trees.obj : trees.c deflate.h zutil.h zlib.h zconf.h + uncompr.obj : uncompr.c zlib.h zconf.h + zutil.obj : zutil.c zutil.h zlib.h zconf.h + infback.obj : infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h + $ eod + $ close out + $ return + $!------------------------------------------------------------------------------ + $! + $! Read list of core library sources from makefile.in and create options + $! needed to build shareable image + $! + $CREA_OLIST: + $ open/read min makefile.in + $ open/write mod modules.opt + $ src_check = "OBJS =" + $MRLOOP: + $ read/end=mrdone min rec + $ if (f$extract(0,6,rec) .nes. src_check) then goto mrloop + $ rec = rec - src_check + $ gosub extra_filnam + $ if (f$element(1,"\",rec) .eqs. "\") then goto mrdone + $MRSLOOP: + $ read/end=mrdone min rec + $ gosub extra_filnam + $ if (f$element(1,"\",rec) .nes. "\") then goto mrsloop + $MRDONE: + $ close min + $ close mod + $ return + $!------------------------------------------------------------------------------ + $! + $! Take record extracted in crea_olist and split it into single filenames + $! + $EXTRA_FILNAM: + $ myrec = f$edit(rec - "\", "trim,compress") + $ i = 0 + $FELOOP: + $ srcfil = f$element(i," ", myrec) + $ if (srcfil .nes. " ") + $ then + $ write mod f$parse(srcfil,,,"NAME"), ".obj" + $ i = i + 1 + $ goto feloop + $ endif + $ return + $!------------------------------------------------------------------------------ + $! + $! Find current Zlib version number + $! + $FIND_VERSION: + $ open/read h_in 'v_file' + $hloop: + $ read/end=hdone h_in rec + $ rec = f$edit(rec,"TRIM") + $ if (f$extract(0,1,rec) .nes. "#") then goto hloop + $ rec = f$edit(rec - "#", "TRIM") + $ if f$element(0," ",rec) .nes. "define" then goto hloop + $ if f$element(1," ",rec) .eqs. v_string + $ then + $ version = 'f$element(2," ",rec)' + $ goto hdone + $ endif + $ goto hloop + $hdone: + $ close h_in + $ return + $!------------------------------------------------------------------------------ + $! + $! Analyze Object files for OpenVMS AXP to extract Procedure and Data + $! information to build a symbol vector for a shareable image + $! All the "brains" of this logic was suggested by Hartmut Becker + $! (Hartmut.Becker@compaq.com). All the bugs were introduced by me + $! (zinser@decus.de), so if you do have problem reports please do not + $! bother Hartmut/HP, but get in touch with me + $! + $ ANAL_OBJ_AXP: Subroutine + $ V = 'F$Verify(0) + $ SAY := "WRITE_ SYS$OUTPUT" + $ + $ IF F$SEARCH("''P1'") .EQS. "" + $ THEN + $ SAY "ANAL_OBJ_AXP-E-NOSUCHFILE: Error, inputfile ''p1' not available" + $ goto exit_aa + $ ENDIF + $ IF "''P2'" .EQS. "" + $ THEN + $ SAY "ANAL_OBJ_AXP: Error, no output file provided" + $ goto exit_aa + $ ENDIF + $ + $ open/read in 'p1 + $ create a.tmp + $ open/append atmp a.tmp + $ loop: + $ read/end=end_loop in line + $ f= f$search(line) + $ if f .eqs. "" + $ then + $ write sys$output "ANAL_OBJ_AXP-w-nosuchfile, ''line'" + $ goto loop + $ endif + $ define/user sys$output nl: + $ define/user sys$error nl: + $ anal/obj/gsd 'f /out=x.tmp + $ open/read xtmp x.tmp + $ XLOOP: + $ read/end=end_xloop xtmp xline + $ xline = f$edit(xline,"compress") + $ write atmp xline + $ goto xloop + $ END_XLOOP: + $ close xtmp + $ goto loop + $ end_loop: + $ close in + $ close atmp + $ if f$search("a.tmp") .eqs. "" - + then $ exit + $ ! all global definitions + $ search a.tmp "symbol:","EGSY$V_DEF 1","EGSY$V_NORM 1"/out=b.tmp + $ ! all procedures + $ search b.tmp "EGSY$V_NORM 1"/wind=(0,1) /out=c.tmp + $ search c.tmp "symbol:"/out=d.tmp + $ define/user sys$output nl: + $ edito/edt/command=sys$input d.tmp + sub/symbol: "/symbol_vector=(/whole + sub/"/=PROCEDURE)/whole + exit + $ ! all data + $ search b.tmp "EGSY$V_DEF 1"/wind=(0,1) /out=e.tmp + $ search e.tmp "symbol:"/out=f.tmp + $ define/user sys$output nl: + $ edito/edt/command=sys$input f.tmp + sub/symbol: "/symbol_vector=(/whole + sub/"/=DATA)/whole + exit + $ sort/nodupl d.tmp,f.tmp 'p2' + $ delete a.tmp;*,b.tmp;*,c.tmp;*,d.tmp;*,e.tmp;*,f.tmp;* + $ if f$search("x.tmp") .nes. "" - + then $ delete x.tmp;* + $! + $ EXIT_AA: + $ if V then set verify + $ endsubroutine + $!------------------------------------------------------------------------------ diff -Nrcpad gcc-4.4.4/zlib/minigzip.c gcc-4.4.5/zlib/minigzip.c *** gcc-4.4.4/zlib/minigzip.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/minigzip.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,322 ---- + /* minigzip.c -- simulate gzip using the zlib compression library + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* + * minigzip is a minimal implementation of the gzip utility. This is + * only an example of using zlib and isn't meant to replace the + * full-featured gzip. No attempt is made to deal with file systems + * limiting names to 14 or 8+3 characters, etc... Error checking is + * very limited. So use minigzip only for testing; use gzip for the + * real thing. On MSDOS, use only on file names without extension + * or in pipe mode. + */ + + /* @(#) $Id: minigzip.c,v 1.1.1.2 2002/03/11 21:53:26 tromey Exp $ */ + + #include + #include "zlib.h" + + #ifdef STDC + # include + # include + #endif + + #ifdef USE_MMAP + # include + # include + # include + #endif + + #if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__) + # include + # include + # define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY) + #else + # define SET_BINARY_MODE(file) + #endif + + #ifdef VMS + # define unlink delete + # define GZ_SUFFIX "-gz" + #endif + #ifdef RISCOS + # define unlink remove + # define GZ_SUFFIX "-gz" + # define fileno(file) file->__file + #endif + #if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os + # include /* for fileno */ + #endif + + #ifndef WIN32 /* unlink already in stdio.h for WIN32 */ + extern int unlink OF((const char *)); + #endif + + #ifndef GZ_SUFFIX + # define GZ_SUFFIX ".gz" + #endif + #define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1) + + #define BUFLEN 16384 + #define MAX_NAME_LEN 1024 + + #ifdef MAXSEG_64K + # define local static + /* Needed for systems with limitation on stack size. */ + #else + # define local + #endif + + char *prog; + + void error OF((const char *msg)); + void gz_compress OF((FILE *in, gzFile out)); + #ifdef USE_MMAP + int gz_compress_mmap OF((FILE *in, gzFile out)); + #endif + void gz_uncompress OF((gzFile in, FILE *out)); + void file_compress OF((char *file, char *mode)); + void file_uncompress OF((char *file)); + int main OF((int argc, char *argv[])); + + /* =========================================================================== + * Display error message and exit + */ + void error(msg) + const char *msg; + { + fprintf(stderr, "%s: %s\n", prog, msg); + exit(1); + } + + /* =========================================================================== + * Compress input to output then close both files. + */ + + void gz_compress(in, out) + FILE *in; + gzFile out; + { + local char buf[BUFLEN]; + int len; + int err; + + #ifdef USE_MMAP + /* Try first compressing with mmap. If mmap fails (minigzip used in a + * pipe), use the normal fread loop. + */ + if (gz_compress_mmap(in, out) == Z_OK) return; + #endif + for (;;) { + len = (int)fread(buf, 1, sizeof(buf), in); + if (ferror(in)) { + perror("fread"); + exit(1); + } + if (len == 0) break; + + if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err)); + } + fclose(in); + if (gzclose(out) != Z_OK) error("failed gzclose"); + } + + #ifdef USE_MMAP /* MMAP version, Miguel Albrecht */ + + /* Try compressing the input file at once using mmap. Return Z_OK if + * if success, Z_ERRNO otherwise. + */ + int gz_compress_mmap(in, out) + FILE *in; + gzFile out; + { + int len; + int err; + int ifd = fileno(in); + caddr_t buf; /* mmap'ed buffer for the entire input file */ + off_t buf_len; /* length of the input file */ + struct stat sb; + + /* Determine the size of the file, needed for mmap: */ + if (fstat(ifd, &sb) < 0) return Z_ERRNO; + buf_len = sb.st_size; + if (buf_len <= 0) return Z_ERRNO; + + /* Now do the actual mmap: */ + buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0); + if (buf == (caddr_t)(-1)) return Z_ERRNO; + + /* Compress the whole file at once: */ + len = gzwrite(out, (char *)buf, (unsigned)buf_len); + + if (len != (int)buf_len) error(gzerror(out, &err)); + + munmap(buf, buf_len); + fclose(in); + if (gzclose(out) != Z_OK) error("failed gzclose"); + return Z_OK; + } + #endif /* USE_MMAP */ + + /* =========================================================================== + * Uncompress input to output then close both files. + */ + void gz_uncompress(in, out) + gzFile in; + FILE *out; + { + local char buf[BUFLEN]; + int len; + int err; + + for (;;) { + len = gzread(in, buf, sizeof(buf)); + if (len < 0) error (gzerror(in, &err)); + if (len == 0) break; + + if ((int)fwrite(buf, 1, (unsigned)len, out) != len) { + error("failed fwrite"); + } + } + if (fclose(out)) error("failed fclose"); + + if (gzclose(in) != Z_OK) error("failed gzclose"); + } + + + /* =========================================================================== + * Compress the given file: create a corresponding .gz file and remove the + * original. + */ + void file_compress(file, mode) + char *file; + char *mode; + { + local char outfile[MAX_NAME_LEN]; + FILE *in; + gzFile out; + + strcpy(outfile, file); + strcat(outfile, GZ_SUFFIX); + + in = fopen(file, "rb"); + if (in == NULL) { + perror(file); + exit(1); + } + out = gzopen(outfile, mode); + if (out == NULL) { + fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile); + exit(1); + } + gz_compress(in, out); + + unlink(file); + } + + + /* =========================================================================== + * Uncompress the given file and remove the original. + */ + void file_uncompress(file) + char *file; + { + local char buf[MAX_NAME_LEN]; + char *infile, *outfile; + FILE *out; + gzFile in; + uInt len = (uInt)strlen(file); + + strcpy(buf, file); + + if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) { + infile = file; + outfile = buf; + outfile[len-3] = '\0'; + } else { + outfile = file; + infile = buf; + strcat(infile, GZ_SUFFIX); + } + in = gzopen(infile, "rb"); + if (in == NULL) { + fprintf(stderr, "%s: can't gzopen %s\n", prog, infile); + exit(1); + } + out = fopen(outfile, "wb"); + if (out == NULL) { + perror(file); + exit(1); + } + + gz_uncompress(in, out); + + unlink(infile); + } + + + /* =========================================================================== + * Usage: minigzip [-d] [-f] [-h] [-r] [-1 to -9] [files...] + * -d : decompress + * -f : compress with Z_FILTERED + * -h : compress with Z_HUFFMAN_ONLY + * -r : compress with Z_RLE + * -1 to -9 : compression level + */ + + int main(argc, argv) + int argc; + char *argv[]; + { + int uncompr = 0; + gzFile file; + char outmode[20]; + + strcpy(outmode, "wb6 "); + + prog = argv[0]; + argc--, argv++; + + while (argc > 0) { + if (strcmp(*argv, "-d") == 0) + uncompr = 1; + else if (strcmp(*argv, "-f") == 0) + outmode[3] = 'f'; + else if (strcmp(*argv, "-h") == 0) + outmode[3] = 'h'; + else if (strcmp(*argv, "-r") == 0) + outmode[3] = 'R'; + else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' && + (*argv)[2] == 0) + outmode[2] = (*argv)[1]; + else + break; + argc--, argv++; + } + if (outmode[3] == ' ') + outmode[3] = 0; + if (argc == 0) { + SET_BINARY_MODE(stdin); + SET_BINARY_MODE(stdout); + if (uncompr) { + file = gzdopen(fileno(stdin), "rb"); + if (file == NULL) error("can't gzdopen stdin"); + gz_uncompress(file, stdout); + } else { + file = gzdopen(fileno(stdout), outmode); + if (file == NULL) error("can't gzdopen stdout"); + gz_compress(stdin, file); + } + } else { + do { + if (uncompr) { + file_uncompress(*argv); + } else { + file_compress(*argv, outmode); + } + } while (argv++, --argc); + } + return 0; + } diff -Nrcpad gcc-4.4.4/zlib/msdos/Makefile.bor gcc-4.4.5/zlib/msdos/Makefile.bor *** gcc-4.4.4/zlib/msdos/Makefile.bor Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/msdos/Makefile.bor Mon Oct 11 18:45:43 2004 *************** *** 0 **** --- 1,109 ---- + # Makefile for zlib + # Borland C++ + # Last updated: 15-Mar-2003 + + # To use, do "make -fmakefile.bor" + # To compile in small model, set below: MODEL=s + + # WARNING: the small model is supported but only for small values of + # MAX_WBITS and MAX_MEM_LEVEL. For example: + # -DMAX_WBITS=11 -DDEF_WBITS=11 -DMAX_MEM_LEVEL=3 + # If you wish to reduce the memory requirements (default 256K for big + # objects plus a few K), you can add to the LOC macro below: + # -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14 + # See zconf.h for details about the memory requirements. + + # ------------ Turbo C++, Borland C++ ------------ + + # Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7) + # should be added to the environment via "set LOCAL_ZLIB=-DFOO" or added + # to the declaration of LOC here: + LOC = $(LOCAL_ZLIB) + + # type for CPU required: 0: 8086, 1: 80186, 2: 80286, 3: 80386, etc. + CPU_TYP = 0 + + # memory model: one of s, m, c, l (small, medium, compact, large) + MODEL=l + + # replace bcc with tcc for Turbo C++ 1.0, with bcc32 for the 32 bit version + CC=bcc + LD=bcc + AR=tlib + + # compiler flags + # replace "-O2" by "-O -G -a -d" for Turbo C++ 1.0 + CFLAGS=-O2 -Z -m$(MODEL) $(LOC) + + LDFLAGS=-m$(MODEL) -f- + + + # variables + ZLIB_LIB = zlib_$(MODEL).lib + + OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj + OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj + OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj + OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj + + + # targets + all: $(ZLIB_LIB) example.exe minigzip.exe + + .c.obj: + $(CC) -c $(CFLAGS) $*.c + + adler32.obj: adler32.c zlib.h zconf.h + + compress.obj: compress.c zlib.h zconf.h + + crc32.obj: crc32.c zlib.h zconf.h crc32.h + + deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h + + gzio.obj: gzio.c zutil.h zlib.h zconf.h + + infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + + inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h + + inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + + inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h + + trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h + + uncompr.obj: uncompr.c zlib.h zconf.h + + zutil.obj: zutil.c zutil.h zlib.h zconf.h + + example.obj: example.c zlib.h zconf.h + + minigzip.obj: minigzip.c zlib.h zconf.h + + + # the command line is cut to fit in the MS-DOS 128 byte limit: + $(ZLIB_LIB): $(OBJ1) $(OBJ2) + -del $(ZLIB_LIB) + $(AR) $(ZLIB_LIB) $(OBJP1) + $(AR) $(ZLIB_LIB) $(OBJP2) + + example.exe: example.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) example.obj $(ZLIB_LIB) + + minigzip.exe: minigzip.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB) + + test: example.exe minigzip.exe + example + echo hello world | minigzip | minigzip -d + + clean: + -del *.obj + -del *.lib + -del *.exe + -del zlib_*.bak + -del foo.gz diff -Nrcpad gcc-4.4.4/zlib/msdos/Makefile.dj2 gcc-4.4.5/zlib/msdos/Makefile.dj2 *** gcc-4.4.4/zlib/msdos/Makefile.dj2 Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/msdos/Makefile.dj2 Mon Oct 11 18:45:43 2004 *************** *** 0 **** --- 1,104 ---- + # Makefile for zlib. Modified for djgpp v2.0 by F. J. Donahoe, 3/15/96. + # Copyright (C) 1995-1998 Jean-loup Gailly. + # For conditions of distribution and use, see copyright notice in zlib.h + + # To compile, or to compile and test, type: + # + # make -fmakefile.dj2; make test -fmakefile.dj2 + # + # To install libz.a, zconf.h and zlib.h in the djgpp directories, type: + # + # make install -fmakefile.dj2 + # + # after first defining LIBRARY_PATH and INCLUDE_PATH in djgpp.env as + # in the sample below if the pattern of the DJGPP distribution is to + # be followed. Remember that, while 'es around <=> are ignored in + # makefiles, they are *not* in batch files or in djgpp.env. + # - - - - - + # [make] + # INCLUDE_PATH=%\>;INCLUDE_PATH%%\DJDIR%\include + # LIBRARY_PATH=%\>;LIBRARY_PATH%%\DJDIR%\lib + # BUTT=-m486 + # - - - - - + # Alternately, these variables may be defined below, overriding the values + # in djgpp.env, as + # INCLUDE_PATH=c:\usr\include + # LIBRARY_PATH=c:\usr\lib + + CC=gcc + + #CFLAGS=-MMD -O + #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 + #CFLAGS=-MMD -g -DDEBUG + CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ + -Wstrict-prototypes -Wmissing-prototypes + + # If cp.exe is available, replace "copy /Y" with "cp -fp" . + CP=copy /Y + # If gnu install.exe is available, replace $(CP) with ginstall. + INSTALL=$(CP) + # The default value of RM is "rm -f." If "rm.exe" is found, comment out: + RM=del + LDLIBS=-L. -lz + LD=$(CC) -s -o + LDSHARED=$(CC) + + INCL=zlib.h zconf.h + LIBS=libz.a + + AR=ar rcs + + prefix=/usr/local + exec_prefix = $(prefix) + + OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ + zutil.o inflate.o infback.o inftrees.o inffast.o + + OBJA = + # to use the asm code: make OBJA=match.o + + TEST_OBJS = example.o minigzip.o + + all: example.exe minigzip.exe + + check: test + test: all + ./example + echo hello world | .\minigzip | .\minigzip -d + + %.o : %.c + $(CC) $(CFLAGS) -c $< -o $@ + + libz.a: $(OBJS) $(OBJA) + $(AR) $@ $(OBJS) $(OBJA) + + %.exe : %.o $(LIBS) + $(LD) $@ $< $(LDLIBS) + + # INCLUDE_PATH and LIBRARY_PATH were set for [make] in djgpp.env . + + .PHONY : uninstall clean + + install: $(INCL) $(LIBS) + -@if not exist $(INCLUDE_PATH)\nul mkdir $(INCLUDE_PATH) + -@if not exist $(LIBRARY_PATH)\nul mkdir $(LIBRARY_PATH) + $(INSTALL) zlib.h $(INCLUDE_PATH) + $(INSTALL) zconf.h $(INCLUDE_PATH) + $(INSTALL) libz.a $(LIBRARY_PATH) + + uninstall: + $(RM) $(INCLUDE_PATH)\zlib.h + $(RM) $(INCLUDE_PATH)\zconf.h + $(RM) $(LIBRARY_PATH)\libz.a + + clean: + $(RM) *.d + $(RM) *.o + $(RM) *.exe + $(RM) libz.a + $(RM) foo.gz + + DEPS := $(wildcard *.d) + ifneq ($(DEPS),) + include $(DEPS) + endif diff -Nrcpad gcc-4.4.4/zlib/msdos/Makefile.emx gcc-4.4.5/zlib/msdos/Makefile.emx *** gcc-4.4.4/zlib/msdos/Makefile.emx Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/msdos/Makefile.emx Mon Oct 11 18:45:43 2004 *************** *** 0 **** --- 1,69 ---- + # Makefile for zlib. Modified for emx 0.9c by Chr. Spieler, 6/17/98. + # Copyright (C) 1995-1998 Jean-loup Gailly. + # For conditions of distribution and use, see copyright notice in zlib.h + + # To compile, or to compile and test, type: + # + # make -fmakefile.emx; make test -fmakefile.emx + # + + CC=gcc + + #CFLAGS=-MMD -O + #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 + #CFLAGS=-MMD -g -DDEBUG + CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ + -Wstrict-prototypes -Wmissing-prototypes + + # If cp.exe is available, replace "copy /Y" with "cp -fp" . + CP=copy /Y + # If gnu install.exe is available, replace $(CP) with ginstall. + INSTALL=$(CP) + # The default value of RM is "rm -f." If "rm.exe" is found, comment out: + RM=del + LDLIBS=-L. -lzlib + LD=$(CC) -s -o + LDSHARED=$(CC) + + INCL=zlib.h zconf.h + LIBS=zlib.a + + AR=ar rcs + + prefix=/usr/local + exec_prefix = $(prefix) + + OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ + zutil.o inflate.o infback.o inftrees.o inffast.o + + TEST_OBJS = example.o minigzip.o + + all: example.exe minigzip.exe + + test: all + ./example + echo hello world | .\minigzip | .\minigzip -d + + %.o : %.c + $(CC) $(CFLAGS) -c $< -o $@ + + zlib.a: $(OBJS) + $(AR) $@ $(OBJS) + + %.exe : %.o $(LIBS) + $(LD) $@ $< $(LDLIBS) + + + .PHONY : clean + + clean: + $(RM) *.d + $(RM) *.o + $(RM) *.exe + $(RM) zlib.a + $(RM) foo.gz + + DEPS := $(wildcard *.d) + ifneq ($(DEPS),) + include $(DEPS) + endif diff -Nrcpad gcc-4.4.4/zlib/msdos/Makefile.msc gcc-4.4.5/zlib/msdos/Makefile.msc *** gcc-4.4.4/zlib/msdos/Makefile.msc Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/msdos/Makefile.msc Mon Oct 11 18:45:43 2004 *************** *** 0 **** --- 1,106 ---- + # Makefile for zlib + # Microsoft C 5.1 or later + # Last updated: 19-Mar-2003 + + # To use, do "make makefile.msc" + # To compile in small model, set below: MODEL=S + + # If you wish to reduce the memory requirements (default 256K for big + # objects plus a few K), you can add to the LOC macro below: + # -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14 + # See zconf.h for details about the memory requirements. + + # ------------- Microsoft C 5.1 and later ------------- + + # Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7) + # should be added to the environment via "set LOCAL_ZLIB=-DFOO" or added + # to the declaration of LOC here: + LOC = $(LOCAL_ZLIB) + + # Type for CPU required: 0: 8086, 1: 80186, 2: 80286, 3: 80386, etc. + CPU_TYP = 0 + + # Memory model: one of S, M, C, L (small, medium, compact, large) + MODEL=L + + CC=cl + CFLAGS=-nologo -A$(MODEL) -G$(CPU_TYP) -W3 -Oait -Gs $(LOC) + #-Ox generates bad code with MSC 5.1 + LIB_CFLAGS=-Zl $(CFLAGS) + + LD=link + LDFLAGS=/noi/e/st:0x1500/noe/farcall/packcode + # "/farcall/packcode" are only useful for `large code' memory models + # but should be a "no-op" for small code models. + + + # variables + ZLIB_LIB = zlib_$(MODEL).lib + + OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj + OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj + + + # targets + all: $(ZLIB_LIB) example.exe minigzip.exe + + .c.obj: + $(CC) -c $(LIB_CFLAGS) $*.c + + adler32.obj: adler32.c zlib.h zconf.h + + compress.obj: compress.c zlib.h zconf.h + + crc32.obj: crc32.c zlib.h zconf.h crc32.h + + deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h + + gzio.obj: gzio.c zutil.h zlib.h zconf.h + + infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + + inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h + + inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + + inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h + + trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h + + uncompr.obj: uncompr.c zlib.h zconf.h + + zutil.obj: zutil.c zutil.h zlib.h zconf.h + + example.obj: example.c zlib.h zconf.h + $(CC) -c $(CFLAGS) $*.c + + minigzip.obj: minigzip.c zlib.h zconf.h + $(CC) -c $(CFLAGS) $*.c + + + # the command line is cut to fit in the MS-DOS 128 byte limit: + $(ZLIB_LIB): $(OBJ1) $(OBJ2) + if exist $(ZLIB_LIB) del $(ZLIB_LIB) + lib $(ZLIB_LIB) $(OBJ1); + lib $(ZLIB_LIB) $(OBJ2); + + example.exe: example.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) example.obj,,,$(ZLIB_LIB); + + minigzip.exe: minigzip.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) minigzip.obj,,,$(ZLIB_LIB); + + test: example.exe minigzip.exe + example + echo hello world | minigzip | minigzip -d + + clean: + -del *.obj + -del *.lib + -del *.exe + -del *.map + -del zlib_*.bak + -del foo.gz diff -Nrcpad gcc-4.4.4/zlib/msdos/Makefile.tc gcc-4.4.5/zlib/msdos/Makefile.tc *** gcc-4.4.4/zlib/msdos/Makefile.tc Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/msdos/Makefile.tc Mon Oct 11 18:45:43 2004 *************** *** 0 **** --- 1,94 ---- + # Makefile for zlib + # Turbo C 2.01, Turbo C++ 1.01 + # Last updated: 15-Mar-2003 + + # To use, do "make -fmakefile.tc" + # To compile in small model, set below: MODEL=s + + # WARNING: the small model is supported but only for small values of + # MAX_WBITS and MAX_MEM_LEVEL. For example: + # -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3 + # If you wish to reduce the memory requirements (default 256K for big + # objects plus a few K), you can add to CFLAGS below: + # -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14 + # See zconf.h for details about the memory requirements. + + # ------------ Turbo C 2.01, Turbo C++ 1.01 ------------ + MODEL=l + CC=tcc + LD=tcc + AR=tlib + # CFLAGS=-O2 -G -Z -m$(MODEL) -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3 + CFLAGS=-O2 -G -Z -m$(MODEL) + LDFLAGS=-m$(MODEL) -f- + + + # variables + ZLIB_LIB = zlib_$(MODEL).lib + + OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj + OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj + OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj + OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj + + + # targets + all: $(ZLIB_LIB) example.exe minigzip.exe + + .c.obj: + $(CC) -c $(CFLAGS) $*.c + + adler32.obj: adler32.c zlib.h zconf.h + + compress.obj: compress.c zlib.h zconf.h + + crc32.obj: crc32.c zlib.h zconf.h crc32.h + + deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h + + gzio.obj: gzio.c zutil.h zlib.h zconf.h + + infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + + inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h + + inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + + inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h + + trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h + + uncompr.obj: uncompr.c zlib.h zconf.h + + zutil.obj: zutil.c zutil.h zlib.h zconf.h + + example.obj: example.c zlib.h zconf.h + + minigzip.obj: minigzip.c zlib.h zconf.h + + + # the command line is cut to fit in the MS-DOS 128 byte limit: + $(ZLIB_LIB): $(OBJ1) $(OBJ2) + -del $(ZLIB_LIB) + $(AR) $(ZLIB_LIB) $(OBJP1) + $(AR) $(ZLIB_LIB) $(OBJP2) + + example.exe: example.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) example.obj $(ZLIB_LIB) + + minigzip.exe: minigzip.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB) + + test: example.exe minigzip.exe + example + echo hello world | minigzip | minigzip -d + + clean: + -del *.obj + -del *.lib + -del *.exe + -del zlib_*.bak + -del foo.gz diff -Nrcpad gcc-4.4.4/zlib/old/Makefile.riscos gcc-4.4.5/zlib/old/Makefile.riscos *** gcc-4.4.4/zlib/old/Makefile.riscos Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/old/Makefile.riscos Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,151 ---- + # Project: zlib_1_03 + # Patched for zlib 1.1.2 rw@shadow.org.uk 19980430 + # test works out-of-the-box, installs `somewhere' on demand + + # Toolflags: + CCflags = -c -depend !Depend -IC: -g -throwback -DRISCOS -fah + C++flags = -c -depend !Depend -IC: -throwback + Linkflags = -aif -c++ -o $@ + ObjAsmflags = -throwback -NoCache -depend !Depend + CMHGflags = + LibFileflags = -c -l -o $@ + Squeezeflags = -o $@ + + # change the line below to where _you_ want the library installed. + libdest = lib:zlib + + # Final targets: + @.lib: @.o.adler32 @.o.compress @.o.crc32 @.o.deflate @.o.gzio \ + @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil @.o.trees \ + @.o.uncompr @.o.zutil + LibFile $(LibFileflags) @.o.adler32 @.o.compress @.o.crc32 @.o.deflate \ + @.o.gzio @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil \ + @.o.trees @.o.uncompr @.o.zutil + test: @.minigzip @.example @.lib + @copy @.lib @.libc A~C~DF~L~N~P~Q~RS~TV + @echo running tests: hang on. + @/@.minigzip -f -9 libc + @/@.minigzip -d libc-gz + @/@.minigzip -f -1 libc + @/@.minigzip -d libc-gz + @/@.minigzip -h -9 libc + @/@.minigzip -d libc-gz + @/@.minigzip -h -1 libc + @/@.minigzip -d libc-gz + @/@.minigzip -9 libc + @/@.minigzip -d libc-gz + @/@.minigzip -1 libc + @/@.minigzip -d libc-gz + @diff @.lib @.libc + @echo that should have reported '@.lib and @.libc identical' if you have diff. + @/@.example @.fred @.fred + @echo that will have given lots of hello!'s. + + @.minigzip: @.o.minigzip @.lib C:o.Stubs + Link $(Linkflags) @.o.minigzip @.lib C:o.Stubs + @.example: @.o.example @.lib C:o.Stubs + Link $(Linkflags) @.o.example @.lib C:o.Stubs + + install: @.lib + cdir $(libdest) + cdir $(libdest).h + @copy @.h.zlib $(libdest).h.zlib A~C~DF~L~N~P~Q~RS~TV + @copy @.h.zconf $(libdest).h.zconf A~C~DF~L~N~P~Q~RS~TV + @copy @.lib $(libdest).lib A~C~DF~L~N~P~Q~RS~TV + @echo okay, installed zlib in $(libdest) + + clean:; remove @.minigzip + remove @.example + remove @.libc + -wipe @.o.* F~r~cV + remove @.fred + + # User-editable dependencies: + .c.o: + cc $(ccflags) -o $@ $< + + # Static dependencies: + + # Dynamic dependencies: + o.example: c.example + o.example: h.zlib + o.example: h.zconf + o.minigzip: c.minigzip + o.minigzip: h.zlib + o.minigzip: h.zconf + o.adler32: c.adler32 + o.adler32: h.zlib + o.adler32: h.zconf + o.compress: c.compress + o.compress: h.zlib + o.compress: h.zconf + o.crc32: c.crc32 + o.crc32: h.zlib + o.crc32: h.zconf + o.deflate: c.deflate + o.deflate: h.deflate + o.deflate: h.zutil + o.deflate: h.zlib + o.deflate: h.zconf + o.gzio: c.gzio + o.gzio: h.zutil + o.gzio: h.zlib + o.gzio: h.zconf + o.infblock: c.infblock + o.infblock: h.zutil + o.infblock: h.zlib + o.infblock: h.zconf + o.infblock: h.infblock + o.infblock: h.inftrees + o.infblock: h.infcodes + o.infblock: h.infutil + o.infcodes: c.infcodes + o.infcodes: h.zutil + o.infcodes: h.zlib + o.infcodes: h.zconf + o.infcodes: h.inftrees + o.infcodes: h.infblock + o.infcodes: h.infcodes + o.infcodes: h.infutil + o.infcodes: h.inffast + o.inffast: c.inffast + o.inffast: h.zutil + o.inffast: h.zlib + o.inffast: h.zconf + o.inffast: h.inftrees + o.inffast: h.infblock + o.inffast: h.infcodes + o.inffast: h.infutil + o.inffast: h.inffast + o.inflate: c.inflate + o.inflate: h.zutil + o.inflate: h.zlib + o.inflate: h.zconf + o.inflate: h.infblock + o.inftrees: c.inftrees + o.inftrees: h.zutil + o.inftrees: h.zlib + o.inftrees: h.zconf + o.inftrees: h.inftrees + o.inftrees: h.inffixed + o.infutil: c.infutil + o.infutil: h.zutil + o.infutil: h.zlib + o.infutil: h.zconf + o.infutil: h.infblock + o.infutil: h.inftrees + o.infutil: h.infcodes + o.infutil: h.infutil + o.trees: c.trees + o.trees: h.deflate + o.trees: h.zutil + o.trees: h.zlib + o.trees: h.zconf + o.trees: h.trees + o.uncompr: c.uncompr + o.uncompr: h.zlib + o.uncompr: h.zconf + o.zutil: c.zutil + o.zutil: h.zutil + o.zutil: h.zlib + o.zutil: h.zconf diff -Nrcpad gcc-4.4.4/zlib/old/README gcc-4.4.5/zlib/old/README *** gcc-4.4.4/zlib/old/README Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/old/README Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,3 ---- + This directory contains files that have not been updated for zlib 1.2.x + + (Volunteers are encouraged to help clean this up. Thanks.) diff -Nrcpad gcc-4.4.4/zlib/old/descrip.mms gcc-4.4.5/zlib/old/descrip.mms *** gcc-4.4.4/zlib/old/descrip.mms Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/old/descrip.mms Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,48 ---- + # descrip.mms: MMS description file for building zlib on VMS + # written by Martin P.J. Zinser + + cc_defs = + c_deb = + + .ifdef __DECC__ + pref = /prefix=all + .endif + + OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj,\ + deflate.obj, trees.obj, zutil.obj, inflate.obj, infblock.obj,\ + inftrees.obj, infcodes.obj, infutil.obj, inffast.obj + + CFLAGS= $(C_DEB) $(CC_DEFS) $(PREF) + + all : example.exe minigzip.exe + @ write sys$output " Example applications available" + libz.olb : libz.olb($(OBJS)) + @ write sys$output " libz available" + + example.exe : example.obj libz.olb + link example,libz.olb/lib + + minigzip.exe : minigzip.obj libz.olb + link minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib + + clean : + delete *.obj;*,libz.olb;* + + + # Other dependencies. + adler32.obj : zutil.h zlib.h zconf.h + compress.obj : zlib.h zconf.h + crc32.obj : zutil.h zlib.h zconf.h + deflate.obj : deflate.h zutil.h zlib.h zconf.h + example.obj : zlib.h zconf.h + gzio.obj : zutil.h zlib.h zconf.h + infblock.obj : zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h + infcodes.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h + inffast.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h + inflate.obj : zutil.h zlib.h zconf.h infblock.h + inftrees.obj : zutil.h zlib.h zconf.h inftrees.h + infutil.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h + minigzip.obj : zlib.h zconf.h + trees.obj : deflate.h zutil.h zlib.h zconf.h + uncompr.obj : zlib.h zconf.h + zutil.obj : zutil.h zlib.h zconf.h diff -Nrcpad gcc-4.4.4/zlib/old/os2/Makefile.os2 gcc-4.4.5/zlib/old/os2/Makefile.os2 *** gcc-4.4.4/zlib/old/os2/Makefile.os2 Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/old/os2/Makefile.os2 Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,136 ---- + # Makefile for zlib under OS/2 using GCC (PGCC) + # For conditions of distribution and use, see copyright notice in zlib.h + + # To compile and test, type: + # cp Makefile.os2 .. + # cd .. + # make -f Makefile.os2 test + + # This makefile will build a static library z.lib, a shared library + # z.dll and a import library zdll.lib. You can use either z.lib or + # zdll.lib by specifying either -lz or -lzdll on gcc's command line + + CC=gcc -Zomf -s + + CFLAGS=-O6 -Wall + #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 + #CFLAGS=-g -DDEBUG + #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ + # -Wstrict-prototypes -Wmissing-prototypes + + #################### BUG WARNING: ##################### + ## infcodes.c hits a bug in pgcc-1.0, so you have to use either + ## -O# where # <= 4 or one of (-fno-ommit-frame-pointer or -fno-force-mem) + ## This bug is reportedly fixed in pgcc >1.0, but this was not tested + CFLAGS+=-fno-force-mem + + LDFLAGS=-s -L. -lzdll -Zcrtdll + LDSHARED=$(CC) -s -Zomf -Zdll -Zcrtdll + + VER=1.1.0 + ZLIB=z.lib + SHAREDLIB=z.dll + SHAREDLIBIMP=zdll.lib + LIBS=$(ZLIB) $(SHAREDLIB) $(SHAREDLIBIMP) + + AR=emxomfar cr + IMPLIB=emximp + RANLIB=echo + TAR=tar + SHELL=bash + + prefix=/usr/local + exec_prefix = $(prefix) + + OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ + zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o + + TEST_OBJS = example.o minigzip.o + + DISTFILES = README INDEX ChangeLog configure Make*[a-z0-9] *.[ch] descrip.mms \ + algorithm.txt zlib.3 msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \ + nt/Makefile.nt nt/zlib.dnt contrib/README.contrib contrib/*.txt \ + contrib/asm386/*.asm contrib/asm386/*.c \ + contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/iostream/*.cpp \ + contrib/iostream/*.h contrib/iostream2/*.h contrib/iostream2/*.cpp \ + contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32 + + all: example.exe minigzip.exe + + test: all + @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ + echo hello world | ./minigzip | ./minigzip -d || \ + echo ' *** minigzip test FAILED ***' ; \ + if ./example; then \ + echo ' *** zlib test OK ***'; \ + else \ + echo ' *** zlib test FAILED ***'; \ + fi + + $(ZLIB): $(OBJS) + $(AR) $@ $(OBJS) + -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 + + $(SHAREDLIB): $(OBJS) os2/z.def + $(LDSHARED) -o $@ $^ + + $(SHAREDLIBIMP): os2/z.def + $(IMPLIB) -o $@ $^ + + example.exe: example.o $(LIBS) + $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) + + minigzip.exe: minigzip.o $(LIBS) + $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) + + clean: + rm -f *.o *~ example minigzip libz.a libz.so* foo.gz + + distclean: clean + + zip: + mv Makefile Makefile~; cp -p Makefile.in Makefile + rm -f test.c ztest*.c + v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\ + zip -ul9 zlib$$v $(DISTFILES) + mv Makefile~ Makefile + + dist: + mv Makefile Makefile~; cp -p Makefile.in Makefile + rm -f test.c ztest*.c + d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\ + rm -f $$d.tar.gz; \ + if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \ + files=""; \ + for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \ + cd ..; \ + GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \ + if test ! -d $$d; then rm -f $$d; fi + mv Makefile~ Makefile + + tags: + etags *.[ch] + + depend: + makedepend -- $(CFLAGS) -- *.[ch] + + # DO NOT DELETE THIS LINE -- make depend depends on it. + + adler32.o: zlib.h zconf.h + compress.o: zlib.h zconf.h + crc32.o: zlib.h zconf.h + deflate.o: deflate.h zutil.h zlib.h zconf.h + example.o: zlib.h zconf.h + gzio.o: zutil.h zlib.h zconf.h + infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h + infcodes.o: zutil.h zlib.h zconf.h + infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h + inffast.o: zutil.h zlib.h zconf.h inftrees.h + inffast.o: infblock.h infcodes.h infutil.h inffast.h + inflate.o: zutil.h zlib.h zconf.h infblock.h + inftrees.o: zutil.h zlib.h zconf.h inftrees.h + infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h + minigzip.o: zlib.h zconf.h + trees.o: deflate.h zutil.h zlib.h zconf.h trees.h + uncompr.o: zlib.h zconf.h + zutil.o: zutil.h zlib.h zconf.h diff -Nrcpad gcc-4.4.4/zlib/old/os2/zlib.def gcc-4.4.5/zlib/old/os2/zlib.def *** gcc-4.4.4/zlib/old/os2/zlib.def Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/old/os2/zlib.def Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,51 ---- + ; + ; Slightly modified version of ../nt/zlib.dnt :-) + ; + + LIBRARY Z + DESCRIPTION "Zlib compression library for OS/2" + CODE PRELOAD MOVEABLE DISCARDABLE + DATA PRELOAD MOVEABLE MULTIPLE + + EXPORTS + adler32 + compress + crc32 + deflate + deflateCopy + deflateEnd + deflateInit2_ + deflateInit_ + deflateParams + deflateReset + deflateSetDictionary + gzclose + gzdopen + gzerror + gzflush + gzopen + gzread + gzwrite + inflate + inflateEnd + inflateInit2_ + inflateInit_ + inflateReset + inflateSetDictionary + inflateSync + uncompress + zlibVersion + gzprintf + gzputc + gzgetc + gzseek + gzrewind + gztell + gzeof + gzsetparams + zError + inflateSyncPoint + get_crc_table + compress2 + gzputs + gzgets diff -Nrcpad gcc-4.4.4/zlib/old/visual-basic.txt gcc-4.4.5/zlib/old/visual-basic.txt *** gcc-4.4.4/zlib/old/visual-basic.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/old/visual-basic.txt Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,160 ---- + See below some functions declarations for Visual Basic. + + Frequently Asked Question: + + Q: Each time I use the compress function I get the -5 error (not enough + room in the output buffer). + + A: Make sure that the length of the compressed buffer is passed by + reference ("as any"), not by value ("as long"). Also check that + before the call of compress this length is equal to the total size of + the compressed buffer and not zero. + + + From: "Jon Caruana" + Subject: Re: How to port zlib declares to vb? + Date: Mon, 28 Oct 1996 18:33:03 -0600 + + Got the answer! (I haven't had time to check this but it's what I got, and + looks correct): + + He has the following routines working: + compress + uncompress + gzopen + gzwrite + gzread + gzclose + + Declares follow: (Quoted from Carlos Rios , in Vb4 form) + + #If Win16 Then 'Use Win16 calls. + Declare Function compress Lib "ZLIB.DLL" (ByVal compr As + String, comprLen As Any, ByVal buf As String, ByVal buflen + As Long) As Integer + Declare Function uncompress Lib "ZLIB.DLL" (ByVal uncompr + As String, uncomprLen As Any, ByVal compr As String, ByVal + lcompr As Long) As Integer + Declare Function gzopen Lib "ZLIB.DLL" (ByVal filePath As + String, ByVal mode As String) As Long + Declare Function gzread Lib "ZLIB.DLL" (ByVal file As + Long, ByVal uncompr As String, ByVal uncomprLen As Integer) + As Integer + Declare Function gzwrite Lib "ZLIB.DLL" (ByVal file As + Long, ByVal uncompr As String, ByVal uncomprLen As Integer) + As Integer + Declare Function gzclose Lib "ZLIB.DLL" (ByVal file As + Long) As Integer + #Else + Declare Function compress Lib "ZLIB32.DLL" + (ByVal compr As String, comprLen As Any, ByVal buf As + String, ByVal buflen As Long) As Integer + Declare Function uncompress Lib "ZLIB32.DLL" + (ByVal uncompr As String, uncomprLen As Any, ByVal compr As + String, ByVal lcompr As Long) As Long + Declare Function gzopen Lib "ZLIB32.DLL" + (ByVal file As String, ByVal mode As String) As Long + Declare Function gzread Lib "ZLIB32.DLL" + (ByVal file As Long, ByVal uncompr As String, ByVal + uncomprLen As Long) As Long + Declare Function gzwrite Lib "ZLIB32.DLL" + (ByVal file As Long, ByVal uncompr As String, ByVal + uncomprLen As Long) As Long + Declare Function gzclose Lib "ZLIB32.DLL" + (ByVal file As Long) As Long + #End If + + -Jon Caruana + jon-net@usa.net + Microsoft Sitebuilder Network Level 1 Member - HTML Writer's Guild Member + + + Here is another example from Michael that he + says conforms to the VB guidelines, and that solves the problem of not + knowing the uncompressed size by storing it at the end of the file: + + 'Calling the functions: + 'bracket meaning: [optional] {Range of possible values} + 'Call subCompressFile( [, , [level of compression {1..9}]]) + 'Call subUncompressFile() + + Option Explicit + Private lngpvtPcnSml As Long 'Stores value for 'lngPercentSmaller' + Private Const SUCCESS As Long = 0 + Private Const strFilExt As String = ".cpr" + Private Declare Function lngfncCpr Lib "zlib.dll" Alias "compress2" (ByRef + dest As Any, ByRef destLen As Any, ByRef src As Any, ByVal srcLen As Long, + ByVal level As Integer) As Long + Private Declare Function lngfncUcp Lib "zlib.dll" Alias "uncompress" (ByRef + dest As Any, ByRef destLen As Any, ByRef src As Any, ByVal srcLen As Long) + As Long + + Public Sub subCompressFile(ByVal strargOriFilPth As String, Optional ByVal + strargCprFilPth As String, Optional ByVal intLvl As Integer = 9) + Dim strCprPth As String + Dim lngOriSiz As Long + Dim lngCprSiz As Long + Dim bytaryOri() As Byte + Dim bytaryCpr() As Byte + lngOriSiz = FileLen(strargOriFilPth) + ReDim bytaryOri(lngOriSiz - 1) + Open strargOriFilPth For Binary Access Read As #1 + Get #1, , bytaryOri() + Close #1 + strCprPth = IIf(strargCprFilPth = "", strargOriFilPth, strargCprFilPth) + 'Select file path and name + strCprPth = strCprPth & IIf(Right(strCprPth, Len(strFilExt)) = + strFilExt, "", strFilExt) 'Add file extension if not exists + lngCprSiz = (lngOriSiz * 1.01) + 12 'Compression needs temporary a bit + more space then original file size + ReDim bytaryCpr(lngCprSiz - 1) + If lngfncCpr(bytaryCpr(0), lngCprSiz, bytaryOri(0), lngOriSiz, intLvl) = + SUCCESS Then + lngpvtPcnSml = (1# - (lngCprSiz / lngOriSiz)) * 100 + ReDim Preserve bytaryCpr(lngCprSiz - 1) + Open strCprPth For Binary Access Write As #1 + Put #1, , bytaryCpr() + Put #1, , lngOriSiz 'Add the the original size value to the end + (last 4 bytes) + Close #1 + Else + MsgBox "Compression error" + End If + Erase bytaryCpr + Erase bytaryOri + End Sub + + Public Sub subUncompressFile(ByVal strargFilPth As String) + Dim bytaryCpr() As Byte + Dim bytaryOri() As Byte + Dim lngOriSiz As Long + Dim lngCprSiz As Long + Dim strOriPth As String + lngCprSiz = FileLen(strargFilPth) + ReDim bytaryCpr(lngCprSiz - 1) + Open strargFilPth For Binary Access Read As #1 + Get #1, , bytaryCpr() + Close #1 + 'Read the original file size value: + lngOriSiz = bytaryCpr(lngCprSiz - 1) * (2 ^ 24) _ + + bytaryCpr(lngCprSiz - 2) * (2 ^ 16) _ + + bytaryCpr(lngCprSiz - 3) * (2 ^ 8) _ + + bytaryCpr(lngCprSiz - 4) + ReDim Preserve bytaryCpr(lngCprSiz - 5) 'Cut of the original size value + ReDim bytaryOri(lngOriSiz - 1) + If lngfncUcp(bytaryOri(0), lngOriSiz, bytaryCpr(0), lngCprSiz) = SUCCESS + Then + strOriPth = Left(strargFilPth, Len(strargFilPth) - Len(strFilExt)) + Open strOriPth For Binary Access Write As #1 + Put #1, , bytaryOri() + Close #1 + Else + MsgBox "Uncompression error" + End If + Erase bytaryCpr + Erase bytaryOri + End Sub + Public Property Get lngPercentSmaller() As Long + lngPercentSmaller = lngpvtPcnSml + End Property diff -Nrcpad gcc-4.4.4/zlib/old/zlib.html gcc-4.4.5/zlib/old/zlib.html *** gcc-4.4.4/zlib/old/zlib.html Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/old/zlib.html Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,971 ---- + + + + zlib general purpose compression library version 1.1.4 + + + + + +

    zlib 1.1.4 Manual

    +
    +

    Contents

    +
      +
    1. Prologue +
    2. Introduction +
    3. Utility functions +
    4. Basic functions +
    5. Advanced functions +
    6. Constants +
    7. struct z_stream_s +
    8. Checksum functions +
    9. Misc +
    +
    +

    Prologue

    + 'zlib' general purpose compression library version 1.1.4, March 11th, 2002 +

    + Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler +

    + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. +

    + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: +

      +
    1. The origin of this software must not be misrepresented ; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +
    2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +
    3. This notice may not be removed or altered from any source distribution. +
    + +
    +
    Jean-loup Gailly +
    jloup@gzip.org +
    Mark Adler +
    madler@alumni.caltech.edu +
    + + The data format used by the zlib library is described by RFCs (Request for + Comments) 1950 to 1952 in the files + + ftp://ds.internic.net/rfc/rfc1950.txt + (zlib format), + + rfc1951.txt + (deflate format) and + + rfc1952.txt + (gzip format). +

    + This manual is converted from zlib.h by + piaip +

    + Visit + http://ftp.cdrom.com/pub/infozip/zlib/ + for the official zlib web page. +

    + +


    +

    Introduction

    + The 'zlib' compression library provides in-memory compression and + decompression functions, including integrity checks of the uncompressed + data. This version of the library supports only one compression method + (deflation) but other algorithms will be added later and will have the same + stream interface. +

    + + Compression can be done in a single step if the buffers are large + enough (for example if an input file is mmap'ed), or can be done by + repeated calls of the compression function. In the latter case, the + application must provide more input and/or consume the output + (providing more output space) before each call. +

    + + The library also supports reading and writing files in gzip (.gz) format + with an interface similar to that of stdio. +

    + + The library does not install any signal handler. The decoder checks + the consistency of the compressed data, so the library should never + crash even in case of corrupted input. +

    + +


    +

    Utility functions

    + The following utility functions are implemented on top of the +
    basic stream-oriented functions. + To simplify the interface, some + default options are assumed (compression level and memory usage, + standard memory allocation functions). The source code of these + utility functions can easily be modified if you need special options. +

    Function list

    +
      +
    • int compress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen); +
    • int compress2 (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen, int level); +
    • int uncompress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen); +
    • typedef voidp gzFile; +
    • gzFile gzopen (const char *path, const char *mode); +
    • gzFile gzdopen (int fd, const char *mode); +
    • int gzsetparams (gzFile file, int level, int strategy); +
    • int gzread (gzFile file, voidp buf, unsigned len); +
    • int gzwrite (gzFile file, const voidp buf, unsigned len); +
    • int VA gzprintf (gzFile file, const char *format, ...); +
    • int gzputs (gzFile file, const char *s); +
    • char * gzgets (gzFile file, char *buf, int len); +
    • int gzputc (gzFile file, int c); +
    • int gzgetc (gzFile file); +
    • int gzflush (gzFile file, int flush); +
    • z_off_t gzseek (gzFile file, z_off_t offset, int whence); +
    • z_off_t gztell (gzFile file); +
    • int gzrewind (gzFile file); +
    • int gzeof (gzFile file); +
    • int gzclose (gzFile file); +
    • const char * gzerror (gzFile file, int *errnum); +
    +

    Function description

    +
    +
    int compress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen); +
    + Compresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be at least 0.1% larger than + sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the + compressed buffer.

    + This function can be used to compress a whole file at once if the + input file is mmap'ed.

    + compress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer.

    + +

    int compress2 (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen, int level); +
    + Compresses the source buffer into the destination buffer. The level + parameter has the same meaning as in deflateInit. sourceLen is the byte + length of the source buffer. Upon entry, destLen is the total size of the + destination buffer, which must be at least 0.1% larger than sourceLen plus + 12 bytes. Upon exit, destLen is the actual size of the compressed buffer. +

    + + compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_BUF_ERROR if there was not enough room in the output buffer, + Z_STREAM_ERROR if the level parameter is invalid. +

    + +

    int uncompress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen); +
    + Decompresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be large enough to hold the + entire uncompressed data. (The size of the uncompressed data must have + been saved previously by the compressor and transmitted to the decompressor + by some mechanism outside the scope of this compression library.) + Upon exit, destLen is the actual size of the compressed buffer.

    + This function can be used to decompress a whole file at once if the + input file is mmap'ed. +

    + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer, or Z_DATA_ERROR if the input data was corrupted. +

    + +

    typedef voidp gzFile; +

    + +

    gzFile gzopen (const char *path, const char *mode); +
    + Opens a gzip (.gz) file for reading or writing. The mode parameter + is as in fopen ("rb" or "wb") but can also include a compression level + ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for + Huffman only compression as in "wb1h". (See the description + of deflateInit2 for more information about the strategy parameter.) +

    + + gzopen can be used to read a file which is not in gzip format ; in this + case gzread will directly read from the file without decompression. +

    + + gzopen returns NULL if the file could not be opened or if there was + insufficient memory to allocate the (de)compression state ; errno + can be checked to distinguish the two cases (if errno is zero, the + zlib error is Z_MEM_ERROR). +

    + +

    gzFile gzdopen (int fd, const char *mode); +
    + gzdopen() associates a gzFile with the file descriptor fd. File + descriptors are obtained from calls like open, dup, creat, pipe or + fileno (in the file has been previously opened with fopen). + The mode parameter is as in gzopen. +

    + The next call of gzclose on the returned gzFile will also close the + file descriptor fd, just like fclose(fdopen(fd), mode) closes the file + descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode). +

    + gzdopen returns NULL if there was insufficient memory to allocate + the (de)compression state. +

    + +

    int gzsetparams (gzFile file, int level, int strategy); +
    + Dynamically update the compression level or strategy. See the description + of deflateInit2 for the meaning of these parameters. +

    + gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not + opened for writing. +

    + +

    int gzread (gzFile file, voidp buf, unsigned len); +
    + Reads the given number of uncompressed bytes from the compressed file. + If the input file was not in gzip format, gzread copies the given number + of bytes into the buffer. +

    + gzread returns the number of uncompressed bytes actually read (0 for + end of file, -1 for error). +

    + +

    int gzwrite (gzFile file, const voidp buf, unsigned len); +
    + Writes the given number of uncompressed bytes into the compressed file. + gzwrite returns the number of uncompressed bytes actually written + (0 in case of error). +

    + +

    int VA gzprintf (gzFile file, const char *format, ...); +
    + Converts, formats, and writes the args to the compressed file under + control of the format string, as in fprintf. gzprintf returns the number of + uncompressed bytes actually written (0 in case of error). +

    + +

    int gzputs (gzFile file, const char *s); +
    + Writes the given null-terminated string to the compressed file, excluding + the terminating null character. +

    + gzputs returns the number of characters written, or -1 in case of error. +

    + +

    char * gzgets (gzFile file, char *buf, int len); +
    + Reads bytes from the compressed file until len-1 characters are read, or + a newline character is read and transferred to buf, or an end-of-file + condition is encountered. The string is then terminated with a null + character. +

    + gzgets returns buf, or Z_NULL in case of error. +

    + +

    int gzputc (gzFile file, int c); +
    + Writes c, converted to an unsigned char, into the compressed file. + gzputc returns the value that was written, or -1 in case of error. +

    + +

    int gzgetc (gzFile file); +
    + Reads one byte from the compressed file. gzgetc returns this byte + or -1 in case of end of file or error. +

    + +

    int gzflush (gzFile file, int flush); +
    + Flushes all pending output into the compressed file. The parameter + flush is as in the deflate() function. The return value is the zlib + error number (see function gzerror below). gzflush returns Z_OK if + the flush parameter is Z_FINISH and all output could be flushed. +

    + gzflush should be called only when strictly necessary because it can + degrade compression. +

    + +

    z_off_t gzseek (gzFile file, z_off_t offset, int whence); +
    + Sets the starting position for the next gzread or gzwrite on the + given compressed file. The offset represents a number of bytes in the + uncompressed data stream. The whence parameter is defined as in lseek(2); + the value SEEK_END is not supported. +

    + If the file is opened for reading, this function is emulated but can be + extremely slow. If the file is opened for writing, only forward seeks are + supported ; gzseek then compresses a sequence of zeroes up to the new + starting position. +

    + gzseek returns the resulting offset location as measured in bytes from + the beginning of the uncompressed stream, or -1 in case of error, in + particular if the file is opened for writing and the new starting position + would be before the current position. +

    + +

    int gzrewind (gzFile file); +
    + Rewinds the given file. This function is supported only for reading. +

    + gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) +

    + +

    z_off_t gztell (gzFile file); +
    + Returns the starting position for the next gzread or gzwrite on the + given compressed file. This position represents a number of bytes in the + uncompressed data stream. +

    + + gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) +

    + +

    int gzeof (gzFile file); +
    + Returns 1 when EOF has previously been detected reading the given + input stream, otherwise zero. +

    + +

    int gzclose (gzFile file); +
    + Flushes all pending output if necessary, closes the compressed file + and deallocates all the (de)compression state. The return value is the zlib + error number (see function gzerror below). +

    + +

    const char * gzerror (gzFile file, int *errnum); +
    + Returns the error message for the last error which occurred on the + given compressed file. errnum is set to zlib error number. If an + error occurred in the file system and not in the compression library, + errnum is set to Z_ERRNO and the application may consult errno + to get the exact error code. +

    +

    +
    +

    Basic functions

    +

    Function list

    +
    + +

    Function description

    +
    +
    const char * zlibVersion (void); +
    The application can compare zlibVersion and ZLIB_VERSION for consistency. + If the first character differs, the library code actually used is + not compatible with the zlib.h header file used by the application. + This check is automatically made by deflateInit and inflateInit. +

    + +

    int deflateInit (z_streamp strm, int level); +
    + Initializes the internal stream state for compression. The fields + zalloc, zfree and opaque must be initialized before by the caller. + If zalloc and zfree are set to Z_NULL, deflateInit updates them to + use default allocation functions. +

    + + The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: + 1 gives best speed, 9 gives best compression, 0 gives no compression at + all (the input data is simply copied a block at a time). +

    + + Z_DEFAULT_COMPRESSION requests a default compromise between speed and + compression (currently equivalent to level 6). +

    + + deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if level is not a valid compression level, + Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible + with the version assumed by the caller (ZLIB_VERSION). + msg is set to null if there is no error message. deflateInit does not + perform any compression: this will be done by deflate(). +

    + +

    int deflate (z_streamp strm, int flush); +
    + deflate compresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce some + output latency (reading input without producing any output) except when + forced to flush.

    + + The detailed semantics are as follows. deflate performs one or both of the + following actions: + +

      +
    • Compress more input starting at next_in and update next_in and avail_in + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in and avail_in are updated and + processing will resume at this point for the next call of deflate(). + +
    • + Provide more output starting at next_out and update next_out and avail_out + accordingly. This action is forced if the parameter flush is non zero. + Forcing flush frequently degrades the compression ratio, so this parameter + should be set only when necessary (in interactive applications). + Some output may be provided even if flush is not set. +

    + + Before the call of deflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming + more output, and updating avail_in or avail_out accordingly ; avail_out + should never be zero before the call. The application can consume the + compressed output when it wants, for example when the output buffer is full + (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK + and with zero avail_out, it must be called again after making room in the + output buffer because there might be more output pending. +

    + + If the parameter flush is set to Z_SYNC_FLUSH, all pending output is + flushed to the output buffer and the output is aligned on a byte boundary, so + that the decompressor can get all input data available so far. (In particular + avail_in is zero after the call if enough output space has been provided + before the call.) Flushing may degrade compression for some compression + algorithms and so it should be used only when necessary. +

    + + If flush is set to Z_FULL_FLUSH, all output is flushed as with + Z_SYNC_FLUSH, and the compression state is reset so that decompression can + restart from this point if previous compressed data has been damaged or if + random access is desired. Using Z_FULL_FLUSH too often can seriously degrade + the compression. +

    + + If deflate returns with avail_out == 0, this function must be called again + with the same value of the flush parameter and more output space (updated + avail_out), until the flush is complete (deflate returns with non-zero + avail_out). +

    + + If the parameter flush is set to Z_FINISH, pending input is processed, + pending output is flushed and deflate returns with Z_STREAM_END if there + was enough output space ; if deflate returns with Z_OK, this function must be + called again with Z_FINISH and more output space (updated avail_out) but no + more input data, until it returns with Z_STREAM_END or an error. After + deflate has returned Z_STREAM_END, the only possible operations on the + stream are deflateReset or deflateEnd. +

    + + Z_FINISH can be used immediately after deflateInit if all the compression + is to be done in a single step. In this case, avail_out must be at least + 0.1% larger than avail_in plus 12 bytes. If deflate does not return + Z_STREAM_END, then it must be called again as described above. +

    + + deflate() sets strm-> adler to the adler32 checksum of all input read + so far (that is, total_in bytes). +

    + + deflate() may update data_type if it can make a good guess about + the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered + binary. This field is only for information purposes and does not affect + the compression algorithm in any manner. +

    + + deflate() returns Z_OK if some progress has been made (more input + processed or more output produced), Z_STREAM_END if all input has been + consumed and all output has been produced (only when flush is set to + Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example + if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible + (for example avail_in or avail_out was zero). +

    + +

    int deflateEnd (z_streamp strm); +
    + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any + pending output. +

    + + deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the + stream state was inconsistent, Z_DATA_ERROR if the stream was freed + prematurely (some input or output was discarded). In the error case, + msg may be set but then points to a static string (which must not be + deallocated). +

    + +

    int inflateInit (z_streamp strm); +
    + Initializes the internal stream state for decompression. The fields + next_in, avail_in, zalloc, zfree and opaque must be initialized before by + the caller. If next_in is not Z_NULL and avail_in is large enough (the exact + value depends on the compression method), inflateInit determines the + compression method from the zlib header and allocates all data structures + accordingly ; otherwise the allocation will be deferred to the first call of + inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to + use default allocation functions. +

    + + inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_VERSION_ERROR if the zlib library version is incompatible with the + version assumed by the caller. msg is set to null if there is no error + message. inflateInit does not perform any decompression apart from reading + the zlib header if present: this will be done by inflate(). (So next_in and + avail_in may be modified, but next_out and avail_out are unchanged.) +

    + +

    int inflate (z_streamp strm, int flush); +
    + inflate decompresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may some + introduce some output latency (reading input without producing any output) + except when forced to flush. +

    + + The detailed semantics are as follows. inflate performs one or both of the + following actions: + +

      +
    • Decompress more input starting at next_in and update next_in and avail_in + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in is updated and processing + will resume at this point for the next call of inflate(). + +
    • Provide more output starting at next_out and update next_out and + avail_out accordingly. inflate() provides as much output as possible, + until there is no more input data or no more space in the output buffer + (see below about the flush parameter). +

    + + Before the call of inflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming + more output, and updating the next_* and avail_* values accordingly. + The application can consume the uncompressed output when it wants, for + example when the output buffer is full (avail_out == 0), or after each + call of inflate(). If inflate returns Z_OK and with zero avail_out, it + must be called again after making room in the output buffer because there + might be more output pending. +

    + + If the parameter flush is set to Z_SYNC_FLUSH, inflate flushes as much + output as possible to the output buffer. The flushing behavior of inflate is + not specified for values of the flush parameter other than Z_SYNC_FLUSH + and Z_FINISH, but the current implementation actually flushes as much output + as possible anyway. +

    + + inflate() should normally be called until it returns Z_STREAM_END or an + error. However if all decompression is to be performed in a single step + (a single call of inflate), the parameter flush should be set to + Z_FINISH. In this case all pending input is processed and all pending + output is flushed ; avail_out must be large enough to hold all the + uncompressed data. (The size of the uncompressed data may have been saved + by the compressor for this purpose.) The next operation on this stream must + be inflateEnd to deallocate the decompression state. The use of Z_FINISH + is never required, but can be used to inform inflate that a faster routine + may be used for the single inflate() call. +

    + + If a preset dictionary is needed at this point (see inflateSetDictionary + below), inflate sets strm-adler to the adler32 checksum of the + dictionary chosen by the compressor and returns Z_NEED_DICT ; otherwise + it sets strm-> adler to the adler32 checksum of all output produced + so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or + an error code as described below. At the end of the stream, inflate() + checks that its computed adler32 checksum is equal to that saved by the + compressor and returns Z_STREAM_END only if the checksum is correct. +

    + + inflate() returns Z_OK if some progress has been made (more input processed + or more output produced), Z_STREAM_END if the end of the compressed data has + been reached and all uncompressed output has been produced, Z_NEED_DICT if a + preset dictionary is needed at this point, Z_DATA_ERROR if the input data was + corrupted (input stream not conforming to the zlib format or incorrect + adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent + (for example if next_in or next_out was NULL), Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if no progress is possible or if there was not + enough room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR + case, the application may then call inflateSync to look for a good + compression block. +

    + +

    int inflateEnd (z_streamp strm); +
    + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any + pending output. +

    + + inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state + was inconsistent. In the error case, msg may be set but then points to a + static string (which must not be deallocated). +

    +
    +

    Advanced functions

    + The following functions are needed only in some special applications. +

    Function list

    +
    +

    Function description

    +
    +
    int deflateInit2 (z_streamp strm, int level, int method, int windowBits, int memLevel, int strategy); + +
    This is another version of deflateInit with more compression options. The + fields next_in, zalloc, zfree and opaque must be initialized before by + the caller.

    + + The method parameter is the compression method. It must be Z_DEFLATED in + this version of the library.

    + + The windowBits parameter is the base two logarithm of the window size + (the size of the history buffer). It should be in the range 8..15 for this + version of the library. Larger values of this parameter result in better + compression at the expense of memory usage. The default value is 15 if + deflateInit is used instead.

    + + The memLevel parameter specifies how much memory should be allocated + for the internal compression state. memLevel=1 uses minimum memory but + is slow and reduces compression ratio ; memLevel=9 uses maximum memory + for optimal speed. The default value is 8. See zconf.h for total memory + usage as a function of windowBits and memLevel.

    + + The strategy parameter is used to tune the compression algorithm. Use the + value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a + filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no + string match). Filtered data consists mostly of small values with a + somewhat random distribution. In this case, the compression algorithm is + tuned to compress them better. The effect of Z_FILTERED is to force more + Huffman coding and less string matching ; it is somewhat intermediate + between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects + the compression ratio but not the correctness of the compressed output even + if it is not set appropriately.

    + + deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid + method). msg is set to null if there is no error message. deflateInit2 does + not perform any compression: this will be done by deflate().

    + +

    int deflateSetDictionary (z_streamp strm, const Bytef *dictionary, uInt dictLength); +
    + Initializes the compression dictionary from the given byte sequence + without producing any compressed output. This function must be called + immediately after deflateInit, deflateInit2 or deflateReset, before any + call of deflate. The compressor and decompressor must use exactly the same + dictionary (see inflateSetDictionary).

    + + The dictionary should consist of strings (byte sequences) that are likely + to be encountered later in the data to be compressed, with the most commonly + used strings preferably put towards the end of the dictionary. Using a + dictionary is most useful when the data to be compressed is short and can be + predicted with good accuracy ; the data can then be compressed better than + with the default empty dictionary.

    + + Depending on the size of the compression data structures selected by + deflateInit or deflateInit2, a part of the dictionary may in effect be + discarded, for example if the dictionary is larger than the window size in + deflate or deflate2. Thus the strings most likely to be useful should be + put at the end of the dictionary, not at the front.

    + + Upon return of this function, strm-> adler is set to the Adler32 value + of the dictionary ; the decompressor may later use this value to determine + which dictionary has been used by the compressor. (The Adler32 value + applies to the whole dictionary even if only a subset of the dictionary is + actually used by the compressor.)

    + + deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a + parameter is invalid (such as NULL dictionary) or the stream state is + inconsistent (for example if deflate has already been called for this stream + or if the compression method is bsort). deflateSetDictionary does not + perform any compression: this will be done by deflate().

    + +

    int deflateCopy (z_streamp dest, z_streamp source); +
    + Sets the destination stream as a complete copy of the source stream.

    + + This function can be useful when several compression strategies will be + tried, for example when there are several ways of pre-processing the input + data with a filter. The streams that will be discarded should then be freed + by calling deflateEnd. Note that deflateCopy duplicates the internal + compression state which can be quite large, so this strategy is slow and + can consume lots of memory.

    + + deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent + (such as zalloc being NULL). msg is left unchanged in both source and + destination.

    + +

    int deflateReset (z_streamp strm); +
    This function is equivalent to deflateEnd followed by deflateInit, + but does not free and reallocate all the internal compression state. + The stream will keep the same compression level and any other attributes + that may have been set by deflateInit2.

    + + deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being NULL).

    + +

    int deflateParams (z_streamp strm, int level, int strategy); +
    + Dynamically update the compression level and compression strategy. The + interpretation of level and strategy is as in deflateInit2. This can be + used to switch between compression and straight copy of the input data, or + to switch to a different kind of input data requiring a different + strategy. If the compression level is changed, the input available so far + is compressed with the old level (and may be flushed); the new level will + take effect only at the next call of deflate().

    + + Before the call of deflateParams, the stream state must be set as for + a call of deflate(), since the currently available input may have to + be compressed and flushed. In particular, strm-> avail_out must be + non-zero.

    + + deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source + stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR + if strm->avail_out was zero.

    + +

    int inflateInit2 (z_streamp strm, int windowBits); + +
    This is another version of inflateInit with an extra parameter. The + fields next_in, avail_in, zalloc, zfree and opaque must be initialized + before by the caller.

    + + The windowBits parameter is the base two logarithm of the maximum window + size (the size of the history buffer). It should be in the range 8..15 for + this version of the library. The default value is 15 if inflateInit is used + instead. If a compressed stream with a larger window size is given as + input, inflate() will return with the error code Z_DATA_ERROR instead of + trying to allocate a larger window.

    + + inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative + memLevel). msg is set to null if there is no error message. inflateInit2 + does not perform any decompression apart from reading the zlib header if + present: this will be done by inflate(). (So next_in and avail_in may be + modified, but next_out and avail_out are unchanged.)

    + +

    int inflateSetDictionary (z_streamp strm, const Bytef *dictionary, uInt dictLength); +
    + Initializes the decompression dictionary from the given uncompressed byte + sequence. This function must be called immediately after a call of inflate + if this call returned Z_NEED_DICT. The dictionary chosen by the compressor + can be determined from the Adler32 value returned by this call of + inflate. The compressor and decompressor must use exactly the same + dictionary (see deflateSetDictionary).

    + + inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a + parameter is invalid (such as NULL dictionary) or the stream state is + inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the + expected one (incorrect Adler32 value). inflateSetDictionary does not + perform any decompression: this will be done by subsequent calls of + inflate().

    + +

    int inflateSync (z_streamp strm); + +
    Skips invalid compressed data until a full flush point (see above the + description of deflate with Z_FULL_FLUSH) can be found, or until all + available input is skipped. No output is provided.

    + + inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR + if no more input was provided, Z_DATA_ERROR if no flush point has been found, + or Z_STREAM_ERROR if the stream structure was inconsistent. In the success + case, the application may save the current current value of total_in which + indicates where valid compressed data was found. In the error case, the + application may repeatedly call inflateSync, providing more input each time, + until success or end of the input data.

    + +

    int inflateReset (z_streamp strm); +
    + This function is equivalent to inflateEnd followed by inflateInit, + but does not free and reallocate all the internal decompression state. + The stream will keep attributes that may have been set by inflateInit2. +

    + + inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being NULL). +

    +

    + +
    +

    Checksum functions

    + These functions are not related to compression but are exported + anyway because they might be useful in applications using the + compression library. +

    Function list

    +
    +

    Function description

    +
    +
    uLong adler32 (uLong adler, const Bytef *buf, uInt len); +
    + Update a running Adler-32 checksum with the bytes buf[0..len-1] and + return the updated checksum. If buf is NULL, this function returns + the required initial value for the checksum. +

    + An Adler-32 checksum is almost as reliable as a CRC32 but can be computed + much faster. Usage example: +

    + 
    +      uLong adler = adler32(0L, Z_NULL, 0);
    + 
    +      while (read_buffer(buffer, length) != EOF) {
    +        adler = adler32(adler, buffer, length);
    +      }
    +      if (adler != original_adler) error();
    +    
    + +
    uLong crc32 (uLong crc, const Bytef *buf, uInt len); +
    + Update a running crc with the bytes buf[0..len-1] and return the updated + crc. If buf is NULL, this function returns the required initial value + for the crc. Pre- and post-conditioning (one's complement) is performed + within this function so it shouldn't be done by the application. + Usage example: +
    + 
    +      uLong crc = crc32(0L, Z_NULL, 0);
    + 
    +      while (read_buffer(buffer, length) != EOF) {
    +        crc = crc32(crc, buffer, length);
    +      }
    +      if (crc != original_crc) error();
    +    
    +
    +
    +

    struct z_stream_s

    + +
    +
    + typedef struct z_stream_s {
    +     Bytef    *next_in;  /* next input byte */
    +     uInt     avail_in;  /* number of bytes available at next_in */
    +     uLong    total_in;  /* total nb of input bytes read so far */
    + 
    +     Bytef    *next_out; /* next output byte should be put there */
    +     uInt     avail_out; /* remaining free space at next_out */
    +     uLong    total_out; /* total nb of bytes output so far */
    + 
    +     char     *msg;      /* last error message, NULL if no error */
    +     struct internal_state FAR *state; /* not visible by applications */
    + 
    +     alloc_func zalloc;  /* used to allocate the internal state */
    +     free_func  zfree;   /* used to free the internal state */
    +     voidpf     opaque;  /* private data object passed to zalloc and zfree */
    + 
    +     int     data_type;  /* best guess about the data type: ascii or binary */
    +     uLong   adler;      /* adler32 value of the uncompressed data */
    +     uLong   reserved;   /* reserved for future use */
    + } z_stream ;
    + 
    + typedef z_stream FAR * z_streamp;  ÿ
    + 
    +
    + The application must update next_in and avail_in when avail_in has + dropped to zero. It must update next_out and avail_out when avail_out + has dropped to zero. The application must initialize zalloc, zfree and + opaque before calling the init function. All other fields are set by the + compression library and must not be updated by the application.

    + + The opaque value provided by the application will be passed as the first + parameter for calls of zalloc and zfree. This can be useful for custom + memory management. The compression library attaches no meaning to the + opaque value.

    + + zalloc must return Z_NULL if there is not enough memory for the object. + If zlib is used in a multi-threaded application, zalloc and zfree must be + thread safe.

    + + On 16-bit systems, the functions zalloc and zfree must be able to allocate + exactly 65536 bytes, but will not be required to allocate more than this + if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, + pointers returned by zalloc for objects of exactly 65536 bytes *must* + have their offset normalized to zero. The default allocation function + provided by this library ensures this (see zutil.c). To reduce memory + requirements and avoid any allocation of 64K objects, at the expense of + compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h). +

    + + The fields total_in and total_out can be used for statistics or + progress reports. After compression, total_in holds the total size of + the uncompressed data and may be saved for use in the decompressor + (particularly if the decompressor wants to decompress everything in + a single step).

    + +


    +

    Constants

    + +
    + #define Z_NO_FLUSH      0
    + #define Z_PARTIAL_FLUSH 1
    + 	/* will be removed, use Z_SYNC_FLUSH instead */
    + #define Z_SYNC_FLUSH    2
    + #define Z_FULL_FLUSH    3
    + #define Z_FINISH        4
    + /* Allowed flush values ; see deflate() below for details */
    + 
    + #define Z_OK            0
    + #define Z_STREAM_END    1
    + #define Z_NEED_DICT     2
    + #define Z_ERRNO        (-1)
    + #define Z_STREAM_ERROR (-2)
    + #define Z_DATA_ERROR   (-3)
    + #define Z_MEM_ERROR    (-4)
    + #define Z_BUF_ERROR    (-5)
    + #define Z_VERSION_ERROR (-6)
    + /* Return codes for the compression/decompression functions. Negative
    +  * values are errors, positive values are used for special but normal events.
    +  */
    + 
    + #define Z_NO_COMPRESSION         0
    + #define Z_BEST_SPEED             1
    + #define Z_BEST_COMPRESSION       9
    + #define Z_DEFAULT_COMPRESSION  (-1)
    + /* compression levels */
    + 
    + #define Z_FILTERED            1
    + #define Z_HUFFMAN_ONLY        2
    + #define Z_DEFAULT_STRATEGY    0
    + /* compression strategy ; see deflateInit2() below for details */
    + 
    + #define Z_BINARY   0
    + #define Z_ASCII    1
    + #define Z_UNKNOWN  2
    + /* Possible values of the data_type field */
    + 
    + #define Z_DEFLATED   8
    + /* The deflate compression method (the only one supported in this version) */
    + 
    + #define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
    + 
    + #define zlib_version zlibVersion()
    + /* for compatibility with versions less than 1.0.2 */
    + 
    +
    + +
    +

    Misc

    +
    deflateInit and inflateInit are macros to allow checking the zlib version + and the compiler's view of z_stream. +

    + Other functions: +

    +
    const char * zError (int err); +
    int inflateSyncPoint (z_streamp z); +
    const uLongf * get_crc_table (void); +
    +
    + + Last update: Wed Oct 13 20:42:34 1999
    + piapi@csie.ntu.edu.tw +
    + + + diff -Nrcpad gcc-4.4.4/zlib/projects/README.projects gcc-4.4.5/zlib/projects/README.projects *** gcc-4.4.4/zlib/projects/README.projects Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/projects/README.projects Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,41 ---- + This directory contains project files for building zlib under various + Integrated Development Environments (IDE). + + If you wish to submit a new project to this directory, you should comply + to the following requirements. Otherwise (e.g. if you wish to integrate + a custom piece of code that changes the zlib interface or its behavior), + please consider submitting the project to the contrib directory. + + + Requirements + ============ + + - The project must build zlib using the source files from the official + zlib source distribution, exclusively. + + - If the project produces redistributable builds (e.g. shared objects + or DLL files), these builds must be compatible to those produced by + makefiles, if such makefiles exist in the zlib distribution. + In particular, if the project produces a DLL build for the Win32 + platform, this build must comply to the officially-ammended Win32 DLL + Application Binary Interface (ABI), described in win32/DLL_FAQ.txt. + + - The project may provide additional build targets, which depend on + 3rd-party (unofficially-supported) software, present in the contrib + directory. For example, it is possible to provide an "ASM build", + besides the officially-supported build, and have ASM source files + among its dependencies. + + - If there are significant differences between the project files created + by different versions of an IDE (e.g. Visual C++ 6.0 vs. 7.0), the name + of the project directory should contain the version number of the IDE + for which the project is intended (e.g. "visualc6" for Visual C++ 6.0, + or "visualc7" for Visual C++ 7.0 and 7.1). + + + Current projects + ================ + + visualc6/ by Simon-Pierre Cadieux + and Cosmin Truta + Project for Microsoft Visual C++ 6.0 diff -Nrcpad gcc-4.4.4/zlib/projects/visualc6/README.txt gcc-4.4.5/zlib/projects/visualc6/README.txt *** gcc-4.4.4/zlib/projects/visualc6/README.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/projects/visualc6/README.txt Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,73 ---- + Microsoft Developer Studio Project Files, Format Version 6.00 for zlib. + + Copyright (C) 2000-2004 Simon-Pierre Cadieux. + Copyright (C) 2004 Cosmin Truta. + For conditions of distribution and use, see copyright notice in zlib.h. + + + This project builds the zlib binaries as follows: + + * Win32_DLL_Release\zlib1.dll DLL build + * Win32_DLL_Debug\zlib1d.dll DLL build (debug version) + * Win32_DLL_ASM_Release\zlib1.dll DLL build using ASM code + * Win32_DLL_ASM_Debug\zlib1d.dll DLL build using ASM code (debug version) + * Win32_LIB_Release\zlib.lib static build + * Win32_LIB_Debug\zlibd.lib static build (debug version) + * Win32_LIB_ASM_Release\zlib.lib static build using ASM code + * Win32_LIB_ASM_Debug\zlibd.lib static build using ASM code (debug version) + + + For more information regarding the DLL builds, please see the DLL FAQ + in ..\..\win32\DLL_FAQ.txt. + + + To build and test: + + 1) On the main menu, select "File | Open Workspace". + Open "zlib.dsw". + + 2) Select "Build | Set Active Configuration". + Choose the configuration you wish to build. + + 3) Select "Build | Clean". + + 4) Select "Build | Build ... (F7)". Ignore warning messages about + not being able to find certain include files (e.g. alloc.h). + + 5) If you built one of the sample programs (example or minigzip), + select "Build | Execute ... (Ctrl+F5)". + + + To use: + + 1) Select "Project | Settings (Alt+F7)". + Make note of the configuration names used in your project. + Usually, these names are "Win32 Release" and "Win32 Debug". + + 2) In the Workspace window, select the "FileView" tab. + Right-click on the root item "Workspace '...'". + Select "Insert Project into Workspace". + Switch on the checkbox "Dependency of:", and select the name + of your project. Open "zlib.dsp". + + 3) Select "Build | Configurations". + For each configuration of your project: + 3.1) Choose the zlib configuration you wish to use. + 3.2) Click on "Add". + 3.3) Set the new zlib configuration name to the name used by + the configuration from the current iteration. + + 4) Select "Build | Set Active Configuration". + Choose the configuration you wish to build. + + 5) Select "Build | Build ... (F7)". + + 6) If you built an executable program, select + "Build | Execute ... (Ctrl+F5)". + + + Note: + + To build the ASM-enabled code, you need Microsoft Assembler + (ML.EXE). You can get it by downloading and installing the + latest Processor Pack for Visual C++ 6.0. diff -Nrcpad gcc-4.4.4/zlib/projects/visualc6/example.dsp gcc-4.4.5/zlib/projects/visualc6/example.dsp *** gcc-4.4.4/zlib/projects/visualc6/example.dsp Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/projects/visualc6/example.dsp Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,278 ---- + # Microsoft Developer Studio Project File - Name="example" - Package Owner=<4> + # Microsoft Developer Studio Generated Build File, Format Version 6.00 + # ** DO NOT EDIT ** + + # TARGTYPE "Win32 (x86) Console Application" 0x0103 + + CFG=example - Win32 LIB Debug + !MESSAGE This is not a valid makefile. To build this project using NMAKE, + !MESSAGE use the Export Makefile command and run + !MESSAGE + !MESSAGE NMAKE /f "example.mak". + !MESSAGE + !MESSAGE You can specify a configuration when running NMAKE + !MESSAGE by defining the macro CFG on the command line. For example: + !MESSAGE + !MESSAGE NMAKE /f "example.mak" CFG="example - Win32 LIB Debug" + !MESSAGE + !MESSAGE Possible choices for configuration are: + !MESSAGE + !MESSAGE "example - Win32 DLL Release" (based on "Win32 (x86) Console Application") + !MESSAGE "example - Win32 DLL Debug" (based on "Win32 (x86) Console Application") + !MESSAGE "example - Win32 DLL ASM Release" (based on "Win32 (x86) Console Application") + !MESSAGE "example - Win32 DLL ASM Debug" (based on "Win32 (x86) Console Application") + !MESSAGE "example - Win32 LIB Release" (based on "Win32 (x86) Console Application") + !MESSAGE "example - Win32 LIB Debug" (based on "Win32 (x86) Console Application") + !MESSAGE "example - Win32 LIB ASM Release" (based on "Win32 (x86) Console Application") + !MESSAGE "example - Win32 LIB ASM Debug" (based on "Win32 (x86) Console Application") + !MESSAGE + + # Begin Project + # PROP AllowPerConfigDependencies 0 + # PROP Scc_ProjName "" + # PROP Scc_LocalPath "" + CPP=cl.exe + RSC=rc.exe + + !IF "$(CFG)" == "example - Win32 DLL Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "example___Win32_DLL_Release" + # PROP BASE Intermediate_Dir "example___Win32_DLL_Release" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "Win32_DLL_Release" + # PROP Intermediate_Dir "Win32_DLL_Release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 + # ADD LINK32 /nologo /subsystem:console /machine:I386 + + !ELSEIF "$(CFG)" == "example - Win32 DLL Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "example___Win32_DLL_Debug" + # PROP BASE Intermediate_Dir "example___Win32_DLL_Debug" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "Win32_DLL_Debug" + # PROP Intermediate_Dir "Win32_DLL_Debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + + !ELSEIF "$(CFG)" == "example - Win32 DLL ASM Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "example___Win32_DLL_ASM_Release" + # PROP BASE Intermediate_Dir "example___Win32_DLL_ASM_Release" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "Win32_DLL_ASM_Release" + # PROP Intermediate_Dir "Win32_DLL_ASM_Release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 + # ADD LINK32 /nologo /subsystem:console /machine:I386 + + !ELSEIF "$(CFG)" == "example - Win32 DLL ASM Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "example___Win32_DLL_ASM_Debug" + # PROP BASE Intermediate_Dir "example___Win32_DLL_ASM_Debug" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "Win32_DLL_ASM_Debug" + # PROP Intermediate_Dir "Win32_DLL_ASM_Debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + + !ELSEIF "$(CFG)" == "example - Win32 LIB Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "example___Win32_LIB_Release" + # PROP BASE Intermediate_Dir "example___Win32_LIB_Release" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "Win32_LIB_Release" + # PROP Intermediate_Dir "Win32_LIB_Release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 + # ADD LINK32 /nologo /subsystem:console /machine:I386 + + !ELSEIF "$(CFG)" == "example - Win32 LIB Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "example___Win32_LIB_Debug" + # PROP BASE Intermediate_Dir "example___Win32_LIB_Debug" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "Win32_LIB_Debug" + # PROP Intermediate_Dir "Win32_LIB_Debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + + !ELSEIF "$(CFG)" == "example - Win32 LIB ASM Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "example___Win32_LIB_ASM_Release" + # PROP BASE Intermediate_Dir "example___Win32_LIB_ASM_Release" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "Win32_LIB_ASM_Release" + # PROP Intermediate_Dir "Win32_LIB_ASM_Release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 + # ADD LINK32 /nologo /subsystem:console /machine:I386 + + !ELSEIF "$(CFG)" == "example - Win32 LIB ASM Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "example___Win32_LIB_ASM_Debug" + # PROP BASE Intermediate_Dir "example___Win32_LIB_ASM_Debug" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "Win32_LIB_ASM_Debug" + # PROP Intermediate_Dir "Win32_LIB_ASM_Debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + + !ENDIF + + # Begin Target + + # Name "example - Win32 DLL Release" + # Name "example - Win32 DLL Debug" + # Name "example - Win32 DLL ASM Release" + # Name "example - Win32 DLL ASM Debug" + # Name "example - Win32 LIB Release" + # Name "example - Win32 LIB Debug" + # Name "example - Win32 LIB ASM Release" + # Name "example - Win32 LIB ASM Debug" + # Begin Group "Source Files" + + # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + # Begin Source File + + SOURCE=..\..\example.c + # End Source File + # End Group + # Begin Group "Header Files" + + # PROP Default_Filter "h;hpp;hxx;hm;inl" + # Begin Source File + + SOURCE=..\..\zconf.h + # End Source File + # Begin Source File + + SOURCE=..\..\zlib.h + # End Source File + # End Group + # End Target + # End Project diff -Nrcpad gcc-4.4.4/zlib/projects/visualc6/minigzip.dsp gcc-4.4.5/zlib/projects/visualc6/minigzip.dsp *** gcc-4.4.4/zlib/projects/visualc6/minigzip.dsp Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/projects/visualc6/minigzip.dsp Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,278 ---- + # Microsoft Developer Studio Project File - Name="minigzip" - Package Owner=<4> + # Microsoft Developer Studio Generated Build File, Format Version 6.00 + # ** DO NOT EDIT ** + + # TARGTYPE "Win32 (x86) Console Application" 0x0103 + + CFG=minigzip - Win32 LIB Debug + !MESSAGE This is not a valid makefile. To build this project using NMAKE, + !MESSAGE use the Export Makefile command and run + !MESSAGE + !MESSAGE NMAKE /f "minigzip.mak". + !MESSAGE + !MESSAGE You can specify a configuration when running NMAKE + !MESSAGE by defining the macro CFG on the command line. For example: + !MESSAGE + !MESSAGE NMAKE /f "minigzip.mak" CFG="minigzip - Win32 LIB Debug" + !MESSAGE + !MESSAGE Possible choices for configuration are: + !MESSAGE + !MESSAGE "minigzip - Win32 DLL Release" (based on "Win32 (x86) Console Application") + !MESSAGE "minigzip - Win32 DLL Debug" (based on "Win32 (x86) Console Application") + !MESSAGE "minigzip - Win32 DLL ASM Release" (based on "Win32 (x86) Console Application") + !MESSAGE "minigzip - Win32 DLL ASM Debug" (based on "Win32 (x86) Console Application") + !MESSAGE "minigzip - Win32 LIB Release" (based on "Win32 (x86) Console Application") + !MESSAGE "minigzip - Win32 LIB Debug" (based on "Win32 (x86) Console Application") + !MESSAGE "minigzip - Win32 LIB ASM Release" (based on "Win32 (x86) Console Application") + !MESSAGE "minigzip - Win32 LIB ASM Debug" (based on "Win32 (x86) Console Application") + !MESSAGE + + # Begin Project + # PROP AllowPerConfigDependencies 0 + # PROP Scc_ProjName "" + # PROP Scc_LocalPath "" + CPP=cl.exe + RSC=rc.exe + + !IF "$(CFG)" == "minigzip - Win32 DLL Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "minigzip___Win32_DLL_Release" + # PROP BASE Intermediate_Dir "minigzip___Win32_DLL_Release" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "Win32_DLL_Release" + # PROP Intermediate_Dir "Win32_DLL_Release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 + # ADD LINK32 /nologo /subsystem:console /machine:I386 + + !ELSEIF "$(CFG)" == "minigzip - Win32 DLL Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "minigzip___Win32_DLL_Debug" + # PROP BASE Intermediate_Dir "minigzip___Win32_DLL_Debug" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "Win32_DLL_Debug" + # PROP Intermediate_Dir "Win32_DLL_Debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + + !ELSEIF "$(CFG)" == "minigzip - Win32 DLL ASM Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "minigzip___Win32_DLL_ASM_Release" + # PROP BASE Intermediate_Dir "minigzip___Win32_DLL_ASM_Release" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "Win32_DLL_ASM_Release" + # PROP Intermediate_Dir "Win32_DLL_ASM_Release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 + # ADD LINK32 /nologo /subsystem:console /machine:I386 + + !ELSEIF "$(CFG)" == "minigzip - Win32 DLL ASM Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "minigzip___Win32_DLL_ASM_Debug" + # PROP BASE Intermediate_Dir "minigzip___Win32_DLL_ASM_Debug" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "Win32_DLL_ASM_Debug" + # PROP Intermediate_Dir "Win32_DLL_ASM_Debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + + !ELSEIF "$(CFG)" == "minigzip - Win32 LIB Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "minigzip___Win32_LIB_Release" + # PROP BASE Intermediate_Dir "minigzip___Win32_LIB_Release" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "Win32_LIB_Release" + # PROP Intermediate_Dir "Win32_LIB_Release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 + # ADD LINK32 /nologo /subsystem:console /machine:I386 + + !ELSEIF "$(CFG)" == "minigzip - Win32 LIB Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "minigzip___Win32_LIB_Debug" + # PROP BASE Intermediate_Dir "minigzip___Win32_LIB_Debug" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "Win32_LIB_Debug" + # PROP Intermediate_Dir "Win32_LIB_Debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + + !ELSEIF "$(CFG)" == "minigzip - Win32 LIB ASM Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "minigzip___Win32_LIB_ASM_Release" + # PROP BASE Intermediate_Dir "minigzip___Win32_LIB_ASM_Release" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "Win32_LIB_ASM_Release" + # PROP Intermediate_Dir "Win32_LIB_ASM_Release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 + # ADD LINK32 /nologo /subsystem:console /machine:I386 + + !ELSEIF "$(CFG)" == "minigzip - Win32 LIB ASM Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "minigzip___Win32_LIB_ASM_Debug" + # PROP BASE Intermediate_Dir "minigzip___Win32_LIB_ASM_Debug" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "Win32_LIB_ASM_Debug" + # PROP Intermediate_Dir "Win32_LIB_ASM_Debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT BASE CPP /YX + # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT CPP /YX + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + + !ENDIF + + # Begin Target + + # Name "minigzip - Win32 DLL Release" + # Name "minigzip - Win32 DLL Debug" + # Name "minigzip - Win32 DLL ASM Release" + # Name "minigzip - Win32 DLL ASM Debug" + # Name "minigzip - Win32 LIB Release" + # Name "minigzip - Win32 LIB Debug" + # Name "minigzip - Win32 LIB ASM Release" + # Name "minigzip - Win32 LIB ASM Debug" + # Begin Group "Source Files" + + # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + # Begin Source File + + SOURCE=..\..\minigzip.c + # End Source File + # End Group + # Begin Group "Header Files" + + # PROP Default_Filter "h;hpp;hxx;hm;inl" + # Begin Source File + + SOURCE=..\..\zconf.h + # End Source File + # Begin Source File + + SOURCE=..\..\zlib.h + # End Source File + # End Group + # End Target + # End Project diff -Nrcpad gcc-4.4.4/zlib/projects/visualc6/zlib.dsp gcc-4.4.5/zlib/projects/visualc6/zlib.dsp *** gcc-4.4.4/zlib/projects/visualc6/zlib.dsp Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/projects/visualc6/zlib.dsp Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,609 ---- + # Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4> + # Microsoft Developer Studio Generated Build File, Format Version 6.00 + # ** DO NOT EDIT ** + + # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + # TARGTYPE "Win32 (x86) Static Library" 0x0104 + + CFG=zlib - Win32 LIB Debug + !MESSAGE This is not a valid makefile. To build this project using NMAKE, + !MESSAGE use the Export Makefile command and run + !MESSAGE + !MESSAGE NMAKE /f "zlib.mak". + !MESSAGE + !MESSAGE You can specify a configuration when running NMAKE + !MESSAGE by defining the macro CFG on the command line. For example: + !MESSAGE + !MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 LIB Debug" + !MESSAGE + !MESSAGE Possible choices for configuration are: + !MESSAGE + !MESSAGE "zlib - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library") + !MESSAGE "zlib - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library") + !MESSAGE "zlib - Win32 DLL ASM Release" (based on "Win32 (x86) Dynamic-Link Library") + !MESSAGE "zlib - Win32 DLL ASM Debug" (based on "Win32 (x86) Dynamic-Link Library") + !MESSAGE "zlib - Win32 LIB Release" (based on "Win32 (x86) Static Library") + !MESSAGE "zlib - Win32 LIB Debug" (based on "Win32 (x86) Static Library") + !MESSAGE "zlib - Win32 LIB ASM Release" (based on "Win32 (x86) Static Library") + !MESSAGE "zlib - Win32 LIB ASM Debug" (based on "Win32 (x86) Static Library") + !MESSAGE + + # Begin Project + # PROP AllowPerConfigDependencies 0 + # PROP Scc_ProjName "" + # PROP Scc_LocalPath "" + + !IF "$(CFG)" == "zlib - Win32 DLL Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "zlib___Win32_DLL_Release" + # PROP BASE Intermediate_Dir "zlib___Win32_DLL_Release" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "Win32_DLL_Release" + # PROP Intermediate_Dir "Win32_DLL_Release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + CPP=cl.exe + # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT BASE CPP /YX /Yc /Yu + # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT CPP /YX /Yc /Yu + MTL=midl.exe + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 + # ADD LINK32 /nologo /dll /machine:I386 /out:"Win32_DLL_Release\zlib1.dll" + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "zlib___Win32_DLL_Debug" + # PROP BASE Intermediate_Dir "zlib___Win32_DLL_Debug" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "Win32_DLL_Debug" + # PROP Intermediate_Dir "Win32_DLL_Debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + CPP=cl.exe + # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT BASE CPP /YX /Yc /Yu + # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT CPP /YX /Yc /Yu + MTL=midl.exe + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept + # ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Win32_DLL_Debug\zlib1d.dll" /pdbtype:sept + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL ASM Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "zlib___Win32_DLL_ASM_Release" + # PROP BASE Intermediate_Dir "zlib___Win32_DLL_ASM_Release" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "Win32_DLL_ASM_Release" + # PROP Intermediate_Dir "Win32_DLL_ASM_Release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + CPP=cl.exe + # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT BASE CPP /YX /Yc /Yu + # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "ASMV" /D "ASMINF" /FD /c + # SUBTRACT CPP /YX /Yc /Yu + MTL=midl.exe + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 + # ADD LINK32 /nologo /dll /machine:I386 /out:"Win32_DLL_ASM_Release\zlib1.dll" + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL ASM Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "zlib___Win32_DLL_ASM_Debug" + # PROP BASE Intermediate_Dir "zlib___Win32_DLL_ASM_Debug" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "Win32_DLL_ASM_Debug" + # PROP Intermediate_Dir "Win32_DLL_ASM_Debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + CPP=cl.exe + # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT BASE CPP /YX /Yc /Yu + # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "ASMV" /D "ASMINF" /FD /GZ /c + # SUBTRACT CPP /YX /Yc /Yu + MTL=midl.exe + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept + # ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Win32_DLL_ASM_Debug\zlib1d.dll" /pdbtype:sept + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "zlib___Win32_LIB_Release" + # PROP BASE Intermediate_Dir "zlib___Win32_LIB_Release" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "Win32_LIB_Release" + # PROP Intermediate_Dir "Win32_LIB_Release" + # PROP Target_Dir "" + CPP=cl.exe + # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT BASE CPP /YX /Yc /Yu + # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT CPP /YX /Yc /Yu + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "zlib___Win32_LIB_Debug" + # PROP BASE Intermediate_Dir "zlib___Win32_LIB_Debug" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "Win32_LIB_Debug" + # PROP Intermediate_Dir "Win32_LIB_Debug" + # PROP Target_Dir "" + CPP=cl.exe + # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT BASE CPP /YX /Yc /Yu + # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT CPP /YX /Yc /Yu + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo /out:"Win32_LIB_Debug\zlibd.lib" + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB ASM Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "zlib___Win32_LIB_ASM_Release" + # PROP BASE Intermediate_Dir "zlib___Win32_LIB_ASM_Release" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "Win32_LIB_ASM_Release" + # PROP Intermediate_Dir "Win32_LIB_ASM_Release" + # PROP Target_Dir "" + CPP=cl.exe + # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c + # SUBTRACT BASE CPP /YX /Yc /Yu + # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "ASMV" /D "ASMINF" /FD /c + # SUBTRACT CPP /YX /Yc /Yu + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB ASM Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "zlib___Win32_LIB_ASM_Debug" + # PROP BASE Intermediate_Dir "zlib___Win32_LIB_ASM_Debug" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "Win32_LIB_ASM_Debug" + # PROP Intermediate_Dir "Win32_LIB_ASM_Debug" + # PROP Target_Dir "" + CPP=cl.exe + # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c + # SUBTRACT BASE CPP /YX /Yc /Yu + # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "ASMV" /D "ASMINF" /FD /GZ /c + # SUBTRACT CPP /YX /Yc /Yu + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo /out:"Win32_LIB_ASM_Debug\zlibd.lib" + + !ENDIF + + # Begin Target + + # Name "zlib - Win32 DLL Release" + # Name "zlib - Win32 DLL Debug" + # Name "zlib - Win32 DLL ASM Release" + # Name "zlib - Win32 DLL ASM Debug" + # Name "zlib - Win32 LIB Release" + # Name "zlib - Win32 LIB Debug" + # Name "zlib - Win32 LIB ASM Release" + # Name "zlib - Win32 LIB ASM Debug" + # Begin Group "Source Files" + + # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + # Begin Source File + + SOURCE=..\..\adler32.c + # End Source File + # Begin Source File + + SOURCE=..\..\compress.c + # End Source File + # Begin Source File + + SOURCE=..\..\crc32.c + # End Source File + # Begin Source File + + SOURCE=..\..\deflate.c + # End Source File + # Begin Source File + + SOURCE=..\..\gzio.c + # End Source File + # Begin Source File + + SOURCE=..\..\infback.c + # End Source File + # Begin Source File + + SOURCE=..\..\inffast.c + # End Source File + # Begin Source File + + SOURCE=..\..\inflate.c + # End Source File + # Begin Source File + + SOURCE=..\..\inftrees.c + # End Source File + # Begin Source File + + SOURCE=..\..\trees.c + # End Source File + # Begin Source File + + SOURCE=..\..\uncompr.c + # End Source File + # Begin Source File + + SOURCE=..\..\win32\zlib.def + + !IF "$(CFG)" == "zlib - Win32 DLL Release" + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL Debug" + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL ASM Release" + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL ASM Debug" + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB Debug" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB ASM Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB ASM Debug" + + # PROP Exclude_From_Build 1 + + !ENDIF + + # End Source File + # Begin Source File + + SOURCE=..\..\zutil.c + # End Source File + # End Group + # Begin Group "Header Files" + + # PROP Default_Filter "h;hpp;hxx;hm;inl" + # Begin Source File + + SOURCE=..\..\crc32.h + # End Source File + # Begin Source File + + SOURCE=..\..\deflate.h + # End Source File + # Begin Source File + + SOURCE=..\..\inffast.h + # End Source File + # Begin Source File + + SOURCE=..\..\inffixed.h + # End Source File + # Begin Source File + + SOURCE=..\..\inflate.h + # End Source File + # Begin Source File + + SOURCE=..\..\inftrees.h + # End Source File + # Begin Source File + + SOURCE=..\..\trees.h + # End Source File + # Begin Source File + + SOURCE=..\..\zconf.h + # End Source File + # Begin Source File + + SOURCE=..\..\zlib.h + # End Source File + # Begin Source File + + SOURCE=..\..\zutil.h + # End Source File + # End Group + # Begin Group "Resource Files" + + # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + # Begin Source File + + SOURCE=..\..\win32\zlib1.rc + # End Source File + # End Group + # Begin Group "Assembler Files (Unsupported)" + + # PROP Default_Filter "asm;obj;c;cpp;cxx;h;hpp;hxx" + # Begin Source File + + SOURCE=..\..\contrib\masmx86\gvmat32.asm + + !IF "$(CFG)" == "zlib - Win32 DLL Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL Debug" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL ASM Release" + + # Begin Custom Build - Assembling... + IntDir=.\Win32_DLL_ASM_Release + InputPath=..\..\contrib\masmx86\gvmat32.asm + InputName=gvmat32 + + "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + ml.exe /nologo /c /coff /Cx /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + + # End Custom Build + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL ASM Debug" + + # Begin Custom Build - Assembling... + IntDir=.\Win32_DLL_ASM_Debug + InputPath=..\..\contrib\masmx86\gvmat32.asm + InputName=gvmat32 + + "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + ml.exe /nologo /c /coff /Cx /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + + # End Custom Build + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB Debug" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB ASM Release" + + # Begin Custom Build - Assembling... + IntDir=.\Win32_LIB_ASM_Release + InputPath=..\..\contrib\masmx86\gvmat32.asm + InputName=gvmat32 + + "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + ml.exe /nologo /c /coff /Cx /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + + # End Custom Build + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB ASM Debug" + + # Begin Custom Build - Assembling... + IntDir=.\Win32_LIB_ASM_Debug + InputPath=..\..\contrib\masmx86\gvmat32.asm + InputName=gvmat32 + + "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + ml.exe /nologo /c /coff /Cx /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + + # End Custom Build + + !ENDIF + + # End Source File + # Begin Source File + + SOURCE=..\..\contrib\masmx86\gvmat32c.c + + !IF "$(CFG)" == "zlib - Win32 DLL Release" + + # PROP Exclude_From_Build 1 + # ADD CPP /I "..\.." + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL Debug" + + # PROP Exclude_From_Build 1 + # ADD CPP /I "..\.." + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL ASM Release" + + # ADD CPP /I "..\.." + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL ASM Debug" + + # ADD CPP /I "..\.." + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB Release" + + # PROP Exclude_From_Build 1 + # ADD CPP /I "..\.." + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB Debug" + + # PROP Exclude_From_Build 1 + # ADD CPP /I "..\.." + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB ASM Release" + + # ADD CPP /I "..\.." + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB ASM Debug" + + # ADD CPP /I "..\.." + + !ENDIF + + # End Source File + # Begin Source File + + SOURCE=..\..\contrib\masmx86\inffas32.asm + + !IF "$(CFG)" == "zlib - Win32 DLL Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL Debug" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL ASM Release" + + # Begin Custom Build - Assembling... + IntDir=.\Win32_DLL_ASM_Release + InputPath=..\..\contrib\masmx86\inffas32.asm + InputName=inffas32 + + "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + ml.exe /nologo /c /coff /Cx /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + + # End Custom Build + + !ELSEIF "$(CFG)" == "zlib - Win32 DLL ASM Debug" + + # Begin Custom Build - Assembling... + IntDir=.\Win32_DLL_ASM_Debug + InputPath=..\..\contrib\masmx86\inffas32.asm + InputName=inffas32 + + "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + ml.exe /nologo /c /coff /Cx /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + + # End Custom Build + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB Debug" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB ASM Release" + + # Begin Custom Build - Assembling... + IntDir=.\Win32_LIB_ASM_Release + InputPath=..\..\contrib\masmx86\inffas32.asm + InputName=inffas32 + + "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + ml.exe /nologo /c /coff /Cx /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + + # End Custom Build + + !ELSEIF "$(CFG)" == "zlib - Win32 LIB ASM Debug" + + # Begin Custom Build - Assembling... + IntDir=.\Win32_LIB_ASM_Debug + InputPath=..\..\contrib\masmx86\inffas32.asm + InputName=inffas32 + + "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + ml.exe /nologo /c /coff /Cx /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + + # End Custom Build + + !ENDIF + + # End Source File + # End Group + # Begin Source File + + SOURCE=.\README.txt + # End Source File + # End Target + # End Project diff -Nrcpad gcc-4.4.4/zlib/projects/visualc6/zlib.dsw gcc-4.4.5/zlib/projects/visualc6/zlib.dsw *** gcc-4.4.4/zlib/projects/visualc6/zlib.dsw Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/projects/visualc6/zlib.dsw Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,59 ---- + Microsoft Developer Studio Workspace File, Format Version 6.00 + # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + + ############################################################################### + + Project: "example"=.\example.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency + }}} + + ############################################################################### + + Project: "minigzip"=.\minigzip.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency + }}} + + ############################################################################### + + Project: "zlib"=.\zlib.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + + Global: + + Package=<5> + {{{ + }}} + + Package=<3> + {{{ + }}} + + ############################################################################### + diff -Nrcpad gcc-4.4.4/zlib/qnx/package.qpg gcc-4.4.5/zlib/qnx/package.qpg *** gcc-4.4.4/zlib/qnx/package.qpg Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/qnx/package.qpg Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,141 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Library + + Medium + + 2.0 + + + + zlib + zlib + alain.bonnefoy@icbt.com + Public + public + www.gzip.org/zlib + + + Jean-Loup Gailly,Mark Adler + www.gzip.org/zlib + + zlib@gzip.org + + + A massively spiffy yet delicately unobtrusive compression library. + zlib is designed to be a free, general-purpose, legally unencumbered, lossless data compression library for use on virtually any computer hardware and operating system. + http://www.gzip.org/zlib + + + + + 1.2.3 + Medium + Stable + + + + + + + No License + + + + Software Development/Libraries and Extensions/C Libraries + zlib,compression + qnx6 + qnx6 + None + Developer + + + + + + + + + + + + + + Install + Post + No + Ignore + + No + Optional + + + + + + + + + + + + + InstallOver + zlib + + + + + + + + + + + + + InstallOver + zlib-dev + + + + + + + + + diff -Nrcpad gcc-4.4.4/zlib/trees.c gcc-4.4.5/zlib/trees.c *** gcc-4.4.4/zlib/trees.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/trees.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,1219 ---- + /* trees.c -- output deflated data using Huffman coding + * Copyright (C) 1995-2005 Jean-loup Gailly + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* + * ALGORITHM + * + * The "deflation" process uses several Huffman trees. The more + * common source values are represented by shorter bit sequences. + * + * Each code tree is stored in a compressed form which is itself + * a Huffman encoding of the lengths of all the code strings (in + * ascending order by source values). The actual code strings are + * reconstructed from the lengths in the inflate process, as described + * in the deflate specification. + * + * REFERENCES + * + * Deutsch, L.P.,"'Deflate' Compressed Data Format Specification". + * Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc + * + * Storer, James A. + * Data Compression: Methods and Theory, pp. 49-50. + * Computer Science Press, 1988. ISBN 0-7167-8156-5. + * + * Sedgewick, R. + * Algorithms, p290. + * Addison-Wesley, 1983. ISBN 0-201-06672-6. + */ + + /* @(#) $Id: trees.c,v 1.1.1.2 2002/03/11 21:53:27 tromey Exp $ */ + + /* #define GEN_TREES_H */ + + #include "deflate.h" + + #ifdef DEBUG + # include + #endif + + /* =========================================================================== + * Constants + */ + + #define MAX_BL_BITS 7 + /* Bit length codes must not exceed MAX_BL_BITS bits */ + + #define END_BLOCK 256 + /* end of block literal code */ + + #define REP_3_6 16 + /* repeat previous bit length 3-6 times (2 bits of repeat count) */ + + #define REPZ_3_10 17 + /* repeat a zero length 3-10 times (3 bits of repeat count) */ + + #define REPZ_11_138 18 + /* repeat a zero length 11-138 times (7 bits of repeat count) */ + + local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */ + = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0}; + + local const int extra_dbits[D_CODES] /* extra bits for each distance code */ + = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; + + local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */ + = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7}; + + local const uch bl_order[BL_CODES] + = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15}; + /* The lengths of the bit length codes are sent in order of decreasing + * probability, to avoid transmitting the lengths for unused bit length codes. + */ + + #define Buf_size (8 * 2*sizeof(char)) + /* Number of bits used within bi_buf. (bi_buf might be implemented on + * more than 16 bits on some systems.) + */ + + /* =========================================================================== + * Local data. These are initialized only once. + */ + + #define DIST_CODE_LEN 512 /* see definition of array dist_code below */ + + #if defined(GEN_TREES_H) || !defined(STDC) + /* non ANSI compilers may not accept trees.h */ + + local ct_data static_ltree[L_CODES+2]; + /* The static literal tree. Since the bit lengths are imposed, there is no + * need for the L_CODES extra codes used during heap construction. However + * The codes 286 and 287 are needed to build a canonical tree (see _tr_init + * below). + */ + + local ct_data static_dtree[D_CODES]; + /* The static distance tree. (Actually a trivial tree since all codes use + * 5 bits.) + */ + + uch _dist_code[DIST_CODE_LEN]; + /* Distance codes. The first 256 values correspond to the distances + * 3 .. 258, the last 256 values correspond to the top 8 bits of + * the 15 bit distances. + */ + + uch _length_code[MAX_MATCH-MIN_MATCH+1]; + /* length code for each normalized match length (0 == MIN_MATCH) */ + + local int base_length[LENGTH_CODES]; + /* First normalized length for each code (0 = MIN_MATCH) */ + + local int base_dist[D_CODES]; + /* First normalized distance for each code (0 = distance of 1) */ + + #else + # include "trees.h" + #endif /* GEN_TREES_H */ + + struct static_tree_desc_s { + const ct_data *static_tree; /* static tree or NULL */ + const intf *extra_bits; /* extra bits for each code or NULL */ + int extra_base; /* base index for extra_bits */ + int elems; /* max number of elements in the tree */ + int max_length; /* max bit length for the codes */ + }; + + local static_tree_desc static_l_desc = + {static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS}; + + local static_tree_desc static_d_desc = + {static_dtree, extra_dbits, 0, D_CODES, MAX_BITS}; + + local static_tree_desc static_bl_desc = + {(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS}; + + /* =========================================================================== + * Local (static) routines in this file. + */ + + local void tr_static_init OF((void)); + local void init_block OF((deflate_state *s)); + local void pqdownheap OF((deflate_state *s, ct_data *tree, int k)); + local void gen_bitlen OF((deflate_state *s, tree_desc *desc)); + local void gen_codes OF((ct_data *tree, int max_code, ushf *bl_count)); + local void build_tree OF((deflate_state *s, tree_desc *desc)); + local void scan_tree OF((deflate_state *s, ct_data *tree, int max_code)); + local void send_tree OF((deflate_state *s, ct_data *tree, int max_code)); + local int build_bl_tree OF((deflate_state *s)); + local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes, + int blcodes)); + local void compress_block OF((deflate_state *s, ct_data *ltree, + ct_data *dtree)); + local void set_data_type OF((deflate_state *s)); + local unsigned bi_reverse OF((unsigned value, int length)); + local void bi_windup OF((deflate_state *s)); + local void bi_flush OF((deflate_state *s)); + local void copy_block OF((deflate_state *s, charf *buf, unsigned len, + int header)); + + #ifdef GEN_TREES_H + local void gen_trees_header OF((void)); + #endif + + #ifndef DEBUG + # define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len) + /* Send a code of the given tree. c and tree must not have side effects */ + + #else /* DEBUG */ + # define send_code(s, c, tree) \ + { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \ + send_bits(s, tree[c].Code, tree[c].Len); } + #endif + + /* =========================================================================== + * Output a short LSB first on the stream. + * IN assertion: there is enough room in pendingBuf. + */ + #define put_short(s, w) { \ + put_byte(s, (uch)((w) & 0xff)); \ + put_byte(s, (uch)((ush)(w) >> 8)); \ + } + + /* =========================================================================== + * Send a value on a given number of bits. + * IN assertion: length <= 16 and value fits in length bits. + */ + #ifdef DEBUG + local void send_bits OF((deflate_state *s, int value, int length)); + + local void send_bits(s, value, length) + deflate_state *s; + int value; /* value to send */ + int length; /* number of bits */ + { + Tracevv((stderr," l %2d v %4x ", length, value)); + Assert(length > 0 && length <= 15, "invalid length"); + s->bits_sent += (ulg)length; + + /* If not enough room in bi_buf, use (valid) bits from bi_buf and + * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid)) + * unused bits in value. + */ + if (s->bi_valid > (int)Buf_size - length) { + s->bi_buf |= (value << s->bi_valid); + put_short(s, s->bi_buf); + s->bi_buf = (ush)value >> (Buf_size - s->bi_valid); + s->bi_valid += length - Buf_size; + } else { + s->bi_buf |= value << s->bi_valid; + s->bi_valid += length; + } + } + #else /* !DEBUG */ + + #define send_bits(s, value, length) \ + { int len = length;\ + if (s->bi_valid > (int)Buf_size - len) {\ + int val = value;\ + s->bi_buf |= (val << s->bi_valid);\ + put_short(s, s->bi_buf);\ + s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\ + s->bi_valid += len - Buf_size;\ + } else {\ + s->bi_buf |= (value) << s->bi_valid;\ + s->bi_valid += len;\ + }\ + } + #endif /* DEBUG */ + + + /* the arguments must not have side effects */ + + /* =========================================================================== + * Initialize the various 'constant' tables. + */ + local void tr_static_init() + { + #if defined(GEN_TREES_H) || !defined(STDC) + static int static_init_done = 0; + int n; /* iterates over tree elements */ + int bits; /* bit counter */ + int length; /* length value */ + int code; /* code value */ + int dist; /* distance index */ + ush bl_count[MAX_BITS+1]; + /* number of codes at each bit length for an optimal tree */ + + if (static_init_done) return; + + /* For some embedded targets, global variables are not initialized: */ + static_l_desc.static_tree = static_ltree; + static_l_desc.extra_bits = extra_lbits; + static_d_desc.static_tree = static_dtree; + static_d_desc.extra_bits = extra_dbits; + static_bl_desc.extra_bits = extra_blbits; + + /* Initialize the mapping length (0..255) -> length code (0..28) */ + length = 0; + for (code = 0; code < LENGTH_CODES-1; code++) { + base_length[code] = length; + for (n = 0; n < (1< dist code (0..29) */ + dist = 0; + for (code = 0 ; code < 16; code++) { + base_dist[code] = dist; + for (n = 0; n < (1<>= 7; /* from now on, all distances are divided by 128 */ + for ( ; code < D_CODES; code++) { + base_dist[code] = dist << 7; + for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) { + _dist_code[256 + dist++] = (uch)code; + } + } + Assert (dist == 256, "tr_static_init: 256+dist != 512"); + + /* Construct the codes of the static literal tree */ + for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0; + n = 0; + while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++; + while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++; + while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++; + while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++; + /* Codes 286 and 287 do not exist, but we must include them in the + * tree construction to get a canonical Huffman tree (longest code + * all ones) + */ + gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count); + + /* The static distance tree is trivial: */ + for (n = 0; n < D_CODES; n++) { + static_dtree[n].Len = 5; + static_dtree[n].Code = bi_reverse((unsigned)n, 5); + } + static_init_done = 1; + + # ifdef GEN_TREES_H + gen_trees_header(); + # endif + #endif /* defined(GEN_TREES_H) || !defined(STDC) */ + } + + /* =========================================================================== + * Genererate the file trees.h describing the static trees. + */ + #ifdef GEN_TREES_H + # ifndef DEBUG + # include + # endif + + # define SEPARATOR(i, last, width) \ + ((i) == (last)? "\n};\n\n" : \ + ((i) % (width) == (width)-1 ? ",\n" : ", ")) + + void gen_trees_header() + { + FILE *header = fopen("trees.h", "w"); + int i; + + Assert (header != NULL, "Can't open trees.h"); + fprintf(header, + "/* header created automatically with -DGEN_TREES_H */\n\n"); + + fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n"); + for (i = 0; i < L_CODES+2; i++) { + fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code, + static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5)); + } + + fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n"); + for (i = 0; i < D_CODES; i++) { + fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code, + static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5)); + } + + fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n"); + for (i = 0; i < DIST_CODE_LEN; i++) { + fprintf(header, "%2u%s", _dist_code[i], + SEPARATOR(i, DIST_CODE_LEN-1, 20)); + } + + fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n"); + for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) { + fprintf(header, "%2u%s", _length_code[i], + SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20)); + } + + fprintf(header, "local const int base_length[LENGTH_CODES] = {\n"); + for (i = 0; i < LENGTH_CODES; i++) { + fprintf(header, "%1u%s", base_length[i], + SEPARATOR(i, LENGTH_CODES-1, 20)); + } + + fprintf(header, "local const int base_dist[D_CODES] = {\n"); + for (i = 0; i < D_CODES; i++) { + fprintf(header, "%5u%s", base_dist[i], + SEPARATOR(i, D_CODES-1, 10)); + } + + fclose(header); + } + #endif /* GEN_TREES_H */ + + /* =========================================================================== + * Initialize the tree data structures for a new zlib stream. + */ + void _tr_init(s) + deflate_state *s; + { + tr_static_init(); + + s->l_desc.dyn_tree = s->dyn_ltree; + s->l_desc.stat_desc = &static_l_desc; + + s->d_desc.dyn_tree = s->dyn_dtree; + s->d_desc.stat_desc = &static_d_desc; + + s->bl_desc.dyn_tree = s->bl_tree; + s->bl_desc.stat_desc = &static_bl_desc; + + s->bi_buf = 0; + s->bi_valid = 0; + s->last_eob_len = 8; /* enough lookahead for inflate */ + #ifdef DEBUG + s->compressed_len = 0L; + s->bits_sent = 0L; + #endif + + /* Initialize the first block of the first file: */ + init_block(s); + } + + /* =========================================================================== + * Initialize a new block. + */ + local void init_block(s) + deflate_state *s; + { + int n; /* iterates over tree elements */ + + /* Initialize the trees. */ + for (n = 0; n < L_CODES; n++) s->dyn_ltree[n].Freq = 0; + for (n = 0; n < D_CODES; n++) s->dyn_dtree[n].Freq = 0; + for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0; + + s->dyn_ltree[END_BLOCK].Freq = 1; + s->opt_len = s->static_len = 0L; + s->last_lit = s->matches = 0; + } + + #define SMALLEST 1 + /* Index within the heap array of least frequent node in the Huffman tree */ + + + /* =========================================================================== + * Remove the smallest element from the heap and recreate the heap with + * one less element. Updates heap and heap_len. + */ + #define pqremove(s, tree, top) \ + {\ + top = s->heap[SMALLEST]; \ + s->heap[SMALLEST] = s->heap[s->heap_len--]; \ + pqdownheap(s, tree, SMALLEST); \ + } + + /* =========================================================================== + * Compares to subtrees, using the tree depth as tie breaker when + * the subtrees have equal frequency. This minimizes the worst case length. + */ + #define smaller(tree, n, m, depth) \ + (tree[n].Freq < tree[m].Freq || \ + (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m])) + + /* =========================================================================== + * Restore the heap property by moving down the tree starting at node k, + * exchanging a node with the smallest of its two sons if necessary, stopping + * when the heap property is re-established (each father smaller than its + * two sons). + */ + local void pqdownheap(s, tree, k) + deflate_state *s; + ct_data *tree; /* the tree to restore */ + int k; /* node to move down */ + { + int v = s->heap[k]; + int j = k << 1; /* left son of k */ + while (j <= s->heap_len) { + /* Set j to the smallest of the two sons: */ + if (j < s->heap_len && + smaller(tree, s->heap[j+1], s->heap[j], s->depth)) { + j++; + } + /* Exit if v is smaller than both sons */ + if (smaller(tree, v, s->heap[j], s->depth)) break; + + /* Exchange v with the smallest son */ + s->heap[k] = s->heap[j]; k = j; + + /* And continue down the tree, setting j to the left son of k */ + j <<= 1; + } + s->heap[k] = v; + } + + /* =========================================================================== + * Compute the optimal bit lengths for a tree and update the total bit length + * for the current block. + * IN assertion: the fields freq and dad are set, heap[heap_max] and + * above are the tree nodes sorted by increasing frequency. + * OUT assertions: the field len is set to the optimal bit length, the + * array bl_count contains the frequencies for each bit length. + * The length opt_len is updated; static_len is also updated if stree is + * not null. + */ + local void gen_bitlen(s, desc) + deflate_state *s; + tree_desc *desc; /* the tree descriptor */ + { + ct_data *tree = desc->dyn_tree; + int max_code = desc->max_code; + const ct_data *stree = desc->stat_desc->static_tree; + const intf *extra = desc->stat_desc->extra_bits; + int base = desc->stat_desc->extra_base; + int max_length = desc->stat_desc->max_length; + int h; /* heap index */ + int n, m; /* iterate over the tree elements */ + int bits; /* bit length */ + int xbits; /* extra bits */ + ush f; /* frequency */ + int overflow = 0; /* number of elements with bit length too large */ + + for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0; + + /* In a first pass, compute the optimal bit lengths (which may + * overflow in the case of the bit length tree). + */ + tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */ + + for (h = s->heap_max+1; h < HEAP_SIZE; h++) { + n = s->heap[h]; + bits = tree[tree[n].Dad].Len + 1; + if (bits > max_length) bits = max_length, overflow++; + tree[n].Len = (ush)bits; + /* We overwrite tree[n].Dad which is no longer needed */ + + if (n > max_code) continue; /* not a leaf node */ + + s->bl_count[bits]++; + xbits = 0; + if (n >= base) xbits = extra[n-base]; + f = tree[n].Freq; + s->opt_len += (ulg)f * (bits + xbits); + if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits); + } + if (overflow == 0) return; + + Trace((stderr,"\nbit length overflow\n")); + /* This happens for example on obj2 and pic of the Calgary corpus */ + + /* Find the first bit length which could increase: */ + do { + bits = max_length-1; + while (s->bl_count[bits] == 0) bits--; + s->bl_count[bits]--; /* move one leaf down the tree */ + s->bl_count[bits+1] += 2; /* move one overflow item as its brother */ + s->bl_count[max_length]--; + /* The brother of the overflow item also moves one step up, + * but this does not affect bl_count[max_length] + */ + overflow -= 2; + } while (overflow > 0); + + /* Now recompute all bit lengths, scanning in increasing frequency. + * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all + * lengths instead of fixing only the wrong ones. This idea is taken + * from 'ar' written by Haruhiko Okumura.) + */ + for (bits = max_length; bits != 0; bits--) { + n = s->bl_count[bits]; + while (n != 0) { + m = s->heap[--h]; + if (m > max_code) continue; + if ((unsigned) tree[m].Len != (unsigned) bits) { + Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits)); + s->opt_len += ((long)bits - (long)tree[m].Len) + *(long)tree[m].Freq; + tree[m].Len = (ush)bits; + } + n--; + } + } + } + + /* =========================================================================== + * Generate the codes for a given tree and bit counts (which need not be + * optimal). + * IN assertion: the array bl_count contains the bit length statistics for + * the given tree and the field len is set for all tree elements. + * OUT assertion: the field code is set for all tree elements of non + * zero code length. + */ + local void gen_codes (tree, max_code, bl_count) + ct_data *tree; /* the tree to decorate */ + int max_code; /* largest code with non zero frequency */ + ushf *bl_count; /* number of codes at each bit length */ + { + ush next_code[MAX_BITS+1]; /* next code value for each bit length */ + ush code = 0; /* running code value */ + int bits; /* bit index */ + int n; /* code index */ + + /* The distribution counts are first used to generate the code values + * without bit reversal. + */ + for (bits = 1; bits <= MAX_BITS; bits++) { + next_code[bits] = code = (code + bl_count[bits-1]) << 1; + } + /* Check that the bit counts in bl_count are consistent. The last code + * must be all ones. + */ + Assert (code + bl_count[MAX_BITS]-1 == (1<dyn_tree; + const ct_data *stree = desc->stat_desc->static_tree; + int elems = desc->stat_desc->elems; + int n, m; /* iterate over heap elements */ + int max_code = -1; /* largest code with non zero frequency */ + int node; /* new node being created */ + + /* Construct the initial heap, with least frequent element in + * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1]. + * heap[0] is not used. + */ + s->heap_len = 0, s->heap_max = HEAP_SIZE; + + for (n = 0; n < elems; n++) { + if (tree[n].Freq != 0) { + s->heap[++(s->heap_len)] = max_code = n; + s->depth[n] = 0; + } else { + tree[n].Len = 0; + } + } + + /* The pkzip format requires that at least one distance code exists, + * and that at least one bit should be sent even if there is only one + * possible code. So to avoid special checks later on we force at least + * two codes of non zero frequency. + */ + while (s->heap_len < 2) { + node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0); + tree[node].Freq = 1; + s->depth[node] = 0; + s->opt_len--; if (stree) s->static_len -= stree[node].Len; + /* node is 0 or 1 so it does not have extra bits */ + } + desc->max_code = max_code; + + /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree, + * establish sub-heaps of increasing lengths: + */ + for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n); + + /* Construct the Huffman tree by repeatedly combining the least two + * frequent nodes. + */ + node = elems; /* next internal node of the tree */ + do { + pqremove(s, tree, n); /* n = node of least frequency */ + m = s->heap[SMALLEST]; /* m = node of next least frequency */ + + s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */ + s->heap[--(s->heap_max)] = m; + + /* Create a new node father of n and m */ + tree[node].Freq = tree[n].Freq + tree[m].Freq; + s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ? + s->depth[n] : s->depth[m]) + 1); + tree[n].Dad = tree[m].Dad = (ush)node; + #ifdef DUMP_BL_TREE + if (tree == s->bl_tree) { + fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)", + node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq); + } + #endif + /* and insert the new node in the heap */ + s->heap[SMALLEST] = node++; + pqdownheap(s, tree, SMALLEST); + + } while (s->heap_len >= 2); + + s->heap[--(s->heap_max)] = s->heap[SMALLEST]; + + /* At this point, the fields freq and dad are set. We can now + * generate the bit lengths. + */ + gen_bitlen(s, (tree_desc *)desc); + + /* The field len is now set, we can generate the bit codes */ + gen_codes ((ct_data *)tree, max_code, s->bl_count); + } + + /* =========================================================================== + * Scan a literal or distance tree to determine the frequencies of the codes + * in the bit length tree. + */ + local void scan_tree (s, tree, max_code) + deflate_state *s; + ct_data *tree; /* the tree to be scanned */ + int max_code; /* and its largest code of non zero frequency */ + { + int n; /* iterates over all tree elements */ + int prevlen = -1; /* last emitted length */ + int curlen; /* length of current code */ + int nextlen = tree[0].Len; /* length of next code */ + int count = 0; /* repeat count of the current code */ + int max_count = 7; /* max repeat count */ + int min_count = 4; /* min repeat count */ + + if (nextlen == 0) max_count = 138, min_count = 3; + tree[max_code+1].Len = (ush)0xffff; /* guard */ + + for (n = 0; n <= max_code; n++) { + curlen = nextlen; nextlen = tree[n+1].Len; + if (++count < max_count && curlen == nextlen) { + continue; + } else if (count < min_count) { + s->bl_tree[curlen].Freq += count; + } else if (curlen != 0) { + if (curlen != prevlen) s->bl_tree[curlen].Freq++; + s->bl_tree[REP_3_6].Freq++; + } else if (count <= 10) { + s->bl_tree[REPZ_3_10].Freq++; + } else { + s->bl_tree[REPZ_11_138].Freq++; + } + count = 0; prevlen = curlen; + if (nextlen == 0) { + max_count = 138, min_count = 3; + } else if (curlen == nextlen) { + max_count = 6, min_count = 3; + } else { + max_count = 7, min_count = 4; + } + } + } + + /* =========================================================================== + * Send a literal or distance tree in compressed form, using the codes in + * bl_tree. + */ + local void send_tree (s, tree, max_code) + deflate_state *s; + ct_data *tree; /* the tree to be scanned */ + int max_code; /* and its largest code of non zero frequency */ + { + int n; /* iterates over all tree elements */ + int prevlen = -1; /* last emitted length */ + int curlen; /* length of current code */ + int nextlen = tree[0].Len; /* length of next code */ + int count = 0; /* repeat count of the current code */ + int max_count = 7; /* max repeat count */ + int min_count = 4; /* min repeat count */ + + /* tree[max_code+1].Len = -1; */ /* guard already set */ + if (nextlen == 0) max_count = 138, min_count = 3; + + for (n = 0; n <= max_code; n++) { + curlen = nextlen; nextlen = tree[n+1].Len; + if (++count < max_count && curlen == nextlen) { + continue; + } else if (count < min_count) { + do { send_code(s, curlen, s->bl_tree); } while (--count != 0); + + } else if (curlen != 0) { + if (curlen != prevlen) { + send_code(s, curlen, s->bl_tree); count--; + } + Assert(count >= 3 && count <= 6, " 3_6?"); + send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2); + + } else if (count <= 10) { + send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3); + + } else { + send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7); + } + count = 0; prevlen = curlen; + if (nextlen == 0) { + max_count = 138, min_count = 3; + } else if (curlen == nextlen) { + max_count = 6, min_count = 3; + } else { + max_count = 7, min_count = 4; + } + } + } + + /* =========================================================================== + * Construct the Huffman tree for the bit lengths and return the index in + * bl_order of the last bit length code to send. + */ + local int build_bl_tree(s) + deflate_state *s; + { + int max_blindex; /* index of last bit length code of non zero freq */ + + /* Determine the bit length frequencies for literal and distance trees */ + scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code); + scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code); + + /* Build the bit length tree: */ + build_tree(s, (tree_desc *)(&(s->bl_desc))); + /* opt_len now includes the length of the tree representations, except + * the lengths of the bit lengths codes and the 5+5+4 bits for the counts. + */ + + /* Determine the number of bit length codes to send. The pkzip format + * requires that at least 4 bit length codes be sent. (appnote.txt says + * 3 but the actual value used is 4.) + */ + for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) { + if (s->bl_tree[bl_order[max_blindex]].Len != 0) break; + } + /* Update opt_len to include the bit length tree and counts */ + s->opt_len += 3*(max_blindex+1) + 5+5+4; + Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", + s->opt_len, s->static_len)); + + return max_blindex; + } + + /* =========================================================================== + * Send the header for a block using dynamic Huffman trees: the counts, the + * lengths of the bit length codes, the literal tree and the distance tree. + * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4. + */ + local void send_all_trees(s, lcodes, dcodes, blcodes) + deflate_state *s; + int lcodes, dcodes, blcodes; /* number of codes for each tree */ + { + int rank; /* index in bl_order */ + + Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes"); + Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES, + "too many codes"); + Tracev((stderr, "\nbl counts: ")); + send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */ + send_bits(s, dcodes-1, 5); + send_bits(s, blcodes-4, 4); /* not -3 as stated in appnote.txt */ + for (rank = 0; rank < blcodes; rank++) { + Tracev((stderr, "\nbl code %2d ", bl_order[rank])); + send_bits(s, s->bl_tree[bl_order[rank]].Len, 3); + } + Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent)); + + send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */ + Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent)); + + send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */ + Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent)); + } + + /* =========================================================================== + * Send a stored block + */ + void _tr_stored_block(s, buf, stored_len, eof) + deflate_state *s; + charf *buf; /* input block */ + ulg stored_len; /* length of input block */ + int eof; /* true if this is the last block for a file */ + { + send_bits(s, (STORED_BLOCK<<1)+eof, 3); /* send block type */ + #ifdef DEBUG + s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; + s->compressed_len += (stored_len + 4) << 3; + #endif + copy_block(s, buf, (unsigned)stored_len, 1); /* with header */ + } + + /* =========================================================================== + * Send one empty static block to give enough lookahead for inflate. + * This takes 10 bits, of which 7 may remain in the bit buffer. + * The current inflate code requires 9 bits of lookahead. If the + * last two codes for the previous block (real code plus EOB) were coded + * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode + * the last real code. In this case we send two empty static blocks instead + * of one. (There are no problems if the previous block is stored or fixed.) + * To simplify the code, we assume the worst case of last real code encoded + * on one bit only. + */ + void _tr_align(s) + deflate_state *s; + { + send_bits(s, STATIC_TREES<<1, 3); + send_code(s, END_BLOCK, static_ltree); + #ifdef DEBUG + s->compressed_len += 10L; /* 3 for block type, 7 for EOB */ + #endif + bi_flush(s); + /* Of the 10 bits for the empty block, we have already sent + * (10 - bi_valid) bits. The lookahead for the last real code (before + * the EOB of the previous block) was thus at least one plus the length + * of the EOB plus what we have just sent of the empty static block. + */ + if (1 + s->last_eob_len + 10 - s->bi_valid < 9) { + send_bits(s, STATIC_TREES<<1, 3); + send_code(s, END_BLOCK, static_ltree); + #ifdef DEBUG + s->compressed_len += 10L; + #endif + bi_flush(s); + } + s->last_eob_len = 7; + } + + /* =========================================================================== + * Determine the best encoding for the current block: dynamic trees, static + * trees or store, and output the encoded block to the zip file. + */ + void _tr_flush_block(s, buf, stored_len, eof) + deflate_state *s; + charf *buf; /* input block, or NULL if too old */ + ulg stored_len; /* length of input block */ + int eof; /* true if this is the last block for a file */ + { + ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ + int max_blindex = 0; /* index of last bit length code of non zero freq */ + + /* Build the Huffman trees unless a stored block is forced */ + if (s->level > 0) { + + /* Check if the file is binary or text */ + if (stored_len > 0 && s->strm->data_type == Z_UNKNOWN) + set_data_type(s); + + /* Construct the literal and distance trees */ + build_tree(s, (tree_desc *)(&(s->l_desc))); + Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len, + s->static_len)); + + build_tree(s, (tree_desc *)(&(s->d_desc))); + Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len, + s->static_len)); + /* At this point, opt_len and static_len are the total bit lengths of + * the compressed block data, excluding the tree representations. + */ + + /* Build the bit length tree for the above two trees, and get the index + * in bl_order of the last bit length code to send. + */ + max_blindex = build_bl_tree(s); + + /* Determine the best encoding. Compute the block lengths in bytes. */ + opt_lenb = (s->opt_len+3+7)>>3; + static_lenb = (s->static_len+3+7)>>3; + + Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", + opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, + s->last_lit)); + + if (static_lenb <= opt_lenb) opt_lenb = static_lenb; + + } else { + Assert(buf != (char*)0, "lost buf"); + opt_lenb = static_lenb = stored_len + 5; /* force a stored block */ + } + + #ifdef FORCE_STORED + if (buf != (char*)0) { /* force stored block */ + #else + if (stored_len+4 <= opt_lenb && buf != (char*)0) { + /* 4: two words for the lengths */ + #endif + /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. + * Otherwise we can't have processed more than WSIZE input bytes since + * the last block flush, because compression would have been + * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to + * transform a block into a stored block. + */ + _tr_stored_block(s, buf, stored_len, eof); + + #ifdef FORCE_STATIC + } else if (static_lenb >= 0) { /* force static trees */ + #else + } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) { + #endif + send_bits(s, (STATIC_TREES<<1)+eof, 3); + compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree); + #ifdef DEBUG + s->compressed_len += 3 + s->static_len; + #endif + } else { + send_bits(s, (DYN_TREES<<1)+eof, 3); + send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1, + max_blindex+1); + compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree); + #ifdef DEBUG + s->compressed_len += 3 + s->opt_len; + #endif + } + Assert (s->compressed_len == s->bits_sent, "bad compressed size"); + /* The above check is made mod 2^32, for files larger than 512 MB + * and uLong implemented on 32 bits. + */ + init_block(s); + + if (eof) { + bi_windup(s); + #ifdef DEBUG + s->compressed_len += 7; /* align on byte boundary */ + #endif + } + Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3, + s->compressed_len-7*eof)); + } + + /* =========================================================================== + * Save the match info and tally the frequency counts. Return true if + * the current block must be flushed. + */ + int _tr_tally (s, dist, lc) + deflate_state *s; + unsigned dist; /* distance of matched string */ + unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ + { + s->d_buf[s->last_lit] = (ush)dist; + s->l_buf[s->last_lit++] = (uch)lc; + if (dist == 0) { + /* lc is the unmatched char */ + s->dyn_ltree[lc].Freq++; + } else { + s->matches++; + /* Here, lc is the match length - MIN_MATCH */ + dist--; /* dist = match distance - 1 */ + Assert((ush)dist < (ush)MAX_DIST(s) && + (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) && + (ush)d_code(dist) < (ush)D_CODES, "_tr_tally: bad match"); + + s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; + s->dyn_dtree[d_code(dist)].Freq++; + } + + #ifdef TRUNCATE_BLOCK + /* Try to guess if it is profitable to stop the current block here */ + if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { + /* Compute an upper bound for the compressed length */ + ulg out_length = (ulg)s->last_lit*8L; + ulg in_length = (ulg)((long)s->strstart - s->block_start); + int dcode; + for (dcode = 0; dcode < D_CODES; dcode++) { + out_length += (ulg)s->dyn_dtree[dcode].Freq * + (5L+extra_dbits[dcode]); + } + out_length >>= 3; + Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", + s->last_lit, in_length, out_length, + 100L - out_length*100L/in_length)); + if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; + } + #endif + return (s->last_lit == s->lit_bufsize-1); + /* We avoid equality with lit_bufsize because of wraparound at 64K + * on 16 bit machines and because stored blocks are restricted to + * 64K-1 bytes. + */ + } + + /* =========================================================================== + * Send the block data compressed using the given Huffman trees + */ + local void compress_block(s, ltree, dtree) + deflate_state *s; + ct_data *ltree; /* literal tree */ + ct_data *dtree; /* distance tree */ + { + unsigned dist; /* distance of matched string */ + int lc; /* match length or unmatched char (if dist == 0) */ + unsigned lx = 0; /* running index in l_buf */ + unsigned code; /* the code to send */ + int extra; /* number of extra bits to send */ + + if (s->last_lit != 0) do { + dist = s->d_buf[lx]; + lc = s->l_buf[lx++]; + if (dist == 0) { + send_code(s, lc, ltree); /* send a literal byte */ + Tracecv(isgraph(lc), (stderr," '%c' ", lc)); + } else { + /* Here, lc is the match length - MIN_MATCH */ + code = _length_code[lc]; + send_code(s, code+LITERALS+1, ltree); /* send the length code */ + extra = extra_lbits[code]; + if (extra != 0) { + lc -= base_length[code]; + send_bits(s, lc, extra); /* send the extra length bits */ + } + dist--; /* dist is now the match distance - 1 */ + code = d_code(dist); + Assert (code < D_CODES, "bad d_code"); + + send_code(s, code, dtree); /* send the distance code */ + extra = extra_dbits[code]; + if (extra != 0) { + dist -= base_dist[code]; + send_bits(s, dist, extra); /* send the extra distance bits */ + } + } /* literal or match pair ? */ + + /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ + Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, + "pendingBuf overflow"); + + } while (lx < s->last_lit); + + send_code(s, END_BLOCK, ltree); + s->last_eob_len = ltree[END_BLOCK].Len; + } + + /* =========================================================================== + * Set the data type to BINARY or TEXT, using a crude approximation: + * set it to Z_TEXT if all symbols are either printable characters (33 to 255) + * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise. + * IN assertion: the fields Freq of dyn_ltree are set. + */ + local void set_data_type(s) + deflate_state *s; + { + int n; + + for (n = 0; n < 9; n++) + if (s->dyn_ltree[n].Freq != 0) + break; + if (n == 9) + for (n = 14; n < 32; n++) + if (s->dyn_ltree[n].Freq != 0) + break; + s->strm->data_type = (n == 32) ? Z_TEXT : Z_BINARY; + } + + /* =========================================================================== + * Reverse the first len bits of a code, using straightforward code (a faster + * method would use a table) + * IN assertion: 1 <= len <= 15 + */ + local unsigned bi_reverse(code, len) + unsigned code; /* the value to invert */ + int len; /* its bit length */ + { + register unsigned res = 0; + do { + res |= code & 1; + code >>= 1, res <<= 1; + } while (--len > 0); + return res >> 1; + } + + /* =========================================================================== + * Flush the bit buffer, keeping at most 7 bits in it. + */ + local void bi_flush(s) + deflate_state *s; + { + if (s->bi_valid == 16) { + put_short(s, s->bi_buf); + s->bi_buf = 0; + s->bi_valid = 0; + } else if (s->bi_valid >= 8) { + put_byte(s, (Byte)s->bi_buf); + s->bi_buf >>= 8; + s->bi_valid -= 8; + } + } + + /* =========================================================================== + * Flush the bit buffer and align the output on a byte boundary + */ + local void bi_windup(s) + deflate_state *s; + { + if (s->bi_valid > 8) { + put_short(s, s->bi_buf); + } else if (s->bi_valid > 0) { + put_byte(s, (Byte)s->bi_buf); + } + s->bi_buf = 0; + s->bi_valid = 0; + #ifdef DEBUG + s->bits_sent = (s->bits_sent+7) & ~7; + #endif + } + + /* =========================================================================== + * Copy a stored block, storing first the length and its + * one's complement if requested. + */ + local void copy_block(s, buf, len, header) + deflate_state *s; + charf *buf; /* the input data */ + unsigned len; /* its length */ + int header; /* true if block header must be written */ + { + bi_windup(s); /* align on byte boundary */ + s->last_eob_len = 8; /* enough lookahead for inflate */ + + if (header) { + put_short(s, (ush)len); + put_short(s, (ush)~len); + #ifdef DEBUG + s->bits_sent += 2*16; + #endif + } + #ifdef DEBUG + s->bits_sent += (ulg)len<<3; + #endif + while (len--) { + put_byte(s, *buf++); + } + } diff -Nrcpad gcc-4.4.4/zlib/trees.h gcc-4.4.5/zlib/trees.h *** gcc-4.4.4/zlib/trees.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/trees.h Mon Sep 12 17:02:07 2005 *************** *** 0 **** --- 1,128 ---- + /* header created automatically with -DGEN_TREES_H */ + + local const ct_data static_ltree[L_CODES+2] = { + {{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}}, + {{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}}, + {{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}}, + {{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}}, + {{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}}, + {{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}}, + {{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}}, + {{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}}, + {{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}}, + {{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}}, + {{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}}, + {{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}}, + {{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}}, + {{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}}, + {{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}}, + {{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}}, + {{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}}, + {{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}}, + {{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}}, + {{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}}, + {{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}}, + {{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}}, + {{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}}, + {{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}}, + {{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}}, + {{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}}, + {{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}}, + {{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}}, + {{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}}, + {{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}}, + {{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}}, + {{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}}, + {{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}}, + {{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}}, + {{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}}, + {{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}}, + {{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}}, + {{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}}, + {{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}}, + {{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}}, + {{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}}, + {{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}}, + {{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}}, + {{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}}, + {{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}}, + {{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}}, + {{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}}, + {{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}}, + {{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}}, + {{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}}, + {{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}}, + {{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}}, + {{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}}, + {{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}}, + {{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}}, + {{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}}, + {{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}}, + {{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}} + }; + + local const ct_data static_dtree[D_CODES] = { + {{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}}, + {{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}}, + {{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}}, + {{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}}, + {{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}}, + {{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} + }; + + const uch _dist_code[DIST_CODE_LEN] = { + 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, + 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17, + 18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, + 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, + 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, + 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, + 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 + }; + + const uch _length_code[MAX_MATCH-MIN_MATCH+1]= { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, + 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, + 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, + 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, + 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, + 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, + 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28 + }; + + local const int base_length[LENGTH_CODES] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, + 64, 80, 96, 112, 128, 160, 192, 224, 0 + }; + + local const int base_dist[D_CODES] = { + 0, 1, 2, 3, 4, 6, 8, 12, 16, 24, + 32, 48, 64, 96, 128, 192, 256, 384, 512, 768, + 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576 + }; + diff -Nrcpad gcc-4.4.4/zlib/uncompr.c gcc-4.4.5/zlib/uncompr.c *** gcc-4.4.4/zlib/uncompr.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/uncompr.c Mon Sep 12 17:02:07 2005 *************** *** 0 **** --- 1,61 ---- + /* uncompr.c -- decompress a memory buffer + * Copyright (C) 1995-2003 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* @(#) $Id: uncompr.c,v 1.1.1.2 2002/03/11 21:53:27 tromey Exp $ */ + + #define ZLIB_INTERNAL + #include "zlib.h" + + /* =========================================================================== + Decompresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be large enough to hold the + entire uncompressed data. (The size of the uncompressed data must have + been saved previously by the compressor and transmitted to the decompressor + by some mechanism outside the scope of this compression library.) + Upon exit, destLen is the actual size of the compressed buffer. + This function can be used to decompress a whole file at once if the + input file is mmap'ed. + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer, or Z_DATA_ERROR if the input data was corrupted. + */ + int ZEXPORT uncompress (dest, destLen, source, sourceLen) + Bytef *dest; + uLongf *destLen; + const Bytef *source; + uLong sourceLen; + { + z_stream stream; + int err; + + stream.next_in = (Bytef*)source; + stream.avail_in = (uInt)sourceLen; + /* Check for source > 64K on 16-bit machine: */ + if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; + + stream.next_out = dest; + stream.avail_out = (uInt)*destLen; + if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; + + stream.zalloc = (alloc_func)0; + stream.zfree = (free_func)0; + + err = inflateInit(&stream); + if (err != Z_OK) return err; + + err = inflate(&stream, Z_FINISH); + if (err != Z_STREAM_END) { + inflateEnd(&stream); + if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) + return Z_DATA_ERROR; + return err; + } + *destLen = stream.total_out; + + err = inflateEnd(&stream); + return err; + } diff -Nrcpad gcc-4.4.4/zlib/win32/DLL_FAQ.txt gcc-4.4.5/zlib/win32/DLL_FAQ.txt *** gcc-4.4.4/zlib/win32/DLL_FAQ.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/win32/DLL_FAQ.txt Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,397 ---- + + Frequently Asked Questions about ZLIB1.DLL + + + This document describes the design, the rationale, and the usage + of the official DLL build of zlib, named ZLIB1.DLL. If you have + general questions about zlib, you should see the file "FAQ" found + in the zlib distribution, or at the following location: + http://www.gzip.org/zlib/zlib_faq.html + + + 1. What is ZLIB1.DLL, and how can I get it? + + - ZLIB1.DLL is the official build of zlib as a DLL. + (Please remark the character '1' in the name.) + + Pointers to a precompiled ZLIB1.DLL can be found in the zlib + web site at: + http://www.zlib.org/ + + Applications that link to ZLIB1.DLL can rely on the following + specification: + + * The exported symbols are exclusively defined in the source + files "zlib.h" and "zlib.def", found in an official zlib + source distribution. + * The symbols are exported by name, not by ordinal. + * The exported names are undecorated. + * The calling convention of functions is "C" (CDECL). + * The ZLIB1.DLL binary is linked to MSVCRT.DLL. + + The archive in which ZLIB1.DLL is bundled contains compiled + test programs that must run with a valid build of ZLIB1.DLL. + It is recommended to download the prebuilt DLL from the zlib + web site, instead of building it yourself, to avoid potential + incompatibilities that could be introduced by your compiler + and build settings. If you do build the DLL yourself, please + make sure that it complies with all the above requirements, + and it runs with the precompiled test programs, bundled with + the original ZLIB1.DLL distribution. + + If, for any reason, you need to build an incompatible DLL, + please use a different file name. + + + 2. Why did you change the name of the DLL to ZLIB1.DLL? + What happened to the old ZLIB.DLL? + + - The old ZLIB.DLL, built from zlib-1.1.4 or earlier, required + compilation settings that were incompatible to those used by + a static build. The DLL settings were supposed to be enabled + by defining the macro ZLIB_DLL, before including "zlib.h". + Incorrect handling of this macro was silently accepted at + build time, resulting in two major problems: + + * ZLIB_DLL was missing from the old makefile. When building + the DLL, not all people added it to the build options. In + consequence, incompatible incarnations of ZLIB.DLL started + to circulate around the net. + + * When switching from using the static library to using the + DLL, applications had to define the ZLIB_DLL macro and + to recompile all the sources that contained calls to zlib + functions. Failure to do so resulted in creating binaries + that were unable to run with the official ZLIB.DLL build. + + The only possible solution that we could foresee was to make + a binary-incompatible change in the DLL interface, in order to + remove the dependency on the ZLIB_DLL macro, and to release + the new DLL under a different name. + + We chose the name ZLIB1.DLL, where '1' indicates the major + zlib version number. We hope that we will not have to break + the binary compatibility again, at least not as long as the + zlib-1.x series will last. + + There is still a ZLIB_DLL macro, that can trigger a more + efficient build and use of the DLL, but compatibility no + longer dependents on it. + + + 3. Can I build ZLIB.DLL from the new zlib sources, and replace + an old ZLIB.DLL, that was built from zlib-1.1.4 or earlier? + + - In principle, you can do it by assigning calling convention + keywords to the macros ZEXPORT and ZEXPORTVA. In practice, + it depends on what you mean by "an old ZLIB.DLL", because the + old DLL exists in several mutually-incompatible versions. + You have to find out first what kind of calling convention is + being used in your particular ZLIB.DLL build, and to use the + same one in the new build. If you don't know what this is all + about, you might be better off if you would just leave the old + DLL intact. + + + 4. Can I compile my application using the new zlib interface, and + link it to an old ZLIB.DLL, that was built from zlib-1.1.4 or + earlier? + + - The official answer is "no"; the real answer depends again on + what kind of ZLIB.DLL you have. Even if you are lucky, this + course of action is unreliable. + + If you rebuild your application and you intend to use a newer + version of zlib (post- 1.1.4), it is strongly recommended to + link it to the new ZLIB1.DLL. + + + 5. Why are the zlib symbols exported by name, and not by ordinal? + + - Although exporting symbols by ordinal is a little faster, it + is risky. Any single glitch in the maintenance or use of the + DEF file that contains the ordinals can result in incompatible + builds and frustrating crashes. Simply put, the benefits of + exporting symbols by ordinal do not justify the risks. + + Technically, it should be possible to maintain ordinals in + the DEF file, and still export the symbols by name. Ordinals + exist in every DLL, and even if the dynamic linking performed + at the DLL startup is searching for names, ordinals serve as + hints, for a faster name lookup. However, if the DEF file + contains ordinals, the Microsoft linker automatically builds + an implib that will cause the executables linked to it to use + those ordinals, and not the names. It is interesting to + notice that the GNU linker for Win32 does not suffer from this + problem. + + It is possible to avoid the DEF file if the exported symbols + are accompanied by a "__declspec(dllexport)" attribute in the + source files. You can do this in zlib by predefining the + ZLIB_DLL macro. + + + 6. I see that the ZLIB1.DLL functions use the "C" (CDECL) calling + convention. Why not use the STDCALL convention? + STDCALL is the standard convention in Win32, and I need it in + my Visual Basic project! + + (For readability, we use CDECL to refer to the convention + triggered by the "__cdecl" keyword, STDCALL to refer to + the convention triggered by "__stdcall", and FASTCALL to + refer to the convention triggered by "__fastcall".) + + - Most of the native Windows API functions (without varargs) use + indeed the WINAPI convention (which translates to STDCALL in + Win32), but the standard C functions use CDECL. If a user + application is intrinsically tied to the Windows API (e.g. + it calls native Windows API functions such as CreateFile()), + sometimes it makes sense to decorate its own functions with + WINAPI. But if ANSI C or POSIX portability is a goal (e.g. + it calls standard C functions such as fopen()), it is not a + sound decision to request the inclusion of , or to + use non-ANSI constructs, for the sole purpose to make the user + functions STDCALL-able. + + The functionality offered by zlib is not in the category of + "Windows functionality", but is more like "C functionality". + + Technically, STDCALL is not bad; in fact, it is slightly + faster than CDECL, and it works with variable-argument + functions, just like CDECL. It is unfortunate that, in spite + of using STDCALL in the Windows API, it is not the default + convention used by the C compilers that run under Windows. + The roots of the problem reside deep inside the unsafety of + the K&R-style function prototypes, where the argument types + are not specified; but that is another story for another day. + + The remaining fact is that CDECL is the default convention. + Even if an explicit convention is hard-coded into the function + prototypes inside C headers, problems may appear. The + necessity to expose the convention in users' callbacks is one + of these problems. + + The calling convention issues are also important when using + zlib in other programming languages. Some of them, like Ada + (GNAT) and Fortran (GNU G77), have C bindings implemented + initially on Unix, and relying on the C calling convention. + On the other hand, the pre- .NET versions of Microsoft Visual + Basic require STDCALL, while Borland Delphi prefers, although + it does not require, FASTCALL. + + In fairness to all possible uses of zlib outside the C + programming language, we choose the default "C" convention. + Anyone interested in different bindings or conventions is + encouraged to maintain specialized projects. The "contrib/" + directory from the zlib distribution already holds a couple + of foreign bindings, such as Ada, C++, and Delphi. + + + 7. I need a DLL for my Visual Basic project. What can I do? + + - Define the ZLIB_WINAPI macro before including "zlib.h", when + building both the DLL and the user application (except that + you don't need to define anything when using the DLL in Visual + Basic). The ZLIB_WINAPI macro will switch on the WINAPI + (STDCALL) convention. The name of this DLL must be different + than the official ZLIB1.DLL. + + Gilles Vollant has contributed a build named ZLIBWAPI.DLL, + with the ZLIB_WINAPI macro turned on, and with the minizip + functionality built in. For more information, please read + the notes inside "contrib/vstudio/readme.txt", found in the + zlib distribution. + + + 8. I need to use zlib in my Microsoft .NET project. What can I + do? + + - Henrik Ravn has contributed a .NET wrapper around zlib. Look + into contrib/dotzlib/, inside the zlib distribution. + + + 9. If my application uses ZLIB1.DLL, should I link it to + MSVCRT.DLL? Why? + + - It is not required, but it is recommended to link your + application to MSVCRT.DLL, if it uses ZLIB1.DLL. + + The executables (.EXE, .DLL, etc.) that are involved in the + same process and are using the C run-time library (i.e. they + are calling standard C functions), must link to the same + library. There are several libraries in the Win32 system: + CRTDLL.DLL, MSVCRT.DLL, the static C libraries, etc. + Since ZLIB1.DLL is linked to MSVCRT.DLL, the executables that + depend on it should also be linked to MSVCRT.DLL. + + + 10. Why are you saying that ZLIB1.DLL and my application should + be linked to the same C run-time (CRT) library? I linked my + application and my DLLs to different C libraries (e.g. my + application to a static library, and my DLLs to MSVCRT.DLL), + and everything works fine. + + - If a user library invokes only pure Win32 API (accessible via + and the related headers), its DLL build will work + in any context. But if this library invokes standard C API, + things get more complicated. + + There is a single Win32 library in a Win32 system. Every + function in this library resides in a single DLL module, that + is safe to call from anywhere. On the other hand, there are + multiple versions of the C library, and each of them has its + own separate internal state. Standalone executables and user + DLLs that call standard C functions must link to a C run-time + (CRT) library, be it static or shared (DLL). Intermixing + occurs when an executable (not necessarily standalone) and a + DLL are linked to different CRTs, and both are running in the + same process. + + Intermixing multiple CRTs is possible, as long as their + internal states are kept intact. The Microsoft Knowledge Base + articles KB94248 "HOWTO: Use the C Run-Time" and KB140584 + "HOWTO: Link with the Correct C Run-Time (CRT) Library" + mention the potential problems raised by intermixing. + + If intermixing works for you, it's because your application + and DLLs are avoiding the corruption of each of the CRTs' + internal states, maybe by careful design, or maybe by fortune. + + Also note that linking ZLIB1.DLL to non-Microsoft CRTs, such + as those provided by Borland, raises similar problems. + + + 11. Why are you linking ZLIB1.DLL to MSVCRT.DLL? + + - MSVCRT.DLL exists on every Windows 95 with a new service pack + installed, or with Microsoft Internet Explorer 4 or later, and + on all other Windows 4.x or later (Windows 98, Windows NT 4, + or later). It is freely distributable; if not present in the + system, it can be downloaded from Microsoft or from other + software provider for free. + + The fact that MSVCRT.DLL does not exist on a virgin Windows 95 + is not so problematic. Windows 95 is scarcely found nowadays, + Microsoft ended its support a long time ago, and many recent + applications from various vendors, including Microsoft, do not + even run on it. Furthermore, no serious user should run + Windows 95 without a proper update installed. + + + 12. Why are you not linking ZLIB1.DLL to + <> ? + + - We considered and abandoned the following alternatives: + + * Linking ZLIB1.DLL to a static C library (LIBC.LIB, or + LIBCMT.LIB) is not a good option. People are using the DLL + mainly to save disk space. If you are linking your program + to a static C library, you may as well consider linking zlib + in statically, too. + + * Linking ZLIB1.DLL to CRTDLL.DLL looks appealing, because + CRTDLL.DLL is present on every Win32 installation. + Unfortunately, it has a series of problems: it does not + work properly with Microsoft's C++ libraries, it does not + provide support for 64-bit file offsets, (and so on...), + and Microsoft discontinued its support a long time ago. + + * Linking ZLIB1.DLL to MSVCR70.DLL or MSVCR71.DLL, supplied + with the Microsoft .NET platform, and Visual C++ 7.0/7.1, + raises problems related to the status of ZLIB1.DLL as a + system component. According to the Microsoft Knowledge Base + article KB326922 "INFO: Redistribution of the Shared C + Runtime Component in Visual C++ .NET", MSVCR70.DLL and + MSVCR71.DLL are not supposed to function as system DLLs, + because they may clash with MSVCRT.DLL. Instead, the + application's installer is supposed to put these DLLs + (if needed) in the application's private directory. + If ZLIB1.DLL depends on a non-system runtime, it cannot + function as a redistributable system component. + + * Linking ZLIB1.DLL to non-Microsoft runtimes, such as + Borland's, or Cygwin's, raises problems related to the + reliable presence of these runtimes on Win32 systems. + It's easier to let the DLL build of zlib up to the people + who distribute these runtimes, and who may proceed as + explained in the answer to Question 14. + + + 13. If ZLIB1.DLL cannot be linked to MSVCR70.DLL or MSVCR71.DLL, + how can I build/use ZLIB1.DLL in Microsoft Visual C++ 7.0 + (Visual Studio .NET) or newer? + + - Due to the problems explained in the Microsoft Knowledge Base + article KB326922 (see the previous answer), the C runtime that + comes with the VC7 environment is no longer considered a + system component. That is, it should not be assumed that this + runtime exists, or may be installed in a system directory. + Since ZLIB1.DLL is supposed to be a system component, it may + not depend on a non-system component. + + In order to link ZLIB1.DLL and your application to MSVCRT.DLL + in VC7, you need the library of Visual C++ 6.0 or older. If + you don't have this library at hand, it's probably best not to + use ZLIB1.DLL. + + We are hoping that, in the future, Microsoft will provide a + way to build applications linked to a proper system runtime, + from the Visual C++ environment. Until then, you have a + couple of alternatives, such as linking zlib in statically. + If your application requires dynamic linking, you may proceed + as explained in the answer to Question 14. + + + 14. I need to link my own DLL build to a CRT different than + MSVCRT.DLL. What can I do? + + - Feel free to rebuild the DLL from the zlib sources, and link + it the way you want. You should, however, clearly state that + your build is unofficial. You should give it a different file + name, and/or install it in a private directory that can be + accessed by your application only, and is not visible to the + others (e.g. it's not in the SYSTEM or the SYSTEM32 directory, + and it's not in the PATH). Otherwise, your build may clash + with applications that link to the official build. + + For example, in Cygwin, zlib is linked to the Cygwin runtime + CYGWIN1.DLL, and it is distributed under the name CYGZ.DLL. + + + 15. May I include additional pieces of code that I find useful, + link them in ZLIB1.DLL, and export them? + + - No. A legitimate build of ZLIB1.DLL must not include code + that does not originate from the official zlib source code. + But you can make your own private DLL build, under a different + file name, as suggested in the previous answer. + + For example, zlib is a part of the VCL library, distributed + with Borland Delphi and C++ Builder. The DLL build of VCL + is a redistributable file, named VCLxx.DLL. + + + 16. May I remove some functionality out of ZLIB1.DLL, by enabling + macros like NO_GZCOMPRESS or NO_GZIP at compile time? + + - No. A legitimate build of ZLIB1.DLL must provide the complete + zlib functionality, as implemented in the official zlib source + code. But you can make your own private DLL build, under a + different file name, as suggested in the previous answer. + + + 17. I made my own ZLIB1.DLL build. Can I test it for compliance? + + - We prefer that you download the official DLL from the zlib + web site. If you need something peculiar from this DLL, you + can send your suggestion to the zlib mailing list. + + However, in case you do rebuild the DLL yourself, you can run + it with the test programs found in the DLL distribution. + Running these test programs is not a guarantee of compliance, + but a failure can imply a detected problem. + + ** + + This document is written and maintained by + Cosmin Truta diff -Nrcpad gcc-4.4.4/zlib/win32/Makefile.bor gcc-4.4.5/zlib/win32/Makefile.bor *** gcc-4.4.4/zlib/win32/Makefile.bor Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/win32/Makefile.bor Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,107 ---- + # Makefile for zlib + # Borland C++ for Win32 + # + # Updated for zlib 1.2.x by Cosmin Truta, 11-Mar-2003 + # Last updated: 28-Aug-2003 + # + # Usage: + # make -f win32/Makefile.bor + # make -f win32/Makefile.bor LOCAL_ZLIB=-DASMV OBJA=match.obj OBJPA=+match.obj + + # ------------ Borland C++ ------------ + + # Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7) + # should be added to the environment via "set LOCAL_ZLIB=-DFOO" or + # added to the declaration of LOC here: + LOC = $(LOCAL_ZLIB) + + CC = bcc32 + AS = bcc32 + LD = bcc32 + AR = tlib + CFLAGS = -a -d -k- -O2 $(LOC) + ASFLAGS = $(LOC) + LDFLAGS = $(LOC) + + + # variables + ZLIB_LIB = zlib.lib + + OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj + OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj + #OBJA = + OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj + OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj + #OBJPA= + + + # targets + all: $(ZLIB_LIB) example.exe minigzip.exe + + .c.obj: + $(CC) -c $(CFLAGS) $< + + .asm.obj: + $(AS) -c $(ASFLAGS) $< + + adler32.obj: adler32.c zlib.h zconf.h + + compress.obj: compress.c zlib.h zconf.h + + crc32.obj: crc32.c zlib.h zconf.h crc32.h + + deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h + + gzio.obj: gzio.c zutil.h zlib.h zconf.h + + infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + + inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h + + inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + + inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h + + trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h + + uncompr.obj: uncompr.c zlib.h zconf.h + + zutil.obj: zutil.c zutil.h zlib.h zconf.h + + example.obj: example.c zlib.h zconf.h + + minigzip.obj: minigzip.c zlib.h zconf.h + + + # For the sake of the old Borland make, + # the command line is cut to fit in the MS-DOS 128 byte limit: + $(ZLIB_LIB): $(OBJ1) $(OBJ2) $(OBJA) + -del $(ZLIB_LIB) + $(AR) $(ZLIB_LIB) $(OBJP1) + $(AR) $(ZLIB_LIB) $(OBJP2) + $(AR) $(ZLIB_LIB) $(OBJPA) + + + # testing + test: example.exe minigzip.exe + example + echo hello world | minigzip | minigzip -d + + example.exe: example.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) example.obj $(ZLIB_LIB) + + minigzip.exe: minigzip.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB) + + + # cleanup + clean: + -del *.obj + -del *.lib + -del *.exe + -del *.tds + -del zlib.bak + -del foo.gz diff -Nrcpad gcc-4.4.4/zlib/win32/Makefile.emx gcc-4.4.5/zlib/win32/Makefile.emx *** gcc-4.4.4/zlib/win32/Makefile.emx Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/win32/Makefile.emx Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,69 ---- + # Makefile for zlib. Modified for emx/rsxnt by Chr. Spieler, 6/16/98. + # Copyright (C) 1995-1998 Jean-loup Gailly. + # For conditions of distribution and use, see copyright notice in zlib.h + + # To compile, or to compile and test, type: + # + # make -fmakefile.emx; make test -fmakefile.emx + # + + CC=gcc -Zwin32 + + #CFLAGS=-MMD -O + #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 + #CFLAGS=-MMD -g -DDEBUG + CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ + -Wstrict-prototypes -Wmissing-prototypes + + # If cp.exe is available, replace "copy /Y" with "cp -fp" . + CP=copy /Y + # If gnu install.exe is available, replace $(CP) with ginstall. + INSTALL=$(CP) + # The default value of RM is "rm -f." If "rm.exe" is found, comment out: + RM=del + LDLIBS=-L. -lzlib + LD=$(CC) -s -o + LDSHARED=$(CC) + + INCL=zlib.h zconf.h + LIBS=zlib.a + + AR=ar rcs + + prefix=/usr/local + exec_prefix = $(prefix) + + OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ + zutil.o inflate.o infback.o inftrees.o inffast.o + + TEST_OBJS = example.o minigzip.o + + all: example.exe minigzip.exe + + test: all + ./example + echo hello world | .\minigzip | .\minigzip -d + + %.o : %.c + $(CC) $(CFLAGS) -c $< -o $@ + + zlib.a: $(OBJS) + $(AR) $@ $(OBJS) + + %.exe : %.o $(LIBS) + $(LD) $@ $< $(LDLIBS) + + + .PHONY : clean + + clean: + $(RM) *.d + $(RM) *.o + $(RM) *.exe + $(RM) zlib.a + $(RM) foo.gz + + DEPS := $(wildcard *.d) + ifneq ($(DEPS),) + include $(DEPS) + endif diff -Nrcpad gcc-4.4.4/zlib/win32/Makefile.gcc gcc-4.4.5/zlib/win32/Makefile.gcc *** gcc-4.4.4/zlib/win32/Makefile.gcc Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/win32/Makefile.gcc Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,141 ---- + # Makefile for zlib, derived from Makefile.dj2. + # Modified for mingw32 by C. Spieler, 6/16/98. + # Updated for zlib 1.2.x by Christian Spieler and Cosmin Truta, Mar-2003. + # Last updated: 1-Aug-2003. + # Tested under Cygwin and MinGW. + + # Copyright (C) 1995-2003 Jean-loup Gailly. + # For conditions of distribution and use, see copyright notice in zlib.h + + # To compile, or to compile and test, type: + # + # make -fmakefile.gcc; make test testdll -fmakefile.gcc + # + # To use the asm code, type: + # cp contrib/asm?86/match.S ./match.S + # make LOC=-DASMV OBJA=match.o -fmakefile.gcc + # + # To install libz.a, zconf.h and zlib.h in the system directories, type: + # + # make install -fmakefile.gcc + + # Note: + # If the platform is *not* MinGW (e.g. it is Cygwin or UWIN), + # the DLL name should be changed from "zlib1.dll". + + STATICLIB = libz.a + SHAREDLIB = zlib1.dll + IMPLIB = libzdll.a + + #LOC = -DASMV + #LOC = -DDEBUG -g + + CC = gcc + CFLAGS = $(LOC) -O3 -Wall + + AS = $(CC) + ASFLAGS = $(LOC) -Wall + + LD = $(CC) + LDFLAGS = $(LOC) -s + + AR = ar + ARFLAGS = rcs + + RC = windres + RCFLAGS = --define GCC_WINDRES + + CP = cp -fp + # If GNU install is available, replace $(CP) with install. + INSTALL = $(CP) + RM = rm -f + + prefix = /usr/local + exec_prefix = $(prefix) + + OBJS = adler32.o compress.o crc32.o deflate.o gzio.o infback.o \ + inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o + OBJA = + + all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example minigzip example_d minigzip_d + + test: example minigzip + ./example + echo hello world | ./minigzip | ./minigzip -d + + testdll: example_d minigzip_d + ./example_d + echo hello world | ./minigzip_d | ./minigzip_d -d + + .c.o: + $(CC) $(CFLAGS) -c -o $@ $< + + .S.o: + $(AS) $(ASFLAGS) -c -o $@ $< + + $(STATICLIB): $(OBJS) $(OBJA) + $(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA) + + $(IMPLIB): $(SHAREDLIB) + + $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o + dllwrap --driver-name $(CC) --def win32/zlib.def \ + --implib $(IMPLIB) -o $@ $(OBJS) $(OBJA) zlibrc.o + strip $@ + + example: example.o $(STATICLIB) + $(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB) + + minigzip: minigzip.o $(STATICLIB) + $(LD) $(LDFLAGS) -o $@ minigzip.o $(STATICLIB) + + example_d: example.o $(IMPLIB) + $(LD) $(LDFLAGS) -o $@ example.o $(IMPLIB) + + minigzip_d: minigzip.o $(IMPLIB) + $(LD) $(LDFLAGS) -o $@ minigzip.o $(IMPLIB) + + zlibrc.o: win32/zlib1.rc + $(RC) $(RCFLAGS) -o $@ win32/zlib1.rc + + + # INCLUDE_PATH and LIBRARY_PATH must be set. + + .PHONY: install uninstall clean + + install: zlib.h zconf.h $(LIB) + -@if not exist $(INCLUDE_PATH)/nul mkdir $(INCLUDE_PATH) + -@if not exist $(LIBRARY_PATH)/nul mkdir $(LIBRARY_PATH) + -$(INSTALL) zlib.h $(INCLUDE_PATH) + -$(INSTALL) zconf.h $(INCLUDE_PATH) + -$(INSTALL) $(STATICLIB) $(LIBRARY_PATH) + -$(INSTALL) $(IMPLIB) $(LIBRARY_PATH) + + uninstall: + -$(RM) $(INCLUDE_PATH)/zlib.h + -$(RM) $(INCLUDE_PATH)/zconf.h + -$(RM) $(LIBRARY_PATH)/$(STATICLIB) + -$(RM) $(LIBRARY_PATH)/$(IMPLIB) + + clean: + -$(RM) $(STATICLIB) + -$(RM) $(SHAREDLIB) + -$(RM) $(IMPLIB) + -$(RM) *.o + -$(RM) *.exe + -$(RM) foo.gz + + adler32.o: zlib.h zconf.h + compress.o: zlib.h zconf.h + crc32.o: crc32.h zlib.h zconf.h + deflate.o: deflate.h zutil.h zlib.h zconf.h + example.o: zlib.h zconf.h + gzio.o: zutil.h zlib.h zconf.h + inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h + inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h + infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h + inftrees.o: zutil.h zlib.h zconf.h inftrees.h + minigzip.o: zlib.h zconf.h + trees.o: deflate.h zutil.h zlib.h zconf.h trees.h + uncompr.o: zlib.h zconf.h + zutil.o: zutil.h zlib.h zconf.h diff -Nrcpad gcc-4.4.4/zlib/win32/Makefile.msc gcc-4.4.5/zlib/win32/Makefile.msc *** gcc-4.4.4/zlib/win32/Makefile.msc Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/win32/Makefile.msc Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,126 ---- + # Makefile for zlib -- Microsoft (Visual) C + # + # Authors: + # Cosmin Truta, 11-Mar-2003 + # Christian Spieler, 19-Mar-2003 + # + # Last updated: + # Cosmin Truta, 27-Aug-2003 + # + # Usage: + # nmake -f win32/Makefile.msc (standard build) + # nmake -f win32/Makefile.msc LOC=-DFOO (nonstandard build) + # nmake -f win32/Makefile.msc LOC=-DASMV OBJA=match.obj (use ASM code) + + + # optional build flags + LOC = + + + # variables + STATICLIB = zlib.lib + SHAREDLIB = zlib1.dll + IMPLIB = zdll.lib + + CC = cl + AS = ml + LD = link + AR = lib + RC = rc + CFLAGS = -nologo -MD -O2 $(LOC) + ASFLAGS = -coff + LDFLAGS = -nologo -release + ARFLAGS = -nologo + RCFLAGS = /dWIN32 /r + + OBJS = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj \ + inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj + OBJA = + + + # targets + all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) \ + example.exe minigzip.exe example_d.exe minigzip_d.exe + + $(STATICLIB): $(OBJS) $(OBJA) + $(AR) $(ARFLAGS) -out:$@ $(OBJS) $(OBJA) + + $(IMPLIB): $(SHAREDLIB) + + $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlib1.res + $(LD) $(LDFLAGS) -def:win32/zlib.def -dll -implib:$(IMPLIB) \ + -out:$@ $(OBJS) $(OBJA) zlib1.res + + example.exe: example.obj $(STATICLIB) + $(LD) $(LDFLAGS) example.obj $(STATICLIB) + + minigzip.exe: minigzip.obj $(STATICLIB) + $(LD) $(LDFLAGS) minigzip.obj $(STATICLIB) + + example_d.exe: example.obj $(IMPLIB) + $(LD) $(LDFLAGS) -out:$@ example.obj $(IMPLIB) + + minigzip_d.exe: minigzip.obj $(IMPLIB) + $(LD) $(LDFLAGS) -out:$@ minigzip.obj $(IMPLIB) + + .c.obj: + $(CC) -c $(CFLAGS) $< + + .asm.obj: + $(AS) -c $(ASFLAGS) $< + + adler32.obj: adler32.c zlib.h zconf.h + + compress.obj: compress.c zlib.h zconf.h + + crc32.obj: crc32.c zlib.h zconf.h crc32.h + + deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h + + gzio.obj: gzio.c zutil.h zlib.h zconf.h + + infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + + inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h + + inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + + inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h + + trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h + + uncompr.obj: uncompr.c zlib.h zconf.h + + zutil.obj: zutil.c zutil.h zlib.h zconf.h + + example.obj: example.c zlib.h zconf.h + + minigzip.obj: minigzip.c zlib.h zconf.h + + zlib1.res: win32/zlib1.rc + $(RC) $(RCFLAGS) /fo$@ win32/zlib1.rc + + + # testing + test: example.exe minigzip.exe + example + echo hello world | minigzip | minigzip -d + + testdll: example_d.exe minigzip_d.exe + example_d + echo hello world | minigzip_d | minigzip_d -d + + + # cleanup + clean: + -del $(STATICLIB) + -del $(SHAREDLIB) + -del $(IMPLIB) + -del *.obj + -del *.res + -del *.exp + -del *.exe + -del foo.gz diff -Nrcpad gcc-4.4.4/zlib/win32/VisualC.txt gcc-4.4.5/zlib/win32/VisualC.txt *** gcc-4.4.4/zlib/win32/VisualC.txt Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/win32/VisualC.txt Mon Sep 12 17:03:48 2005 *************** *** 0 **** --- 1,3 ---- + + To build zlib using the Microsoft Visual C++ environment, + use the appropriate project from the projects/ directory. diff -Nrcpad gcc-4.4.4/zlib/win32/zlib.def gcc-4.4.5/zlib/win32/zlib.def *** gcc-4.4.4/zlib/win32/zlib.def Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/win32/zlib.def Mon Oct 11 17:44:11 2004 *************** *** 0 **** --- 1,60 ---- + LIBRARY + ; zlib data compression library + + EXPORTS + ; basic functions + zlibVersion + deflate + deflateEnd + inflate + inflateEnd + ; advanced functions + deflateSetDictionary + deflateCopy + deflateReset + deflateParams + deflateBound + deflatePrime + inflateSetDictionary + inflateSync + inflateCopy + inflateReset + inflateBack + inflateBackEnd + zlibCompileFlags + ; utility functions + compress + compress2 + compressBound + uncompress + gzopen + gzdopen + gzsetparams + gzread + gzwrite + gzprintf + gzputs + gzgets + gzputc + gzgetc + gzungetc + gzflush + gzseek + gzrewind + gztell + gzeof + gzclose + gzerror + gzclearerr + ; checksum functions + adler32 + crc32 + ; various hacks, don't look :) + deflateInit_ + deflateInit2_ + inflateInit_ + inflateInit2_ + inflateBackInit_ + inflateSyncPoint + get_crc_table + zError diff -Nrcpad gcc-4.4.4/zlib/win32/zlib1.rc gcc-4.4.5/zlib/win32/zlib1.rc *** gcc-4.4.4/zlib/win32/zlib1.rc Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/win32/zlib1.rc Mon Sep 12 17:04:02 2005 *************** *** 0 **** --- 1,39 ---- + #include + + #ifdef GCC_WINDRES + VS_VERSION_INFO VERSIONINFO + #else + VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE + #endif + FILEVERSION 1,2,2,0 + PRODUCTVERSION 1,2,2,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + #ifdef _DEBUG + FILEFLAGS 1 + #else + FILEFLAGS 0 + #endif + FILEOS VOS_DOS_WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0 // not used + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + //language ID = U.S. English, char set = Windows, Multilingual + BEGIN + VALUE "FileDescription", "zlib data compression library\0" + VALUE "FileVersion", "1.2.3\0" + VALUE "InternalName", "zlib1.dll\0" + VALUE "LegalCopyright", "(C) 1995-2004 Jean-loup Gailly & Mark Adler\0" + VALUE "OriginalFilename", "zlib1.dll\0" + VALUE "ProductName", "zlib\0" + VALUE "ProductVersion", "1.2.3\0" + VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1252 + END + END diff -Nrcpad gcc-4.4.4/zlib/zconf.h gcc-4.4.5/zlib/zconf.h *** gcc-4.4.4/zlib/zconf.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/zconf.h Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,348 ---- + /* zconf.h -- configuration of the zlib compression library + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* @(#) $Id: zconf.h,v 1.1.1.2 2002/03/11 21:53:27 tromey Exp $ */ + + #ifndef ZCONF_H + #define ZCONF_H + + /* + * If you *really* need a unique prefix for all types and library functions, + * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. + */ + #ifdef Z_PREFIX + # define deflateInit_ z_deflateInit_ + # define deflate z_deflate + # define deflateEnd z_deflateEnd + # define inflateInit_ z_inflateInit_ + # define inflate z_inflate + # define inflateEnd z_inflateEnd + # define deflateInit2_ z_deflateInit2_ + # define deflateSetDictionary z_deflateSetDictionary + # define deflateCopy z_deflateCopy + # define deflateReset z_deflateReset + # define deflateParams z_deflateParams + # define deflateBound z_deflateBound + # define deflatePrime z_deflatePrime + # define inflateInit2_ z_inflateInit2_ + # define inflateSetDictionary z_inflateSetDictionary + # define inflateSync z_inflateSync + # define inflateSyncPoint z_inflateSyncPoint + # define inflateCopy z_inflateCopy + # define inflateReset z_inflateReset + # define inflateBack z_inflateBack + # define inflateBackEnd z_inflateBackEnd + # define compress z_compress + # define compress2 z_compress2 + # define compressBound z_compressBound + # define uncompress z_uncompress + # define adler32 z_adler32 + # define crc32 z_crc32 + # define get_crc_table z_get_crc_table + # define zError z_zError + + # define alloc_func z_alloc_func + # define free_func z_free_func + # define in_func z_in_func + # define out_func z_out_func + # define Byte z_Byte + # define uInt z_uInt + # define uLong z_uLong + # define Bytef z_Bytef + # define charf z_charf + # define intf z_intf + # define uIntf z_uIntf + # define uLongf z_uLongf + # define voidpf z_voidpf + # define voidp z_voidp + #endif + + #if defined(__MSDOS__) && !defined(MSDOS) + # define MSDOS + #endif + #if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) + # define OS2 + #endif + #if defined(_WINDOWS) && !defined(WINDOWS) + # define WINDOWS + #endif + #if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) + # ifndef WIN32 + # define WIN32 + # endif + #endif + #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) + # if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) + # ifndef SYS16BIT + # define SYS16BIT + # endif + # endif + #endif + + /* + * Compile with -DMAXSEG_64K if the alloc function cannot allocate more + * than 64k bytes at a time (needed on systems with 16-bit int). + */ + #ifdef SYS16BIT + # define MAXSEG_64K + #endif + #ifdef MSDOS + # define UNALIGNED_OK + #endif + + #ifdef __STDC_VERSION__ + # ifndef STDC + # define STDC + # endif + # if __STDC_VERSION__ >= 199901L + # ifndef STDC99 + # define STDC99 + # endif + # endif + #endif + #if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) + # define STDC + #endif + #if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) + # define STDC + #endif + #if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) + # define STDC + #endif + #if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) + # define STDC + #endif + + #if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ + # define STDC + #endif + + #ifndef STDC + # ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ + # define const /* note: need a more gentle solution here */ + # endif + #endif + + /* Some Mac compilers merge all .h files incorrectly: */ + #if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) + # define NO_DUMMY_DECL + #endif + + /* Maximum value for memLevel in deflateInit2 */ + #ifndef MAX_MEM_LEVEL + # ifdef MAXSEG_64K + # define MAX_MEM_LEVEL 8 + # else + # define MAX_MEM_LEVEL 9 + # endif + #endif + + /* Maximum value for windowBits in deflateInit2 and inflateInit2. + * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files + * created by gzip. (Files created by minigzip can still be extracted by + * gzip.) + */ + #ifndef MAX_WBITS + # define MAX_WBITS 15 /* 32K LZ77 window */ + #endif + + /* The memory requirements for deflate are (in bytes): + (1 << (windowBits+2)) + (1 << (memLevel+9)) + that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) + plus a few kilobytes for small objects. For example, if you want to reduce + the default memory requirements from 256K to 128K, compile with + make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" + Of course this will generally degrade compression (there's no free lunch). + + The memory requirements for inflate are (in bytes) 1 << windowBits + that is, 32K for windowBits=15 (default value) plus a few kilobytes + for small objects. + */ + + /* Type declarations */ + + #ifndef OF /* function prototypes */ + # ifdef STDC + # define OF(args) args + # else + # define OF(args) () + # endif + #endif + + /* The following definitions for FAR are needed only for MSDOS mixed + * model programming (small or medium model with some far allocations). + * This was tested only with MSC; for other MSDOS compilers you may have + * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, + * just define FAR to be empty. + */ + #ifdef SYS16BIT + # if defined(M_I86SM) || defined(M_I86MM) + /* MSC small or medium model */ + # define SMALL_MEDIUM + # ifdef _MSC_VER + # define FAR _far + # else + # define FAR far + # endif + # endif + # if (defined(__SMALL__) || defined(__MEDIUM__)) + /* Turbo C small or medium model */ + # define SMALL_MEDIUM + # ifdef __BORLANDC__ + # define FAR _far + # else + # define FAR far + # endif + # endif + #endif + + #if defined(WINDOWS) || defined(WIN32) + /* If building or using zlib as a DLL, define ZLIB_DLL. + * This is not mandatory, but it offers a little performance increase. + */ + # ifdef ZLIB_DLL + # if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) + # ifdef ZLIB_INTERNAL + # define ZEXTERN extern __declspec(dllexport) + # else + # define ZEXTERN extern __declspec(dllimport) + # endif + # endif + # endif /* ZLIB_DLL */ + /* If building or using zlib with the WINAPI/WINAPIV calling convention, + * define ZLIB_WINAPI. + * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. + */ + # ifdef ZLIB_WINAPI + # ifdef FAR + # undef FAR + # endif + # include + /* No need for _export, use ZLIB.DEF instead. */ + /* For complete Windows compatibility, use WINAPI, not __stdcall. */ + # define ZEXPORT WINAPI + # ifdef WIN32 + # define ZEXPORTVA WINAPIV + # else + # define ZEXPORTVA FAR CDECL + # endif + # endif + #endif + + #if defined (__BEOS__) + # ifdef ZLIB_DLL + # ifdef ZLIB_INTERNAL + # define ZEXPORT __declspec(dllexport) + # define ZEXPORTVA __declspec(dllexport) + # else + # define ZEXPORT __declspec(dllimport) + # define ZEXPORTVA __declspec(dllimport) + # endif + # endif + #endif + + #ifndef ZEXTERN + # define ZEXTERN extern + #endif + #ifndef ZEXPORT + # define ZEXPORT + #endif + #ifndef ZEXPORTVA + # define ZEXPORTVA + #endif + + #ifndef FAR + # define FAR + #endif + + #if !defined(__MACTYPES__) + typedef unsigned char Byte; /* 8 bits */ + #endif + typedef unsigned int uInt; /* 16 bits or more */ + typedef unsigned long uLong; /* 32 bits or more */ + + #ifdef SMALL_MEDIUM + /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ + # define Bytef Byte FAR + #else + typedef Byte FAR Bytef; + #endif + typedef char FAR charf; + typedef int FAR intf; + typedef uInt FAR uIntf; + typedef uLong FAR uLongf; + + #ifdef STDC + typedef void const *voidpc; + typedef void FAR *voidpf; + typedef void *voidp; + #else + typedef Byte const *voidpc; + typedef Byte FAR *voidpf; + typedef Byte *voidp; + #endif + + #if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ + # include /* for off_t */ + # include /* for SEEK_* and off_t */ + # ifdef VMS + # include /* for off_t */ + # endif + # define z_off_t off_t + #endif + #ifndef SEEK_SET + # define SEEK_SET 0 /* Seek from beginning of file. */ + # define SEEK_CUR 1 /* Seek from current position. */ + # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ + #endif + #ifndef z_off_t + # define z_off_t long + #endif + + #if defined(__OS400__) + # define NO_vsnprintf + #endif + + #if defined(__MVS__) + # define NO_vsnprintf + # ifdef FAR + # undef FAR + # endif + #endif + + /* MVS linker does not support external names larger than 8 bytes */ + #if defined(__MVS__) + # pragma map(deflateInit_,"DEIN") + # pragma map(deflateInit2_,"DEIN2") + # pragma map(deflateEnd,"DEEND") + # pragma map(deflateBound,"DEBND") + # pragma map(inflateInit_,"ININ") + # pragma map(inflateInit2_,"ININ2") + # pragma map(inflateEnd,"INEND") + # pragma map(inflateSync,"INSY") + # pragma map(inflateSetDictionary,"INSEDI") + # pragma map(compressBound,"CMBND") + # pragma map(inflate_table,"INTABL") + # pragma map(inflate_fast,"INFA") + # pragma map(inflate_copyright,"INCOPY") + #endif + + /* Solaris 2.5.1 doesn't have vsnprintf */ + #if defined(__sun) && defined(__svr4__) + #include + #if _XOPEN_VERSION < 3 + #define NO_vsnprintf + #endif + #endif + + /* Tru64 UNIX V4.0 neither */ + #if defined(__alpha) && defined(__osf__) + #include + #if _XOPEN_VERSION < 500 + #define NO_vsnprintf + #endif + #endif + + #endif /* ZCONF_H */ diff -Nrcpad gcc-4.4.4/zlib/zconf.in.h gcc-4.4.5/zlib/zconf.in.h *** gcc-4.4.4/zlib/zconf.in.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/zconf.in.h Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,332 ---- + /* zconf.h -- configuration of the zlib compression library + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* @(#) $Id$ */ + + #ifndef ZCONF_H + #define ZCONF_H + + /* + * If you *really* need a unique prefix for all types and library functions, + * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. + */ + #ifdef Z_PREFIX + # define deflateInit_ z_deflateInit_ + # define deflate z_deflate + # define deflateEnd z_deflateEnd + # define inflateInit_ z_inflateInit_ + # define inflate z_inflate + # define inflateEnd z_inflateEnd + # define deflateInit2_ z_deflateInit2_ + # define deflateSetDictionary z_deflateSetDictionary + # define deflateCopy z_deflateCopy + # define deflateReset z_deflateReset + # define deflateParams z_deflateParams + # define deflateBound z_deflateBound + # define deflatePrime z_deflatePrime + # define inflateInit2_ z_inflateInit2_ + # define inflateSetDictionary z_inflateSetDictionary + # define inflateSync z_inflateSync + # define inflateSyncPoint z_inflateSyncPoint + # define inflateCopy z_inflateCopy + # define inflateReset z_inflateReset + # define inflateBack z_inflateBack + # define inflateBackEnd z_inflateBackEnd + # define compress z_compress + # define compress2 z_compress2 + # define compressBound z_compressBound + # define uncompress z_uncompress + # define adler32 z_adler32 + # define crc32 z_crc32 + # define get_crc_table z_get_crc_table + # define zError z_zError + + # define alloc_func z_alloc_func + # define free_func z_free_func + # define in_func z_in_func + # define out_func z_out_func + # define Byte z_Byte + # define uInt z_uInt + # define uLong z_uLong + # define Bytef z_Bytef + # define charf z_charf + # define intf z_intf + # define uIntf z_uIntf + # define uLongf z_uLongf + # define voidpf z_voidpf + # define voidp z_voidp + #endif + + #if defined(__MSDOS__) && !defined(MSDOS) + # define MSDOS + #endif + #if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) + # define OS2 + #endif + #if defined(_WINDOWS) && !defined(WINDOWS) + # define WINDOWS + #endif + #if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) + # ifndef WIN32 + # define WIN32 + # endif + #endif + #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) + # if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) + # ifndef SYS16BIT + # define SYS16BIT + # endif + # endif + #endif + + /* + * Compile with -DMAXSEG_64K if the alloc function cannot allocate more + * than 64k bytes at a time (needed on systems with 16-bit int). + */ + #ifdef SYS16BIT + # define MAXSEG_64K + #endif + #ifdef MSDOS + # define UNALIGNED_OK + #endif + + #ifdef __STDC_VERSION__ + # ifndef STDC + # define STDC + # endif + # if __STDC_VERSION__ >= 199901L + # ifndef STDC99 + # define STDC99 + # endif + # endif + #endif + #if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) + # define STDC + #endif + #if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) + # define STDC + #endif + #if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) + # define STDC + #endif + #if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) + # define STDC + #endif + + #if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ + # define STDC + #endif + + #ifndef STDC + # ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ + # define const /* note: need a more gentle solution here */ + # endif + #endif + + /* Some Mac compilers merge all .h files incorrectly: */ + #if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) + # define NO_DUMMY_DECL + #endif + + /* Maximum value for memLevel in deflateInit2 */ + #ifndef MAX_MEM_LEVEL + # ifdef MAXSEG_64K + # define MAX_MEM_LEVEL 8 + # else + # define MAX_MEM_LEVEL 9 + # endif + #endif + + /* Maximum value for windowBits in deflateInit2 and inflateInit2. + * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files + * created by gzip. (Files created by minigzip can still be extracted by + * gzip.) + */ + #ifndef MAX_WBITS + # define MAX_WBITS 15 /* 32K LZ77 window */ + #endif + + /* The memory requirements for deflate are (in bytes): + (1 << (windowBits+2)) + (1 << (memLevel+9)) + that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) + plus a few kilobytes for small objects. For example, if you want to reduce + the default memory requirements from 256K to 128K, compile with + make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" + Of course this will generally degrade compression (there's no free lunch). + + The memory requirements for inflate are (in bytes) 1 << windowBits + that is, 32K for windowBits=15 (default value) plus a few kilobytes + for small objects. + */ + + /* Type declarations */ + + #ifndef OF /* function prototypes */ + # ifdef STDC + # define OF(args) args + # else + # define OF(args) () + # endif + #endif + + /* The following definitions for FAR are needed only for MSDOS mixed + * model programming (small or medium model with some far allocations). + * This was tested only with MSC; for other MSDOS compilers you may have + * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, + * just define FAR to be empty. + */ + #ifdef SYS16BIT + # if defined(M_I86SM) || defined(M_I86MM) + /* MSC small or medium model */ + # define SMALL_MEDIUM + # ifdef _MSC_VER + # define FAR _far + # else + # define FAR far + # endif + # endif + # if (defined(__SMALL__) || defined(__MEDIUM__)) + /* Turbo C small or medium model */ + # define SMALL_MEDIUM + # ifdef __BORLANDC__ + # define FAR _far + # else + # define FAR far + # endif + # endif + #endif + + #if defined(WINDOWS) || defined(WIN32) + /* If building or using zlib as a DLL, define ZLIB_DLL. + * This is not mandatory, but it offers a little performance increase. + */ + # ifdef ZLIB_DLL + # if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) + # ifdef ZLIB_INTERNAL + # define ZEXTERN extern __declspec(dllexport) + # else + # define ZEXTERN extern __declspec(dllimport) + # endif + # endif + # endif /* ZLIB_DLL */ + /* If building or using zlib with the WINAPI/WINAPIV calling convention, + * define ZLIB_WINAPI. + * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. + */ + # ifdef ZLIB_WINAPI + # ifdef FAR + # undef FAR + # endif + # include + /* No need for _export, use ZLIB.DEF instead. */ + /* For complete Windows compatibility, use WINAPI, not __stdcall. */ + # define ZEXPORT WINAPI + # ifdef WIN32 + # define ZEXPORTVA WINAPIV + # else + # define ZEXPORTVA FAR CDECL + # endif + # endif + #endif + + #if defined (__BEOS__) + # ifdef ZLIB_DLL + # ifdef ZLIB_INTERNAL + # define ZEXPORT __declspec(dllexport) + # define ZEXPORTVA __declspec(dllexport) + # else + # define ZEXPORT __declspec(dllimport) + # define ZEXPORTVA __declspec(dllimport) + # endif + # endif + #endif + + #ifndef ZEXTERN + # define ZEXTERN extern + #endif + #ifndef ZEXPORT + # define ZEXPORT + #endif + #ifndef ZEXPORTVA + # define ZEXPORTVA + #endif + + #ifndef FAR + # define FAR + #endif + + #if !defined(__MACTYPES__) + typedef unsigned char Byte; /* 8 bits */ + #endif + typedef unsigned int uInt; /* 16 bits or more */ + typedef unsigned long uLong; /* 32 bits or more */ + + #ifdef SMALL_MEDIUM + /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ + # define Bytef Byte FAR + #else + typedef Byte FAR Bytef; + #endif + typedef char FAR charf; + typedef int FAR intf; + typedef uInt FAR uIntf; + typedef uLong FAR uLongf; + + #ifdef STDC + typedef void const *voidpc; + typedef void FAR *voidpf; + typedef void *voidp; + #else + typedef Byte const *voidpc; + typedef Byte FAR *voidpf; + typedef Byte *voidp; + #endif + + #if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ + # include /* for off_t */ + # include /* for SEEK_* and off_t */ + # ifdef VMS + # include /* for off_t */ + # endif + # define z_off_t off_t + #endif + #ifndef SEEK_SET + # define SEEK_SET 0 /* Seek from beginning of file. */ + # define SEEK_CUR 1 /* Seek from current position. */ + # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ + #endif + #ifndef z_off_t + # define z_off_t long + #endif + + #if defined(__OS400__) + # define NO_vsnprintf + #endif + + #if defined(__MVS__) + # define NO_vsnprintf + # ifdef FAR + # undef FAR + # endif + #endif + + /* MVS linker does not support external names larger than 8 bytes */ + #if defined(__MVS__) + # pragma map(deflateInit_,"DEIN") + # pragma map(deflateInit2_,"DEIN2") + # pragma map(deflateEnd,"DEEND") + # pragma map(deflateBound,"DEBND") + # pragma map(inflateInit_,"ININ") + # pragma map(inflateInit2_,"ININ2") + # pragma map(inflateEnd,"INEND") + # pragma map(inflateSync,"INSY") + # pragma map(inflateSetDictionary,"INSEDI") + # pragma map(compressBound,"CMBND") + # pragma map(inflate_table,"INTABL") + # pragma map(inflate_fast,"INFA") + # pragma map(inflate_copyright,"INCOPY") + #endif + + #endif /* ZCONF_H */ diff -Nrcpad gcc-4.4.4/zlib/zlib.3 gcc-4.4.5/zlib/zlib.3 *** gcc-4.4.4/zlib/zlib.3 Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/zlib.3 Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,159 ---- + .TH ZLIB 3 "18 July 2005" + .SH NAME + zlib \- compression/decompression library + .SH SYNOPSIS + [see + .I zlib.h + for full description] + .SH DESCRIPTION + The + .I zlib + library is a general purpose data compression library. + The code is thread safe. + It provides in-memory compression and decompression functions, + including integrity checks of the uncompressed data. + This version of the library supports only one compression method (deflation) + but other algorithms will be added later + and will have the same stream interface. + .LP + Compression can be done in a single step if the buffers are large enough + (for example if an input file is mmap'ed), + or can be done by repeated calls of the compression function. + In the latter case, + the application must provide more input and/or consume the output + (providing more output space) before each call. + .LP + The library also supports reading and writing files in + .IR gzip (1) + (.gz) format + with an interface similar to that of stdio. + .LP + The library does not install any signal handler. + The decoder checks the consistency of the compressed data, + so the library should never crash even in case of corrupted input. + .LP + All functions of the compression library are documented in the file + .IR zlib.h . + The distribution source includes examples of use of the library + in the files + .I example.c + and + .IR minigzip.c . + .LP + Changes to this version are documented in the file + .I ChangeLog + that accompanies the source, + and are concerned primarily with bug fixes and portability enhancements. + .LP + A Java implementation of + .I zlib + is available in the Java Development Kit 1.1: + .IP + http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html + .LP + A Perl interface to + .IR zlib , + written by Paul Marquess (pmqs@cpan.org), + is available at CPAN (Comprehensive Perl Archive Network) sites, + including: + .IP + http://www.cpan.org/modules/by-module/Compress/ + .LP + A Python interface to + .IR zlib , + written by A.M. Kuchling (amk@magnet.com), + is available in Python 1.5 and later versions: + .IP + http://www.python.org/doc/lib/module-zlib.html + .LP + A + .I zlib + binding for + .IR tcl (1), + written by Andreas Kupries (a.kupries@westend.com), + is availlable at: + .IP + http://www.westend.com/~kupries/doc/trf/man/man.html + .LP + An experimental package to read and write files in .zip format, + written on top of + .I zlib + by Gilles Vollant (info@winimage.com), + is available at: + .IP + http://www.winimage.com/zLibDll/unzip.html + and also in the + .I contrib/minizip + directory of the main + .I zlib + web site. + .SH "SEE ALSO" + The + .I zlib + web site can be found at either of these locations: + .IP + http://www.zlib.org + .br + http://www.gzip.org/zlib/ + .LP + The data format used by the zlib library is described by RFC + (Request for Comments) 1950 to 1952 in the files: + .IP + http://www.ietf.org/rfc/rfc1950.txt (concerning zlib format) + .br + http://www.ietf.org/rfc/rfc1951.txt (concerning deflate format) + .br + http://www.ietf.org/rfc/rfc1952.txt (concerning gzip format) + .LP + These documents are also available in other formats from: + .IP + ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html + .LP + Mark Nelson (markn@ieee.org) wrote an article about + .I zlib + for the Jan. 1997 issue of Dr. Dobb's Journal; + a copy of the article is available at: + .IP + http://dogma.net/markn/articles/zlibtool/zlibtool.htm + .SH "REPORTING PROBLEMS" + Before reporting a problem, + please check the + .I zlib + web site to verify that you have the latest version of + .IR zlib ; + otherwise, + obtain the latest version and see if the problem still exists. + Please read the + .I zlib + FAQ at: + .IP + http://www.gzip.org/zlib/zlib_faq.html + .LP + before asking for help. + Send questions and/or comments to zlib@gzip.org, + or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). + .SH AUTHORS + Version 1.2.3 + Copyright (C) 1995-2005 Jean-loup Gailly (jloup@gzip.org) + and Mark Adler (madler@alumni.caltech.edu). + .LP + This software is provided "as-is," + without any express or implied warranty. + In no event will the authors be held liable for any damages + arising from the use of this software. + See the distribution directory with respect to requirements + governing redistribution. + The deflate format used by + .I zlib + was defined by Phil Katz. + The deflate and + .I zlib + specifications were written by L. Peter Deutsch. + Thanks to all the people who reported problems and suggested various + improvements in + .IR zlib ; + who are too numerous to cite here. + .LP + UNIX manual page by R. P. C. Rodgers, + U.S. National Library of Medicine (rodgers@nlm.nih.gov). + .\" end of man page diff -Nrcpad gcc-4.4.4/zlib/zlib.h gcc-4.4.5/zlib/zlib.h *** gcc-4.4.4/zlib/zlib.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/zlib.h Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,1357 ---- + /* zlib.h -- interface of the 'zlib' general purpose compression library + version 1.2.3, July 18th, 2005 + + Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + + The data format used by the zlib library is described by RFCs (Request for + Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt + (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). + */ + + #ifndef ZLIB_H + #define ZLIB_H + + #include "zconf.h" + + #ifdef __cplusplus + extern "C" { + #endif + + #define ZLIB_VERSION "1.2.3" + #define ZLIB_VERNUM 0x1230 + + /* + The 'zlib' compression library provides in-memory compression and + decompression functions, including integrity checks of the uncompressed + data. This version of the library supports only one compression method + (deflation) but other algorithms will be added later and will have the same + stream interface. + + Compression can be done in a single step if the buffers are large + enough (for example if an input file is mmap'ed), or can be done by + repeated calls of the compression function. In the latter case, the + application must provide more input and/or consume the output + (providing more output space) before each call. + + The compressed data format used by default by the in-memory functions is + the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped + around a deflate stream, which is itself documented in RFC 1951. + + The library also supports reading and writing files in gzip (.gz) format + with an interface similar to that of stdio using the functions that start + with "gz". The gzip format is different from the zlib format. gzip is a + gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. + + This library can optionally read and write gzip streams in memory as well. + + The zlib format was designed to be compact and fast for use in memory + and on communications channels. The gzip format was designed for single- + file compression on file systems, has a larger header than zlib to maintain + directory information, and uses a different, slower check method than zlib. + + The library does not install any signal handler. The decoder checks + the consistency of the compressed data, so the library should never + crash even in case of corrupted input. + */ + + typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); + typedef void (*free_func) OF((voidpf opaque, voidpf address)); + + struct internal_state; + + typedef struct z_stream_s { + Bytef *next_in; /* next input byte */ + uInt avail_in; /* number of bytes available at next_in */ + uLong total_in; /* total nb of input bytes read so far */ + + Bytef *next_out; /* next output byte should be put there */ + uInt avail_out; /* remaining free space at next_out */ + uLong total_out; /* total nb of bytes output so far */ + + char *msg; /* last error message, NULL if no error */ + struct internal_state FAR *state; /* not visible by applications */ + + alloc_func zalloc; /* used to allocate the internal state */ + free_func zfree; /* used to free the internal state */ + voidpf opaque; /* private data object passed to zalloc and zfree */ + + int data_type; /* best guess about the data type: binary or text */ + uLong adler; /* adler32 value of the uncompressed data */ + uLong reserved; /* reserved for future use */ + } z_stream; + + typedef z_stream FAR *z_streamp; + + /* + gzip header information passed to and from zlib routines. See RFC 1952 + for more details on the meanings of these fields. + */ + typedef struct gz_header_s { + int text; /* true if compressed data believed to be text */ + uLong time; /* modification time */ + int xflags; /* extra flags (not used when writing a gzip file) */ + int os; /* operating system */ + Bytef *extra; /* pointer to extra field or Z_NULL if none */ + uInt extra_len; /* extra field length (valid if extra != Z_NULL) */ + uInt extra_max; /* space at extra (only when reading header) */ + Bytef *name; /* pointer to zero-terminated file name or Z_NULL */ + uInt name_max; /* space at name (only when reading header) */ + Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */ + uInt comm_max; /* space at comment (only when reading header) */ + int hcrc; /* true if there was or will be a header crc */ + int done; /* true when done reading gzip header (not used + when writing a gzip file) */ + } gz_header; + + typedef gz_header FAR *gz_headerp; + + /* + The application must update next_in and avail_in when avail_in has + dropped to zero. It must update next_out and avail_out when avail_out + has dropped to zero. The application must initialize zalloc, zfree and + opaque before calling the init function. All other fields are set by the + compression library and must not be updated by the application. + + The opaque value provided by the application will be passed as the first + parameter for calls of zalloc and zfree. This can be useful for custom + memory management. The compression library attaches no meaning to the + opaque value. + + zalloc must return Z_NULL if there is not enough memory for the object. + If zlib is used in a multi-threaded application, zalloc and zfree must be + thread safe. + + On 16-bit systems, the functions zalloc and zfree must be able to allocate + exactly 65536 bytes, but will not be required to allocate more than this + if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, + pointers returned by zalloc for objects of exactly 65536 bytes *must* + have their offset normalized to zero. The default allocation function + provided by this library ensures this (see zutil.c). To reduce memory + requirements and avoid any allocation of 64K objects, at the expense of + compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h). + + The fields total_in and total_out can be used for statistics or + progress reports. After compression, total_in holds the total size of + the uncompressed data and may be saved for use in the decompressor + (particularly if the decompressor wants to decompress everything in + a single step). + */ + + /* constants */ + + #define Z_NO_FLUSH 0 + #define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */ + #define Z_SYNC_FLUSH 2 + #define Z_FULL_FLUSH 3 + #define Z_FINISH 4 + #define Z_BLOCK 5 + /* Allowed flush values; see deflate() and inflate() below for details */ + + #define Z_OK 0 + #define Z_STREAM_END 1 + #define Z_NEED_DICT 2 + #define Z_ERRNO (-1) + #define Z_STREAM_ERROR (-2) + #define Z_DATA_ERROR (-3) + #define Z_MEM_ERROR (-4) + #define Z_BUF_ERROR (-5) + #define Z_VERSION_ERROR (-6) + /* Return codes for the compression/decompression functions. Negative + * values are errors, positive values are used for special but normal events. + */ + + #define Z_NO_COMPRESSION 0 + #define Z_BEST_SPEED 1 + #define Z_BEST_COMPRESSION 9 + #define Z_DEFAULT_COMPRESSION (-1) + /* compression levels */ + + #define Z_FILTERED 1 + #define Z_HUFFMAN_ONLY 2 + #define Z_RLE 3 + #define Z_FIXED 4 + #define Z_DEFAULT_STRATEGY 0 + /* compression strategy; see deflateInit2() below for details */ + + #define Z_BINARY 0 + #define Z_TEXT 1 + #define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */ + #define Z_UNKNOWN 2 + /* Possible values of the data_type field (though see inflate()) */ + + #define Z_DEFLATED 8 + /* The deflate compression method (the only one supported in this version) */ + + #define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ + + #define zlib_version zlibVersion() + /* for compatibility with versions < 1.0.2 */ + + /* basic functions */ + + ZEXTERN const char * ZEXPORT zlibVersion OF((void)); + /* The application can compare zlibVersion and ZLIB_VERSION for consistency. + If the first character differs, the library code actually used is + not compatible with the zlib.h header file used by the application. + This check is automatically made by deflateInit and inflateInit. + */ + + /* + ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); + + Initializes the internal stream state for compression. The fields + zalloc, zfree and opaque must be initialized before by the caller. + If zalloc and zfree are set to Z_NULL, deflateInit updates them to + use default allocation functions. + + The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: + 1 gives best speed, 9 gives best compression, 0 gives no compression at + all (the input data is simply copied a block at a time). + Z_DEFAULT_COMPRESSION requests a default compromise between speed and + compression (currently equivalent to level 6). + + deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if level is not a valid compression level, + Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible + with the version assumed by the caller (ZLIB_VERSION). + msg is set to null if there is no error message. deflateInit does not + perform any compression: this will be done by deflate(). + */ + + + ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); + /* + deflate compresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce some + output latency (reading input without producing any output) except when + forced to flush. + + The detailed semantics are as follows. deflate performs one or both of the + following actions: + + - Compress more input starting at next_in and update next_in and avail_in + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in and avail_in are updated and + processing will resume at this point for the next call of deflate(). + + - Provide more output starting at next_out and update next_out and avail_out + accordingly. This action is forced if the parameter flush is non zero. + Forcing flush frequently degrades the compression ratio, so this parameter + should be set only when necessary (in interactive applications). + Some output may be provided even if flush is not set. + + Before the call of deflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming + more output, and updating avail_in or avail_out accordingly; avail_out + should never be zero before the call. The application can consume the + compressed output when it wants, for example when the output buffer is full + (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK + and with zero avail_out, it must be called again after making room in the + output buffer because there might be more output pending. + + Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to + decide how much data to accumualte before producing output, in order to + maximize compression. + + If the parameter flush is set to Z_SYNC_FLUSH, all pending output is + flushed to the output buffer and the output is aligned on a byte boundary, so + that the decompressor can get all input data available so far. (In particular + avail_in is zero after the call if enough output space has been provided + before the call.) Flushing may degrade compression for some compression + algorithms and so it should be used only when necessary. + + If flush is set to Z_FULL_FLUSH, all output is flushed as with + Z_SYNC_FLUSH, and the compression state is reset so that decompression can + restart from this point if previous compressed data has been damaged or if + random access is desired. Using Z_FULL_FLUSH too often can seriously degrade + compression. + + If deflate returns with avail_out == 0, this function must be called again + with the same value of the flush parameter and more output space (updated + avail_out), until the flush is complete (deflate returns with non-zero + avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that + avail_out is greater than six to avoid repeated flush markers due to + avail_out == 0 on return. + + If the parameter flush is set to Z_FINISH, pending input is processed, + pending output is flushed and deflate returns with Z_STREAM_END if there + was enough output space; if deflate returns with Z_OK, this function must be + called again with Z_FINISH and more output space (updated avail_out) but no + more input data, until it returns with Z_STREAM_END or an error. After + deflate has returned Z_STREAM_END, the only possible operations on the + stream are deflateReset or deflateEnd. + + Z_FINISH can be used immediately after deflateInit if all the compression + is to be done in a single step. In this case, avail_out must be at least + the value returned by deflateBound (see below). If deflate does not return + Z_STREAM_END, then it must be called again as described above. + + deflate() sets strm->adler to the adler32 checksum of all input read + so far (that is, total_in bytes). + + deflate() may update strm->data_type if it can make a good guess about + the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered + binary. This field is only for information purposes and does not affect + the compression algorithm in any manner. + + deflate() returns Z_OK if some progress has been made (more input + processed or more output produced), Z_STREAM_END if all input has been + consumed and all output has been produced (only when flush is set to + Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example + if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible + (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not + fatal, and deflate() can be called again with more input and more output + space to continue compressing. + */ + + + ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); + /* + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any + pending output. + + deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the + stream state was inconsistent, Z_DATA_ERROR if the stream was freed + prematurely (some input or output was discarded). In the error case, + msg may be set but then points to a static string (which must not be + deallocated). + */ + + + /* + ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); + + Initializes the internal stream state for decompression. The fields + next_in, avail_in, zalloc, zfree and opaque must be initialized before by + the caller. If next_in is not Z_NULL and avail_in is large enough (the exact + value depends on the compression method), inflateInit determines the + compression method from the zlib header and allocates all data structures + accordingly; otherwise the allocation will be deferred to the first call of + inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to + use default allocation functions. + + inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_VERSION_ERROR if the zlib library version is incompatible with the + version assumed by the caller. msg is set to null if there is no error + message. inflateInit does not perform any decompression apart from reading + the zlib header if present: this will be done by inflate(). (So next_in and + avail_in may be modified, but next_out and avail_out are unchanged.) + */ + + + ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); + /* + inflate decompresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce + some output latency (reading input without producing any output) except when + forced to flush. + + The detailed semantics are as follows. inflate performs one or both of the + following actions: + + - Decompress more input starting at next_in and update next_in and avail_in + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in is updated and processing + will resume at this point for the next call of inflate(). + + - Provide more output starting at next_out and update next_out and avail_out + accordingly. inflate() provides as much output as possible, until there + is no more input data or no more space in the output buffer (see below + about the flush parameter). + + Before the call of inflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming + more output, and updating the next_* and avail_* values accordingly. + The application can consume the uncompressed output when it wants, for + example when the output buffer is full (avail_out == 0), or after each + call of inflate(). If inflate returns Z_OK and with zero avail_out, it + must be called again after making room in the output buffer because there + might be more output pending. + + The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, + Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much + output as possible to the output buffer. Z_BLOCK requests that inflate() stop + if and when it gets to the next deflate block boundary. When decoding the + zlib or gzip format, this will cause inflate() to return immediately after + the header and before the first block. When doing a raw inflate, inflate() + will go ahead and process the first block, and will return when it gets to + the end of that block, or when it runs out of data. + + The Z_BLOCK option assists in appending to or combining deflate streams. + Also to assist in this, on return inflate() will set strm->data_type to the + number of unused bits in the last byte taken from strm->next_in, plus 64 + if inflate() is currently decoding the last block in the deflate stream, + plus 128 if inflate() returned immediately after decoding an end-of-block + code or decoding the complete header up to just before the first byte of the + deflate stream. The end-of-block will not be indicated until all of the + uncompressed data from that block has been written to strm->next_out. The + number of unused bits may in general be greater than seven, except when + bit 7 of data_type is set, in which case the number of unused bits will be + less than eight. + + inflate() should normally be called until it returns Z_STREAM_END or an + error. However if all decompression is to be performed in a single step + (a single call of inflate), the parameter flush should be set to + Z_FINISH. In this case all pending input is processed and all pending + output is flushed; avail_out must be large enough to hold all the + uncompressed data. (The size of the uncompressed data may have been saved + by the compressor for this purpose.) The next operation on this stream must + be inflateEnd to deallocate the decompression state. The use of Z_FINISH + is never required, but can be used to inform inflate that a faster approach + may be used for the single inflate() call. + + In this implementation, inflate() always flushes as much output as + possible to the output buffer, and always uses the faster approach on the + first call. So the only effect of the flush parameter in this implementation + is on the return value of inflate(), as noted below, or when it returns early + because Z_BLOCK is used. + + If a preset dictionary is needed after this call (see inflateSetDictionary + below), inflate sets strm->adler to the adler32 checksum of the dictionary + chosen by the compressor and returns Z_NEED_DICT; otherwise it sets + strm->adler to the adler32 checksum of all output produced so far (that is, + total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described + below. At the end of the stream, inflate() checks that its computed adler32 + checksum is equal to that saved by the compressor and returns Z_STREAM_END + only if the checksum is correct. + + inflate() will decompress and check either zlib-wrapped or gzip-wrapped + deflate data. The header type is detected automatically. Any information + contained in the gzip header is not retained, so applications that need that + information should instead use raw inflate, see inflateInit2() below, or + inflateBack() and perform their own processing of the gzip header and + trailer. + + inflate() returns Z_OK if some progress has been made (more input processed + or more output produced), Z_STREAM_END if the end of the compressed data has + been reached and all uncompressed output has been produced, Z_NEED_DICT if a + preset dictionary is needed at this point, Z_DATA_ERROR if the input data was + corrupted (input stream not conforming to the zlib format or incorrect check + value), Z_STREAM_ERROR if the stream structure was inconsistent (for example + if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory, + Z_BUF_ERROR if no progress is possible or if there was not enough room in the + output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and + inflate() can be called again with more input and more output space to + continue decompressing. If Z_DATA_ERROR is returned, the application may then + call inflateSync() to look for a good compression block if a partial recovery + of the data is desired. + */ + + + ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); + /* + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any + pending output. + + inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state + was inconsistent. In the error case, msg may be set but then points to a + static string (which must not be deallocated). + */ + + /* Advanced functions */ + + /* + The following functions are needed only in some special applications. + */ + + /* + ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, + int level, + int method, + int windowBits, + int memLevel, + int strategy)); + + This is another version of deflateInit with more compression options. The + fields next_in, zalloc, zfree and opaque must be initialized before by + the caller. + + The method parameter is the compression method. It must be Z_DEFLATED in + this version of the library. + + The windowBits parameter is the base two logarithm of the window size + (the size of the history buffer). It should be in the range 8..15 for this + version of the library. Larger values of this parameter result in better + compression at the expense of memory usage. The default value is 15 if + deflateInit is used instead. + + windowBits can also be -8..-15 for raw deflate. In this case, -windowBits + determines the window size. deflate() will then generate raw deflate data + with no zlib header or trailer, and will not compute an adler32 check value. + + windowBits can also be greater than 15 for optional gzip encoding. Add + 16 to windowBits to write a simple gzip header and trailer around the + compressed data instead of a zlib wrapper. The gzip header will have no + file name, no extra data, no comment, no modification time (set to zero), + no header crc, and the operating system will be set to 255 (unknown). If a + gzip stream is being written, strm->adler is a crc32 instead of an adler32. + + The memLevel parameter specifies how much memory should be allocated + for the internal compression state. memLevel=1 uses minimum memory but + is slow and reduces compression ratio; memLevel=9 uses maximum memory + for optimal speed. The default value is 8. See zconf.h for total memory + usage as a function of windowBits and memLevel. + + The strategy parameter is used to tune the compression algorithm. Use the + value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a + filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no + string match), or Z_RLE to limit match distances to one (run-length + encoding). Filtered data consists mostly of small values with a somewhat + random distribution. In this case, the compression algorithm is tuned to + compress them better. The effect of Z_FILTERED is to force more Huffman + coding and less string matching; it is somewhat intermediate between + Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as + Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy + parameter only affects the compression ratio but not the correctness of the + compressed output even if it is not set appropriately. Z_FIXED prevents the + use of dynamic Huffman codes, allowing for a simpler decoder for special + applications. + + deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid + method). msg is set to null if there is no error message. deflateInit2 does + not perform any compression: this will be done by deflate(). + */ + + ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, + const Bytef *dictionary, + uInt dictLength)); + /* + Initializes the compression dictionary from the given byte sequence + without producing any compressed output. This function must be called + immediately after deflateInit, deflateInit2 or deflateReset, before any + call of deflate. The compressor and decompressor must use exactly the same + dictionary (see inflateSetDictionary). + + The dictionary should consist of strings (byte sequences) that are likely + to be encountered later in the data to be compressed, with the most commonly + used strings preferably put towards the end of the dictionary. Using a + dictionary is most useful when the data to be compressed is short and can be + predicted with good accuracy; the data can then be compressed better than + with the default empty dictionary. + + Depending on the size of the compression data structures selected by + deflateInit or deflateInit2, a part of the dictionary may in effect be + discarded, for example if the dictionary is larger than the window size in + deflate or deflate2. Thus the strings most likely to be useful should be + put at the end of the dictionary, not at the front. In addition, the + current implementation of deflate will use at most the window size minus + 262 bytes of the provided dictionary. + + Upon return of this function, strm->adler is set to the adler32 value + of the dictionary; the decompressor may later use this value to determine + which dictionary has been used by the compressor. (The adler32 value + applies to the whole dictionary even if only a subset of the dictionary is + actually used by the compressor.) If a raw deflate was requested, then the + adler32 value is not computed and strm->adler is not set. + + deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a + parameter is invalid (such as NULL dictionary) or the stream state is + inconsistent (for example if deflate has already been called for this stream + or if the compression method is bsort). deflateSetDictionary does not + perform any compression: this will be done by deflate(). + */ + + ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, + z_streamp source)); + /* + Sets the destination stream as a complete copy of the source stream. + + This function can be useful when several compression strategies will be + tried, for example when there are several ways of pre-processing the input + data with a filter. The streams that will be discarded should then be freed + by calling deflateEnd. Note that deflateCopy duplicates the internal + compression state which can be quite large, so this strategy is slow and + can consume lots of memory. + + deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent + (such as zalloc being NULL). msg is left unchanged in both source and + destination. + */ + + ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); + /* + This function is equivalent to deflateEnd followed by deflateInit, + but does not free and reallocate all the internal compression state. + The stream will keep the same compression level and any other attributes + that may have been set by deflateInit2. + + deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being NULL). + */ + + ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, + int level, + int strategy)); + /* + Dynamically update the compression level and compression strategy. The + interpretation of level and strategy is as in deflateInit2. This can be + used to switch between compression and straight copy of the input data, or + to switch to a different kind of input data requiring a different + strategy. If the compression level is changed, the input available so far + is compressed with the old level (and may be flushed); the new level will + take effect only at the next call of deflate(). + + Before the call of deflateParams, the stream state must be set as for + a call of deflate(), since the currently available input may have to + be compressed and flushed. In particular, strm->avail_out must be non-zero. + + deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source + stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR + if strm->avail_out was zero. + */ + + ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, + int good_length, + int max_lazy, + int nice_length, + int max_chain)); + /* + Fine tune deflate's internal compression parameters. This should only be + used by someone who understands the algorithm used by zlib's deflate for + searching for the best matching string, and even then only by the most + fanatic optimizer trying to squeeze out the last compressed bit for their + specific input data. Read the deflate.c source code for the meaning of the + max_lazy, good_length, nice_length, and max_chain parameters. + + deflateTune() can be called after deflateInit() or deflateInit2(), and + returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. + */ + + ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, + uLong sourceLen)); + /* + deflateBound() returns an upper bound on the compressed size after + deflation of sourceLen bytes. It must be called after deflateInit() + or deflateInit2(). This would be used to allocate an output buffer + for deflation in a single pass, and so would be called before deflate(). + */ + + ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, + int bits, + int value)); + /* + deflatePrime() inserts bits in the deflate output stream. The intent + is that this function is used to start off the deflate output with the + bits leftover from a previous deflate stream when appending to it. As such, + this function can only be used for raw deflate, and must be used before the + first deflate() call after a deflateInit2() or deflateReset(). bits must be + less than or equal to 16, and that many of the least significant bits of + value will be inserted in the output. + + deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. + */ + + ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, + gz_headerp head)); + /* + deflateSetHeader() provides gzip header information for when a gzip + stream is requested by deflateInit2(). deflateSetHeader() may be called + after deflateInit2() or deflateReset() and before the first call of + deflate(). The text, time, os, extra field, name, and comment information + in the provided gz_header structure are written to the gzip header (xflag is + ignored -- the extra flags are set according to the compression level). The + caller must assure that, if not Z_NULL, name and comment are terminated with + a zero byte, and that if extra is not Z_NULL, that extra_len bytes are + available there. If hcrc is true, a gzip header crc is included. Note that + the current versions of the command-line version of gzip (up through version + 1.3.x) do not support header crc's, and will report that it is a "multi-part + gzip file" and give up. + + If deflateSetHeader is not used, the default gzip header has text false, + the time set to zero, and os set to 255, with no extra, name, or comment + fields. The gzip header is returned to the default state by deflateReset(). + + deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. + */ + + /* + ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, + int windowBits)); + + This is another version of inflateInit with an extra parameter. The + fields next_in, avail_in, zalloc, zfree and opaque must be initialized + before by the caller. + + The windowBits parameter is the base two logarithm of the maximum window + size (the size of the history buffer). It should be in the range 8..15 for + this version of the library. The default value is 15 if inflateInit is used + instead. windowBits must be greater than or equal to the windowBits value + provided to deflateInit2() while compressing, or it must be equal to 15 if + deflateInit2() was not used. If a compressed stream with a larger window + size is given as input, inflate() will return with the error code + Z_DATA_ERROR instead of trying to allocate a larger window. + + windowBits can also be -8..-15 for raw inflate. In this case, -windowBits + determines the window size. inflate() will then process raw deflate data, + not looking for a zlib or gzip header, not generating a check value, and not + looking for any check values for comparison at the end of the stream. This + is for use with other formats that use the deflate compressed data format + such as zip. Those formats provide their own check values. If a custom + format is developed using the raw deflate format for compressed data, it is + recommended that a check value such as an adler32 or a crc32 be applied to + the uncompressed data as is done in the zlib, gzip, and zip formats. For + most applications, the zlib format should be used as is. Note that comments + above on the use in deflateInit2() applies to the magnitude of windowBits. + + windowBits can also be greater than 15 for optional gzip decoding. Add + 32 to windowBits to enable zlib and gzip decoding with automatic header + detection, or add 16 to decode only the gzip format (the zlib format will + return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is + a crc32 instead of an adler32. + + inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg + is set to null if there is no error message. inflateInit2 does not perform + any decompression apart from reading the zlib header if present: this will + be done by inflate(). (So next_in and avail_in may be modified, but next_out + and avail_out are unchanged.) + */ + + ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, + const Bytef *dictionary, + uInt dictLength)); + /* + Initializes the decompression dictionary from the given uncompressed byte + sequence. This function must be called immediately after a call of inflate, + if that call returned Z_NEED_DICT. The dictionary chosen by the compressor + can be determined from the adler32 value returned by that call of inflate. + The compressor and decompressor must use exactly the same dictionary (see + deflateSetDictionary). For raw inflate, this function can be called + immediately after inflateInit2() or inflateReset() and before any call of + inflate() to set the dictionary. The application must insure that the + dictionary that was used for compression is provided. + + inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a + parameter is invalid (such as NULL dictionary) or the stream state is + inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the + expected one (incorrect adler32 value). inflateSetDictionary does not + perform any decompression: this will be done by subsequent calls of + inflate(). + */ + + ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); + /* + Skips invalid compressed data until a full flush point (see above the + description of deflate with Z_FULL_FLUSH) can be found, or until all + available input is skipped. No output is provided. + + inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR + if no more input was provided, Z_DATA_ERROR if no flush point has been found, + or Z_STREAM_ERROR if the stream structure was inconsistent. In the success + case, the application may save the current current value of total_in which + indicates where valid compressed data was found. In the error case, the + application may repeatedly call inflateSync, providing more input each time, + until success or end of the input data. + */ + + ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, + z_streamp source)); + /* + Sets the destination stream as a complete copy of the source stream. + + This function can be useful when randomly accessing a large stream. The + first pass through the stream can periodically record the inflate state, + allowing restarting inflate at those points when randomly accessing the + stream. + + inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent + (such as zalloc being NULL). msg is left unchanged in both source and + destination. + */ + + ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); + /* + This function is equivalent to inflateEnd followed by inflateInit, + but does not free and reallocate all the internal decompression state. + The stream will keep attributes that may have been set by inflateInit2. + + inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being NULL). + */ + + ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, + int bits, + int value)); + /* + This function inserts bits in the inflate input stream. The intent is + that this function is used to start inflating at a bit position in the + middle of a byte. The provided bits will be used before any bytes are used + from next_in. This function should only be used with raw inflate, and + should be used before the first inflate() call after inflateInit2() or + inflateReset(). bits must be less than or equal to 16, and that many of the + least significant bits of value will be inserted in the input. + + inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. + */ + + ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, + gz_headerp head)); + /* + inflateGetHeader() requests that gzip header information be stored in the + provided gz_header structure. inflateGetHeader() may be called after + inflateInit2() or inflateReset(), and before the first call of inflate(). + As inflate() processes the gzip stream, head->done is zero until the header + is completed, at which time head->done is set to one. If a zlib stream is + being decoded, then head->done is set to -1 to indicate that there will be + no gzip header information forthcoming. Note that Z_BLOCK can be used to + force inflate() to return immediately after header processing is complete + and before any actual data is decompressed. + + The text, time, xflags, and os fields are filled in with the gzip header + contents. hcrc is set to true if there is a header CRC. (The header CRC + was valid if done is set to one.) If extra is not Z_NULL, then extra_max + contains the maximum number of bytes to write to extra. Once done is true, + extra_len contains the actual extra field length, and extra contains the + extra field, or that field truncated if extra_max is less than extra_len. + If name is not Z_NULL, then up to name_max characters are written there, + terminated with a zero unless the length is greater than name_max. If + comment is not Z_NULL, then up to comm_max characters are written there, + terminated with a zero unless the length is greater than comm_max. When + any of extra, name, or comment are not Z_NULL and the respective field is + not present in the header, then that field is set to Z_NULL to signal its + absence. This allows the use of deflateSetHeader() with the returned + structure to duplicate the header. However if those fields are set to + allocated memory, then the application will need to save those pointers + elsewhere so that they can be eventually freed. + + If inflateGetHeader is not used, then the header information is simply + discarded. The header is always checked for validity, including the header + CRC if present. inflateReset() will reset the process to discard the header + information. The application would need to call inflateGetHeader() again to + retrieve the header from the next gzip stream. + + inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. + */ + + /* + ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, + unsigned char FAR *window)); + + Initialize the internal stream state for decompression using inflateBack() + calls. The fields zalloc, zfree and opaque in strm must be initialized + before the call. If zalloc and zfree are Z_NULL, then the default library- + derived memory allocation routines are used. windowBits is the base two + logarithm of the window size, in the range 8..15. window is a caller + supplied buffer of that size. Except for special applications where it is + assured that deflate was used with small window sizes, windowBits must be 15 + and a 32K byte window must be supplied to be able to decompress general + deflate streams. + + See inflateBack() for the usage of these routines. + + inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of + the paramaters are invalid, Z_MEM_ERROR if the internal state could not + be allocated, or Z_VERSION_ERROR if the version of the library does not + match the version of the header file. + */ + + typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); + typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); + + ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, + in_func in, void FAR *in_desc, + out_func out, void FAR *out_desc)); + /* + inflateBack() does a raw inflate with a single call using a call-back + interface for input and output. This is more efficient than inflate() for + file i/o applications in that it avoids copying between the output and the + sliding window by simply making the window itself the output buffer. This + function trusts the application to not change the output buffer passed by + the output function, at least until inflateBack() returns. + + inflateBackInit() must be called first to allocate the internal state + and to initialize the state with the user-provided window buffer. + inflateBack() may then be used multiple times to inflate a complete, raw + deflate stream with each call. inflateBackEnd() is then called to free + the allocated state. + + A raw deflate stream is one with no zlib or gzip header or trailer. + This routine would normally be used in a utility that reads zip or gzip + files and writes out uncompressed files. The utility would decode the + header and process the trailer on its own, hence this routine expects + only the raw deflate stream to decompress. This is different from the + normal behavior of inflate(), which expects either a zlib or gzip header and + trailer around the deflate stream. + + inflateBack() uses two subroutines supplied by the caller that are then + called by inflateBack() for input and output. inflateBack() calls those + routines until it reads a complete deflate stream and writes out all of the + uncompressed data, or until it encounters an error. The function's + parameters and return types are defined above in the in_func and out_func + typedefs. inflateBack() will call in(in_desc, &buf) which should return the + number of bytes of provided input, and a pointer to that input in buf. If + there is no input available, in() must return zero--buf is ignored in that + case--and inflateBack() will return a buffer error. inflateBack() will call + out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out() + should return zero on success, or non-zero on failure. If out() returns + non-zero, inflateBack() will return with an error. Neither in() nor out() + are permitted to change the contents of the window provided to + inflateBackInit(), which is also the buffer that out() uses to write from. + The length written by out() will be at most the window size. Any non-zero + amount of input may be provided by in(). + + For convenience, inflateBack() can be provided input on the first call by + setting strm->next_in and strm->avail_in. If that input is exhausted, then + in() will be called. Therefore strm->next_in must be initialized before + calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called + immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in + must also be initialized, and then if strm->avail_in is not zero, input will + initially be taken from strm->next_in[0 .. strm->avail_in - 1]. + + The in_desc and out_desc parameters of inflateBack() is passed as the + first parameter of in() and out() respectively when they are called. These + descriptors can be optionally used to pass any information that the caller- + supplied in() and out() functions need to do their job. + + On return, inflateBack() will set strm->next_in and strm->avail_in to + pass back any unused input that was provided by the last in() call. The + return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR + if in() or out() returned an error, Z_DATA_ERROR if there was a format + error in the deflate stream (in which case strm->msg is set to indicate the + nature of the error), or Z_STREAM_ERROR if the stream was not properly + initialized. In the case of Z_BUF_ERROR, an input or output error can be + distinguished using strm->next_in which will be Z_NULL only if in() returned + an error. If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to + out() returning non-zero. (in() will always be called before out(), so + strm->next_in is assured to be defined if out() returns non-zero.) Note + that inflateBack() cannot return Z_OK. + */ + + ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); + /* + All memory allocated by inflateBackInit() is freed. + + inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream + state was inconsistent. + */ + + ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); + /* Return flags indicating compile-time options. + + Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: + 1.0: size of uInt + 3.2: size of uLong + 5.4: size of voidpf (pointer) + 7.6: size of z_off_t + + Compiler, assembler, and debug options: + 8: DEBUG + 9: ASMV or ASMINF -- use ASM code + 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention + 11: 0 (reserved) + + One-time table building (smaller code, but not thread-safe if true): + 12: BUILDFIXED -- build static block decoding tables when needed + 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed + 14,15: 0 (reserved) + + Library content (indicates missing functionality): + 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking + deflate code when not needed) + 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect + and decode gzip streams (to avoid linking crc code) + 18-19: 0 (reserved) + + Operation variations (changes in library functionality): + 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate + 21: FASTEST -- deflate algorithm with only one, lowest compression level + 22,23: 0 (reserved) + + The sprintf variant used by gzprintf (zero is best): + 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format + 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure! + 26: 0 = returns value, 1 = void -- 1 means inferred string length returned + + Remainder: + 27-31: 0 (reserved) + */ + + + /* utility functions */ + + /* + The following utility functions are implemented on top of the + basic stream-oriented functions. To simplify the interface, some + default options are assumed (compression level and memory usage, + standard memory allocation functions). The source code of these + utility functions can easily be modified if you need special options. + */ + + ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); + /* + Compresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be at least the value returned + by compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressed buffer. + This function can be used to compress a whole file at once if the + input file is mmap'ed. + compress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer. + */ + + ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen, + int level)); + /* + Compresses the source buffer into the destination buffer. The level + parameter has the same meaning as in deflateInit. sourceLen is the byte + length of the source buffer. Upon entry, destLen is the total size of the + destination buffer, which must be at least the value returned by + compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressed buffer. + + compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_BUF_ERROR if there was not enough room in the output buffer, + Z_STREAM_ERROR if the level parameter is invalid. + */ + + ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); + /* + compressBound() returns an upper bound on the compressed size after + compress() or compress2() on sourceLen bytes. It would be used before + a compress() or compress2() call to allocate the destination buffer. + */ + + ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); + /* + Decompresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be large enough to hold the + entire uncompressed data. (The size of the uncompressed data must have + been saved previously by the compressor and transmitted to the decompressor + by some mechanism outside the scope of this compression library.) + Upon exit, destLen is the actual size of the compressed buffer. + This function can be used to decompress a whole file at once if the + input file is mmap'ed. + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. + */ + + + typedef voidp gzFile; + + ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); + /* + Opens a gzip (.gz) file for reading or writing. The mode parameter + is as in fopen ("rb" or "wb") but can also include a compression level + ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for + Huffman only compression as in "wb1h", or 'R' for run-length encoding + as in "wb1R". (See the description of deflateInit2 for more information + about the strategy parameter.) + + gzopen can be used to read a file which is not in gzip format; in this + case gzread will directly read from the file without decompression. + + gzopen returns NULL if the file could not be opened or if there was + insufficient memory to allocate the (de)compression state; errno + can be checked to distinguish the two cases (if errno is zero, the + zlib error is Z_MEM_ERROR). */ + + ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); + /* + gzdopen() associates a gzFile with the file descriptor fd. File + descriptors are obtained from calls like open, dup, creat, pipe or + fileno (in the file has been previously opened with fopen). + The mode parameter is as in gzopen. + The next call of gzclose on the returned gzFile will also close the + file descriptor fd, just like fclose(fdopen(fd), mode) closes the file + descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode). + gzdopen returns NULL if there was insufficient memory to allocate + the (de)compression state. + */ + + ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); + /* + Dynamically update the compression level or strategy. See the description + of deflateInit2 for the meaning of these parameters. + gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not + opened for writing. + */ + + ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); + /* + Reads the given number of uncompressed bytes from the compressed file. + If the input file was not in gzip format, gzread copies the given number + of bytes into the buffer. + gzread returns the number of uncompressed bytes actually read (0 for + end of file, -1 for error). */ + + ZEXTERN int ZEXPORT gzwrite OF((gzFile file, + voidpc buf, unsigned len)); + /* + Writes the given number of uncompressed bytes into the compressed file. + gzwrite returns the number of uncompressed bytes actually written + (0 in case of error). + */ + + ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); + /* + Converts, formats, and writes the args to the compressed file under + control of the format string, as in fprintf. gzprintf returns the number of + uncompressed bytes actually written (0 in case of error). The number of + uncompressed bytes written is limited to 4095. The caller should assure that + this limit is not exceeded. If it is exceeded, then gzprintf() will return + return an error (0) with nothing written. In this case, there may also be a + buffer overflow with unpredictable consequences, which is possible only if + zlib was compiled with the insecure functions sprintf() or vsprintf() + because the secure snprintf() or vsnprintf() functions were not available. + */ + + ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); + /* + Writes the given null-terminated string to the compressed file, excluding + the terminating null character. + gzputs returns the number of characters written, or -1 in case of error. + */ + + ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); + /* + Reads bytes from the compressed file until len-1 characters are read, or + a newline character is read and transferred to buf, or an end-of-file + condition is encountered. The string is then terminated with a null + character. + gzgets returns buf, or Z_NULL in case of error. + */ + + ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); + /* + Writes c, converted to an unsigned char, into the compressed file. + gzputc returns the value that was written, or -1 in case of error. + */ + + ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); + /* + Reads one byte from the compressed file. gzgetc returns this byte + or -1 in case of end of file or error. + */ + + ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); + /* + Push one character back onto the stream to be read again later. + Only one character of push-back is allowed. gzungetc() returns the + character pushed, or -1 on failure. gzungetc() will fail if a + character has been pushed but not read yet, or if c is -1. The pushed + character will be discarded if the stream is repositioned with gzseek() + or gzrewind(). + */ + + ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); + /* + Flushes all pending output into the compressed file. The parameter + flush is as in the deflate() function. The return value is the zlib + error number (see function gzerror below). gzflush returns Z_OK if + the flush parameter is Z_FINISH and all output could be flushed. + gzflush should be called only when strictly necessary because it can + degrade compression. + */ + + ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, + z_off_t offset, int whence)); + /* + Sets the starting position for the next gzread or gzwrite on the + given compressed file. The offset represents a number of bytes in the + uncompressed data stream. The whence parameter is defined as in lseek(2); + the value SEEK_END is not supported. + If the file is opened for reading, this function is emulated but can be + extremely slow. If the file is opened for writing, only forward seeks are + supported; gzseek then compresses a sequence of zeroes up to the new + starting position. + + gzseek returns the resulting offset location as measured in bytes from + the beginning of the uncompressed stream, or -1 in case of error, in + particular if the file is opened for writing and the new starting position + would be before the current position. + */ + + ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); + /* + Rewinds the given file. This function is supported only for reading. + + gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) + */ + + ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); + /* + Returns the starting position for the next gzread or gzwrite on the + given compressed file. This position represents a number of bytes in the + uncompressed data stream. + + gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) + */ + + ZEXTERN int ZEXPORT gzeof OF((gzFile file)); + /* + Returns 1 when EOF has previously been detected reading the given + input stream, otherwise zero. + */ + + ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); + /* + Returns 1 if file is being read directly without decompression, otherwise + zero. + */ + + ZEXTERN int ZEXPORT gzclose OF((gzFile file)); + /* + Flushes all pending output if necessary, closes the compressed file + and deallocates all the (de)compression state. The return value is the zlib + error number (see function gzerror below). + */ + + ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); + /* + Returns the error message for the last error which occurred on the + given compressed file. errnum is set to zlib error number. If an + error occurred in the file system and not in the compression library, + errnum is set to Z_ERRNO and the application may consult errno + to get the exact error code. + */ + + ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); + /* + Clears the error and end-of-file flags for file. This is analogous to the + clearerr() function in stdio. This is useful for continuing to read a gzip + file that is being written concurrently. + */ + + /* checksum functions */ + + /* + These functions are not related to compression but are exported + anyway because they might be useful in applications using the + compression library. + */ + + ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); + /* + Update a running Adler-32 checksum with the bytes buf[0..len-1] and + return the updated checksum. If buf is NULL, this function returns + the required initial value for the checksum. + An Adler-32 checksum is almost as reliable as a CRC32 but can be computed + much faster. Usage example: + + uLong adler = adler32(0L, Z_NULL, 0); + + while (read_buffer(buffer, length) != EOF) { + adler = adler32(adler, buffer, length); + } + if (adler != original_adler) error(); + */ + + ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, + z_off_t len2)); + /* + Combine two Adler-32 checksums into one. For two sequences of bytes, seq1 + and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for + each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of + seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. + */ + + ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); + /* + Update a running CRC-32 with the bytes buf[0..len-1] and return the + updated CRC-32. If buf is NULL, this function returns the required initial + value for the for the crc. Pre- and post-conditioning (one's complement) is + performed within this function so it shouldn't be done by the application. + Usage example: + + uLong crc = crc32(0L, Z_NULL, 0); + + while (read_buffer(buffer, length) != EOF) { + crc = crc32(crc, buffer, length); + } + if (crc != original_crc) error(); + */ + + ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); + + /* + Combine two CRC-32 check values into one. For two sequences of bytes, + seq1 and seq2 with lengths len1 and len2, CRC-32 check values were + calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32 + check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and + len2. + */ + + + /* various hacks, don't look :) */ + + /* deflateInit and inflateInit are macros to allow checking the zlib version + * and the compiler's view of z_stream: + */ + ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, + const char *version, int stream_size)); + ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, + const char *version, int stream_size)); + ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, + int windowBits, int memLevel, + int strategy, const char *version, + int stream_size)); + ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, + const char *version, int stream_size)); + ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, + unsigned char FAR *window, + const char *version, + int stream_size)); + #define deflateInit(strm, level) \ + deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream)) + #define inflateInit(strm) \ + inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream)) + #define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ + deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ + (strategy), ZLIB_VERSION, sizeof(z_stream)) + #define inflateInit2(strm, windowBits) \ + inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream)) + #define inflateBackInit(strm, windowBits, window) \ + inflateBackInit_((strm), (windowBits), (window), \ + ZLIB_VERSION, sizeof(z_stream)) + + + #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) + struct internal_state {int dummy;}; /* hack for buggy compilers */ + #endif + + ZEXTERN const char * ZEXPORT zError OF((int)); + ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); + ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); + + #ifdef __cplusplus + } + #endif + + #endif /* ZLIB_H */ diff -Nrcpad gcc-4.4.4/zlib/zutil.c gcc-4.4.5/zlib/zutil.c *** gcc-4.4.4/zlib/zutil.c Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/zutil.c Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,318 ---- + /* zutil.c -- target dependent utility functions for the compression library + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* @(#) $Id: zutil.c,v 1.1.1.2 2002/03/11 21:53:27 tromey Exp $ */ + + #include "zutil.h" + + #ifndef NO_DUMMY_DECL + struct internal_state {int dummy;}; /* for buggy compilers */ + #endif + + const char * const z_errmsg[10] = { + "need dictionary", /* Z_NEED_DICT 2 */ + "stream end", /* Z_STREAM_END 1 */ + "", /* Z_OK 0 */ + "file error", /* Z_ERRNO (-1) */ + "stream error", /* Z_STREAM_ERROR (-2) */ + "data error", /* Z_DATA_ERROR (-3) */ + "insufficient memory", /* Z_MEM_ERROR (-4) */ + "buffer error", /* Z_BUF_ERROR (-5) */ + "incompatible version",/* Z_VERSION_ERROR (-6) */ + ""}; + + + const char * ZEXPORT zlibVersion() + { + return ZLIB_VERSION; + } + + uLong ZEXPORT zlibCompileFlags() + { + uLong flags; + + flags = 0; + switch (sizeof(uInt)) { + case 2: break; + case 4: flags += 1; break; + case 8: flags += 2; break; + default: flags += 3; + } + switch (sizeof(uLong)) { + case 2: break; + case 4: flags += 1 << 2; break; + case 8: flags += 2 << 2; break; + default: flags += 3 << 2; + } + switch (sizeof(voidpf)) { + case 2: break; + case 4: flags += 1 << 4; break; + case 8: flags += 2 << 4; break; + default: flags += 3 << 4; + } + switch (sizeof(z_off_t)) { + case 2: break; + case 4: flags += 1 << 6; break; + case 8: flags += 2 << 6; break; + default: flags += 3 << 6; + } + #ifdef DEBUG + flags += 1 << 8; + #endif + #if defined(ASMV) || defined(ASMINF) + flags += 1 << 9; + #endif + #ifdef ZLIB_WINAPI + flags += 1 << 10; + #endif + #ifdef BUILDFIXED + flags += 1 << 12; + #endif + #ifdef DYNAMIC_CRC_TABLE + flags += 1 << 13; + #endif + #ifdef NO_GZCOMPRESS + flags += 1L << 16; + #endif + #ifdef NO_GZIP + flags += 1L << 17; + #endif + #ifdef PKZIP_BUG_WORKAROUND + flags += 1L << 20; + #endif + #ifdef FASTEST + flags += 1L << 21; + #endif + #ifdef STDC + # ifdef NO_vsnprintf + flags += 1L << 25; + # ifdef HAS_vsprintf_void + flags += 1L << 26; + # endif + # else + # ifdef HAS_vsnprintf_void + flags += 1L << 26; + # endif + # endif + #else + flags += 1L << 24; + # ifdef NO_snprintf + flags += 1L << 25; + # ifdef HAS_sprintf_void + flags += 1L << 26; + # endif + # else + # ifdef HAS_snprintf_void + flags += 1L << 26; + # endif + # endif + #endif + return flags; + } + + #ifdef DEBUG + + # ifndef verbose + # define verbose 0 + # endif + int z_verbose = verbose; + + void z_error (m) + char *m; + { + fprintf(stderr, "%s\n", m); + exit(1); + } + #endif + + /* exported to allow conversion of error code to string for compress() and + * uncompress() + */ + const char * ZEXPORT zError(err) + int err; + { + return ERR_MSG(err); + } + + #if defined(_WIN32_WCE) + /* The Microsoft C Run-Time Library for Windows CE doesn't have + * errno. We define it as a global variable to simplify porting. + * Its value is always 0 and should not be used. + */ + int errno = 0; + #endif + + #ifndef HAVE_MEMCPY + + void zmemcpy(dest, source, len) + Bytef* dest; + const Bytef* source; + uInt len; + { + if (len == 0) return; + do { + *dest++ = *source++; /* ??? to be unrolled */ + } while (--len != 0); + } + + int zmemcmp(s1, s2, len) + const Bytef* s1; + const Bytef* s2; + uInt len; + { + uInt j; + + for (j = 0; j < len; j++) { + if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1; + } + return 0; + } + + void zmemzero(dest, len) + Bytef* dest; + uInt len; + { + if (len == 0) return; + do { + *dest++ = 0; /* ??? to be unrolled */ + } while (--len != 0); + } + #endif + + + #ifdef SYS16BIT + + #ifdef __TURBOC__ + /* Turbo C in 16-bit mode */ + + # define MY_ZCALLOC + + /* Turbo C malloc() does not allow dynamic allocation of 64K bytes + * and farmalloc(64K) returns a pointer with an offset of 8, so we + * must fix the pointer. Warning: the pointer must be put back to its + * original form in order to free it, use zcfree(). + */ + + #define MAX_PTR 10 + /* 10*64K = 640K */ + + local int next_ptr = 0; + + typedef struct ptr_table_s { + voidpf org_ptr; + voidpf new_ptr; + } ptr_table; + + local ptr_table table[MAX_PTR]; + /* This table is used to remember the original form of pointers + * to large buffers (64K). Such pointers are normalized with a zero offset. + * Since MSDOS is not a preemptive multitasking OS, this table is not + * protected from concurrent access. This hack doesn't work anyway on + * a protected system like OS/2. Use Microsoft C instead. + */ + + voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) + { + voidpf buf = opaque; /* just to make some compilers happy */ + ulg bsize = (ulg)items*size; + + /* If we allocate less than 65520 bytes, we assume that farmalloc + * will return a usable pointer which doesn't have to be normalized. + */ + if (bsize < 65520L) { + buf = farmalloc(bsize); + if (*(ush*)&buf != 0) return buf; + } else { + buf = farmalloc(bsize + 16L); + } + if (buf == NULL || next_ptr >= MAX_PTR) return NULL; + table[next_ptr].org_ptr = buf; + + /* Normalize the pointer to seg:0 */ + *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4; + *(ush*)&buf = 0; + table[next_ptr++].new_ptr = buf; + return buf; + } + + void zcfree (voidpf opaque, voidpf ptr) + { + int n; + if (*(ush*)&ptr != 0) { /* object < 64K */ + farfree(ptr); + return; + } + /* Find the original pointer */ + for (n = 0; n < next_ptr; n++) { + if (ptr != table[n].new_ptr) continue; + + farfree(table[n].org_ptr); + while (++n < next_ptr) { + table[n-1] = table[n]; + } + next_ptr--; + return; + } + ptr = opaque; /* just to make some compilers happy */ + Assert(0, "zcfree: ptr not found"); + } + + #endif /* __TURBOC__ */ + + + #ifdef M_I86 + /* Microsoft C in 16-bit mode */ + + # define MY_ZCALLOC + + #if (!defined(_MSC_VER) || (_MSC_VER <= 600)) + # define _halloc halloc + # define _hfree hfree + #endif + + voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) + { + if (opaque) opaque = 0; /* to make compiler happy */ + return _halloc((long)items, size); + } + + void zcfree (voidpf opaque, voidpf ptr) + { + if (opaque) opaque = 0; /* to make compiler happy */ + _hfree(ptr); + } + + #endif /* M_I86 */ + + #endif /* SYS16BIT */ + + + #ifndef MY_ZCALLOC /* Any system without a special alloc function */ + + #ifndef STDC + extern voidp malloc OF((uInt size)); + extern voidp calloc OF((uInt items, uInt size)); + extern void free OF((voidpf ptr)); + #endif + + voidpf zcalloc (opaque, items, size) + voidpf opaque; + unsigned items; + unsigned size; + { + if (opaque) items += size - size; /* make compiler happy */ + return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : + (voidpf)calloc(items, size); + } + + void zcfree (opaque, ptr) + voidpf opaque; + voidpf ptr; + { + free(ptr); + if (opaque) return; /* make compiler happy */ + } + + #endif /* MY_ZCALLOC */ diff -Nrcpad gcc-4.4.4/zlib/zutil.h gcc-4.4.5/zlib/zutil.h *** gcc-4.4.4/zlib/zutil.h Thu Jan 1 00:00:00 1970 --- gcc-4.4.5/zlib/zutil.h Mon Sep 12 17:42:53 2005 *************** *** 0 **** --- 1,269 ---- + /* zutil.h -- internal interface and configuration of the compression library + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + + /* @(#) $Id: zutil.h,v 1.1.1.2 2002/03/11 21:53:28 tromey Exp $ */ + + #ifndef ZUTIL_H + #define ZUTIL_H + + #define ZLIB_INTERNAL + #include "zlib.h" + + #ifdef STDC + # ifndef _WIN32_WCE + # include + # endif + # include + # include + #endif + #ifdef NO_ERRNO_H + # ifdef _WIN32_WCE + /* The Microsoft C Run-Time Library for Windows CE doesn't have + * errno. We define it as a global variable to simplify porting. + * Its value is always 0 and should not be used. We rename it to + * avoid conflict with other libraries that use the same workaround. + */ + # define errno z_errno + # endif + extern int errno; + #else + # ifndef _WIN32_WCE + # include + # endif + #endif + + #ifndef local + # define local static + #endif + /* compile with -Dlocal if your debugger can't find static symbols */ + + typedef unsigned char uch; + typedef uch FAR uchf; + typedef unsigned short ush; + typedef ush FAR ushf; + typedef unsigned long ulg; + + extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ + /* (size given to avoid silly warnings with Visual C++) */ + + #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] + + #define ERR_RETURN(strm,err) \ + return (strm->msg = (char*)ERR_MSG(err), (err)) + /* To be used only when the state is known to be valid */ + + /* common constants */ + + #ifndef DEF_WBITS + # define DEF_WBITS MAX_WBITS + #endif + /* default windowBits for decompression. MAX_WBITS is for compression only */ + + #if MAX_MEM_LEVEL >= 8 + # define DEF_MEM_LEVEL 8 + #else + # define DEF_MEM_LEVEL MAX_MEM_LEVEL + #endif + /* default memLevel */ + + #define STORED_BLOCK 0 + #define STATIC_TREES 1 + #define DYN_TREES 2 + /* The three kinds of block type */ + + #define MIN_MATCH 3 + #define MAX_MATCH 258 + /* The minimum and maximum match lengths */ + + #define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */ + + /* target dependencies */ + + #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32)) + # define OS_CODE 0x00 + # if defined(__TURBOC__) || defined(__BORLANDC__) + # if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) + /* Allow compilation with ANSI keywords only enabled */ + void _Cdecl farfree( void *block ); + void *_Cdecl farmalloc( unsigned long nbytes ); + # else + # include + # endif + # else /* MSC or DJGPP */ + # include + # endif + #endif + + #ifdef AMIGA + # define OS_CODE 0x01 + #endif + + #if defined(VAXC) || defined(VMS) + # define OS_CODE 0x02 + # define F_OPEN(name, mode) \ + fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512") + #endif + + #if defined(ATARI) || defined(atarist) + # define OS_CODE 0x05 + #endif + + #ifdef OS2 + # define OS_CODE 0x06 + # ifdef M_I86 + #include + # endif + #endif + + #if defined(MACOS) || defined(TARGET_OS_MAC) + # define OS_CODE 0x07 + # if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os + # include /* for fdopen */ + # else + # ifndef fdopen + # define fdopen(fd,mode) NULL /* No fdopen() */ + # endif + # endif + #endif + + #ifdef TOPS20 + # define OS_CODE 0x0a + #endif + + #ifdef WIN32 + # ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */ + # define OS_CODE 0x0b + # endif + #endif + + #ifdef __50SERIES /* Prime/PRIMOS */ + # define OS_CODE 0x0f + #endif + + #if defined(_BEOS_) || defined(RISCOS) + # define fdopen(fd,mode) NULL /* No fdopen() */ + #endif + + #if (defined(_MSC_VER) && (_MSC_VER > 600)) + # if defined(_WIN32_WCE) + # define fdopen(fd,mode) NULL /* No fdopen() */ + # ifndef _PTRDIFF_T_DEFINED + typedef int ptrdiff_t; + # define _PTRDIFF_T_DEFINED + # endif + # else + # define fdopen(fd,type) _fdopen(fd,type) + # endif + #endif + + /* common defaults */ + + #ifndef OS_CODE + # define OS_CODE 0x03 /* assume Unix */ + #endif + + #ifndef F_OPEN + # define F_OPEN(name, mode) fopen((name), (mode)) + #endif + + /* functions */ + + #if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) + # ifndef HAVE_VSNPRINTF + # define HAVE_VSNPRINTF + # endif + #endif + #if defined(__CYGWIN__) + # ifndef HAVE_VSNPRINTF + # define HAVE_VSNPRINTF + # endif + #endif + #ifndef HAVE_VSNPRINTF + # ifdef MSDOS + /* vsnprintf may exist on some MS-DOS compilers (DJGPP?), + but for now we just assume it doesn't. */ + # define NO_vsnprintf + # endif + # ifdef __TURBOC__ + # define NO_vsnprintf + # endif + # ifdef WIN32 + /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ + # if !defined(vsnprintf) && !defined(NO_vsnprintf) + # define vsnprintf _vsnprintf + # endif + # endif + # ifdef __SASC + # define NO_vsnprintf + # endif + #endif + #ifdef VMS + # define NO_vsnprintf + #endif + + #if defined(pyr) + # define NO_MEMCPY + #endif + #if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__) + /* Use our own functions for small and medium model with MSC <= 5.0. + * You may have to use the same strategy for Borland C (untested). + * The __SC__ check is for Symantec. + */ + # define NO_MEMCPY + #endif + #if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY) + # define HAVE_MEMCPY + #endif + #ifdef HAVE_MEMCPY + # ifdef SMALL_MEDIUM /* MSDOS small or medium model */ + # define zmemcpy _fmemcpy + # define zmemcmp _fmemcmp + # define zmemzero(dest, len) _fmemset(dest, 0, len) + # else + # define zmemcpy memcpy + # define zmemcmp memcmp + # define zmemzero(dest, len) memset(dest, 0, len) + # endif + #else + extern void zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); + extern int zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); + extern void zmemzero OF((Bytef* dest, uInt len)); + #endif + + /* Diagnostic functions */ + #ifdef DEBUG + # include + extern int z_verbose; + extern void z_error OF((char *m)); + # define Assert(cond,msg) {if(!(cond)) z_error(msg);} + # define Trace(x) {if (z_verbose>=0) fprintf x ;} + # define Tracev(x) {if (z_verbose>0) fprintf x ;} + # define Tracevv(x) {if (z_verbose>1) fprintf x ;} + # define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;} + # define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;} + #else + # define Assert(cond,msg) + # define Trace(x) + # define Tracev(x) + # define Tracevv(x) + # define Tracec(c,x) + # define Tracecv(c,x) + #endif + + + voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size)); + void zcfree OF((voidpf opaque, voidpf ptr)); + + #define ZALLOC(strm, items, size) \ + (*((strm)->zalloc))((strm)->opaque, (items), (size)) + #define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) + #define TRY_FREE(s, p) {if (p) ZFREE(s, p);} + + #endif /* ZUTIL_H */