From owner-svn-src-user@FreeBSD.ORG  Fri Mar 19 21:29:30 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A5B24106566B;
	Fri, 19 Mar 2010 21:29:30 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 944EA8FC08;
	Fri, 19 Mar 2010 21:29:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2JLTUiN069925;
	Fri, 19 Mar 2010 21:29:30 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2JLTUDt069923;
	Fri, 19 Mar 2010 21:29:30 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201003192129.o2JLTUDt069923@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 19 Mar 2010 21:29:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205348 - in user/delphij/libz: . contrib/inflate86
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Mar 2010 21:29:30 -0000

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