leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390: disable asm code expolines if cc does not support it

Browse Source 
To avoid a mixture of asm code with expolines and c code without them,
propagate CC_USING_EXPOLINE to KBUILD_AFLAGS and use it to detect
whether asm code should have expolines or not.

Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Vasily Gorbik 2018-06-15 10:22:18 +02:00 committed by Martin Schwidefsky
parent 64e03ff726
commit 157484abb9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/s390/Makefile
View File

@ -82,6 +82,7 @@ ifdef CONFIG_EXPOLINE
CC_FLAGS_EXPOLINE += -mindirect-branch-table CC_FLAGS_EXPOLINE += -mindirect-branch-table
export CC_FLAGS_EXPOLINE export CC_FLAGS_EXPOLINE
cflags-y += $(CC_FLAGS_EXPOLINE) -DCC_USING_EXPOLINE cflags-y += $(CC_FLAGS_EXPOLINE) -DCC_USING_EXPOLINE
aflags-y += -DCC_USING_EXPOLINE
endif endif
endif endif

4
arch/s390/include/asm/nospec-insn.h
View File

@ -8,7 +8,7 @@
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
#ifdef CONFIG_EXPOLINE #ifdef CC_USING_EXPOLINE
_LC_BR_R1 = __LC_BR_R1 _LC_BR_R1 = __LC_BR_R1
@ -189,7 +189,7 @@ _LC_BR_R1 = __LC_BR_R1
.macro BASR_EX rsave,rtarget,ruse=%r1 .macro BASR_EX rsave,rtarget,ruse=%r1
basr \rsave,\rtarget basr \rsave,\rtarget
.endm .endm
#endif #endif /* CC_USING_EXPOLINE */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */