From owner-svn-src-all@FreeBSD.ORG  Thu Jul 21 00:37:32 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D465F1065674;
	Thu, 21 Jul 2011 00:37:32 +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 C3C638FC12;
	Thu, 21 Jul 2011 00:37:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6L0bWf5038441;
	Thu, 21 Jul 2011 00:37:32 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6L0bWit038439;
	Thu, 21 Jul 2011 00:37:32 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201107210037.p6L0bWit038439@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 21 Jul 2011 00:37:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224238 - stable/8/lib/libz
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jul 2011 00:37:32 -0000

Author: delphij
Date: Thu Jul 21 00:37:32 2011
New Revision: 224238
URL: http://svn.freebsd.org/changeset/base/224238

Log:
  MFC r224196:
  
  Disable gvmat64.S, the assembler version of longest_match for now.
  
  PR:		kern/154073

Modified:
  stable/8/lib/libz/Makefile
Directory Properties:
  stable/8/lib/libz/   (props changed)
  stable/8/lib/libz/contrib/   (props changed)

Modified: stable/8/lib/libz/Makefile
==============================================================================
--- stable/8/lib/libz/Makefile	Wed Jul 20 22:48:48 2011	(r224237)
+++ stable/8/lib/libz/Makefile	Thu Jul 21 00:37:32 2011	(r224238)
@@ -25,11 +25,12 @@ SRCS+=		match.S
 CFLAGS+=	-DASMV -DNO_UNDERLINE
 .endif
 
-.if ${MACHINE_ARCH} == "amd64"
-.PATH:		${.CURDIR}/contrib/gcc_gvmat64
-SRCS+=		gvmat64.S
-CFLAGS+=	-DASMV -DNO_UNDERLINE
-.endif
+#.if ${MACHINE_ARCH} == "amd64"
+#.PATH:		${.CURDIR}/contrib/gcc_gvmat64
+#SRCS+=		gvmat64.S
+#CFLAGS+=	-DASMV -DNO_UNDERLINE
+#ACFLAGS+=	-Wa,--noexecstack
+#.endif
 
 minigzip:	all minigzip.o
 	$(CC) -o minigzip minigzip.o -L. -lz