Commit a216376a authored by Stefan Agner's avatar Stefan Agner Committed by Russell King
Browse files

ARM: 8841/1: use unified assembler in macros 



Use unified assembler syntax (UAL) in macros. Divided syntax is
considered deprecated. This will also allow to build the kernel
using LLVM's integrated assembler.

Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 28941701

arch/arm/lib/copy_from_user.S

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
	.endm



	.macro str1b ptr reg cond=al abort

	str\cond\()b \reg, [\ptr], #1

	strb\cond \reg, [\ptr], #1

	.endm



	.macro enter reg1 reg2

arch/arm/lib/copy_to_user.S

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
	.endm



	.macro ldr1b ptr reg cond=al abort

	ldr\cond\()b \reg, [\ptr], #1

	ldrb\cond \reg, [\ptr], #1

	.endm



#ifdef CONFIG_CPU_USE_DOMAINS

arch/arm/lib/memcpy.S

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
	.endm



	.macro ldr1b ptr reg cond=al abort

	ldr\cond\()b \reg, [\ptr], #1

	ldrb\cond \reg, [\ptr], #1

	.endm



	.macro str1w ptr reg abort
@@ -42,7 +42,7 @@ 
	.endm



	.macro str1b ptr reg cond=al abort

	str\cond\()b \reg, [\ptr], #1

	strb\cond \reg, [\ptr], #1

	.endm



	.macro enter reg1 reg2

CRA Git | Maintained and supported by SUSTech CRA and CCSE