From owner-svn-src-head@FreeBSD.ORG  Mon Mar 10 21:58:39 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C7D4F272;
 Mon, 10 Mar 2014 21:58:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9A5D56C9;
 Mon, 10 Mar 2014 21:58:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2ALwdNU090383;
 Mon, 10 Mar 2014 21:58:39 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2ALwd1G090379;
 Mon, 10 Mar 2014 21:58:39 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201403102158.s2ALwd1G090379@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 10 Mar 2014 21:58:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262985 - in head/contrib/llvm/lib/Target/Sparc: .
 InstPrinter MCTargetDesc
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.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Mar 2014 21:58:39 -0000

Author: dim
Date: Mon Mar 10 21:58:38 2014
New Revision: 262985
URL: http://svnweb.freebsd.org/changeset/base/262985

Log:
  Repair a few minor mismerges from r262261 in the clang-sparc64 project
  branch.  This is also to minimize differences with upstream.
  
  MFC after:	3 weeks
  X-MFC-With:	r262613

Deleted:
  head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcBaseInfo.h
Modified:
  head/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp
  head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCCodeEmitter.cpp
  head/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp

Modified: head/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp	Mon Mar 10 21:37:40 2014	(r262984)
+++ head/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp	Mon Mar 10 21:58:38 2014	(r262985)
@@ -15,7 +15,6 @@
 #include "SparcInstPrinter.h"
 
 #include "Sparc.h"
-#include "MCTargetDesc/SparcBaseInfo.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCSymbol.h"

Modified: head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCCodeEmitter.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCCodeEmitter.cpp	Mon Mar 10 21:37:40 2014	(r262984)
+++ head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCCodeEmitter.cpp	Mon Mar 10 21:58:38 2014	(r262985)
@@ -20,8 +20,8 @@
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCRegisterInfo.h"
-#include "llvm/ADT/Statistic.h"
 #include "llvm/MC/MCSymbol.h"
+#include "llvm/ADT/Statistic.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;

Modified: head/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp	Mon Mar 10 21:37:40 2014	(r262984)
+++ head/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp	Mon Mar 10 21:58:38 2014	(r262985)
@@ -17,7 +17,6 @@
 #include "SparcMachineFunctionInfo.h"
 #include "SparcRegisterInfo.h"
 #include "SparcTargetMachine.h"
-#include "MCTargetDesc/SparcBaseInfo.h"
 #include "SparcTargetObjectFile.h"
 #include "llvm/CodeGen/CallingConvLower.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"