Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 472671ee authored by Stefan Agner's avatar Stefan Agner Committed by Greg Kroah-Hartman
Browse files

ARM: 8989/1: use .fpu assembler directives instead of assembler arguments 

commit a6c30873ee4a5cc0549c1973668156381ab2c1c4 upstream

Explicit FPU selection has been introduced in commit 1a6be26d
("[ARM] Enable VFP to be built when non-VFP capable CPUs are selected")
to make use of assembler mnemonics for VFP instructions.

However, clang currently does not support passing assembler flags
like this and errors out with:
clang-10: error: the clang compiler does not support '-Wa,-mfpu=softvfp+vfp'

Make use of the .fpu assembler directives to select the floating point
hardware selectively. Also use the new unified assembler language
mnemonics. This allows to build these procedures with Clang.

Link: https://github.com/ClangBuiltLinux/linux/issues/762



Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2bfb0d43

arch/arm/vfp/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -8,6 +8,4 @@ 
# ccflags-y := -DDEBUG

# asflags-y := -DDEBUG



KBUILD_AFLAGS	:=$(KBUILD_AFLAGS:-msoft-float=-Wa,-mfpu=softvfp+vfp -mfloat-abi=soft)



obj-y		+= vfpmodule.o entry.o vfphw.o vfpsingle.o vfpdouble.o

arch/arm/vfp/vfphw.S

+20 −10
Original line number Diff line number Diff line
@@ -253,11 +253,14 @@ vfp_current_hw_state_address: 


ENTRY(vfp_get_float)

	tbl_branch r0, r3, #3

	.fpu	vfpv2

	.irp	dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15

1:	mrc	p10, 0, r0, c\dr, c0, 0	@ fmrs	r0, s0

1:	vmov	r0, s\dr

	ret	lr

	.org	1b + 8

1:	mrc	p10, 0, r0, c\dr, c0, 4	@ fmrs	r0, s1

	.endr

	.irp	dr,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31

1:	vmov	r0, s\dr

	ret	lr

	.org	1b + 8

	.endr
@@ -265,11 +268,14 @@ ENDPROC(vfp_get_float) 


ENTRY(vfp_put_float)

	tbl_branch r1, r3, #3

	.fpu	vfpv2

	.irp	dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15

1:	mcr	p10, 0, r0, c\dr, c0, 0	@ fmsr	r0, s0

1:	vmov	s\dr, r0

	ret	lr

	.org	1b + 8

1:	mcr	p10, 0, r0, c\dr, c0, 4	@ fmsr	r0, s1

	.endr

	.irp	dr,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31

1:	vmov	s\dr, r0

	ret	lr

	.org	1b + 8

	.endr
@@ -277,15 +283,17 @@ ENDPROC(vfp_put_float) 


ENTRY(vfp_get_double)

	tbl_branch r0, r3, #3

	.fpu	vfpv2

	.irp	dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15

1:	fmrrd	r0, r1, d\dr

1:	vmov	r0, r1, d\dr

	ret	lr

	.org	1b + 8

	.endr

#ifdef CONFIG_VFPv3

	@ d16 - d31 registers

	.irp	dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15

1:	mrrc	p11, 3, r0, r1, c\dr	@ fmrrd	r0, r1, d\dr

	.fpu	vfpv3

	.irp	dr,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31

1:	vmov	r0, r1, d\dr

	ret	lr

	.org	1b + 8

	.endr
@@ -299,15 +307,17 @@ ENDPROC(vfp_get_double) 


ENTRY(vfp_put_double)

	tbl_branch r2, r3, #3

	.fpu	vfpv2

	.irp	dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15

1:	fmdrr	d\dr, r0, r1

1:	vmov	d\dr, r0, r1

	ret	lr

	.org	1b + 8

	.endr

#ifdef CONFIG_VFPv3

	.fpu	vfpv3

	@ d16 - d31 registers

	.irp	dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15

1:	mcrr	p11, 3, r0, r1, c\dr	@ fmdrr	r0, r1, d\dr

	.irp	dr,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31

1:	vmov	d\dr, r0, r1

	ret	lr

	.org	1b + 8

	.endr