| commit | cf06b4a943a507a47edae816d2d40a5edd7162eb | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue May 11 15:04:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 11 15:04:22 2021 +0000 |
| tree | e90c882bb55d9c813e7cb71660222f2cb299c2ae | |
| parent | 00e2459843d96764a65e1ad4426dd8e4517d7b37 [diff] | |
| parent | ee8091affaedaacc7ba723b8699950a3b2078d21 [diff] |
Merge "Teach mclinker that SHT_RELR sections are just relocations." am: ee8091affa Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1702185 Change-Id: I7a3989728eca1ff317afc4b6441d4bd561d0dc3b
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;