From 2f913e3c6c3a42c0055df5cc6007e0064df3dec0 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Thu, 3 Apr 2014 02:27:00 +0000
Subject: [PATCH] Add support for the R_ARM_ABS32 relocation.

This should bring the arm buildbots back.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205502 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/Object/RelocVisitor.h       |  13 +++++++++++++
 test/DebugInfo/Inputs/arm-relocs.elf-arm | Bin 0 -> 3012 bytes
 test/DebugInfo/arm-relocs.test           |   5 +++++
 3 files changed, 18 insertions(+)
 create mode 100644 test/DebugInfo/Inputs/arm-relocs.elf-arm
 create mode 100644 test/DebugInfo/arm-relocs.test

diff --git a/include/llvm/Object/RelocVisitor.h b/include/llvm/Object/RelocVisitor.h
index c72db2ce412..a3aaf17f1d6 100644
--- a/include/llvm/Object/RelocVisitor.h
+++ b/include/llvm/Object/RelocVisitor.h
@@ -153,6 +153,14 @@ public:
         HasError = true;
         return RelocToApply();
       }
+    } else if (FileFormat == "ELF32-arm") {
+      switch (RelocType) {
+      default:
+        HasError = true;
+        return RelocToApply();
+      case llvm::ELF::R_ARM_ABS32:
+        return visitELF_ARM_ABS32(R, Value);
+      }
     }
     HasError = true;
     return RelocToApply();
@@ -325,6 +333,11 @@ private:
     return RelocToApply(Value + Addend, 8);
   }
 
+  RelocToApply visitELF_ARM_ABS32(RelocationRef R, uint64_t Value) {
+    int64_t Addend = getAddend32LE(R);
+    return RelocToApply(Value + Addend, 4);
+  }
+
 };
 
 }
diff --git a/test/DebugInfo/Inputs/arm-relocs.elf-arm b/test/DebugInfo/Inputs/arm-relocs.elf-arm
new file mode 100644
index 0000000000000000000000000000000000000000..4864c36256f3ff8cccb31fb787dee4c77a89a359
GIT binary patch
literal 3012
zcma)8O>7%Q6n?X7C#mghn>e9q8`@MjkQB6y6Q@l|Xc~zkLK`IDK!rfYj-AvZ*%;di
zDdHyr2_)3;Bjtb);?x^L>H#4R9C|@Q;*t{wZWM7r;(){f!6AI#?v8iX9N<Ya?|tvR
z`DSKkW@p~KeDyJ<lr5ns855-e^h^**7JT2B49TD*_LuGg{w%WlOJaZb?#Y9*KP`;H
zQ>vEAHBl#EcBOjMAuDBP)PNdPN9`eXObx3K5eWzrekTdwNGzHYC>T)EPxGrDrGh-a
zK7btdt({QnlGGf^RzB|lNnYrpTP1Fywmu3wPADtvw42dnLR6m`b+Sp@Ins5)L1sa0
zXE8gUxsZN1ZKcpGp=>9eCKO4GAv)ZPhOT<|l4Cn`&u1pneX3twLUtFM)47;s<L(^b
z#dI1?Wt!uVQ>c~t+v(*jIam}WRc~|MU9Q)GAxZyB45Z$^V)Y>HUbuXZ?7=#TQj%v;
zuWWkDP$D^$D1l$FnwQt9CWW)Fc`ei;%WEZXb!4mBXx28oktw$@5_NpGwO$ABqC6p2
z*u3~$f&5!RFV{#_ZWD>zzAZZ$P;xnxsMnlKuN?6^2`a9@qYgf`+o-O&3r{b()$Lkk
zTii;uyt!H|mCKFlmbk6zc1zrHvnhT~snu%K%A2h!Fxv&m_04kYM*Uwtue45Ikki1-
zBGha(OoE!XvSH%2npZXPN&{4yX>DU!+~##qv`S@ITHjdrai!EM8T0%vldHv5_V*%m
z0fpa2OSl<j9}eaPr$gj%oe*lB$EEJ+$RpOG?QuB36>g}2?|z*G&AupaplF-eL)oJd
zijKVsd`LT?|G?({82TO*9zTwceRB`!HZa8ksL=>T$KD6lHbXA~%!WBsI`$rHv)`LI
zN$iLHQtN)7g00)Ylv@C&X@sI<OTZ@Ip23GHwfP=_t=o{|TYxbdq39ULZ1R0-@bP@;
z@om6nn+X)kZvdAA)2|t0`8?FV6V+sJt~G3rsq{bdxHjOezZEhRz{l^#z9<|Yh1i_O
zEzE;!$?x2UqUZ4$Y~2>7%z-aQBNWZ|39!lcrNNg)O!IvOTkm;Nya>J@XoRBs`VJVO
zw)}|$bq9{4@QkC7kK?_AV)A{BLCk6r#0(QC64RfM-w((eiHgmIy-k@7@I|MhWLSN2
zA%<;vGKL*F9&4YJQ!(5vxfo8#cnoL6jp3}!ckn+0%<mkCBR|53#^lJaz;j_##F4*X
zM;wl%z`tO`%dm$H{4(s*2Ht^vpMgJsJ!)X?n+FX11#GTcAdY+k;~@<(p6_Av!VCoW
zvLSZID%!D~!Sy$H0I}Yc0f`+w7<`8<{#&5kgYBP?Hbi^=86vTTCp!`w<2A*W!zM&~
z?#xJR|3sNM+h*Y1(2x1egkhf5J}^YzKG^3n*KAd4-bKk(+==M2&XrtT-9`T)R^0Sn
zsd<$mo)yJ<V}hBJxZ$Cu#J$Qpv53p9=B@gnLfn^+!^t@8An0g29Zx<Nhv(yPCJtxg
zFh9|OJI0mo7+8La^P6UMj@5ZqGpuG=feymE*cuUk6)n8w`iZfG{MT97)W@lDc=%Ma
zupr!*))|pJ^-yq6S%blOvCwFde*7@5Q6Cd|o*E<-YCMLohnjbQg`X+!Tnk&`9cpZq
iU1|)%?+5w*_|Uo52+J8hswoc!?+0s4@D@iq`2PVf{4SIL

literal 0
HcmV?d00001

diff --git a/test/DebugInfo/arm-relocs.test b/test/DebugInfo/arm-relocs.test
new file mode 100644
index 00000000000..13e11f7043f
--- /dev/null
+++ b/test/DebugInfo/arm-relocs.test
@@ -0,0 +1,5 @@
+RUN: llvm-dwarfdump %p/Inputs/arm-relocs.elf-arm | FileCheck %s
+
+; CHECK: debug_info contents
+; CHECK: DW_TAG_enumeration_type
+; CHECK-NEXT: DW_AT_name{{.*}} = "e1"