Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/asm: Make <asm/asm.h> valid on cross-builds as well

Stephen Rothwell reported that the objtool cross-build breaks on
non-x86 hosts:

> tools/arch/x86/include/asm/asm.h:185:24: error: invalid register name for 'current_stack_pointer'
> 185 | register unsigned long current_stack_pointer asm(_ASM_SP);
> | ^~~~~~~~~~~~~~~~~~~~~

The PowerPC host obviously doesn't know much about x86 register names.

Protect the kernel-specific bits of <asm/asm.h>, so that it can be
included by tooling and cross-built.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reviewed-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

+8
+4
arch/x86/include/asm/asm.h
··· 120 120 # define CC_OUT(c) [_cc_ ## c] "=qm" 121 121 #endif 122 122 123 + #ifdef __KERNEL__ 124 + 123 125 /* Exception table entry */ 124 126 #ifdef __ASSEMBLY__ 125 127 # define _ASM_EXTABLE_HANDLE(from, to, handler) \ ··· 187 185 register unsigned long current_stack_pointer asm(_ASM_SP); 188 186 #define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer) 189 187 #endif /* __ASSEMBLY__ */ 188 + 189 + #endif /* __KERNEL__ */ 190 190 191 191 #endif /* _ASM_X86_ASM_H */
+4
tools/arch/x86/include/asm/asm.h
··· 120 120 # define CC_OUT(c) [_cc_ ## c] "=qm" 121 121 #endif 122 122 123 + #ifdef __KERNEL__ 124 + 123 125 /* Exception table entry */ 124 126 #ifdef __ASSEMBLY__ 125 127 # define _ASM_EXTABLE_HANDLE(from, to, handler) \ ··· 187 185 register unsigned long current_stack_pointer asm(_ASM_SP); 188 186 #define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer) 189 187 #endif /* __ASSEMBLY__ */ 188 + 189 + #endif /* __KERNEL__ */ 190 190 191 191 #endif /* _ASM_X86_ASM_H */