From 878eb9f599526178ee720623e0f56c0503bd47b5 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 14 Mar 2010 19:09:07 +0000 Subject: Import from zlib-1.2.4 --- cpukit/zlib/contrib/masmx64/readme.txt | 31 +++++++++++++++++++++++++++++++ cpukit/zlib/contrib/masmx86/readme.txt | 14 ++++++++++---- 2 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 cpukit/zlib/contrib/masmx64/readme.txt (limited to 'cpukit/zlib') diff --git a/cpukit/zlib/contrib/masmx64/readme.txt b/cpukit/zlib/contrib/masmx64/readme.txt new file mode 100644 index 0000000000..1115d9b529 --- /dev/null +++ b/cpukit/zlib/contrib/masmx64/readme.txt @@ -0,0 +1,31 @@ +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 +---------------- +Assemble the .asm files using MASM and put the object files into the zlib source +directory. You can also get object files here: + + http://www.winimage.com/zLibDll/zlib124_masm_obj.zip + +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 --git a/cpukit/zlib/contrib/masmx86/readme.txt b/cpukit/zlib/contrib/masmx86/readme.txt index 7b57167b71..90230f2d5e 100644 --- a/cpukit/zlib/contrib/masmx86/readme.txt +++ b/cpukit/zlib/contrib/masmx86/readme.txt @@ -7,15 +7,21 @@ longest_match() and inflate_fast(). Use instructions ---------------- -Copy these files into the zlib source directory, then run the -appropriate makefile, as suggested below. +Assemble using MASM, and copy the object files into the zlib source +directory, then run the appropriate makefile, as suggested below. You can +donwload MASM from here: + http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=7a1c9da0-0510-44a2-b042-7ef370530c64 + +You can also get objects files here: + + http://www.winimage.com/zLibDll/zlib124_masm_obj.zip Build instructions ------------------ * With Microsoft C and MASM: -nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" OBJA="gvmat32c.obj gvmat32.obj inffas32.obj" +nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" OBJA="match686.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" +make -f win32/Makefile.bor LOCAL_ZLIB="-DASMV -DASMINF" OBJA="match686.obj inffas32.obj" OBJPA="+match686c.obj+match686.obj+inffas32.obj" -- cgit v1.2.3 From d5af3c14fd1b6c85012ad03af3963d94fc893a7b Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 28 Mar 2010 19:06:13 +0000 Subject: Import from zlib-1.2.5 --- cpukit/zlib/CMakeLists.txt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'cpukit/zlib') diff --git a/cpukit/zlib/CMakeLists.txt b/cpukit/zlib/CMakeLists.txt index 7eefa49251..a64fe0b2ca 100644 --- a/cpukit/zlib/CMakeLists.txt +++ b/cpukit/zlib/CMakeLists.txt @@ -20,7 +20,7 @@ check_include_file(stddef.h HAVE_STDDEF_H) # # Check to see if we have large file support # -set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE) +set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1) # We add these other definitions here because CheckTypeSize.cmake # in CMake 2.4.x does not automatically do so and we want # compatibility with CMake 2.4.x. @@ -35,7 +35,7 @@ if(HAVE_STDDEF_H) endif() check_type_size(off64_t OFF64_T) if(HAVE_OFF64_T) - add_definitions(-D_LARGEFILE64_SOURCE) + add_definitions(-D_LARGEFILE64_SOURCE=1) endif() set(CMAKE_REQUIRED_DEFINITIONS) # clear variable @@ -52,13 +52,6 @@ endif() # check_include_file(unistd.h Z_HAVE_UNISTD_H) -# -# Check for errno.h -check_include_file(errno.h HAVE_ERRNO_H) -if(NOT HAVE_ERRNO_H) - add_definitions(-DNO_ERRNO_H) -endif() - if(MSVC) set(CMAKE_DEBUG_POSTFIX "d") add_definitions(-D_CRT_SECURE_NO_DEPRECATE) -- cgit v1.2.3