From owner-svn-src-head@freebsd.org  Tue Dec 19 03:15:21 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 C7FC3EA54E9;
 Tue, 19 Dec 2017 03:15:21 +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 9459D1108;
 Tue, 19 Dec 2017 03:15:21 +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 vBJ3FKvC065936;
 Tue, 19 Dec 2017 03:15:20 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBJ3FKWo065935;
 Tue, 19 Dec 2017 03:15:20 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201712190315.vBJ3FKWo065935@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 19 Dec 2017 03:15:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326957 - head/contrib/llvm/tools/lld/ELF
X-SVN-Group: head
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: head/contrib/llvm/tools/lld/ELF
X-SVN-Commit-Revision: 326957
X-SVN-Commit-Repository: base
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.25
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: Tue, 19 Dec 2017 03:15:21 -0000

Author: emaste
Date: Tue Dec 19 03:15:20 2017
New Revision: 326957
URL: https://svnweb.freebsd.org/changeset/base/326957

Log:
  lld: Don't write preemptible symbol values to the .got.
  
  It is not necessary and matches what bfd and gold do.
  
  This was a regression from [LLVM] r315658.
  
  Obtained from:	LLVM r321023 by Rafael Espíndola

Modified:
  head/contrib/llvm/tools/lld/ELF/Relocations.cpp

Modified: head/contrib/llvm/tools/lld/ELF/Relocations.cpp
==============================================================================
--- head/contrib/llvm/tools/lld/ELF/Relocations.cpp	Tue Dec 19 02:49:11 2017	(r326956)
+++ head/contrib/llvm/tools/lld/ELF/Relocations.cpp	Tue Dec 19 03:15:20 2017	(r326957)
@@ -812,7 +812,7 @@ static void addGotEntry(SymbolBody &Sym, bool Preempti
     //
     // This is ugly -- the difference between REL and RELA should be
     // handled in a better way. It's a TODO.
-    if (!Config->IsRela)
+    if (!Config->IsRela && !Preemptible)
       InX::Got->Relocations.push_back({R_ABS, Target->GotRel, Off, 0, &Sym});
   }
 }