[lld] 62e7c5b - Revert "[ELF] --pack-dyn-relocs=android: scan relocation serially after D133003"

Fangrui Song via llvm-commits llvm-commits at lists.llvm.org
Wed Sep 28 00:06:58 PDT 2022


Author: Fangrui Song
Date: 2022-09-28T07:06:49Z
New Revision: 62e7c5b4e2e1fd5b7abb4df8537b5ec018ed6050

URL: https://github.com/llvm/llvm-project/commit/62e7c5b4e2e1fd5b7abb4df8537b5ec018ed6050
DIFF: https://github.com/llvm/llvm-project/commit/62e7c5b4e2e1fd5b7abb4df8537b5ec018ed6050.diff

LOG: Revert "[ELF] --pack-dyn-relocs=android: scan relocation serially after D133003"

This reverts commit bce6416775ea1577f0a7f82cc012cf0c1b9d9ce5.

The workaround is unneeded after 7dac9f4e481c9119a2205e869e07a643828f53db.

Added: 
    

Modified: 
    lld/ELF/Relocations.cpp

Removed: 
    


################################################################################
diff  --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp
index 027f2c3636c4..ecb0c48cee14 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1541,11 +1541,10 @@ template <class ELFT> void elf::scanRelocations() {
   // directly processed by InputSection::relocateNonAlloc.
 
   // Deterministic parallellism needs sorting relocations which is unsuitable
-  // for -z nocombreloc and does not currently work with
-  // AndroidPackedRelocationSection. MIPS and PPC64 use global states which are
-  // not suitable for parallelism.
-  bool serial = !config->zCombreloc || config->androidPackDynRelocs ||
-                config->emachine == EM_MIPS || config->emachine == EM_PPC64;
+  // for -z nocombreloc. MIPS and PPC64 use global states which are not suitable
+  // for parallelism.
+  bool serial = !config->zCombreloc || config->emachine == EM_MIPS ||
+                config->emachine == EM_PPC64;
   parallel::TaskGroup tg;
   for (ELFFileBase *f : ctx->objectFiles) {
     auto fn = [f]() {


        


More information about the llvm-commits mailing list