Changes per review

Author: androm3da

lld/ELF/Arch/Hexagon.cpp

@@ -11,7 +11,6 @@
 #include "Symbols.h"
 #include "SyntheticSections.h"
 #include "Target.h"
-#include "Thunks.h"
 #include "lld/Common/ErrorHandler.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/BinaryFormat/ELF.h"

lld/ELF/Config.h

@@ -568,8 +568,8 @@ struct UndefinedDiag {
 // a partition.
 struct InStruct {
   std::unique_ptr<InputSection> attributes;
-  std::unique_ptr<SyntheticSection> riscvAttributes;
   std::unique_ptr<SyntheticSection> hexagonAttributes;
+  std::unique_ptr<SyntheticSection> riscvAttributes;
   std::unique_ptr<BssSection> bss;
   std::unique_ptr<BssSection> bssRelRo;
   std::unique_ptr<SyntheticSection> gnuProperty;

lld/ELF/Driver.cpp

@@ -3446,14 +3446,14 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &args) {
   if (!ctx.arg.relocatable)
     combineEhSections(ctx);
 
-  // Merge .riscv.attributes sections.
-  if (ctx.arg.emachine == EM_RISCV)
-    mergeRISCVAttributesSections(ctx);
-
   // Merge .hexagon.attributes sections.
   if (ctx.arg.emachine == EM_HEXAGON)
     mergeHexagonAttributesSections(ctx);
 
+  // Merge .riscv.attributes sections.
+  if (ctx.arg.emachine == EM_RISCV)
+    mergeRISCVAttributesSections(ctx);
+
   {
     llvm::TimeTraceScope timeScope("Assign sections");