| commit | d8f7e0ee321bce64c601a20345d0ef15391229fc | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <[email protected]> | Tue May 11 15:28:18 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Tue May 11 15:28:18 2021 +0000 |
| tree | e90c882bb55d9c813e7cb71660222f2cb299c2ae | |
| parent | 6997a6a4374792a7a4c89e8a913ab92c429903bb [diff] | |
| parent | cf06b4a943a507a47edae816d2d40a5edd7162eb [diff] |
Merge "Teach mclinker that SHT_RELR sections are just relocations." am: ee8091affa am: cf06b4a943 Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1702185 Change-Id: Ifea75fbde99d0ab42f192b36eb15a6a058d00cec
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;