[lld] [llvm] [RISCV] Support RISCV Atomics ABI attributes (PR #84597)

Paul Kirth via llvm-commits llvm-commits at lists.llvm.org
Mon Apr 29 13:38:03 PDT 2024


================
@@ -1084,10 +1084,62 @@ static void mergeArch(RISCVISAInfo::OrderedExtensionMap &mergedExts,
   }
 }
 
+static void mergeAtomic(DenseMap<unsigned, unsigned>::iterator it,
+                        const InputSectionBase *oldSection,
+                        const InputSectionBase *newSection, unsigned int oldTag,
+                        unsigned int newTag) {
+  using RISCVAttrs::RISCVAtomicAbiTag::AtomicABI;
+  // Same tags stay the same, and UNKNOWN is compatible with anything
+  if (oldTag == newTag || newTag == AtomicABI::UNKNOWN)
+    return;
+
+  switch (oldTag) {
+  case AtomicABI::UNKNOWN:
+    it->getSecond() = newTag;
+    return;
+  case AtomicABI::A6C:
+    switch (newTag) {
+    case AtomicABI::A6S:
+      it->getSecond() = AtomicABI::A6C;
+      return;
+    case AtomicABI::A7:
+      error(toString(oldSection) + " has atomic_abi=" + Twine(oldTag) +
----------------
ilovepi wrote:

Noted. I'll follow up in https://github.com/llvm/llvm-project/pull/90266. I based this on your comment to a similar line in https://github.com/llvm/llvm-project/pull/84598#discussion_r1521836857, but it seems like I misunderstood?

https://github.com/llvm/llvm-project/pull/84597


More information about the llvm-commits mailing list