<div dir="ltr">I reverted this change with r258894, as it breaks (at least) sparc-rtems. Clearly this area of the code was not sufficiently covered by the testsuite.</div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jan 22, 2016 at 10:24 AM, Andrey Bokhanko via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-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: asbokhan<br>
Date: Fri Jan 22 09:24:34 2016<br>
New Revision: 258504<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=258504&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=258504&view=rev</a><br>
Log:<br>
Change of UserLabelPrefix default value from "_" to ""<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D16295" rel="noreferrer" target="_blank">http://reviews.llvm.org/D16295</a><br>
<br>
Modified:<br>
cfe/trunk/lib/Basic/TargetInfo.cpp<br>
cfe/trunk/lib/Basic/Targets.cpp<br>
<br>
Modified: cfe/trunk/lib/Basic/TargetInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/TargetInfo.cpp?rev=258504&r1=258503&r2=258504&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/TargetInfo.cpp?rev=258504&r1=258503&r2=258504&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Basic/TargetInfo.cpp (original)<br>
+++ cfe/trunk/lib/Basic/TargetInfo.cpp Fri Jan 22 09:24:34 2016<br>
@@ -72,7 +72,7 @@ TargetInfo::TargetInfo(const llvm::Tripl<br>
DoubleFormat = &llvm::APFloat::IEEEdouble;<br>
LongDoubleFormat = &llvm::APFloat::IEEEdouble;<br>
DataLayoutString = nullptr;<br>
- UserLabelPrefix = "_";<br>
+ UserLabelPrefix = "";<br>
MCountName = "mcount";<br>
RegParmMax = 0;<br>
SSERegParmMax = 0;<br>
<br>
Modified: cfe/trunk/lib/Basic/Targets.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=258504&r1=258503&r2=258504&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=258504&r1=258503&r2=258504&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Basic/Targets.cpp (original)<br>
+++ cfe/trunk/lib/Basic/Targets.cpp Fri Jan 22 09:24:34 2016<br>
@@ -102,9 +102,7 @@ protected:<br>
<br>
public:<br>
CloudABITargetInfo(const llvm::Triple &Triple)<br>
- : OSTargetInfo<Target>(Triple) {<br>
- this->UserLabelPrefix = "";<br>
- }<br>
+ : OSTargetInfo<Target>(Triple) {}<br>
};<br>
<br>
static void getDarwinDefines(MacroBuilder &Builder, const LangOptions &Opts,<br>
@@ -242,6 +240,7 @@ public:<br>
this->TLSSupported = !Triple.isOSVersionLT(2);<br>
<br>
this->MCountName = "\01mcount";<br>
+ this->UserLabelPrefix = "_";<br>
}<br>
<br>
std::string isValidSectionSpecifier(StringRef SR) const override {<br>
@@ -284,8 +283,6 @@ protected:<br>
public:<br>
DragonFlyBSDTargetInfo(const llvm::Triple &Triple)<br>
: OSTargetInfo<Target>(Triple) {<br>
- this->UserLabelPrefix = "";<br>
-<br>
switch (Triple.getArch()) {<br>
default:<br>
case llvm::Triple::x86:<br>
@@ -327,8 +324,6 @@ protected:<br>
}<br>
public:<br>
FreeBSDTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) {<br>
- this->UserLabelPrefix = "";<br>
-<br>
switch (Triple.getArch()) {<br>
default:<br>
case llvm::Triple::x86:<br>
@@ -368,9 +363,7 @@ protected:<br>
}<br>
public:<br>
KFreeBSDTargetInfo(const llvm::Triple &Triple)<br>
- : OSTargetInfo<Target>(Triple) {<br>
- this->UserLabelPrefix = "";<br>
- }<br>
+ : OSTargetInfo<Target>(Triple) {}<br>
};<br>
<br>
// Minix Target<br>
@@ -392,9 +385,7 @@ protected:<br>
DefineStd(Builder, "unix", Opts);<br>
}<br>
public:<br>
- MinixTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) {<br>
- this->UserLabelPrefix = "";<br>
- }<br>
+ MinixTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) {}<br>
};<br>
<br>
// Linux target<br>
@@ -467,7 +458,6 @@ protected:<br>
}<br>
public:<br>
NetBSDTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) {<br>
- this->UserLabelPrefix = "";<br>
this->MCountName = "_mcount";<br>
}<br>
};<br>
@@ -488,7 +478,6 @@ protected:<br>
}<br>
public:<br>
OpenBSDTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) {<br>
- this->UserLabelPrefix = "";<br>
this->TLSSupported = false;<br>
<br>
switch (Triple.getArch()) {<br>
@@ -536,7 +525,6 @@ protected:<br>
}<br>
public:<br>
BitrigTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) {<br>
- this->UserLabelPrefix = "";<br>
this->MCountName = "__mcount";<br>
}<br>
};<br>
@@ -554,9 +542,7 @@ protected:<br>
Builder.defineMacro("__ELF__");<br>
}<br>
public:<br>
- PSPTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) {<br>
- this->UserLabelPrefix = "";<br>
- }<br>
+ PSPTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) {}<br>
};<br>
<br>
// PS3 PPU Target<br>
@@ -576,7 +562,6 @@ protected:<br>
}<br>
public:<br>
PS3PPUTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) {<br>
- this->UserLabelPrefix = "";<br>
this->LongWidth = this->LongAlign = 32;<br>
this->PointerWidth = this->PointerAlign = 32;<br>
this->IntMaxType = TargetInfo::SignedLongLong;<br>
@@ -604,7 +589,6 @@ public:<br>
<br>
// On PS4, TLS variable cannot be aligned to more than 32 bytes (256 bits).<br>
this->MaxTLSAlign = 256;<br>
- this->UserLabelPrefix = "";<br>
<br>
switch (Triple.getArch()) {<br>
default:<br>
@@ -724,7 +708,6 @@ protected:<br>
<br>
public:<br>
NaClTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) {<br>
- this->UserLabelPrefix = "";<br>
this->LongAlign = 32;<br>
this->LongWidth = 32;<br>
this->PointerAlign = 32;<br>
@@ -778,7 +761,6 @@ public:<br>
explicit WebAssemblyOSTargetInfo(const llvm::Triple &Triple)<br>
: OSTargetInfo<Target>(Triple) {<br>
this->MCountName = "__mcount";<br>
- this->UserLabelPrefix = "";<br>
this->TheCXXABI.set(TargetCXXABI::WebAssembly);<br>
}<br>
};<br>
@@ -816,6 +798,7 @@ public:<br>
SimdDefaultAlign = 128;<br>
LongDoubleWidth = LongDoubleAlign = 128;<br>
LongDoubleFormat = &llvm::APFloat::PPCDoubleDouble;<br>
+ UserLabelPrefix = "_";<br>
}<br>
<br>
/// \brief Flags for architecture specific defines.<br>
@@ -1631,6 +1614,7 @@ public:<br>
NoAsmVariants = true;<br>
// Set the default GPU to sm20<br>
GPU = GK_SM20;<br>
+ UserLabelPrefix = "_";<br>
}<br>
void getTargetDefines(const LangOptions &Opts,<br>
MacroBuilder &Builder) const override {<br>
@@ -3671,6 +3655,8 @@ public:<br>
// FIXME: Check that we actually have cmpxchg8b before setting<br>
// MaxAtomicInlineWidth. (cmpxchg8b is an i586 instruction.)<br>
MaxAtomicPromoteWidth = MaxAtomicInlineWidth = 64;<br>
+<br>
+ UserLabelPrefix = "_";<br>
}<br>
BuiltinVaListKind getBuiltinVaListKind() const override {<br>
return TargetInfo::CharPtrBuiltinVaList;<br>
@@ -3882,7 +3868,6 @@ public:<br>
IntPtrType = SignedLong;<br>
PtrDiffType = SignedLong;<br>
ProcessIDType = SignedLong;<br>
- this->UserLabelPrefix = "";<br>
this->TLSSupported = false;<br>
}<br>
void getTargetDefines(const LangOptions &Opts,<br>
@@ -3929,8 +3914,6 @@ protected:<br>
<br>
public:<br>
RTEMSTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) {<br>
- this->UserLabelPrefix = "";<br>
-<br>
switch (Triple.getArch()) {<br>
default:<br>
case llvm::Triple::x86:<br>
@@ -3957,7 +3940,6 @@ public:<br>
SizeType = UnsignedLong;<br>
IntPtrType = SignedLong;<br>
PtrDiffType = SignedLong;<br>
- this->UserLabelPrefix = "";<br>
}<br>
void getTargetDefines(const LangOptions &Opts,<br>
MacroBuilder &Builder) const override {<br>
@@ -4005,6 +3987,8 @@ public:<br>
// x86-64 has atomics up to 16 bytes.<br>
MaxAtomicPromoteWidth = 128;<br>
MaxAtomicInlineWidth = 128;<br>
+<br>
+ UserLabelPrefix = "_";<br>
}<br>
BuiltinVaListKind getBuiltinVaListKind() const override {<br>
return TargetInfo::X86_64ABIBuiltinVaList;<br>
@@ -4060,7 +4044,6 @@ public:<br>
SizeType = UnsignedLongLong;<br>
PtrDiffType = SignedLongLong;<br>
IntPtrType = SignedLongLong;<br>
- this->UserLabelPrefix = "";<br>
}<br>
<br>
void getTargetDefines(const LangOptions &Opts,<br>
@@ -4543,6 +4526,8 @@ public:<br>
// that follows it, `bar', `bar' will be aligned as the type of the<br>
// zero length bitfield.<br>
UseZeroLengthBitfieldAlignment = true;<br>
+<br>
+ UserLabelPrefix = "_";<br>
}<br>
<br>
StringRef getABI() const override { return ABI; }<br>
@@ -5120,7 +5105,6 @@ public:<br>
TLSSupported = false;<br>
WCharType = UnsignedShort;<br>
SizeType = UnsignedInt;<br>
- UserLabelPrefix = "";<br>
}<br>
void getVisualStudioDefines(const LangOptions &Opts,<br>
MacroBuilder &Builder) const {<br>
@@ -5320,6 +5304,8 @@ public:<br>
<br>
// AArch64 targets default to using the ARM C++ ABI.<br>
TheCXXABI.set(TargetCXXABI::GenericAArch64);<br>
+<br>
+ UserLabelPrefix = "_";<br>
}<br>
<br>
StringRef getABI() const override { return ABI; }<br>
@@ -5844,7 +5830,9 @@ class SparcTargetInfo : public TargetInf<br>
bool SoftFloat;<br>
public:<br>
SparcTargetInfo(const llvm::Triple &Triple)<br>
- : TargetInfo(Triple), SoftFloat(false) {}<br>
+ : TargetInfo(Triple), SoftFloat(false) {<br>
+ UserLabelPrefix = "_";<br>
+ }<br>
<br>
bool handleTargetFeatures(std::vector<std::string> &Features,<br>
DiagnosticsEngine &Diags) override {<br>
@@ -6145,6 +6133,7 @@ public:<br>
MinGlobalAlign = 16;<br>
DataLayoutString = "E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-a:8:16-n32:64";<br>
MaxAtomicPromoteWidth = MaxAtomicInlineWidth = 64;<br>
+ UserLabelPrefix = "_";<br>
}<br>
void getTargetDefines(const LangOptions &Opts,<br>
MacroBuilder &Builder) const override {<br>
@@ -6304,6 +6293,7 @@ public:<br>
PtrDiffType = SignedInt;<br>
SigAtomicType = SignedLong;<br>
DataLayoutString = "e-m:e-p:16:16-i32:16:32-a:16-n8:16";<br>
+ UserLabelPrefix = "_";<br>
}<br>
void getTargetDefines(const LangOptions &Opts,<br>
MacroBuilder &Builder) const override {<br>
@@ -6400,6 +6390,7 @@ public:<br>
"-f64:32-v64:32-v128:32-a:0:32-n32";<br>
AddrSpaceMap = &TCEOpenCLAddrSpaceMap;<br>
UseAddrSpaceMapMangling = true;<br>
+ UserLabelPrefix = "_";<br>
}<br>
<br>
void getTargetDefines(const LangOptions &Opts,<br>
@@ -6502,6 +6493,7 @@ public:<br>
IsNan2008(false), IsSingleFloat(false), FloatABI(HardFloat),<br>
DspRev(NoDSP), HasMSA(false), HasFP64(false), ABI(ABIStr) {<br>
TheCXXABI.set(TargetCXXABI::GenericMIPS);<br>
+ UserLabelPrefix = "_";<br>
}<br>
<br>
bool isNaN2008Default() const {<br>
@@ -7078,7 +7070,6 @@ class PNaClTargetInfo : public TargetInf<br>
public:<br>
PNaClTargetInfo(const llvm::Triple &Triple) : TargetInfo(Triple) {<br>
BigEndian = false;<br>
- this->UserLabelPrefix = "";<br>
this->LongAlign = 32;<br>
this->LongWidth = 32;<br>
this->PointerAlign = 32;<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>