Skip to content

Commit d0704a8

Browse files
author
Mark Adler
committed
Remove deleted assembler code references.
The code was removed, but the builds that used the code were not updated. This fixes that. Thanks to Adenilson and toxieainc for the patches.
1 parent 095da07 commit d0704a8

30 files changed

+192
-615
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ project(zlib C)
55

66
set(VERSION "1.2.12.1")
77

8-
option(ASM686 "Enable building i686 assembly implementation")
9-
option(AMD64 "Enable building amd64 assembly implementation")
10-
118
set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
129
set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
1310
set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
@@ -129,39 +126,6 @@ if(NOT MINGW)
129126
)
130127
endif()
131128

132-
if(CMAKE_COMPILER_IS_GNUCC)
133-
if(ASM686)
134-
set(ZLIB_ASMS contrib/asm686/match.S)
135-
elseif (AMD64)
136-
set(ZLIB_ASMS contrib/amd64/amd64-match.S)
137-
endif ()
138-
139-
if(ZLIB_ASMS)
140-
add_definitions(-DASMV)
141-
set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
142-
endif()
143-
endif()
144-
145-
if(MSVC)
146-
if(ASM686)
147-
ENABLE_LANGUAGE(ASM_MASM)
148-
set(ZLIB_ASMS
149-
contrib/masmx86/inffas32.asm
150-
contrib/masmx86/match686.asm
151-
)
152-
elseif (AMD64)
153-
ENABLE_LANGUAGE(ASM_MASM)
154-
set(ZLIB_ASMS
155-
contrib/masmx64/gvmat64.asm
156-
contrib/masmx64/inffasx64.asm
157-
)
158-
endif()
159-
160-
if(ZLIB_ASMS)
161-
add_definitions(-DASMV -DASMINF)
162-
endif()
163-
endif()
164-
165129
# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
166130
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
167131
string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
@@ -183,8 +147,8 @@ if(MINGW)
183147
set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
184148
endif(MINGW)
185149

186-
add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
187-
add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
150+
add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
151+
add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
188152
set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
189153
set_target_properties(zlib PROPERTIES SOVERSION 1)
190154

‎Makefile.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
# Normally configure builds both a static and a shared library.
88
# If you want to build just a static library, use: ./configure --static
99

10-
# To use the asm code, type:
11-
# cp contrib/asm?86/match.S ./match.S
12-
# make LOC=-DASMV OBJA=match.o
13-
1410
# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
1511
# make install
1612
# To install in $HOME instead of /usr/local, use:

‎configure

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ else
179179
fi
180180

181181
cflags=${CFLAGS-"-O3"}
182-
# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
183182
case "$cc" in
184183
*gcc*) gcc=1 ;;
185184
*clang*) gcc=1 ;;
@@ -453,20 +452,6 @@ else
453452
TEST="all teststatic testshared"
454453
fi
455454

456-
# check for underscores in external names for use by assembler code
457-
CPP=${CPP-"$CC -E"}
458-
case $CFLAGS in
459-
*ASMV*)
460-
echo >> configure.log
461-
show "$NM $test.o | grep _hello"
462-
if test "`$NM $test.o | grep _hello | tee -a configure.log`" = ""; then
463-
CPP="$CPP -DNO_UNDERLINE"
464-
echo Checking for underline in external names... No. | tee -a configure.log
465-
else
466-
echo Checking for underline in external names... Yes. | tee -a configure.log
467-
fi ;;
468-
esac
469-
470455
echo >> configure.log
471456

472457
# check for size_t

‎contrib/vstudio/readme.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ More information can be found at this site.
1717
Build instructions for Visual Studio 2008 (32 bits or 64 bits)
1818
--------------------------------------------------------------
1919
- Decompress current zlib, including all contrib/* files
20-
- Compile assembly code (with Visual Studio Command Prompt) by running:
21-
bld_ml64.bat (in contrib\masmx64)
22-
bld_ml32.bat (in contrib\masmx86)
2320
- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
2421
- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
2522

‎contrib/vstudio/vc10/miniunz.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ItemGroup>
44
<Filter Include="Source Files">
55
<UniqueIdentifier>{048af943-022b-4db6-beeb-a54c34774ee2}</UniqueIdentifier>
6-
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
6+
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
77
</Filter>
88
<Filter Include="Header Files">
99
<UniqueIdentifier>{c1d600d2-888f-4aea-b73e-8b0dd9befa0c}</UniqueIdentifier>

‎contrib/vstudio/vc10/minizip.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ItemGroup>
44
<Filter Include="Source Files">
55
<UniqueIdentifier>{c0419b40-bf50-40da-b153-ff74215b79de}</UniqueIdentifier>
6-
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
6+
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
77
</Filter>
88
<Filter Include="Header Files">
99
<UniqueIdentifier>{bb87b070-735b-478e-92ce-7383abb2f36c}</UniqueIdentifier>

‎contrib/vstudio/vc10/testzlib.vcxproj

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<ClCompile>
182182
<Optimization>Disabled</Optimization>
183183
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
184-
<PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
184+
<PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
185185
<MinimalRebuild>true</MinimalRebuild>
186186
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
187187
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -194,7 +194,7 @@
194194
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
195195
</ClCompile>
196196
<Link>
197-
<AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
197+
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
198198
<OutputFile>$(OutDir)testzlib.exe</OutputFile>
199199
<GenerateDebugInformation>true</GenerateDebugInformation>
200200
<ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -241,7 +241,7 @@
241241
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
242242
<OmitFramePointers>true</OmitFramePointers>
243243
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
244-
<PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
244+
<PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
245245
<StringPooling>true</StringPooling>
246246
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
247247
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -254,7 +254,7 @@
254254
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
255255
</ClCompile>
256256
<Link>
257-
<AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
257+
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
258258
<OutputFile>$(OutDir)testzlib.exe</OutputFile>
259259
<GenerateDebugInformation>true</GenerateDebugInformation>
260260
<SubSystem>Console</SubSystem>
@@ -269,14 +269,14 @@
269269
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
270270
<ClCompile>
271271
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
272-
<PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
272+
<PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
273273
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
274274
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
275275
<BufferSecurityCheck>false</BufferSecurityCheck>
276276
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
277277
</ClCompile>
278278
<Link>
279-
<AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
279+
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
280280
</Link>
281281
</ItemDefinitionGroup>
282282
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
@@ -352,14 +352,14 @@
352352
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
353353
<ClCompile>
354354
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
355-
<PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
355+
<PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
356356
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
357357
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
358358
<BufferSecurityCheck>false</BufferSecurityCheck>
359359
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
360360
</ClCompile>
361361
<Link>
362-
<AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
362+
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
363363
</Link>
364364
</ItemDefinitionGroup>
365365
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
@@ -398,14 +398,6 @@
398398
<ClCompile Include="..\..\..\crc32.c" />
399399
<ClCompile Include="..\..\..\deflate.c" />
400400
<ClCompile Include="..\..\..\infback.c" />
401-
<ClCompile Include="..\..\masmx64\inffas8664.c">
402-
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
403-
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
404-
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
405-
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
406-
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
407-
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
408-
</ClCompile>
409401
<ClCompile Include="..\..\..\inffast.c" />
410402
<ClCompile Include="..\..\..\inflate.c" />
411403
<ClCompile Include="..\..\..\inftrees.c" />

‎contrib/vstudio/vc10/testzlib.vcxproj.filters

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ItemGroup>
44
<Filter Include="Source Files">
55
<UniqueIdentifier>{c1f6a2e3-5da5-4955-8653-310d3efe05a9}</UniqueIdentifier>
6-
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
6+
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
77
</Filter>
88
<Filter Include="Header Files">
99
<UniqueIdentifier>{c2aaffdc-2c95-4d6f-8466-4bec5890af2c}</UniqueIdentifier>
@@ -30,9 +30,6 @@
3030
<ClCompile Include="..\..\..\infback.c">
3131
<Filter>Source Files</Filter>
3232
</ClCompile>
33-
<ClCompile Include="..\..\masmx64\inffas8664.c">
34-
<Filter>Source Files</Filter>
35-
</ClCompile>
3633
<ClCompile Include="..\..\..\inffast.c">
3734
<Filter>Source Files</Filter>
3835
</ClCompile>

‎contrib/vstudio/vc10/testzlibdll.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ItemGroup>
44
<Filter Include="Source Files">
55
<UniqueIdentifier>{fa61a89f-93fc-4c89-b29e-36224b7592f4}</UniqueIdentifier>
6-
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
6+
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
77
</Filter>
88
<Filter Include="Header Files">
99
<UniqueIdentifier>{d4b85da0-2ba2-4934-b57f-e2584e3848ee}</UniqueIdentifier>

0 commit comments

Comments
 (0)