.

Created using spr 1.3.5-bogner

Author: MaskRay

lld/ELF/Arch/RISCV.cpp

@@ -1084,7 +1084,6 @@ void RISCV::finalizeRelax(int passes) const {
   llvm::TimeTraceScope timeScope("Finalize RISC-V relaxation");
   Log(ctx) << "relaxation passes: " << passes;
   SmallVector<InputSection *, 0> storage;
-
   for (OutputSection *osec : ctx.outputSections) {
     if (!(osec->flags & SHF_EXECINSTR))
       continue;

lld/ELF/LinkerScript.cpp

@@ -1230,9 +1230,9 @@ bool LinkerScript::assignOffsets(OutputSection *sec) {
   if (sec->firstInOverlay)
     state->overlaySize = 0;
 
-  bool synthesizeAlign =
-      (sec->flags & SHF_EXECINSTR) && ctx.arg.relocatable && ctx.arg.relax &&
-      is_contained({EM_RISCV, EM_LOONGARCH}, ctx.arg.emachine);
+  bool synthesizeAlign = ctx.arg.relocatable && ctx.arg.relax &&
+                         (sec->flags & SHF_EXECINSTR) &&
+                         ctx.arg.emachine == EM_RISCV;
   // We visited SectionsCommands from processSectionCommands to
   // layout sections. Now, we visit SectionsCommands again to fix
   // section offsets.
@@ -1263,6 +1263,8 @@ bool LinkerScript::assignOffsets(OutputSection *sec) {
       if (isa<PotentialSpillSection>(isec))
         continue;
       const uint64_t pos = dot;
+      // If synthesized ALIGN may be needed, call maybeSynthesizeAlign and
+      // disable the default handling if the return value is true.
       if (!(synthesizeAlign && ctx.target->maybeSynthesizeAlign(dot, isec)))
         dot = alignToPowerOf2(dot, isec->addralign);
       isec->outSecOff = dot - sec->addr;

lld/ELF/OutputSections.cpp

@@ -892,6 +892,9 @@ std::array<uint8_t, 4> OutputSection::getFiller(Ctx &ctx) {
   if (!(flags & SHF_EXECINSTR))
     return {0, 0, 0, 0};
   if (ctx.arg.relocatable && ctx.arg.emachine == EM_RISCV) {
+    // See RISCV::maybeSynthesizeAlign: Synthesized NOP bytes and ALIGN
+    // relocations might be needed between two input sections. Use a NOP for the
+    // filler.
     if (ctx.arg.eflags & EF_RISCV_RVC)
       return {1, 0, 1, 0};
     return {0x13, 0, 0, 0};