svn commit: r205348 - in user/delphij/libz: . contrib/inflate86

[Xin LI]

Author: delphij
Date: Fri Mar 19 21:29:30 2010
New Revision: 205348
URL: http://svn.freebsd.org/changeset/base/205348

Log:
  Remove the optimized inflate code - it doesn't work on i386 (uses %ebx
  which conflicts with PIC) and doesn't seem to provide benefit during my
  tests with help from ministat(1) if we compare with the gain provided
  by gvmat64 code.

Deleted:
  user/delphij/libz/contrib/inflate86/
Modified:
  user/delphij/libz/Makefile

Modified: user/delphij/libz/Makefile
==============================================================================
--- user/delphij/libz/Makefile	Fri Mar 19 21:15:43 2010	(r205347)
+++ user/delphij/libz/Makefile	Fri Mar 19 21:29:30 2010	(r205348)
@@ -27,6 +27,7 @@ SRCS+=		gzlib.c
 SRCS+=		gzread.c
 SRCS+=		gzwrite.c
 SRCS+=		infback.c
+SRCS+=		inffast.c
 SRCS+=		inflate.c
 SRCS+=		inftrees.c
 SRCS+=		trees.c
@@ -34,22 +35,16 @@ SRCS+=		uncompr.c
 SRCS+=		zopen.c
 SRCS+=		zutil.c
 
-.if ${MACHINE_ARCH} == "i386" && defined(MACHINE_CPU)
-.if ${MACHINE_CPU:M*i686*}
+.if ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU:M*i686*}
 .PATH:		${.CURDIR}/contrib/asm686
 SRCS+=		match.S
 CFLAGS+=	-DASMV -DNO_UNDERLINE
 .endif
-.endif
 
 .if ${MACHINE_ARCH} == "amd64"
 .PATH:		${.CURDIR}/contrib/gcc_gvmat64
-.PATH:		${.CURDIR}/contrib/inflate86
 SRCS+=		gvmat64.S
-SRCS+=		inffas86.c
-CFLAGS+=	-DASMV -DASMINF -DNO_UNDERLINE
-.else
-SRCS+=		inffast.c
+CFLAGS+=	-DASMV -DNO_UNDERLINE
 .endif
 
 INCS=		zconf.h zlib.h