From owner-svn-src-projects@freebsd.org  Tue Jan  3 18:09:17 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 D8F84C9D273
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue,  3 Jan 2017 18:09:17 +0000 (UTC) (envelope-from dim@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 A881E1D91;
 Tue,  3 Jan 2017 18:09:17 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v03I9Gir018160;
 Tue, 3 Jan 2017 18:09:16 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v03I9GIb018159;
 Tue, 3 Jan 2017 18:09:16 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201701031809.v03I9GIb018159@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 3 Jan 2017 18:09:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r311162 -
 projects/clang400-import/contrib/llvm/lib/Target/AArch64
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jan 2017 18:09:17 -0000

Author: dim
Date: Tue Jan  3 18:09:16 2017
New Revision: 311162
URL: https://svnweb.freebsd.org/changeset/base/311162

Log:
  Remove incorrectly merged code fragment.

Modified:
  projects/clang400-import/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp

Modified: projects/clang400-import/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp
==============================================================================
--- projects/clang400-import/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp	Tue Jan  3 18:05:23 2017	(r311161)
+++ projects/clang400-import/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp	Tue Jan  3 18:09:16 2017	(r311162)
@@ -88,9 +88,6 @@ unsigned AArch64InstrInfo::getInstSizeIn
     // This gets lowered to an instruction sequence which takes 16 bytes
     NumBytes = 16;
     break;
-  case AArch64::TLSDESC_CALLSEQ:
-    // This gets lowered to an instruction sequence which takes 16 bytes
-    return 16;
   }
 
   return NumBytes;