From owner-svn-src-head@freebsd.org  Fri Apr  7 12:41:59 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 276F3D2FED3;
 Fri,  7 Apr 2017 12:41:59 +0000 (UTC)
 (envelope-from andrew@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 E3E7EC93;
 Fri,  7 Apr 2017 12:41:58 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v37CfwZ5043975;
 Fri, 7 Apr 2017 12:41:58 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v37Cfw4J043974;
 Fri, 7 Apr 2017 12:41:58 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201704071241.v37Cfw4J043974@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Fri, 7 Apr 2017 12:41:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316607 - head/crypto/openssl/crypto
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Apr 2017 12:41:59 -0000

Author: andrew
Date: Fri Apr  7 12:41:57 2017
New Revision: 316607
URL: https://svnweb.freebsd.org/changeset/base/316607

Log:
  Fix linking with lld by marking OPENSSL_armcap_P as hidden.
  
  Linking with lld fails as it contains a relative address, however the data
  this address is for may be relocated from the shared object to the main
  executable.
  
  Fix this by adding the hidden attribute. This stops moving this value to
  the main executable. It seems this is implicit upstream as it uses a
  version script.
  
  Approved by:	jkim
  Sponsored by:	DARPA, AFRL

Modified:
  head/crypto/openssl/crypto/armcap.c

Modified: head/crypto/openssl/crypto/armcap.c
==============================================================================
--- head/crypto/openssl/crypto/armcap.c	Fri Apr  7 12:27:49 2017	(r316606)
+++ head/crypto/openssl/crypto/armcap.c	Fri Apr  7 12:41:57 2017	(r316607)
@@ -7,6 +7,7 @@
 
 #include "arm_arch.h"
 
+__attribute__ ((visibility("hidden")))
 unsigned int OPENSSL_armcap_P = 0;
 
 #if __ARM_MAX_ARCH__<7