split the Symbols.list up so that arch specific symbols do not end up everywhere

ok tb@

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 2040428..2a793f8 100644 (file)
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.155 2023/08/09 09:32:22 tb Exp $
+# $OpenBSD: Makefile,v 1.156 2023/11/12 10:49:27 robert Exp $
 
 LIB=   crypto
 LIBREBUILD=y
@@ -52,6 +52,10 @@ VERSION_SCRIPT=      Symbols.map
 SYMBOL_LIST=   ${.CURDIR}/Symbols.list
 SYMBOL_NAMESPACE=      ${.CURDIR}/Symbols.namespace
 
+.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 da0c9c5..bb80f34 100644 (file)
--- a/lib/libcrypto/Symbols.list
+++ b/lib/libcrypto/Symbols.list
@@ -1893,7 +1893,6 @@ OPENSSL_cleanup
 OPENSSL_config
 OPENSSL_cpu_caps
 OPENSSL_cpuid_setup
-OPENSSL_ia32cap_P
 OPENSSL_init
 OPENSSL_init_crypto
 OPENSSL_load_builtin_modules

diff --git a/lib/libcrypto/arch/amd64/Symbols.list b/lib/libcrypto/arch/amd64/Symbols.list
new file mode 100644 (file)
index 0000000..4a0bada
--- /dev/null
+++ b/lib/libcrypto/arch/amd64/Symbols.list
@@ -0,0 +1 @@
+OPENSSL_ia32cap_P

diff --git a/lib/libcrypto/arch/i386/Symbols.list b/lib/libcrypto/arch/i386/Symbols.list
new file mode 100644 (file)
index 0000000..4a0bada
--- /dev/null
+++ b/lib/libcrypto/arch/i386/Symbols.list
@@ -0,0 +1 @@
+OPENSSL_ia32cap_P