Date: Mon, 10 Mar 2014 21:58:39 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> 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 Message-ID: <201403102158.s2ALwd1G090379@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403102158.s2ALwd1G090379>