From 0d2c19d05b7c6a96a04b465d759bc0ab49afb7b1 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 23 Jul 2020 18:55:47 +0000
Subject: [PATCH] libmd: temporarily disable optimized assembly skein1024
 implementation

It is apparently broken when assembled by contemporary GNU as as well as
Clang IAS (which is used in the default configuration).

PR:		248221
Reported by:	pizzamig
Sponsored by:	The FreeBSD Foundation
---
 lib/libmd/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index e001bb428d3c..cc464a1a46bf 100644
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@@ -116,12 +116,12 @@ CFLAGS+= -DSHA1_ASM
 SRCS+=	rmd160.S
 CFLAGS+= -DRMD160_ASM
 .endif
-.if exists(${MACHINE_ARCH}/skein_block_asm.S)
-# Fully unroll all loops in the assembly optimized version
-ACFLAGS+= -DSKEIN_LOOP=0
-SRCS+= skein_block_asm.S
-CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792
-.endif
+#.if exists(${MACHINE_ARCH}/skein_block_asm.S)
+## Fully unroll all loops in the assembly optimized version
+#ACFLAGS+= -DSKEIN_LOOP=0
+#SRCS+= skein_block_asm.S
+#CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792
+#.endif
 .if exists(${MACHINE_ARCH}/sha.S) || exists(${MACHINE_ARCH}/rmd160.S) || exists(${MACHINE_ARCH}/skein_block_asm.S)
 ACFLAGS+= -DELF -Wa,--noexecstack
 .endif