From 44558ee19c46d2d4bdefb16d5d65ae04b069b104 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 16 Feb 2021 17:55:29 +0000
Subject: [PATCH] openssl: Drop SSE2-optimized version

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/common/i586/openssl-sse2     |  1 -
 .../core/155/filelists/i586/openssl-sse2      |  1 -
 lfs/openssl                                   | 19 ++-----------------
 make.sh                                       |  1 -
 4 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 config/rootfiles/common/i586/openssl-sse2
 delete mode 120000 config/rootfiles/core/155/filelists/i586/openssl-sse2

diff --git a/config/rootfiles/common/i586/openssl-sse2 b/config/rootfiles/common/i586/openssl-sse2
deleted file mode 100644
index d366bd47f5..0000000000
--- a/config/rootfiles/common/i586/openssl-sse2
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/sse2/libcrypto.so.1.1
diff --git a/config/rootfiles/core/155/filelists/i586/openssl-sse2 b/config/rootfiles/core/155/filelists/i586/openssl-sse2
deleted file mode 120000
index f424713d6c..0000000000
--- a/config/rootfiles/core/155/filelists/i586/openssl-sse2
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/openssl-sse2
\ No newline at end of file
diff --git a/lfs/openssl b/lfs/openssl
index ea7eff1350..a50d686f02 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -35,11 +35,6 @@ TARGET = $(DIR_INFO)/$(THISAPP)$(KCFG)
 
 CFLAGS += -DPURIFY -Wa,--noexecstack
 
-# Enable SSE2 for this build
-ifeq "$(KCFG)" "-sse2"
-  CFLAGS+= -march=i686 -mmmx -msse -msse2 -mfpmath=sse
-endif
-
 export RPM_OPT_FLAGS = $(CFLAGS)
 
 CONFIGURE_OPTIONS = \
@@ -72,11 +67,7 @@ ifeq "$(BUILD_ARCH)" "x86_64"
 endif
 
 ifeq "$(BUILD_ARCH)" "i586"
-	OPENSSL_ARCH = linux-elf
-
-  ifneq "$(KCFG)" "-sse2"
-	OPENSSL_ARCH += no-sse2
-  endif
+	OPENSSL_ARCH = linux-elf no-sse2
 endif
 
 ###############################################################################
@@ -132,15 +123,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make depend
 	cd $(DIR_APP) && make $(MAKETUNING)
 
-ifeq "$(KCFG)" "-sse2"
-	-mkdir -pv /usr/lib/sse2
-	cd $(DIR_APP) && install -m 755 \
-		libcrypto.so.1.1 /usr/lib/sse2
-else
-	# Install everything.
+	# Install everything
 	cd $(DIR_APP) && make install
 	install -m 0644 $(DIR_SRC)/config/ssl/openssl.cnf /etc/ssl
-endif
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index a0c71ce737..eb00087f69 100755
--- a/make.sh
+++ b/make.sh
@@ -1145,7 +1145,6 @@ buildipfire() {
   lfsmake2 initscripts
   lfsmake2 backup
   lfsmake2 openssl
-  [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
   lfsmake2 kmod
   lfsmake2 udev
   lfsmake2 popt
-- 
2.39.2