tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: disable KABI macros for VDSO and EFI libstub

Browse Source 
If BUILD_VDSO or __DISABLED_EXPORTS are defined, mostly disable the
KABI macros to prevent VDSO and EFI libstub link errors.

Bug: 400972353
Change-Id: I8031509bc5b481f0350735ecdf6c79f6d885daeb
Suggested-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Giuliano Procida <gprocida@google.com>
Signed-off-by: John Stultz <jstultz@google.com>
This commit is contained in:
Giuliano Procida
2025-06-10 19:16:48 +01:00
committed by Treehugger Robot
parent 52cc64794a
commit 31e7de7400
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/android_kabi.h
+8
View File
@@ -42,11 +42,15 @@
* Worker macros, don't use these, use the ones without a leading '_' * Worker macros, don't use these, use the ones without a leading '_'
*/ */
#if defined(BUILD_VDSO) || defined(__DISABLE_EXPORTS)
#define __ANDROID_KABI_RULE(hint, target, value)
#else
#define __ANDROID_KABI_RULE(hint, target, value) \ #define __ANDROID_KABI_RULE(hint, target, value) \
static const char CONCATENATE(__gendwarfksyms_rule_, \ static const char CONCATENATE(__gendwarfksyms_rule_, \
__COUNTER__)[] __used __aligned(1) \ __COUNTER__)[] __used __aligned(1) \
__section(".discard.gendwarfksyms.kabi_rules") = \ __section(".discard.gendwarfksyms.kabi_rules") = \
"1\0" #hint "\0" target "\0" value "1\0" #hint "\0" target "\0" value
#endif
#define _ANDROID_KABI_RULE(hint, target, value) \ #define _ANDROID_KABI_RULE(hint, target, value) \
__ANDROID_KABI_RULE(hint, #target, #value) __ANDROID_KABI_RULE(hint, #target, #value)
@@ -66,6 +70,9 @@
__stringify(_new)); \ __stringify(_new)); \
} }
#if defined(BUILD_VDSO) || defined(__DISABLE_EXPORTS)
#define _ANDROID_KABI_REPLACE(_orig, _new) _new
#else
#define _ANDROID_KABI_REPLACE(_orig, _new) \ #define _ANDROID_KABI_REPLACE(_orig, _new) \
union { \ union { \
_new; \ _new; \
@@ -74,6 +81,7 @@
}; \ }; \
_ANDROID_KABI_NORMAL_SIZE_ALIGN(_orig, _new); \ _ANDROID_KABI_NORMAL_SIZE_ALIGN(_orig, _new); \
} }
#endif
/* /*