summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2024-08-31 10:44:39 +0000
committertb <>2024-08-31 10:44:39 +0000
commit21cf540d53146de578980b2ac00c1ba17009d853 (patch)
tree553a802f61aae980ab82336c3ba2fa3e5bff77ca /src
parent50e7b8e3a51beeb992068b20edea932e63a73b3c (diff)
downloadopenbsd-21cf540d53146de578980b2ac00c1ba17009d853.tar.gz
openbsd-21cf540d53146de578980b2ac00c1ba17009d853.tar.bz2
openbsd-21cf540d53146de578980b2ac00c1ba17009d853.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/Makefile6
-rw-r--r--src/lib/libcrypto/Symbols.list1
-rw-r--r--src/lib/libcrypto/arch/amd64/Symbols.list1
-rw-r--r--src/lib/libcrypto/arch/i386/Symbols.list1
4 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 00afb18be4..bb3f415d0d 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.208 2024/08/31 10:38:49 tb Exp $ 1# $OpenBSD: Makefile,v 1.209 2024/08/31 10:44:39 tb Exp $
2 2
3LIB= crypto 3LIB= crypto
4LIBREBUILD=y 4LIBREBUILD=y
@@ -55,10 +55,6 @@ CFLAGS+= -I${LCRYPTO_SRC}/x509
55VERSION_SCRIPT= Symbols.map 55VERSION_SCRIPT= Symbols.map
56SYMBOL_LIST= ${.CURDIR}/Symbols.list 56SYMBOL_LIST= ${.CURDIR}/Symbols.list
57 57
58.if (${MACHINE_CPU} == "amd64") || (${MACHINE_CPU} == "i386")
59SYMBOL_LIST+= ${.CURDIR}/arch/${MACHINE_CPU}/Symbols.list
60.endif
61
62# crypto/ 58# crypto/
63SRCS+= cpt_err.c 59SRCS+= cpt_err.c
64SRCS+= cryptlib.c 60SRCS+= cryptlib.c
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 3eb64bb2d6..5a7bcf01a3 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -1653,7 +1653,6 @@ OPENSSL_cleanse
1653OPENSSL_cleanup 1653OPENSSL_cleanup
1654OPENSSL_config 1654OPENSSL_config
1655OPENSSL_cpu_caps 1655OPENSSL_cpu_caps
1656OPENSSL_cpuid_setup
1657OPENSSL_gmtime 1656OPENSSL_gmtime
1658OPENSSL_init 1657OPENSSL_init
1659OPENSSL_init_crypto 1658OPENSSL_init_crypto
diff --git a/src/lib/libcrypto/arch/amd64/Symbols.list b/src/lib/libcrypto/arch/amd64/Symbols.list
deleted file mode 100644
index 4a0badae41..0000000000
--- a/src/lib/libcrypto/arch/amd64/Symbols.list
+++ /dev/null
@@ -1 +0,0 @@
1OPENSSL_ia32cap_P
diff --git a/src/lib/libcrypto/arch/i386/Symbols.list b/src/lib/libcrypto/arch/i386/Symbols.list
deleted file mode 100644
index 4a0badae41..0000000000
--- a/src/lib/libcrypto/arch/i386/Symbols.list
+++ /dev/null
@@ -1 +0,0 @@
1OPENSSL_ia32cap_P