<div dir="ltr">Thanks!</div><br><div class="gmail_quote"><div dir="ltr">On Tue, Nov 13, 2018 at 7:19 PM George Rimar via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: grimar<br>
Date: Tue Nov 13 02:16:36 2018<br>
New Revision: 346749<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=346749&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=346749&view=rev</a><br>
Log:<br>
[ELF] - Renamed AArch64 specific relocations expressions. NFC.<br>
<br>
They did not have AArch64 prefix. Now they do.<br>
<br>
Modified:<br>
lld/trunk/ELF/Arch/AArch64.cpp<br>
lld/trunk/ELF/InputSection.cpp<br>
lld/trunk/ELF/Relocations.cpp<br>
lld/trunk/ELF/Relocations.h<br>
<br>
Modified: lld/trunk/ELF/Arch/AArch64.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Arch/AArch64.cpp?rev=346749&r1=346748&r2=346749&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Arch/AArch64.cpp?rev=346749&r1=346748&r2=346749&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Arch/AArch64.cpp (original)<br>
+++ lld/trunk/ELF/Arch/AArch64.cpp Tue Nov 13 02:16:36 2018<br>
@@ -111,7 +111,7 @@ RelExpr AArch64::getRelExpr(RelType Type<br>
return R_GOT;<br>
case R_AARCH64_ADR_GOT_PAGE:<br>
case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21:<br>
- return R_GOT_PAGE_PC;<br>
+ return R_AARCH64_GOT_PAGE_PC;<br>
case R_AARCH64_NONE:<br>
return R_NONE;<br>
default:<br>
@@ -123,7 +123,7 @@ RelExpr AArch64::adjustRelaxExpr(RelType<br>
RelExpr Expr) const {<br>
if (Expr == R_RELAX_TLS_GD_TO_IE) {<br>
if (Type == R_AARCH64_TLSDESC_ADR_PAGE21)<br>
- return R_RELAX_TLS_GD_TO_IE_PAGE_PC;<br>
+ return R_AARCH64_RELAX_TLS_GD_TO_IE_PAGE_PC;<br>
return R_RELAX_TLS_GD_TO_IE_ABS;<br>
}<br>
return Expr;<br>
<br>
Modified: lld/trunk/ELF/InputSection.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputSection.cpp?rev=346749&r1=346748&r2=346749&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputSection.cpp?rev=346749&r1=346748&r2=346749&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/InputSection.cpp (original)<br>
+++ lld/trunk/ELF/InputSection.cpp Tue Nov 13 02:16:36 2018<br>
@@ -622,8 +622,8 @@ static uint64_t getRelocTargetVA(const I<br>
case R_GOT_OFF:<br>
case R_RELAX_TLS_GD_TO_IE_GOT_OFF:<br>
return Sym.getGotOffset() + A;<br>
- case R_GOT_PAGE_PC:<br>
- case R_RELAX_TLS_GD_TO_IE_PAGE_PC:<br>
+ case R_AARCH64_GOT_PAGE_PC:<br>
+ case R_AARCH64_RELAX_TLS_GD_TO_IE_PAGE_PC:<br>
return getAArch64Page(Sym.getGotVA() + A) - getAArch64Page(P);<br>
case R_GOT_PC:<br>
case R_RELAX_TLS_GD_TO_IE:<br>
@@ -894,10 +894,10 @@ void InputSectionBase::relocateAlloc(uin<br>
case R_RELAX_TLS_GD_TO_LE_NEG:<br>
Target->relaxTlsGdToLe(BufLoc, Type, TargetVA);<br>
break;<br>
+ case R_AARCH64_RELAX_TLS_GD_TO_IE_PAGE_PC:<br>
case R_RELAX_TLS_GD_TO_IE:<br>
case R_RELAX_TLS_GD_TO_IE_ABS:<br>
case R_RELAX_TLS_GD_TO_IE_GOT_OFF:<br>
- case R_RELAX_TLS_GD_TO_IE_PAGE_PC:<br>
case R_RELAX_TLS_GD_TO_IE_END:<br>
Target->relaxTlsGdToIe(BufLoc, Type, TargetVA);<br>
break;<br>
<br>
Modified: lld/trunk/ELF/Relocations.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Relocations.cpp?rev=346749&r1=346748&r2=346749&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Relocations.cpp?rev=346749&r1=346748&r2=346749&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Relocations.cpp (original)<br>
+++ lld/trunk/ELF/Relocations.cpp Tue Nov 13 02:16:36 2018<br>
@@ -271,8 +271,8 @@ handleTlsRelocation(RelType Type, Symbol<br>
<br>
// Initial-Exec relocs can be relaxed to Local-Exec if the symbol is locally<br>
// defined.<br>
- if (isRelExprOneOf<R_GOT, R_GOT_FROM_END, R_GOT_PC, R_GOT_PAGE_PC, R_GOT_OFF,<br>
- R_TLSIE_HINT>(Expr) &&<br>
+ if (isRelExprOneOf<R_GOT, R_GOT_FROM_END, R_GOT_PC, R_AARCH64_GOT_PAGE_PC,<br>
+ R_GOT_OFF, R_TLSIE_HINT>(Expr) &&<br>
!Config->Shared && !Sym.IsPreemptible) {<br>
C.Relocations.push_back({R_RELAX_TLS_IE_TO_LE, Type, Offset, Addend, &Sym});<br>
return 1;<br>
@@ -332,7 +332,7 @@ static bool needsPlt(RelExpr Expr) {<br>
// TLS variables uses GOT differently than the regular variables.<br>
static bool needsGot(RelExpr Expr) {<br>
return isRelExprOneOf<R_GOT, R_GOT_OFF, R_HEXAGON_GOT, R_MIPS_GOT_LOCAL_PAGE,<br>
- R_MIPS_GOT_OFF, R_MIPS_GOT_OFF32, R_GOT_PAGE_PC,<br>
+ R_MIPS_GOT_OFF, R_MIPS_GOT_OFF32, R_AARCH64_GOT_PAGE_PC,<br>
R_GOT_PC, R_GOT_FROM_END>(Expr);<br>
}<br>
<br>
@@ -356,13 +356,14 @@ static bool isRelExpr(RelExpr Expr) {<br>
static bool isStaticLinkTimeConstant(RelExpr E, RelType Type, const Symbol &Sym,<br>
InputSectionBase &S, uint64_t RelOff) {<br>
// These expressions always compute a constant<br>
- if (isRelExprOneOf<<br>
- R_GOT_FROM_END, R_GOT_OFF, R_HEXAGON_GOT, R_TLSLD_GOT_OFF,<br>
- R_MIPS_GOT_LOCAL_PAGE, R_MIPS_GOTREL, R_MIPS_GOT_OFF,<br>
- R_MIPS_GOT_OFF32, R_MIPS_GOT_GP_PC, R_MIPS_TLSGD, R_GOT_PAGE_PC,<br>
- R_GOT_PC, R_GOTONLY_PC, R_GOTONLY_PC_FROM_END, R_PLT_PC, R_TLSGD_GOT,<br>
- R_TLSGD_GOT_FROM_END, R_TLSGD_PC, R_PPC_CALL_PLT, R_TLSDESC_CALL,<br>
- R_TLSDESC_PAGE, R_HINT, R_TLSLD_HINT, R_TLSIE_HINT>(E))<br>
+ if (isRelExprOneOf<R_GOT_FROM_END, R_GOT_OFF, R_HEXAGON_GOT, R_TLSLD_GOT_OFF,<br>
+ R_MIPS_GOT_LOCAL_PAGE, R_MIPS_GOTREL, R_MIPS_GOT_OFF,<br>
+ R_MIPS_GOT_OFF32, R_MIPS_GOT_GP_PC, R_MIPS_TLSGD,<br>
+ R_AARCH64_GOT_PAGE_PC, R_GOT_PC, R_GOTONLY_PC,<br>
+ R_GOTONLY_PC_FROM_END, R_PLT_PC, R_TLSGD_GOT,<br>
+ R_TLSGD_GOT_FROM_END, R_TLSGD_PC, R_PPC_CALL_PLT,<br>
+ R_TLSDESC_CALL, R_TLSDESC_PAGE, R_HINT, R_TLSLD_HINT,<br>
+ R_TLSIE_HINT>(E))<br>
return true;<br>
<br>
// These never do, except if the entire file is position dependent or if<br>
<br>
Modified: lld/trunk/ELF/Relocations.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Relocations.h?rev=346749&r1=346748&r2=346749&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Relocations.h?rev=346749&r1=346748&r2=346749&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Relocations.h (original)<br>
+++ lld/trunk/ELF/Relocations.h Tue Nov 13 02:16:36 2018<br>
@@ -33,6 +33,8 @@ enum RelExpr {<br>
R_INVALID,<br>
R_ABS,<br>
R_ADDEND,<br>
+ R_AARCH64_GOT_PAGE_PC,<br>
+ R_AARCH64_RELAX_TLS_GD_TO_IE_PAGE_PC,<br>
R_ARM_SBREL,<br>
R_GOT,<br>
R_GOTONLY_PC,<br>
@@ -41,7 +43,6 @@ enum RelExpr {<br>
R_GOTREL_FROM_END,<br>
R_GOT_FROM_END,<br>
R_GOT_OFF,<br>
- R_GOT_PAGE_PC,<br>
R_GOT_PC,<br>
R_HEXAGON_GOT,<br>
R_HINT,<br>
@@ -69,7 +70,6 @@ enum RelExpr {<br>
R_RELAX_TLS_GD_TO_IE_ABS,<br>
R_RELAX_TLS_GD_TO_IE_END,<br>
R_RELAX_TLS_GD_TO_IE_GOT_OFF,<br>
- R_RELAX_TLS_GD_TO_IE_PAGE_PC,<br>
R_RELAX_TLS_GD_TO_LE,<br>
R_RELAX_TLS_GD_TO_LE_NEG,<br>
R_RELAX_TLS_IE_TO_LE,<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">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>