summaryrefslogtreecommitdiff
path: root/main/openssl/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'main/openssl/crypto')
-rw-r--r--main/openssl/crypto/perlasm/x86asm.pl2
-rw-r--r--main/openssl/crypto/perlasm/x86gas.pl2
-rw-r--r--main/openssl/crypto/x86cpuid.S2
-rw-r--r--main/openssl/crypto/x86cpuid.pl3
4 files changed, 9 insertions, 0 deletions
diff --git a/main/openssl/crypto/perlasm/x86asm.pl b/main/openssl/crypto/perlasm/x86asm.pl
index eb543db2..3f190ae5 100644
--- a/main/openssl/crypto/perlasm/x86asm.pl
+++ b/main/openssl/crypto/perlasm/x86asm.pl
@@ -257,4 +257,6 @@ EOF
&file($filename);
}
+sub ::hidden {}
+
1;
diff --git a/main/openssl/crypto/perlasm/x86gas.pl b/main/openssl/crypto/perlasm/x86gas.pl
index 682a3a31..735c1ad2 100644
--- a/main/openssl/crypto/perlasm/x86gas.pl
+++ b/main/openssl/crypto/perlasm/x86gas.pl
@@ -250,4 +250,6 @@ ___
sub ::dataseg
{ push(@out,".data\n"); }
+*::hidden = sub { push(@out,".hidden\t$nmdecor$_[0]\n"); } if ($::elf);
+
1;
diff --git a/main/openssl/crypto/x86cpuid.S b/main/openssl/crypto/x86cpuid.S
index 87a46d4b..10be221c 100644
--- a/main/openssl/crypto/x86cpuid.S
+++ b/main/openssl/crypto/x86cpuid.S
@@ -341,6 +341,8 @@ OPENSSL_ia32_rdrand:
cmovel %ecx,%eax
ret
.size OPENSSL_ia32_rdrand,.-.L_OPENSSL_ia32_rdrand_begin
+.hidden OPENSSL_cpuid_setup
+.hidden OPENSSL_ia32cap_P
.comm OPENSSL_ia32cap_P,8,4
.section .init
call OPENSSL_cpuid_setup
diff --git a/main/openssl/crypto/x86cpuid.pl b/main/openssl/crypto/x86cpuid.pl
index b270b443..0212a5b6 100644
--- a/main/openssl/crypto/x86cpuid.pl
+++ b/main/openssl/crypto/x86cpuid.pl
@@ -355,4 +355,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
&initseg("OPENSSL_cpuid_setup");
+&hidden("OPENSSL_cpuid_setup");
+&hidden("OPENSSL_ia32cap_P");
+
&asm_finish();