From f2ae64ca746a17bff2acee13d7f429ae826443cf Mon Sep 17 00:00:00 2001
From: hanzhelii <18221254@bjtu.edu.cn>
Date: Mon, 17 May 2021 17:02:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20zip-3.0-?=
 =?UTF-8?q?crc-builtin.patch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zip-3.0-crc-builtin.patch | 99 ---------------------------------------
 1 file changed, 99 deletions(-)
 delete mode 100644 zip-3.0-crc-builtin.patch

diff --git a/zip-3.0-crc-builtin.patch b/zip-3.0-crc-builtin.patch
deleted file mode 100644
index a970398..0000000
--- a/zip-3.0-crc-builtin.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -Nabur zip30/crc32.c zip304/crc32.c
---- zip30/crc32.c	2008-05-05 00:51:40.000000000 +0800
-+++ zip304/crc32.c	2021-05-11 19:15:43.071275962 +0800
-@@ -675,7 +675,32 @@
- 
- #endif /* (IZ_CRC_BE_OPTIMIZ || IZ_CRC_LE_OPTIMIZ) */
- 
-+#ifdef ARCH_AARCH64
-+u_int32_t crc32(u_int32_t crc,const u_int8_t *p, unsigned int len)
-+{
-+int64_t length = len;
-+
-+while ((length -= sizeof(u_int64_t)) >=0) {
-+        __builtin_aarch64_crc32cx(crc, *((u_int64_t *)p));
-+        p += sizeof(u_int64_t);
-+}
-+
-+if (length & sizeof(u_int32_t)) {
-+        __builtin_aarch64_crc32cw(crc, *((u_int32_t *)p));
-+        p += sizeof(u_int32_t);
-+}
- 
-+if (length & sizeof(u_int16_t)) {
-+        __builtin_aarch64_crc32ch(crc, *((u_int16_t *)p));
-+        p += sizeof(u_int16_t);
-+}
-+
-+if (length & sizeof(u_int8_t))
-+        __builtin_aarch64_crc32cb(crc, *p);
-+
-+return crc;
-+}
-+#else
- /* ========================================================================= */
- ulg crc32(crc, buf, len)
-     ulg crc;                    /* crc shift register */
-@@ -726,6 +751,8 @@
- 
-   return REV_BE(c) ^ 0xffffffffL;   /* (instead of ~c for 64-bit machines) */
- }
-+#endif /* !ARCH_AARCH64*/
-+
- #endif /* !ASM_CRC */
- #endif /* !CRC_TABLE_ONLY */
- #endif /* !USE_ZLIB */
-diff -Nabur zip30/crc32.h zip304/crc32.h
---- zip30/crc32.h	2008-03-28 20:25:46.000000000 +0800
-+++ zip304/crc32.h	2021-05-11 19:17:36.765057779 +0800
-@@ -36,7 +36,11 @@
- #    undef IZ_CRC_BE_OPTIMIZ
- #  endif
- #else /* !(USE_ZLIB || CRC_TABLE_ONLY) */
-+#  ifdef ARCH_AARCH64
-+  u_int32_t crc32(u_int32_t crc,const u_int8_t *p, unsigned int len);
-+#  else
-    ulg      crc32           OF((ulg crc, ZCONST uch *buf, extent len));
-+#  endif
- #endif /* ?(USE_ZLIB || CRC_TABLE_ONLY) */
- 
- #ifndef CRC_32_TAB
-diff -Nabur zip30/unix/Makefile zip304/unix/Makefile
---- zip30/unix/Makefile	2008-05-07 14:33:56.000000000 +0800
-+++ zip304/unix/Makefile	2021-05-11 19:15:55.727474311 +0800
-@@ -37,6 +37,9 @@
- BINFLAGS = 755
- MANFLAGS = 644
- 
-+
-+TARGET_ARCH = $(shell uname -m)
-+ARCH = $(shell getconf LONG_BIT)
- # target directories - where to install executables and man pages to
- prefix = /usr/local
- BINDIR = $(prefix)/bin
-@@ -59,6 +62,12 @@
- #   LFLAGS2   flags after obj file list (libraries, etc)
- CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP)
- CFLAGS = -O2 $(CFLAGS_NOOPT)
-+ifeq ($(TARGET_ARCH),aarch64)
-+CFF = -DARCH=$(ARCH) -march=armv8.1-a -D ARCH_AARCH64
-+else
-+CFF =
-+endif
-+
- LFLAGS1 =
- LFLAGS2 = -s
- 
-@@ -80,10 +89,10 @@
- .SUFFIXES:
- .SUFFIXES: _.o .o .c .doc .1
- .c_.o:
--	$(CC) -c $(CFLAGS) -DUTIL -o $@ $<
-+	$(CC) -c $(CFLAGS) -DUTIL $(CFF)  -o $@ $<
- 
- .c.o:
--	$(CC) -c $(CFLAGS) $<
-+	$(CC) -c $(CFLAGS) $(CFF) $<
- 
- .1.doc:
- 	nroff -man $< | col -bx | uniq > $@