From owner-svn-src-all@freebsd.org  Fri Dec 15 18:56:14 2017
Return-Path: <owner-svn-src-all@freebsd.org>
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 48F46E89566;
 Fri, 15 Dec 2017 18:56:14 +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 0C79313AF;
 Fri, 15 Dec 2017 18:56:13 +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 vBFIuDtQ032328;
 Fri, 15 Dec 2017 18:56:13 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBFIuDNY032327;
 Fri, 15 Dec 2017 18:56:13 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201712151856.vBFIuDNY032327@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: Fri, 15 Dec 2017 18:56:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326879 - 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: 326879
X-SVN-Commit-Repository: base
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.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Dec 2017 18:56:14 -0000

Author: emaste
Date: Fri Dec 15 18:56:12 2017
New Revision: 326879
URL: https://svnweb.freebsd.org/changeset/base/326879

Log:
  lld: Simplify a boolean expression by De Morgan's laws.
  
  Cherry-pick lld r315653 by Rui Ueyama:
      I don't really understand what exactly this expression means,
      but at least I can mechanically transform it.
  
  Obtained from:	LLVM r315653
  MFC after:	1 week

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	Fri Dec 15 18:09:23 2017	(r326878)
+++ head/contrib/llvm/tools/lld/ELF/Relocations.cpp	Fri Dec 15 18:56:12 2017	(r326879)
@@ -790,7 +790,7 @@ static void addGotEntry(SymbolBody &Sym, bool Preempti
     DynType = Target->GotRel;
   }
 
-  bool Constant = !Preemptible && !(Config->Pic && !isAbsolute(Sym));
+  bool Constant = !Preemptible && (!Config->Pic || isAbsolute(Sym));
   if (!Constant)
     In<ELFT>::RelaDyn->addReloc(
         {DynType, InX::Got, Off, !Preemptible, &Sym, 0});