Commit fd7710cb authored by Paul Burton's avatar Paul Burton

MIPS: futex: Restore \n after sync instructions

Commit 3c1d3f09 ("MIPS: futex: Emit Loongson3 sync workarounds
within asm") inadvertently removed the newlines following
__WEAK_LLSC_MB, which causes build failures for configurations in which
__WEAK_LLSC_MB expands to a sync instruction:

  {standard input}: Assembler messages:
  {standard input}:9346: Error: symbol `sync3' is already defined
  {standard input}:9380: Error: symbol `sync3' is already defined
  ...

Fix this by restoring the newlines to separate the sync instruction from
anything following it (such as the 3: label), preventing inadvertent
concatenation.
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Fixes: 3c1d3f09 ("MIPS: futex: Emit Loongson3 sync workarounds within asm")
parent 9662dd75
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
" .set arch=r4000 \n" \ " .set arch=r4000 \n" \
"2: sc $1, %2 \n" \ "2: sc $1, %2 \n" \
" beqzl $1, 1b \n" \ " beqzl $1, 1b \n" \
__stringify(__WEAK_LLSC_MB) \ __stringify(__WEAK_LLSC_MB) " \n" \
"3: \n" \ "3: \n" \
" .insn \n" \ " .insn \n" \
" .set pop \n" \ " .set pop \n" \
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
" .set "MIPS_ISA_ARCH_LEVEL" \n" \ " .set "MIPS_ISA_ARCH_LEVEL" \n" \
"2: "user_sc("$1", "%2")" \n" \ "2: "user_sc("$1", "%2")" \n" \
" beqz $1, 1b \n" \ " beqz $1, 1b \n" \
__stringify(__WEAK_LLSC_MB) \ __stringify(__WEAK_LLSC_MB) " \n" \
"3: \n" \ "3: \n" \
" .insn \n" \ " .insn \n" \
" .set pop \n" \ " .set pop \n" \
...@@ -148,7 +148,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, ...@@ -148,7 +148,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
" .set arch=r4000 \n" " .set arch=r4000 \n"
"2: sc $1, %2 \n" "2: sc $1, %2 \n"
" beqzl $1, 1b \n" " beqzl $1, 1b \n"
__stringify(__WEAK_LLSC_MB) __stringify(__WEAK_LLSC_MB) " \n"
"3: \n" "3: \n"
" .insn \n" " .insn \n"
" .set pop \n" " .set pop \n"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment