| commit | 1e52fb525f003a90bb88052a8cf1919a350fc627 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <[email protected]> | Tue May 11 16:10:35 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Tue May 11 16:10:35 2021 +0000 |
| tree | e90c882bb55d9c813e7cb71660222f2cb299c2ae | |
| parent | 949980c8fbf6281e573e2d5dd2e44dab2c578f14 [diff] | |
| parent | 3f42d04145e3c2f6bd6f236bc4eb4630d84fb3b7 [diff] |
Merge "Teach mclinker that SHT_RELR sections are just relocations." am: ee8091affa am: cf06b4a943 am: d8f7e0ee32 am: 3f42d04145 Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1702185 Change-Id: Ifb2dc11e48fee799bf0e03ab88bce6302ff1422f
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 @@ 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;