include: sbi: Don't use #pragma when preprocessing device tree sources
PATCH 1/1 include: sbi: Don't use #pragma when preprocessing device tree sources
Since this persists in the preprocessed output (so that it can affect the subsequent compilation), it ends up in the input to dtc and is a syntax error, breaking the k210 build. Ideally we wouldn't add the -include flag to DTSCPPFLAGS in the first place as this header is wholly pointless there, but that's a more invasive build system change compared to just making this header safe to include there.
--- include/sbi/sbi_visibility.h | 2 ++ 1 file changed, 2 insertions(+)
include/sbi/sbi_visibility.h +2 -0
@@ -7,10 +7,12 @@#ifndef __SBI_VISIBILITY_H__#define __SBI_VISIBILITY_H__ +#ifndef __DTS__/* * Declare all global objects with hidden visibility so access is PC-relative * instead of going through the GOT. */ #pragma GCC visibility push(hidden) +#endif #endif
Signature · 7 lines
2.34.1 -- opensbi mailing list [email protected] http://lists.infradead.org/mailman/listinfo/opensbi
Quoted 9 lines · 在 2025-07-10四的 00:28 +0100,Jessica Clarke写道:
Since this persists in the preprocessed output (so that it can affect the subsequent compilation), it ends up in the input to dtc and is a syntax error, breaking the k210 build. Ideally we wouldn't add the -include flag to DTSCPPFLAGS in the first place as this header is wholly pointless there, but that's a more invasive build system change compared to just making this header safe to include there.
Fixes 86c01a73ff9d ("lib: sbi: Avoid GOT indirection for global symbol references")Signed-off-by Jessica Clarke <[email protected]>
This error will reappear when PLATFORM=kendryte/k210 LLVM=1. No problem under gcc.
Quoted 24 lines
---
include/sbi/sbi_visibility.h | 2 ++1 file changed, 2 insertions(+)include/sbi/sbi_visibility.h +0
-0@@ -7,10 +7,12 @@ #ifndef __SBI_VISIBILITY_H__ #define __SBI_VISIBILITY_H__
+#ifndef__DTS__
/*
* Declare all global objects with hidden visibility so access is PC-relative
* instead of going through the GOT.
*/
#pragma GCC visibility push(hidden)
+#endif
#endifSignature · 1 line
2.34.1
Signature · 3 lines
opensbi mailing list [email protected] http://lists.infradead.org/mailman/listinfo/opensbi
Quoted 20 lines · Jessica Clarke
Since this persists in the preprocessed output (so that it can affect the subsequent compilation), it ends up in the input to dtc and is a syntax error, breaking the k210 build. Ideally we wouldn't add the -include flag to DTSCPPFLAGS in the first place as this header is wholly pointless there, but that's a more invasive build system change compared to just making this header safe to include there.
Fixes 86c01a73ff9d ("lib: sbi: Avoid GOT indirection for global symbol references")Signed-off-by Jessica Clarke <[email protected]>--- include/sbi/sbi_visibility.h | 2 ++ 1 file changed, 2 insertions(+)include/sbi/sbi_visibility.h +0
-0@@ -7,10 +7,12 @@#ifndef __SBI_VISIBILITY_H__#define __SBI_VISIBILITY_H__
include/sbi/sbi_visibility.h line 18
Quoted 10 lines
include/sbi/sbi_visibility.h +2
-0+#ifndef __DTS__/* * Declare all global objects with hidden visibility so access is PC-relative * instead of going through the GOT. */ #pragma GCC visibility push(hidden) +#endif #endif
Thanks for the fix!
Signature · 3 lines
opensbi mailing list [email protected] http://lists.infradead.org/mailman/listinfo/opensbi
Anup Patel
AppliedQuoted 10 lines · Jessica Clarke
Since this persists in the preprocessed output (so that it can affect the subsequent compilation), it ends up in the input to dtc and is a syntax error, breaking the k210 build. Ideally we wouldn't add the -include flag to DTSCPPFLAGS in the first place as this header is wholly pointless there, but that's a more invasive build system change compared to just making this header safe to include there.
Fixes 86c01a73ff9d ("lib: sbi: Avoid GOT indirection for global symbol references")Signed-off-by Jessica Clarke <[email protected]>
Applied this patch to the riscv/opensbi repo.
Thanks,
Anup
Quoted 29 lines
--- include/sbi/sbi_visibility.h | 2 ++ 1 file changed, 2 insertions(+)include/sbi/sbi_visibility.h +2
-1@@ -7,10 +7,12 @@#ifndef __SBI_VISIBILITY_H__#define __SBI_VISIBILITY_H__ +#ifndef __DTS__/* * Declare all global objects with hidden visibility so access is PC-relative * instead of going through the GOT. */ #pragma GCC visibility push(hidden) +#endif #endif --2.34.1
--
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
Signature · 3 lines
opensbi mailing list [email protected] http://lists.infradead.org/mailman/listinfo/opensbi