Force linker to be ld.
This commit is contained in:
@@ -68,6 +68,8 @@ else()
|
||||
else()
|
||||
# set(EMULATOR_FLAGS ${EMULATOR_FLAGS} -sdl)
|
||||
endif()
|
||||
# Speicfy the linker.
|
||||
set(CMAKE_LINKER ld)
|
||||
endif()
|
||||
|
||||
# =============================================================================
|
||||
|
||||
+2
-5
@@ -1,17 +1,14 @@
|
||||
OUTPUT_FORMAT("elf")
|
||||
OUTPUT_ARCH(i386)
|
||||
OUTPUT_FORMAT("elf32-i386")
|
||||
|
||||
ENTRY(boot_entry)
|
||||
|
||||
BOOTLOADER_PHYSICAL_ADDRESS = 0x00100000;
|
||||
|
||||
MEMORY {
|
||||
BOOTLOADER_MEM : ORIGIN = 0x00000000, LENGTH = 128M
|
||||
}
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
. = BOOTLOADER_PHYSICAL_ADDRESS;
|
||||
. = 0x00100000;
|
||||
_bootloader_start = .;
|
||||
.multiboot . : AT(ADDR(.multiboot))
|
||||
{
|
||||
|
||||
+3
-6
@@ -1,20 +1,17 @@
|
||||
OUTPUT_FORMAT("elf")
|
||||
OUTPUT_ARCH(i386)
|
||||
OUTPUT_FORMAT("elf32-i386")
|
||||
|
||||
ENTRY(kmain)
|
||||
|
||||
KERNEL_VIRTUAL_ADDRESS = 0xC0000000;
|
||||
|
||||
MEMORY {
|
||||
USER_SPACE : ORIGIN = 0x00000000, LENGTH = 3072M
|
||||
KERNEL_LOWMEM : ORIGIN = KERNEL_VIRTUAL_ADDRESS, LENGTH = 896M
|
||||
KERNEL_LOWMEM : ORIGIN = 0xC0000000, LENGTH = 896M
|
||||
KERNEL_HIGHMEM : ORIGIN = 0xF8000000, LENGTH = 128M
|
||||
}
|
||||
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
. = KERNEL_VIRTUAL_ADDRESS;
|
||||
. = 0xC0000000;
|
||||
/* Put the .text section. */
|
||||
.text . : AT(ADDR(.text))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user