* [tip: x86/asm] x86/asm: Make <asm/asm.h> valid on cross-builds as well
@ 2021-05-14 6:55 tip-bot2 for Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Ingo Molnar @ 2021-05-14 6:55 UTC (permalink / raw)
To: linux-tip-commits
Cc: Stephen Rothwell, H. Peter Anvin, Ingo Molnar, x86, linux-kernel
The following commit has been merged into the x86/asm branch of tip:
Commit-ID: 41f45fb045bcc20e71eb705b361356e715682162
Gitweb: https://git.kernel.org/tip/41f45fb045bcc20e71eb705b361356e715682162
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Thu, 13 May 2021 13:41:41 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 14 May 2021 08:50:28 +02:00
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>
---
arch/x86/include/asm/asm.h | 4 ++++
tools/arch/x86/include/asm/asm.h | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h
index 507a37a..3ad3da9 100644
--- a/arch/x86/include/asm/asm.h
+++ b/arch/x86/include/asm/asm.h
@@ -120,6 +120,8 @@
# define CC_OUT(c) [_cc_ ## c] "=qm"
#endif
+#ifdef __KERNEL__
+
/* Exception table entry */
#ifdef __ASSEMBLY__
# define _ASM_EXTABLE_HANDLE(from, to, handler) \
@@ -186,4 +188,6 @@ register unsigned long current_stack_pointer asm(_ASM_SP);
#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)
#endif /* __ASSEMBLY__ */
+#endif /* __KERNEL__ */
+
#endif /* _ASM_X86_ASM_H */
diff --git a/tools/arch/x86/include/asm/asm.h b/tools/arch/x86/include/asm/asm.h
index 507a37a..3ad3da9 100644
--- a/tools/arch/x86/include/asm/asm.h
+++ b/tools/arch/x86/include/asm/asm.h
@@ -120,6 +120,8 @@
# define CC_OUT(c) [_cc_ ## c] "=qm"
#endif
+#ifdef __KERNEL__
+
/* Exception table entry */
#ifdef __ASSEMBLY__
# define _ASM_EXTABLE_HANDLE(from, to, handler) \
@@ -186,4 +188,6 @@ register unsigned long current_stack_pointer asm(_ASM_SP);
#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)
#endif /* __ASSEMBLY__ */
+#endif /* __KERNEL__ */
+
#endif /* _ASM_X86_ASM_H */
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: x86/asm] x86/asm: Make <asm/asm.h> valid on cross-builds as well
@ 2021-05-13 12:06 tip-bot2 for Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Ingo Molnar @ 2021-05-13 12:06 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Stephen Rothwell, Ingo Molnar, x86, linux-kernel
The following commit has been merged into the x86/asm branch of tip:
Commit-ID: 4173d63a75ce47de95ce5406d8adab9005826def
Gitweb: https://git.kernel.org/tip/4173d63a75ce47de95ce5406d8adab9005826def
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Thu, 13 May 2021 13:41:41 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Thu, 13 May 2021 13:45:04 +02:00
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>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/include/asm/asm.h | 4 ++++
tools/arch/x86/include/asm/asm.h | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h
index 507a37a..3ad3da9 100644
--- a/arch/x86/include/asm/asm.h
+++ b/arch/x86/include/asm/asm.h
@@ -120,6 +120,8 @@
# define CC_OUT(c) [_cc_ ## c] "=qm"
#endif
+#ifdef __KERNEL__
+
/* Exception table entry */
#ifdef __ASSEMBLY__
# define _ASM_EXTABLE_HANDLE(from, to, handler) \
@@ -186,4 +188,6 @@ register unsigned long current_stack_pointer asm(_ASM_SP);
#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)
#endif /* __ASSEMBLY__ */
+#endif /* __KERNEL__ */
+
#endif /* _ASM_X86_ASM_H */
diff --git a/tools/arch/x86/include/asm/asm.h b/tools/arch/x86/include/asm/asm.h
index 507a37a..3ad3da9 100644
--- a/tools/arch/x86/include/asm/asm.h
+++ b/tools/arch/x86/include/asm/asm.h
@@ -120,6 +120,8 @@
# define CC_OUT(c) [_cc_ ## c] "=qm"
#endif
+#ifdef __KERNEL__
+
/* Exception table entry */
#ifdef __ASSEMBLY__
# define _ASM_EXTABLE_HANDLE(from, to, handler) \
@@ -186,4 +188,6 @@ register unsigned long current_stack_pointer asm(_ASM_SP);
#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)
#endif /* __ASSEMBLY__ */
+#endif /* __KERNEL__ */
+
#endif /* _ASM_X86_ASM_H */
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-14 6:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-14 6:55 [tip: x86/asm] x86/asm: Make <asm/asm.h> valid on cross-builds as well tip-bot2 for Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2021-05-13 12:06 tip-bot2 for Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).