From owner-svn-src-all@freebsd.org Thu May 5 21:25:42 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 6C8FFB2F014; Thu, 5 May 2016 21:25:42 +0000 (UTC) (envelope-from emaste@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 258331D75; Thu, 5 May 2016 21:25:42 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u45LPfrN075370; Thu, 5 May 2016 21:25:41 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u45LPf1T075368; Thu, 5 May 2016 21:25:41 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201605052125.u45LPf1T075368@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 5 May 2016 21:25:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299139 - in head/secure/lib/libcrypto: . i386 X-SVN-Group: head 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: Thu, 05 May 2016 21:25:42 -0000 Author: emaste Date: Thu May 5 21:25:41 2016 New Revision: 299139 URL: https://svnweb.freebsd.org/changeset/base/299139 Log: Make libcrypto position independent on i386 Prior to this change libcrypto ended up with a .text relocation. Submitted by: Rafael Espíndola (earlier version) Reviewed by: kib Approved by: so (glebius) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D6164 Added: head/secure/lib/libcrypto/i386/crypt586.S - copied, changed from r299138, head/secure/lib/libcrypto/i386/crypt586.s Deleted: head/secure/lib/libcrypto/i386/crypt586.s Modified: head/secure/lib/libcrypto/Makefile Modified: head/secure/lib/libcrypto/Makefile ============================================================================== --- head/secure/lib/libcrypto/Makefile Thu May 5 21:20:09 2016 (r299138) +++ head/secure/lib/libcrypto/Makefile Thu May 5 21:25:41 2016 (r299139) @@ -137,7 +137,7 @@ SRCS+= cbc_cksm.c cbc_enc.c cfb64ede.c c fcrypt.c ofb64ede.c ofb64enc.c ofb_enc.c pcbc_enc.c qud_cksm.c \ rand_key.c read2pwd.c rpc_enc.c set_key.c str2key.c xcbc_enc.c .if ${MACHINE_CPUARCH} == "i386" -SRCS+= crypt586.s des-586.s +SRCS+= crypt586.S des-586.s .else SRCS+= des_enc.c fcrypt_b.c .endif Copied and modified: head/secure/lib/libcrypto/i386/crypt586.S (from r299138, head/secure/lib/libcrypto/i386/crypt586.s) ============================================================================== --- head/secure/lib/libcrypto/i386/crypt586.s Thu May 5 21:20:09 2016 (r299138, copy source) +++ head/secure/lib/libcrypto/i386/crypt586.S Thu May 5 21:25:41 2016 (r299139) @@ -14,7 +14,15 @@ fcrypt_body: xorl %edi,%edi xorl %esi,%esi +#ifdef PIC + calll .L1 +.L1: + popl %edx + addl $_GLOBAL_OFFSET_TABLE_+(.-.L1), %edx + movl DES_SPtrans@GOT(%edx), %edx +#else leal DES_SPtrans,%edx +#endif pushl %edx movl 28(%esp),%ebp pushl $25