From: tb <tb@openbsd.org>
Date: Sat, 31 Aug 2024 10:44:39 +0000 (+0000)
Subject: Unexport OPENSSL_cpuid_setup and OPENSSL_ia32cap_P
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=47f8587cd7c9261a971c3aac8e725dcccb262d42;p=openbsd

Unexport OPENSSL_cpuid_setup and OPENSSL_ia32cap_P

This allows us in particular to get rid of the MD Symbols.list which
were needed on amd64 and i386 for llvm 16 a while back. OPENSSL_ia32cap_P
was never properly exported since the symbols were marked .hidden in the
asm.

ok beck jsing
---

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 00afb18be42..bb3f415d0d6 100644
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.208 2024/08/31 10:38:49 tb Exp $
+# $OpenBSD: Makefile,v 1.209 2024/08/31 10:44:39 tb Exp $
 
 LIB=	crypto
 LIBREBUILD=y
@@ -55,10 +55,6 @@ CFLAGS+= -I${LCRYPTO_SRC}/x509
 VERSION_SCRIPT=	Symbols.map
 SYMBOL_LIST=	${.CURDIR}/Symbols.list
 
-.if (${MACHINE_CPU} == "amd64") || (${MACHINE_CPU} == "i386")
-SYMBOL_LIST+=	${.CURDIR}/arch/${MACHINE_CPU}/Symbols.list
-.endif
-
 # crypto/
 SRCS+= cpt_err.c
 SRCS+= cryptlib.c
diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list
index 3eb64bb2d66..5a7bcf01a3c 100644
--- a/lib/libcrypto/Symbols.list
+++ b/lib/libcrypto/Symbols.list
@@ -1653,7 +1653,6 @@ OPENSSL_cleanse
 OPENSSL_cleanup
 OPENSSL_config
 OPENSSL_cpu_caps
-OPENSSL_cpuid_setup
 OPENSSL_gmtime
 OPENSSL_init
 OPENSSL_init_crypto
diff --git a/lib/libcrypto/arch/amd64/Symbols.list b/lib/libcrypto/arch/amd64/Symbols.list
deleted file mode 100644
index 4a0badae415..00000000000
--- a/lib/libcrypto/arch/amd64/Symbols.list
+++ /dev/null
@@ -1 +0,0 @@
-OPENSSL_ia32cap_P
diff --git a/lib/libcrypto/arch/i386/Symbols.list b/lib/libcrypto/arch/i386/Symbols.list
deleted file mode 100644
index 4a0badae415..00000000000
--- a/lib/libcrypto/arch/i386/Symbols.list
+++ /dev/null
@@ -1 +0,0 @@
-OPENSSL_ia32cap_P