Attachment #210548 for bug #242523

View | Details | Raw Unified | Return to bug 242523 | Differences between
Collapse All | Expand All




		ssltap strsclnt symkeyutil vfychain vfyserv

OPTIONS_DEFINE=	DEBUG
OPTIONS_DEFINE_powerpc64=	VSX

VSX_DESC=	Enable VSX and crypto (POWER8 and newer)

VSX_CFLAGS=	-mcrypto -mvsx
VSX_USES=	compiler:c11

.include <bsd.port.options.mk>

.if ! ${PORT_OPTIONS:MDEBUG}

BINS=		${DIST}/${OPSYS}${OSREL}_DBG.OBJ
.endif

.if ${ARCH} == powerpc64
USES+=		compiler:c++11-lang # -mcrypto -mvsx
.endif

.if ${OPSYS} == FreeBSD && ${ARCH} == amd64
USE_BINUTILS=	# intel-gcm.s
CC+=	-B${LOCALBASE}/bin





--- lib/freebl/Makefile.orig	2019-12-04 01:03:31.000000000 +0100
+++ lib/freebl/Makefile	2019-12-11 16:48:47.959791000 +0100
@@ -788,5 +788,1 @@
 endif
-
-ifeq ($(CPU_ARCH),ppc)
-$(OBJDIR)/$(PROG_PREFIX)gcm-ppc$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec
-endif
+$(OBJDIR)/$(PROG_PREFIX)gcm$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec -mvsx
+$(OBJDIR)/$(PROG_PREFIX)rijndael$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec -mvsx
 endif
--- lib/freebl/blinit.c.orig	2019-12-11 17:45:06.930646000 +0100
+++ lib/freebl/blinit.c	2019-12-11 17:50:04.797680000 +0100
@@ -393,7 +393,12 @@




--- lib/freebl/gcm.h.orig	2019-12-04 01:03:31.000000000 +0100
+++ lib/freebl/gcm.h	2020-01-07 23:15:04.826777000 +0100
@@ -31,7 +31,6 @@
 #endif
 
 #ifdef __powerpc64__
-#include "altivec-types.h"
 
 /* The ghash freebl test tries to use this in C++, and gcc defines conflict. */
 #ifdef __cplusplus
@@ -41,12 +40,11 @@
 #endif
 
 /*
- * PPC CRYPTO requires at least gcc 5 or clang. The LE check is purely
- * because it's only been tested on LE. If you're interested in BE,
- * please send a patch.
+ * PPC CRYPTO requires at least gcc 5 or clang.
  */
 #if (defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 5)) && \
-    defined(IS_LITTLE_ENDIAN)
+    defined(__VSX__) && defined(__CRYPTO__)
+#include "altivec-types.h"
 #define USE_PPC_CRYPTO
 #endif
 

Return to bug 242523

Lines 44-50 Link Here

(-)Makefile (-4 / +6 lines)
44	ssltap strsclnt symkeyutil vfychain vfyserv	44	ssltap strsclnt symkeyutil vfychain vfyserv
45		45
46	OPTIONS_DEFINE= DEBUG	46	OPTIONS_DEFINE= DEBUG
		47	OPTIONS_DEFINE_powerpc64= VSX
47		48
		49	VSX_DESC= Enable VSX and crypto (POWER8 and newer)
		50
		51	VSX_CFLAGS= -mcrypto -mvsx
		52	VSX_USES= compiler:c11
		53
48	.include <bsd.port.options.mk>	54	.include <bsd.port.options.mk>
49		55
50	.if ! ${PORT_OPTIONS:MDEBUG}	56	.if ! ${PORT_OPTIONS:MDEBUG}
Lines 54-63 Link Here
54	BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ	60	BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ
55	.endif	61	.endif
56		62
57	.if ${ARCH} == powerpc64
58	USES+= compiler:c++11-lang # -mcrypto -mvsx
59	.endif
60
61	.if ${OPSYS} == FreeBSD && ${ARCH} == amd64	63	.if ${OPSYS} == FreeBSD && ${ARCH} == amd64
62	USE_BINUTILS= # intel-gcm.s	64	USE_BINUTILS= # intel-gcm.s
63	CC+= -B${LOCALBASE}/bin	65	CC+= -B${LOCALBASE}/bin

Lines 4-18 Link Here

(-)files/patch-bug1602386 (-7 / +4 lines)
4		4
5	--- lib/freebl/Makefile.orig 2019-12-04 01:03:31.000000000 +0100	5	--- lib/freebl/Makefile.orig 2019-12-04 01:03:31.000000000 +0100
6	+++ lib/freebl/Makefile 2019-12-11 16:48:47.959791000 +0100	6	+++ lib/freebl/Makefile 2019-12-11 16:48:47.959791000 +0100
7	@@ -788,5 +788,7 @@	7	@@ -788,5 +788,1 @@
8	endif	8	endif
9		9	-
10	ifeq ($(CPU_ARCH),ppc)	10	-ifeq ($(CPU_ARCH),ppc)
11	-$(OBJDIR)/$(PROG_PREFIX)gcm-ppc$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec	11	-$(OBJDIR)/$(PROG_PREFIX)gcm-ppc$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec
12	+$(OBJDIR)/$(PROG_PREFIX)gcm-ppc$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec -mvsx	12	-endif
13	+$(OBJDIR)/$(PROG_PREFIX)gcm$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec -mvsx
14	+$(OBJDIR)/$(PROG_PREFIX)rijndael$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec -mvsx
15	endif
16	--- lib/freebl/blinit.c.orig 2019-12-11 17:45:06.930646000 +0100	13	--- lib/freebl/blinit.c.orig 2019-12-11 17:45:06.930646000 +0100
17	+++ lib/freebl/blinit.c 2019-12-11 17:50:04.797680000 +0100	14	+++ lib/freebl/blinit.c 2019-12-11 17:50:04.797680000 +0100
18	@@ -393,7 +393,12 @@	15	@@ -393,7 +393,12 @@

Line 0 Link Here

(-)files/patch-lib_freebl_gcm.h (+26 lines)
	1	--- lib/freebl/gcm.h.orig 2019-12-04 01:03:31.000000000 +0100
	2	+++ lib/freebl/gcm.h 2020-01-07 23:15:04.826777000 +0100
	3	@@ -31,7 +31,6 @@
	4	#endif
	5
	6	#ifdef __powerpc64__
	7	-#include "altivec-types.h"
	8
	9	/* The ghash freebl test tries to use this in C++, and gcc defines conflict. */
	10	#ifdef __cplusplus
	11	@@ -41,12 +40,11 @@
	12	#endif
	13
	14	/*
	15	- * PPC CRYPTO requires at least gcc 5 or clang. The LE check is purely
	16	- * because it's only been tested on LE. If you're interested in BE,
	17	- * please send a patch.
	18	+ * PPC CRYPTO requires at least gcc 5 or clang.
	19	*/
	20	#if (defined(__clang__) \|\| (defined(__GNUC__) && __GNUC__ >= 5)) && \
	21	- defined(IS_LITTLE_ENDIAN)
	22	+ defined(__VSX__) && defined(__CRYPTO__)
	23	+#include "altivec-types.h"
	24	#define USE_PPC_CRYPTO
	25	#endif
	26