From 54397579be0eaf2a12e40fad1823cd1ce3d1f6fc Mon Sep 17 00:00:00 2001 From: robert <> Date: Sun, 12 Nov 2023 10:49:27 +0000 Subject: split the Symbols.list up so that arch specific symbols do not end up everywhere ok tb@ --- src/lib/libcrypto/Makefile | 6 +++++- src/lib/libcrypto/Symbols.list | 1 - src/lib/libcrypto/arch/amd64/Symbols.list | 1 + src/lib/libcrypto/arch/i386/Symbols.list | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 src/lib/libcrypto/arch/amd64/Symbols.list create mode 100644 src/lib/libcrypto/arch/i386/Symbols.list (limited to 'src/lib') diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile index 2040428cef..2a793f8aee 100644 --- a/src/lib/libcrypto/Makefile +++ b/src/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/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index da0c9c50f3..bb80f34cf5 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/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/src/lib/libcrypto/arch/amd64/Symbols.list b/src/lib/libcrypto/arch/amd64/Symbols.list new file mode 100644 index 0000000000..4a0badae41 --- /dev/null +++ b/src/lib/libcrypto/arch/amd64/Symbols.list @@ -0,0 +1 @@ +OPENSSL_ia32cap_P diff --git a/src/lib/libcrypto/arch/i386/Symbols.list b/src/lib/libcrypto/arch/i386/Symbols.list new file mode 100644 index 0000000000..4a0badae41 --- /dev/null +++ b/src/lib/libcrypto/arch/i386/Symbols.list @@ -0,0 +1 @@ +OPENSSL_ia32cap_P -- cgit v1.2.3-55-g6feb