Attachment #171490 for bug #210328

View | Details | Raw Unified | Return to bug 210328
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	libgcrypt
PORTVERSION=	1.7.1
CATEGORIES=	security
MASTER_SITES=	GNUPG


CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
USE_LDCONFIG=	yes
TEST_TARGET=	check

DOCS=		AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS README \
		README.GIT THANKS TODO doc/HACKING doc/README.apichanges

	${MKDIR} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}

regression-test: build
	cd ${WRKSRC} && ${MAKE_CMD} check

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)security/libgcrypt/distinfo (-2 / +3 lines)
1	SHA256 (libgcrypt-1.7.0.tar.bz2) = b0e67ea74474939913c4d9d9ef4ef5ec378efbe2bebe36389dee319c79bffa92	1	TIMESTAMP = 1466077169
2	SIZE (libgcrypt-1.7.0.tar.bz2) = 2840453	2	SHA256 (libgcrypt-1.7.1.tar.bz2) = 450d9cfcbf1611c64dbe3bd04b627b83379ef89f11406d94c8bba305e36d7a95
		3	SIZE (libgcrypt-1.7.1.tar.bz2) = 2843435




--- cipher/crc-intel-pclmul.c.orig	2016-04-07 15:30:08 UTC
+++ cipher/crc-intel-pclmul.c
@@ -143,7 +143,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
 		      [inbuf_2] "m" (inbuf[2 * 16]),
 		      [inbuf_3] "m" (inbuf[3 * 16]),
 		      [crc] "m" (*pcrc)
-		    : );
+		    );
 
       inbuf += 4 * 16;
       inlen -= 4 * 16;
@@ -151,7 +151,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
       asm volatile ("movdqa %[k1k2], %%xmm4\n\t"
 		    :
 		    : [k1k2] "m" (consts->k[1 - 1])
-		    : );
+		    );
 
       /* Fold by 4. */
       while (inlen >= 4 * 16)
@@ -188,7 +188,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
 			  [inbuf_1] "m" (inbuf[1 * 16]),
 			  [inbuf_2] "m" (inbuf[2 * 16]),
 			  [inbuf_3] "m" (inbuf[3 * 16])
-			: );
+			);
 
 	  inbuf += 4 * 16;
 	  inlen -= 4 * 16;
@@ -199,7 +199,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
 		    :
 		    : [k3k4] "m" (consts->k[3 - 1]),
 		      [my_p] "m" (consts->my_p[0])
-		    : );
+		    );
 
       /* Fold 4 to 1. */
 
@@ -222,7 +222,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
 		    "pxor %%xmm4, %%xmm0\n\t"
 		    :
 		    :
-		    : );
+		    );
     }
   else
     {
@@ -236,7 +236,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
 		      [crc] "m" (*pcrc),
 		      [k3k4] "m" (consts->k[3 - 1]),
 		      [my_p] "m" (consts->my_p[0])
-		    : );
+		    );
 
       inbuf += 16;
       inlen -= 16;
@@ -256,7 +256,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
 			"pxor %%xmm1, %%xmm0\n\t"
 			:
 			: [inbuf] "m" (*inbuf)
-			: );
+			);
 
 	  inbuf += 16;
 	  inlen -= 16;
@@ -288,7 +288,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
 		      [mask] "m" (crc32_partial_fold_input_mask[inlen]),
 		      [shl_shuf] "m" (crc32_refl_shuf_shift[inlen]),
 		      [shr_shuf] "m" (crc32_refl_shuf_shift[inlen + 16])
-		    : );
+		    );
 
       inbuf += inlen;
       inlen -= inlen;
@@ -318,7 +318,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
 		"pextrd $2, %%xmm0, %[out]\n\t"
 		: [out] "=m" (*pcrc)
 		: [k5] "m" (consts->k[5 - 1])
-	        : );
+	        );
 }
 
 static inline void
@@ -333,7 +333,7 @@ crc32_reflected_less_than_16 (u32 *pcrc,
       asm volatile ("movdqa %[my_p], %%xmm5\n\t"
 		    :
 		    : [my_p] "m" (consts->my_p[0])
-		    : );
+		    );
 
       if (inlen == 1)
 	{
@@ -372,7 +372,7 @@ crc32_reflected_less_than_16 (u32 *pcrc,
 		    : [out] "=m" (*pcrc)
 		    : [in] "rm" (data),
 		      [crc] "rm" (crc)
-		    : );
+		    );
     }
   else if (inlen == 4)
     {
@@ -391,7 +391,7 @@ crc32_reflected_less_than_16 (u32 *pcrc,
 		    : [in] "m" (*inbuf),
 		      [crc] "m" (*pcrc),
 		      [my_p] "m" (consts->my_p[0])
-		    : );
+		    );
     }
   else
     {
@@ -404,14 +404,14 @@ crc32_reflected_less_than_16 (u32 *pcrc,
 		      [crc] "m" (*pcrc),
 		      [my_p] "m" (consts->my_p[0]),
 		      [k3k4] "m" (consts->k[3 - 1])
-		    : );
+		    );
 
       if (inlen >= 8)
 	{
 	  asm volatile ("movq %[inbuf], %%xmm0\n\t"
 			:
 			: [inbuf] "m" (*inbuf)
-			: );
+			);
 	  if (inlen > 8)
 	    {
 	      asm volatile (/*"pinsrq $1, %[inbuf_tail], %%xmm0\n\t"*/
@@ -422,7 +422,7 @@ crc32_reflected_less_than_16 (u32 *pcrc,
 			    : [inbuf_tail] "m" (inbuf[inlen - 8]),
 			      [merge_shuf] "m"
 				(*crc32_merge9to15_shuf[inlen - 9])
-			    : );
+			    );
 	    }
 	}
       else
@@ -435,7 +435,7 @@ crc32_reflected_less_than_16 (u32 *pcrc,
 			  [inbuf_tail] "m" (inbuf[inlen - 4]),
 			  [merge_shuf] "m"
 			    (*crc32_merge5to7_shuf[inlen - 5])
-			: );
+			);
 	}
 
       /* Final fold. */
@@ -465,7 +465,7 @@ crc32_reflected_less_than_16 (u32 *pcrc,
 		    "pextrd $2, %%xmm0, %[out]\n\t"
 		    : [out] "=m" (*pcrc)
 		    : [k5] "m" (consts->k[5 - 1])
-		    : );
+		    );
     }
 }
 
@@ -477,7 +477,7 @@ crc32_bulk (u32 *pcrc, const byte *inbuf
   asm volatile ("movdqa %[bswap], %%xmm7\n\t"
 		:
 		: [bswap] "m" (*crc32_bswap_shuf)
-		: );
+		);
 
   if (inlen >= 8 * 16)
     {
@@ -497,7 +497,7 @@ crc32_bulk (u32 *pcrc, const byte *inbuf
 		      [inbuf_2] "m" (inbuf[2 * 16]),
 		      [inbuf_3] "m" (inbuf[3 * 16]),
 		      [crc] "m" (*pcrc)
-		    : );
+		    );
 
       inbuf += 4 * 16;
       inlen -= 4 * 16;
@@ -505,7 +505,7 @@ crc32_bulk (u32 *pcrc, const byte *inbuf
       asm volatile ("movdqa %[k1k2], %%xmm4\n\t"
 		    :
 		    : [k1k2] "m" (consts->k[1 - 1])
-		    : );
+		    );
 
       /* Fold by 4. */
       while (inlen >= 4 * 16)
@@ -546,7 +546,7 @@ crc32_bulk (u32 *pcrc, const byte *inbuf
 			  [inbuf_1] "m" (inbuf[1 * 16]),
 			  [inbuf_2] "m" (inbuf[2 * 16]),
 			  [inbuf_3] "m" (inbuf[3 * 16])
-			: );
+			);
 
 	  inbuf += 4 * 16;
 	  inlen -= 4 * 16;
@@ -557,7 +557,7 @@ crc32_bulk (u32 *pcrc, const byte *inbuf
 		    :
 		    : [k3k4] "m" (consts->k[3 - 1]),
 		      [my_p] "m" (consts->my_p[0])
-		    : );
+		    );
 
       /* Fold 4 to 1. */
 
@@ -580,7 +580,7 @@ crc32_bulk (u32 *pcrc, const byte *inbuf
 		    "pxor %%xmm4, %%xmm0\n\t"
 		    :
 		    :
-		    : );
+		    );
     }
   else
     {
@@ -595,7 +595,7 @@ crc32_bulk (u32 *pcrc, const byte *inbuf
 		      [crc] "m" (*pcrc),
 		      [k3k4] "m" (consts->k[3 - 1]),
 		      [my_p] "m" (consts->my_p[0])
-		    : );
+		    );
 
       inbuf += 16;
       inlen -= 16;
@@ -616,7 +616,7 @@ crc32_bulk (u32 *pcrc, const byte *inbuf
 			"pxor %%xmm1, %%xmm0\n\t"
 			:
 			: [inbuf] "m" (*inbuf)
-			: );
+			);
 
 	  inbuf += 16;
 	  inlen -= 16;
@@ -650,7 +650,7 @@ crc32_bulk (u32 *pcrc, const byte *inbuf
 		      [mask] "m" (crc32_partial_fold_input_mask[inlen]),
 		      [shl_shuf] "m" (crc32_refl_shuf_shift[32 - inlen]),
 		      [shr_shuf] "m" (crc32_shuf_shift[inlen + 16])
-		    : );
+		    );
 
       inbuf += inlen;
       inlen -= inlen;
@@ -697,7 +697,7 @@ crc32_less_than_16 (u32 *pcrc, const byt
       asm volatile ("movdqa %[my_p], %%xmm5\n\t"
 		    :
 		    : [my_p] "m" (consts->my_p[0])
-		    : );
+		    );
 
       if (inlen == 1)
 	{
@@ -774,14 +774,14 @@ crc32_less_than_16 (u32 *pcrc, const byt
 		      [crc] "m" (*pcrc),
 		      [my_p] "m" (consts->my_p[0]),
 		      [k3k4] "m" (consts->k[3 - 1])
-		    : );
+		    );
 
       if (inlen >= 8)
 	{
 	  asm volatile ("movq %[inbuf], %%xmm0\n\t"
 			:
 			: [inbuf] "m" (*inbuf)
-			: );
+			);
 	  if (inlen > 8)
 	    {
 	      asm volatile (/*"pinsrq $1, %[inbuf_tail], %%xmm0\n\t"*/
@@ -792,7 +792,7 @@ crc32_less_than_16 (u32 *pcrc, const byt
 			    : [inbuf_tail] "m" (inbuf[inlen - 8]),
 			      [merge_shuf] "m"
 				(*crc32_merge9to15_shuf[inlen - 9])
-			    : );
+			    );
 	    }
 	}
       else
@@ -805,7 +805,7 @@ crc32_less_than_16 (u32 *pcrc, const byt
 			  [inbuf_tail] "m" (inbuf[inlen - 4]),
 			  [merge_shuf] "m"
 			    (*crc32_merge5to7_shuf[inlen - 5])
-			: );
+			);
 	}
 
       /* Final fold. */

Lines 1-4 Link Here

(-)security/libgcrypt/files/patch-mpi_longlong.h (-4 / +4 lines)
1	--- mpi/longlong.h.orig 2016-04-18 19:16:10 UTC	1	--- mpi/longlong.h.orig 2016-06-16 11:43:39 UTC
2	+++ mpi/longlong.h	2	+++ mpi/longlong.h
3	@@ -174,6 +174,7 @@ MA 02111-1307, USA. */	3	@@ -174,6 +174,7 @@ MA 02111-1307, USA. */
4	(pl) = __m0 * __m1; \	4	(pl) = __m0 * __m1; \
Lines 12-18 Link Here
12	extern UDItype __udiv_qrnnd ();	12	extern UDItype __udiv_qrnnd ();
13	# define UDIV_TIME 220	13	# define UDIV_TIME 220
14	# endif /* !LONGLONG_STANDALONE */	14	# endif /* !LONGLONG_STANDALONE */
15	+# endif /* 0 */	15	+#endif /* 0 */
16	#endif /* __alpha */	16	#endif /* __alpha */
17		17
18	/***************************************	18	/***************************************
Lines 20-27 Link Here
20	"rJ" ((USItype)(al)), \	20	"rJ" ((USItype)(al)), \
21	"rI" ((USItype)(bl)) \	21	"rI" ((USItype)(bl)) \
22	__CLOBBER_CC)	22	__CLOBBER_CC)
23	-# if defined (__sparc_v8__)	23	-# if defined (__sparc_v8__) \|\| defined(__sparcv8)
24	+# if defined (__sparc_v8__) \|\| defined (__sparc__)	24	+# if defined (__sparc_v8__) \|\| defined(__sparcv8) \|\| defined(__sparc__)
25	/* Don't match immediate range because, 1) it is not often useful,	25	/* Don't match immediate range because, 1) it is not often useful,
26	2) the 'I' flag thinks of the range as a 13 bit signed interval,	26	2) the 'I' flag thinks of the range as a 13 bit signed interval,
27	while we want to match a 13 bit interval, sign extended to 32 bits,	27	while we want to match a 13 bit interval, sign extended to 32 bits,

Lines 6-11 Link Here

(-)security/libgcrypt/pkg-plist (-1 / +1 lines)
6	lib/libgcrypt.a	6	lib/libgcrypt.a
7	lib/libgcrypt.so	7	lib/libgcrypt.so
8	lib/libgcrypt.so.20	8	lib/libgcrypt.so.20
9	lib/libgcrypt.so.20.1.0	9	lib/libgcrypt.so.20.1.1
10	man/man1/hmac256.1.gz	10	man/man1/hmac256.1.gz
11	share/aclocal/libgcrypt.m4	11	share/aclocal/libgcrypt.m4

Return to bug 210328

Lines 1-7 Link Here

(-)security/libgcrypt/Makefile (-4 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= libgcrypt	3	PORTNAME= libgcrypt
4	PORTVERSION= 1.7.0	4	PORTVERSION= 1.7.1
5	CATEGORIES= security	5	CATEGORIES= security
6	MASTER_SITES= GNUPG	6	MASTER_SITES= GNUPG
7		7
Lines 22-27 Link Here
22	CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"	22	CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
23	CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}	23	CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
24	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
		25	TEST_TARGET= check
25		26
26	DOCS= AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS README \	27	DOCS= AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS README \
27	README.GIT THANKS TODO doc/HACKING doc/README.apichanges	28	README.GIT THANKS TODO doc/HACKING doc/README.apichanges
Lines 47-53 Link Here
47	${MKDIR} ${STAGEDIR}${DOCSDIR}	48	${MKDIR} ${STAGEDIR}${DOCSDIR}
48	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}	49	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
49		50
50	regression-test: build
51	cd ${WRKSRC} && ${MAKE_CMD} check
52
53	.include <bsd.port.mk>	51	.include <bsd.port.mk>

Lines 1-279 Link Here

(-)security/libgcrypt/files/patch-cipher_crc-intel-pclmul.c (-279 lines)
1	--- cipher/crc-intel-pclmul.c.orig 2016-04-07 15:30:08 UTC
2	+++ cipher/crc-intel-pclmul.c
3	@@ -143,7 +143,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
4	[inbuf_2] "m" (inbuf[2 * 16]),
5	[inbuf_3] "m" (inbuf[3 * 16]),
6	[crc] "m" (*pcrc)
7	- : );
8	+ );
9
10	inbuf += 4 * 16;
11	inlen -= 4 * 16;
12	@@ -151,7 +151,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
13	asm volatile ("movdqa %[k1k2], %%xmm4\n\t"
14	:
15	: [k1k2] "m" (consts->k[1 - 1])
16	- : );
17	+ );
18
19	/* Fold by 4. */
20	while (inlen >= 4 * 16)
21	@@ -188,7 +188,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
22	[inbuf_1] "m" (inbuf[1 * 16]),
23	[inbuf_2] "m" (inbuf[2 * 16]),
24	[inbuf_3] "m" (inbuf[3 * 16])
25	- : );
26	+ );
27
28	inbuf += 4 * 16;
29	inlen -= 4 * 16;
30	@@ -199,7 +199,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
31	:
32	: [k3k4] "m" (consts->k[3 - 1]),
33	[my_p] "m" (consts->my_p[0])
34	- : );
35	+ );
36
37	/* Fold 4 to 1. */
38
39	@@ -222,7 +222,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
40	"pxor %%xmm4, %%xmm0\n\t"
41	:
42	:
43	- : );
44	+ );
45	}
46	else
47	{
48	@@ -236,7 +236,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
49	[crc] "m" (*pcrc),
50	[k3k4] "m" (consts->k[3 - 1]),
51	[my_p] "m" (consts->my_p[0])
52	- : );
53	+ );
54
55	inbuf += 16;
56	inlen -= 16;
57	@@ -256,7 +256,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
58	"pxor %%xmm1, %%xmm0\n\t"
59	:
60	: [inbuf] "m" (*inbuf)
61	- : );
62	+ );
63
64	inbuf += 16;
65	inlen -= 16;
66	@@ -288,7 +288,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
67	[mask] "m" (crc32_partial_fold_input_mask[inlen]),
68	[shl_shuf] "m" (crc32_refl_shuf_shift[inlen]),
69	[shr_shuf] "m" (crc32_refl_shuf_shift[inlen + 16])
70	- : );
71	+ );
72
73	inbuf += inlen;
74	inlen -= inlen;
75	@@ -318,7 +318,7 @@ crc32_reflected_bulk (u32 *pcrc, const b
76	"pextrd $2, %%xmm0, %[out]\n\t"
77	: [out] "=m" (*pcrc)
78	: [k5] "m" (consts->k[5 - 1])
79	- : );
80	+ );
81	}
82
83	static inline void
84	@@ -333,7 +333,7 @@ crc32_reflected_less_than_16 (u32 *pcrc,
85	asm volatile ("movdqa %[my_p], %%xmm5\n\t"
86	:
87	: [my_p] "m" (consts->my_p[0])
88	- : );
89	+ );
90
91	if (inlen == 1)
92	{
93	@@ -372,7 +372,7 @@ crc32_reflected_less_than_16 (u32 *pcrc,
94	: [out] "=m" (*pcrc)
95	: [in] "rm" (data),
96	[crc] "rm" (crc)
97	- : );
98	+ );
99	}
100	else if (inlen == 4)
101	{
102	@@ -391,7 +391,7 @@ crc32_reflected_less_than_16 (u32 *pcrc,
103	: [in] "m" (*inbuf),
104	[crc] "m" (*pcrc),
105	[my_p] "m" (consts->my_p[0])
106	- : );
107	+ );
108	}
109	else
110	{
111	@@ -404,14 +404,14 @@ crc32_reflected_less_than_16 (u32 *pcrc,
112	[crc] "m" (*pcrc),
113	[my_p] "m" (consts->my_p[0]),
114	[k3k4] "m" (consts->k[3 - 1])
115	- : );
116	+ );
117
118	if (inlen >= 8)
119	{
120	asm volatile ("movq %[inbuf], %%xmm0\n\t"
121	:
122	: [inbuf] "m" (*inbuf)
123	- : );
124	+ );
125	if (inlen > 8)
126	{
127	asm volatile (/"pinsrq $1, %[inbuf_tail], %%xmm0\n\t"/
128	@@ -422,7 +422,7 @@ crc32_reflected_less_than_16 (u32 *pcrc,
129	: [inbuf_tail] "m" (inbuf[inlen - 8]),
130	[merge_shuf] "m"
131	(*crc32_merge9to15_shuf[inlen - 9])
132	- : );
133	+ );
134	}
135	}
136	else
137	@@ -435,7 +435,7 @@ crc32_reflected_less_than_16 (u32 *pcrc,
138	[inbuf_tail] "m" (inbuf[inlen - 4]),
139	[merge_shuf] "m"
140	(*crc32_merge5to7_shuf[inlen - 5])
141	- : );
142	+ );
143	}
144
145	/* Final fold. */
146	@@ -465,7 +465,7 @@ crc32_reflected_less_than_16 (u32 *pcrc,
147	"pextrd $2, %%xmm0, %[out]\n\t"
148	: [out] "=m" (*pcrc)
149	: [k5] "m" (consts->k[5 - 1])
150	- : );
151	+ );
152	}
153	}
154
155	@@ -477,7 +477,7 @@ crc32_bulk (u32 pcrc, const byte inbuf
156	asm volatile ("movdqa %[bswap], %%xmm7\n\t"
157	:
158	: [bswap] "m" (*crc32_bswap_shuf)
159	- : );
160	+ );
161
162	if (inlen >= 8 * 16)
163	{
164	@@ -497,7 +497,7 @@ crc32_bulk (u32 pcrc, const byte inbuf
165	[inbuf_2] "m" (inbuf[2 * 16]),
166	[inbuf_3] "m" (inbuf[3 * 16]),
167	[crc] "m" (*pcrc)
168	- : );
169	+ );
170
171	inbuf += 4 * 16;
172	inlen -= 4 * 16;
173	@@ -505,7 +505,7 @@ crc32_bulk (u32 pcrc, const byte inbuf
174	asm volatile ("movdqa %[k1k2], %%xmm4\n\t"
175	:
176	: [k1k2] "m" (consts->k[1 - 1])
177	- : );
178	+ );
179
180	/* Fold by 4. */
181	while (inlen >= 4 * 16)
182	@@ -546,7 +546,7 @@ crc32_bulk (u32 pcrc, const byte inbuf
183	[inbuf_1] "m" (inbuf[1 * 16]),
184	[inbuf_2] "m" (inbuf[2 * 16]),
185	[inbuf_3] "m" (inbuf[3 * 16])
186	- : );
187	+ );
188
189	inbuf += 4 * 16;
190	inlen -= 4 * 16;
191	@@ -557,7 +557,7 @@ crc32_bulk (u32 pcrc, const byte inbuf
192	:
193	: [k3k4] "m" (consts->k[3 - 1]),
194	[my_p] "m" (consts->my_p[0])
195	- : );
196	+ );
197
198	/* Fold 4 to 1. */
199
200	@@ -580,7 +580,7 @@ crc32_bulk (u32 pcrc, const byte inbuf
201	"pxor %%xmm4, %%xmm0\n\t"
202	:
203	:
204	- : );
205	+ );
206	}
207	else
208	{
209	@@ -595,7 +595,7 @@ crc32_bulk (u32 pcrc, const byte inbuf
210	[crc] "m" (*pcrc),
211	[k3k4] "m" (consts->k[3 - 1]),
212	[my_p] "m" (consts->my_p[0])
213	- : );
214	+ );
215
216	inbuf += 16;
217	inlen -= 16;
218	@@ -616,7 +616,7 @@ crc32_bulk (u32 pcrc, const byte inbuf
219	"pxor %%xmm1, %%xmm0\n\t"
220	:
221	: [inbuf] "m" (*inbuf)
222	- : );
223	+ );
224
225	inbuf += 16;
226	inlen -= 16;
227	@@ -650,7 +650,7 @@ crc32_bulk (u32 pcrc, const byte inbuf
228	[mask] "m" (crc32_partial_fold_input_mask[inlen]),
229	[shl_shuf] "m" (crc32_refl_shuf_shift[32 - inlen]),
230	[shr_shuf] "m" (crc32_shuf_shift[inlen + 16])
231	- : );
232	+ );
233
234	inbuf += inlen;
235	inlen -= inlen;
236	@@ -697,7 +697,7 @@ crc32_less_than_16 (u32 *pcrc, const byt
237	asm volatile ("movdqa %[my_p], %%xmm5\n\t"
238	:
239	: [my_p] "m" (consts->my_p[0])
240	- : );
241	+ );
242
243	if (inlen == 1)
244	{
245	@@ -774,14 +774,14 @@ crc32_less_than_16 (u32 *pcrc, const byt
246	[crc] "m" (*pcrc),
247	[my_p] "m" (consts->my_p[0]),
248	[k3k4] "m" (consts->k[3 - 1])
249	- : );
250	+ );
251
252	if (inlen >= 8)
253	{
254	asm volatile ("movq %[inbuf], %%xmm0\n\t"
255	:
256	: [inbuf] "m" (*inbuf)
257	- : );
258	+ );
259	if (inlen > 8)
260	{
261	asm volatile (/"pinsrq $1, %[inbuf_tail], %%xmm0\n\t"/
262	@@ -792,7 +792,7 @@ crc32_less_than_16 (u32 *pcrc, const byt
263	: [inbuf_tail] "m" (inbuf[inlen - 8]),
264	[merge_shuf] "m"
265	(*crc32_merge9to15_shuf[inlen - 9])
266	- : );
267	+ );
268	}
269	}
270	else
271	@@ -805,7 +805,7 @@ crc32_less_than_16 (u32 *pcrc, const byt
272	[inbuf_tail] "m" (inbuf[inlen - 4]),
273	[merge_shuf] "m"
274	(*crc32_merge5to7_shuf[inlen - 5])
275	- : );
276	+ );
277	}
278
279	/* Final fold. */