From: jsing <jsing@openbsd.org>
Date: Thu, 28 Mar 2024 11:16:32 +0000 (+0000)
Subject: Remove .init section that calls OPENSSL_cpuid_setup on amd64.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=db9cd57725789270c36763286ca8dc0a7c1b9d10;p=openbsd

Remove .init section that calls OPENSSL_cpuid_setup on amd64.

OPENSSL_cpuid_setup() is already called from OPENSSL_crypto_init(), hence
we do not need or want automatic initialisation on library load.

ok tb@
---

diff --git a/lib/libcrypto/x86_64cpuid.pl b/lib/libcrypto/x86_64cpuid.pl
index 5e85c40c972..a735a97f605 100644
--- a/lib/libcrypto/x86_64cpuid.pl
+++ b/lib/libcrypto/x86_64cpuid.pl
@@ -15,17 +15,7 @@ open OUT,"| \"$^X\" $xlate $flavour $output";
 ($arg1,$arg2,$arg3,$arg4)=("%rdi","%rsi","%rdx","%rcx");	# Unix order
 
 print<<___;
-.extern		OPENSSL_cpuid_setup
-.hidden		OPENSSL_cpuid_setup
-.section	.init
-	_CET_ENDBR
-	call	OPENSSL_cpuid_setup
-
-.extern	OPENSSL_ia32cap_P
-.hidden	OPENSSL_ia32cap_P
-
 .text
-
 .globl	OPENSSL_ia32_cpuid
 .type	OPENSSL_ia32_cpuid,\@abi-omnipotent
 .align	16