<div dir="ltr">Could we have this and it's dependent r261462 merged in to 3.8?<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Feb 20, 2016 at 5:40 PM, David Majnemer via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Sat Feb 20 19:40:04 2016<br>
New Revision: 261463<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=261463&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=261463&view=rev</a><br>
Log:<br>
Unbreak non-X86 targets from fallout caused by r261462<br>
<br>
Modified:<br>
llvm/trunk/lib/Target/Mips/MipsTargetObjectFile.cpp<br>
llvm/trunk/lib/Target/Mips/MipsTargetObjectFile.h<br>
llvm/trunk/lib/Target/NVPTX/NVPTXTargetObjectFile.h<br>
llvm/trunk/lib/Target/XCore/XCoreTargetObjectFile.cpp<br>
llvm/trunk/lib/Target/XCore/XCoreTargetObjectFile.h<br>
<br>
Modified: llvm/trunk/lib/Target/Mips/MipsTargetObjectFile.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetObjectFile.cpp?rev=261463&r1=261462&r2=261463&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetObjectFile.cpp?rev=261463&r1=261462&r2=261463&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/Mips/MipsTargetObjectFile.cpp (original)<br>
+++ llvm/trunk/lib/Target/Mips/MipsTargetObjectFile.cpp Sat Feb 20 19:40:04 2016<br>
@@ -140,11 +140,13 @@ bool MipsTargetObjectFile::IsConstantInS<br>
}<br>
<br>
/// Return true if this constant should be placed into small data section.<br>
-MCSection *MipsTargetObjectFile::getSectionForConstant(<br>
- const DataLayout &DL, SectionKind Kind, const Constant *C) const {<br>
+MCSection *MipsTargetObjectFile::getSectionForConstant(const DataLayout &DL,<br>
+ SectionKind Kind,<br>
+ const Constant *C,<br>
+ unsigned &Align) const {<br>
if (IsConstantInSmallSection(DL, C, *TM))<br>
return SmallDataSection;<br>
<br>
// Otherwise, we work the same as ELF.<br>
- return TargetLoweringObjectFileELF::getSectionForConstant(DL, Kind, C);<br>
+ return TargetLoweringObjectFileELF::getSectionForConstant(DL, Kind, C, Align);<br>
}<br>
<br>
Modified: llvm/trunk/lib/Target/Mips/MipsTargetObjectFile.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetObjectFile.h?rev=261463&r1=261462&r2=261463&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetObjectFile.h?rev=261463&r1=261462&r2=261463&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/Mips/MipsTargetObjectFile.h (original)<br>
+++ llvm/trunk/lib/Target/Mips/MipsTargetObjectFile.h Sat Feb 20 19:40:04 2016<br>
@@ -40,7 +40,8 @@ class MipsTargetMachine;<br>
const TargetMachine &TM) const;<br>
<br>
MCSection *getSectionForConstant(const DataLayout &DL, SectionKind Kind,<br>
- const Constant *C) const override;<br>
+ const Constant *C,<br>
+ unsigned &Align) const override;<br>
};<br>
} // end namespace llvm<br>
<br>
<br>
Modified: llvm/trunk/lib/Target/NVPTX/NVPTXTargetObjectFile.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXTargetObjectFile.h?rev=261463&r1=261462&r2=261463&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXTargetObjectFile.h?rev=261463&r1=261462&r2=261463&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/NVPTX/NVPTXTargetObjectFile.h (original)<br>
+++ llvm/trunk/lib/Target/NVPTX/NVPTXTargetObjectFile.h Sat Feb 20 19:40:04 2016<br>
@@ -87,7 +87,8 @@ public:<br>
}<br>
<br>
MCSection *getSectionForConstant(const DataLayout &DL, SectionKind Kind,<br>
- const Constant *C) const override {<br>
+ const Constant *C,<br>
+ unsigned &Align) const override {<br>
return ReadOnlySection;<br>
}<br>
<br>
<br>
Modified: llvm/trunk/lib/Target/XCore/XCoreTargetObjectFile.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/XCoreTargetObjectFile.cpp?rev=261463&r1=261462&r2=261463&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/XCoreTargetObjectFile.cpp?rev=261463&r1=261462&r2=261463&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/XCore/XCoreTargetObjectFile.cpp (original)<br>
+++ llvm/trunk/lib/Target/XCore/XCoreTargetObjectFile.cpp Sat Feb 20 19:40:04 2016<br>
@@ -145,8 +145,10 @@ XCoreTargetObjectFile::SelectSectionForG<br>
report_fatal_error("Target does not support TLS or Common sections");<br>
}<br>
<br>
-MCSection *XCoreTargetObjectFile::getSectionForConstant(<br>
- const DataLayout &DL, SectionKind Kind, const Constant *C) const {<br>
+MCSection *XCoreTargetObjectFile::getSectionForConstant(const DataLayout &DL,<br>
+ SectionKind Kind,<br>
+ const Constant *C,<br>
+ unsigned &Align) const {<br>
if (Kind.isMergeableConst4()) return MergeableConst4Section;<br>
if (Kind.isMergeableConst8()) return MergeableConst8Section;<br>
if (Kind.isMergeableConst16()) return MergeableConst16Section;<br>
<br>
Modified: llvm/trunk/lib/Target/XCore/XCoreTargetObjectFile.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/XCoreTargetObjectFile.h?rev=261463&r1=261462&r2=261463&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/XCoreTargetObjectFile.h?rev=261463&r1=261462&r2=261463&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/XCore/XCoreTargetObjectFile.h (original)<br>
+++ llvm/trunk/lib/Target/XCore/XCoreTargetObjectFile.h Sat Feb 20 19:40:04 2016<br>
@@ -34,7 +34,8 @@ static const unsigned CodeModelLargeSize<br>
const TargetMachine &TM) const override;<br>
<br>
MCSection *getSectionForConstant(const DataLayout &DL, SectionKind Kind,<br>
- const Constant *C) const override;<br>
+ const Constant *C,<br>
+ unsigned &Align) const override;<br>
};<br>
} // end namespace llvm<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>