From 3b2b83ce2f6bb32fc73dbd303c791cabf16c8218 Mon Sep 17 00:00:00 2001
From: Ayke van Laethem <aykevanlaethem@gmail.com>
Date: Wed, 23 Nov 2022 02:10:22 +0100
Subject: [PATCH] [AVR] Add $ separator string (like avr-gcc)

avr-gcc uses the $ symbol as an assembly separator instead of the more
common %% syntax. We need it in LLVM too to be compatible.

Differential Revision: https://reviews.llvm.org/D138535
---
 llvm/lib/Target/AVR/MCTargetDesc/AVRMCAsmInfo.cpp |  1 +
 llvm/test/MC/AVR/separator.s                      | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 llvm/test/MC/AVR/separator.s

diff --git a/llvm/lib/Target/AVR/MCTargetDesc/AVRMCAsmInfo.cpp b/llvm/lib/Target/AVR/MCTargetDesc/AVRMCAsmInfo.cpp
index b11ee42..c377721 100644
--- a/llvm/lib/Target/AVR/MCTargetDesc/AVRMCAsmInfo.cpp
+++ b/llvm/lib/Target/AVR/MCTargetDesc/AVRMCAsmInfo.cpp
@@ -20,6 +20,7 @@ AVRMCAsmInfo::AVRMCAsmInfo(const Triple &TT, const MCTargetOptions &Options) {
   CodePointerSize = 2;
   CalleeSaveStackSlotSize = 2;
   CommentString = ";";
+  SeparatorString = "$";
   PrivateGlobalPrefix = ".L";
   PrivateLabelPrefix = ".L";
   UsesELFSectionDirectiveForBSS = true;
diff --git a/llvm/test/MC/AVR/separator.s b/llvm/test/MC/AVR/separator.s
new file mode 100644
index 0000000..c62e01b
--- /dev/null
+++ b/llvm/test/MC/AVR/separator.s
@@ -0,0 +1,11 @@
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck %s
+
+foo:
+
+  ; The $ symbol is a separator (like a newline).
+  mov r0, r1 $ mov r1, r2 $ mov r2, r3 $ mov r3, r4
+
+; CHECK: mov r0, r1
+; CHECK: mov r1, r2
+; CHECK: mov r2, r3
+; CHECK: mov r3, r4
-- 
2.7.4