diff options
| author | Michael Brown | 2018-03-21 15:47:33 +0100 |
|---|---|---|
| committer | Michael Brown | 2018-03-21 16:00:53 +0100 |
| commit | bc85368cdd311fe68ffcf251e7e8e90c14f8a9dc (patch) | |
| tree | 2966a5d8310f0b57e39a8db9dec202ea5823286d /src/arch/x86/interface/pcbios/bios_console.c | |
| parent | [librm] Provide symbols for inline code placed into other sections (diff) | |
| download | ipxe-bc85368cdd311fe68ffcf251e7e8e90c14f8a9dc.tar.gz ipxe-bc85368cdd311fe68ffcf251e7e8e90c14f8a9dc.tar.xz ipxe-bc85368cdd311fe68ffcf251e7e8e90c14f8a9dc.zip | |
[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 <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/x86/interface/pcbios/bios_console.c')
| -rw-r--r-- | src/arch/x86/interface/pcbios/bios_console.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/x86/interface/pcbios/bios_console.c b/src/arch/x86/interface/pcbios/bios_console.c index 81e3a7d7..08fa6d03 100644 --- a/src/arch/x86/interface/pcbios/bios_console.c +++ b/src/arch/x86/interface/pcbios/bios_console.c @@ -521,12 +521,12 @@ static void bios_inject_startup ( void ) { __asm__ __volatile__ ( TEXT16_CODE ( "\nint16_wrapper:\n\t" "pushfw\n\t" - "cmpb $0, %cs:bios_inject_lock\n\t" + "cmpb $0, %%cs:bios_inject_lock\n\t" "jnz 1f\n\t" VIRT_CALL ( bios_inject ) "\n1:\n\t" "popfw\n\t" - "ljmp *%cs:int16_vector\n\t" ) ); + "ljmp *%%cs:int16_vector\n\t" ) : ); /* Hook INT 16 */ hook_bios_interrupt ( 0x16, ( ( intptr_t ) int16_wrapper ), |