[lanai] Change reloc to use PIC_ by default and cleanup.
* Change reloc to PIC_;
* Cleanup (clang-format & modify test);
llvm-svn: 270282
diff --git a/llvm/lib/Target/Lanai/InstPrinter/LanaiInstPrinter.cpp b/llvm/lib/Target/Lanai/InstPrinter/LanaiInstPrinter.cpp
index 2185517..4a1dcd8 100644
--- a/llvm/lib/Target/Lanai/InstPrinter/LanaiInstPrinter.cpp
+++ b/llvm/lib/Target/Lanai/InstPrinter/LanaiInstPrinter.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "Lanai.h"
#include "LanaiInstPrinter.h"
+#include "Lanai.h"
#include "MCTargetDesc/LanaiMCExpr.h"
#include "llvm/MC/MCAsmInfo.h"
#include "llvm/MC/MCExpr.h"
@@ -138,7 +138,8 @@
void LanaiInstPrinter::printInst(const MCInst *MI, raw_ostream &OS,
StringRef Annotation,
const MCSubtargetInfo &STI) {
- if (!printAlias(MI, OS) && !printAliasInstr(MI, OS)) printInstruction(MI, OS);
+ if (!printAlias(MI, OS) && !printAliasInstr(MI, OS))
+ printInstruction(MI, OS);
printAnnotation(OS, Annotation);
}
@@ -210,9 +211,11 @@
const MCOperand &RegOp) {
assert(RegOp.isReg() && "Register operand expected");
OS << "[";
- if (LPAC::isPreOp(AluCode)) OS << "*";
+ if (LPAC::isPreOp(AluCode))
+ OS << "*";
OS << "%" << LanaiInstPrinter::getRegisterName(RegOp.getReg());
- if (LPAC::isPostOp(AluCode)) OS << "*";
+ if (LPAC::isPostOp(AluCode))
+ OS << "*";
OS << "]";
}
@@ -254,9 +257,11 @@
// [ Base OP Offset ]
OS << "[";
- if (LPAC::isPreOp(AluCode)) OS << "*";
+ if (LPAC::isPreOp(AluCode))
+ OS << "*";
OS << "%" << getRegisterName(RegOp.getReg());
- if (LPAC::isPostOp(AluCode)) OS << "*";
+ if (LPAC::isPostOp(AluCode))
+ OS << "*";
OS << " " << LPAC::lanaiAluCodeToString(AluCode) << " ";
OS << "%" << getRegisterName(OffsetOp.getReg());
OS << "]";
diff --git a/llvm/lib/Target/Lanai/LanaiAsmPrinter.cpp b/llvm/lib/Target/Lanai/LanaiAsmPrinter.cpp
index 27a5e9e..0effa5c 100644
--- a/llvm/lib/Target/Lanai/LanaiAsmPrinter.cpp
+++ b/llvm/lib/Target/Lanai/LanaiAsmPrinter.cpp
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#include "Lanai.h"
#include "InstPrinter/LanaiInstPrinter.h"
+#include "Lanai.h"
#include "LanaiInstrInfo.h"
#include "LanaiMCInstLower.h"
#include "LanaiTargetMachine.h"
diff --git a/llvm/lib/Target/Lanai/LanaiDelaySlotFiller.cpp b/llvm/lib/Target/Lanai/LanaiDelaySlotFiller.cpp
index f94b0cd..90157ea 100644
--- a/llvm/lib/Target/Lanai/LanaiDelaySlotFiller.cpp
+++ b/llvm/lib/Target/Lanai/LanaiDelaySlotFiller.cpp
@@ -249,7 +249,8 @@
// be inserted in the delay slot of a call/return as these instructions are
// expanded to multiple instructions with SP modified before the branch that
// has the delay slot.
- if (MI->isCall() || MI->isReturn()) RegDefs.insert(Lanai::SP);
+ if (MI->isCall() || MI->isReturn())
+ RegDefs.insert(Lanai::SP);
}
// Returns true if the Reg or its alias is in the RegSet.
diff --git a/llvm/lib/Target/Lanai/LanaiRegisterInfo.cpp b/llvm/lib/Target/Lanai/LanaiRegisterInfo.cpp
index 4352404..5d99f12 100644
--- a/llvm/lib/Target/Lanai/LanaiRegisterInfo.cpp
+++ b/llvm/lib/Target/Lanai/LanaiRegisterInfo.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "Lanai.h"
#include "LanaiRegisterInfo.h"
+#include "Lanai.h"
#include "LanaiSubtarget.h"
#include "llvm/ADT/BitVector.h"
#include "llvm/ADT/STLExtras.h"
@@ -31,8 +31,7 @@
using namespace llvm;
-LanaiRegisterInfo::LanaiRegisterInfo()
- : LanaiGenRegisterInfo(Lanai::RCA) {}
+LanaiRegisterInfo::LanaiRegisterInfo() : LanaiGenRegisterInfo(Lanai::RCA) {}
const uint16_t *
LanaiRegisterInfo::getCalleeSavedRegs(const MachineFunction *MF) const {
diff --git a/llvm/lib/Target/Lanai/LanaiTargetMachine.cpp b/llvm/lib/Target/Lanai/LanaiTargetMachine.cpp
index bb418f3..b43e970 100644
--- a/llvm/lib/Target/Lanai/LanaiTargetMachine.cpp
+++ b/llvm/lib/Target/Lanai/LanaiTargetMachine.cpp
@@ -18,8 +18,8 @@
#include "LanaiTargetTransformInfo.h"
#include "llvm/Analysis/TargetTransformInfo.h"
#include "llvm/CodeGen/Passes.h"
-#include "llvm/CodeGen/TargetPassConfig.h"
#include "llvm/CodeGen/TargetLoweringObjectFileImpl.h"
+#include "llvm/CodeGen/TargetPassConfig.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/TargetRegistry.h"
#include "llvm/Target/TargetOptions.h"
@@ -50,7 +50,7 @@
static Reloc::Model getEffectiveRelocModel(const Triple &TT,
Optional<Reloc::Model> RM) {
if (!RM.hasValue())
- return Reloc::Static;
+ return Reloc::PIC_;
return *RM;
}
diff --git a/llvm/lib/Target/Lanai/LanaiTargetObjectFile.cpp b/llvm/lib/Target/Lanai/LanaiTargetObjectFile.cpp
index a4a6de8..65764d0 100644
--- a/llvm/lib/Target/Lanai/LanaiTargetObjectFile.cpp
+++ b/llvm/lib/Target/Lanai/LanaiTargetObjectFile.cpp
@@ -106,8 +106,8 @@
}
/// Return true if this constant should be placed into small data section.
-bool LanaiTargetObjectFile::isConstantInSmallSection(
- const DataLayout &DL, const Constant *CN) const {
+bool LanaiTargetObjectFile::isConstantInSmallSection(const DataLayout &DL,
+ const Constant *CN) const {
return isInSmallSection(DL.getTypeAllocSize(CN->getType()));
}