From 9ab6b92ad7a0147b0fed8dc661dbecc5adfd87ec Mon Sep 17 00:00:00 2001 From: Yang Chung-Fan Date: Tue, 5 May 2020 15:30:01 +0900 Subject: [PATCH] arch: x86_64: move the disable multiboot2 marco around to retain labels --- arch/x86_64/src/intel64/intel64_head.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86_64/src/intel64/intel64_head.S b/arch/x86_64/src/intel64/intel64_head.S index b8d19fbeda..9ffa25275a 100644 --- a/arch/x86_64/src/intel64/intel64_head.S +++ b/arch/x86_64/src/intel64/intel64_head.S @@ -89,11 +89,11 @@ .set HEADER_LENGTH, header_end - header_start .set CHECKSUM, -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT_ARCHITECTURE_I386 + HEADER_LENGTH) -#ifndef CONFIG_ARCH_EXCLUDE_MULTIBOOT .section ".multiboot", "a" .align 8 header_start: +#ifndef CONFIG_ARCH_EXCLUDE_MULTIBOOT .long MULTIBOOT2_HEADER_MAGIC .long MULTIBOOT_ARCHITECTURE_I386 .long HEADER_LENGTH @@ -104,9 +104,9 @@ header_start: .short MULTIBOOT_HEADER_TAG_END .short 0 // flags, none set .long 8 // size, including itself (short + short + long) +#endif header_end: -#endif /**************************************************************************** * .text