You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/05/12 12:00:15 UTC
svn commit: r1593916 -
/subversion/branches/1.7.x-disable_zlib_asm/build/generator/templates/build_zlib.ezt
Author: rhuijben
Date: Mon May 12 10:00:15 2014
New Revision: 1593916
URL: http://svn.apache.org/r1593916
Log:
On the 1.7.x-disable_zlib_asm: Disable ZLib assembly optimization on
Windows for whoever enabled it themselves by passing --enable-ml.
* build/generator/templates/build_zlib.ezt
Remove all support for enabling assembly optimizations.
Modified:
subversion/branches/1.7.x-disable_zlib_asm/build/generator/templates/build_zlib.ezt
Modified: subversion/branches/1.7.x-disable_zlib_asm/build/generator/templates/build_zlib.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-disable_zlib_asm/build/generator/templates/build_zlib.ezt?rev=1593916&r1=1593915&r2=1593916&view=diff
==============================================================================
--- subversion/branches/1.7.x-disable_zlib_asm/build/generator/templates/build_zlib.ezt (original)
+++ subversion/branches/1.7.x-disable_zlib_asm/build/generator/templates/build_zlib.ezt Mon May 12 10:00:15 2014
@@ -44,25 +44,6 @@ if /i "%2" == "x64" goto PX64
goto pIIerr
:checkrebuild
-
-[if-any use_ml]
-@rem **************************************************************************
-@rem Compile ASM sources with ML
-set ASFLAGS=-nologo -Zi -coff
-set LOC=-DASMV -DASMINF
-[is zlib_version "1.2.4"]
-set OBJA=contrib\masmx86\gvmat32c.obj contrib\masmx86\gvmat32.obj contrib\masmx86\inffas32.obj
-set ASM_OPTS=ASFLAGS="%ASFLAGS%" LOC="%LOC%" OBJA="%OBJA%"
-[else]
-if /i "%2" == "Win32" (
- set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj"
-) else if /i "%2" == "x64" (
- set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" AS=ml64
-)
-[end]
-[end]
-
-
if /i "%3" == "rebuild" goto rebuild
if /i "%3" == "clean" goto clean
if not "%3" == "" goto pIIIerr