From bc85368cdd311fe68ffcf251e7e8e90c14f8a9dc Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 21 Mar 2018 16:47:33 +0200 Subject: [librm] Ensure that inline code symbols are unique Commit 6149e0a ("[librm] Provide symbols for inline code placed into other sections") may cause build failures due to duplicate label names if the compiler chooses to duplicate inline assembly code. Fix by using the "%=" special format string to include a guaranteed-unique number within the label name. The "%=" will be expanded only if constraints exist for the inline assembly. This fix therefore requires that all REAL_CODE() fragments use a (possibly empty) constraint list. Signed-off-by: Michael Brown --- src/arch/x86/include/librm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/arch/x86/include') diff --git a/src/arch/x86/include/librm.h b/src/arch/x86/include/librm.h index 6bad9c42b..5196d390f 100644 --- a/src/arch/x86/include/librm.h +++ b/src/arch/x86/include/librm.h @@ -255,7 +255,7 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size ); #endif /* LINE_SYMBOL: declare a symbol for the current source code line */ -#define LINE_SYMBOL _S2 ( OBJECT ) "__line_" _S2 ( __LINE__ ) ":" +#define LINE_SYMBOL _S2 ( OBJECT ) "__line_" _S2 ( __LINE__ ) "__%=:" /* TEXT16_CODE: declare a fragment of code that resides in .text16 */ #define TEXT16_CODE( asm_code_str ) \ -- cgit