diff options
author | Elliott Hughes <enh@google.com> | 2021-05-11 15:53:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-11 15:53:31 +0000 |
commit | 3f42d04145e3c2f6bd6f236bc4eb4630d84fb3b7 (patch) | |
tree | e90c882bb55d9c813e7cb71660222f2cb299c2ae | |
parent | 949980c8fbf6281e573e2d5dd2e44dab2c578f14 (diff) | |
parent | d8f7e0ee321bce64c601a20345d0ef15391229fc (diff) | |
download | mclinker-3f42d04145e3c2f6bd6f236bc4eb4630d84fb3b7.tar.gz |
Merge "Teach mclinker that SHT_RELR sections are just relocations." am: ee8091affa am: cf06b4a943 am: d8f7e0ee32android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1702185
Change-Id: Ie5d9698f9f7fc907b2125c2d1aec0fd20293c534
-rw-r--r-- | lib/Core/IRBuilder.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Core/IRBuilder.cpp b/lib/Core/IRBuilder.cpp index 4c6eab8..3c3823e 100644 --- a/lib/Core/IRBuilder.cpp +++ b/lib/Core/IRBuilder.cpp @@ -82,6 +82,7 @@ LDFileFormat::Kind GetELFSectionKind(uint32_t pType, return LDFileFormat::NamePool; case llvm::ELF::SHT_RELA: case llvm::ELF::SHT_REL: + case 19 /*llvm::ELF::SHT_RELR*/: return LDFileFormat::Relocation; case llvm::ELF::SHT_NOBITS: return LDFileFormat::BSS; |