From owner-svn-src-all@freebsd.org Mon May 16 22:42:10 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DEAC9B3D94E; Mon, 16 May 2016 22:42:10 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9A4621A18; Mon, 16 May 2016 22:42:10 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4GMg9I9071932; Mon, 16 May 2016 22:42:09 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4GMg9AO071928; Mon, 16 May 2016 22:42:09 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201605162242.u4GMg9AO071928@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Mon, 16 May 2016 22:42:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r299983 - in stable/10: crypto/openssl/crypto crypto/openssl/crypto/perlasm secure/lib/libcrypto/i386 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2016 22:42:11 -0000 Author: jkim Date: Mon May 16 22:42:09 2016 New Revision: 299983 URL: https://svnweb.freebsd.org/changeset/base/299983 Log: Hide OPENSSL_cpuid_setup and OPENSSL_ia32cap_P symbols from libcrypto.so. Note this is a direct commit because it is merged from OpenSSL upstream and head (OpenSSL 1.0.2 branch) already has the same change: https://github.com/openssl/openssl/commit/6206682 Modified: stable/10/crypto/openssl/crypto/perlasm/x86asm.pl stable/10/crypto/openssl/crypto/perlasm/x86gas.pl stable/10/crypto/openssl/crypto/x86cpuid.pl stable/10/secure/lib/libcrypto/i386/x86cpuid.S Modified: stable/10/crypto/openssl/crypto/perlasm/x86asm.pl ============================================================================== --- stable/10/crypto/openssl/crypto/perlasm/x86asm.pl Mon May 16 22:39:17 2016 (r299982) +++ stable/10/crypto/openssl/crypto/perlasm/x86asm.pl Mon May 16 22:42:09 2016 (r299983) @@ -257,4 +257,6 @@ EOF &file($filename); } +sub ::hidden {} + 1; Modified: stable/10/crypto/openssl/crypto/perlasm/x86gas.pl ============================================================================== --- stable/10/crypto/openssl/crypto/perlasm/x86gas.pl Mon May 16 22:39:17 2016 (r299982) +++ stable/10/crypto/openssl/crypto/perlasm/x86gas.pl Mon May 16 22:42:09 2016 (r299983) @@ -250,4 +250,6 @@ ___ sub ::dataseg { push(@out,".data\n"); } +*::hidden = sub { push(@out,".hidden\t$nmdecor$_[0]\n"); } if ($::elf); + 1; Modified: stable/10/crypto/openssl/crypto/x86cpuid.pl ============================================================================== --- stable/10/crypto/openssl/crypto/x86cpuid.pl Mon May 16 22:39:17 2016 (r299982) +++ stable/10/crypto/openssl/crypto/x86cpuid.pl Mon May 16 22:42:09 2016 (r299983) @@ -355,4 +355,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA3 &initseg("OPENSSL_cpuid_setup"); +&hidden("OPENSSL_cpuid_setup"); +&hidden("OPENSSL_ia32cap_P"); + &asm_finish(); Modified: stable/10/secure/lib/libcrypto/i386/x86cpuid.S ============================================================================== --- stable/10/secure/lib/libcrypto/i386/x86cpuid.S Mon May 16 22:39:17 2016 (r299982) +++ stable/10/secure/lib/libcrypto/i386/x86cpuid.S Mon May 16 22:42:09 2016 (r299983) @@ -344,6 +344,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 @@ -679,6 +681,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