svn commit: r224238 - stable/8/lib/libz

[Xin LI]

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