mirror of
https://github.com/kenshineto/kern.git
synced 2025-04-15 15:07:25 +00:00
move user to 0x30000, update kernel.ld
This commit is contained in:
parent
ce4ec2917a
commit
8683b472a6
2 changed files with 19 additions and 5 deletions
2
Makefile
2
Makefile
|
@ -46,5 +46,5 @@ bin/user.img: build
|
|||
bin/disk.img: build bin/boot.bin bin/user.img
|
||||
cd bin && \
|
||||
./BuildImage -d usb -o disk.img -b boot.bin \
|
||||
kernel 0x10000 user.img 0x40000
|
||||
kernel 0x10000 user.img 0x30000
|
||||
|
||||
|
|
|
@ -25,15 +25,27 @@ SECTIONS
|
|||
*(.rodata .rodata.* .gnu.linkonce.r.*)
|
||||
}
|
||||
|
||||
/* Could put STABs here */
|
||||
.stab : {
|
||||
PROVIDE(__STAB_BEGIN__ = .);
|
||||
*(.stab);
|
||||
PROVIDE(__STAB_END__ = .);
|
||||
}
|
||||
.stabstr : {
|
||||
PROVIDE(__STABSTR_BEGIN__ = .);
|
||||
*(.stabstr);
|
||||
PROVIDE(__STABSTR_END__ = .);
|
||||
}
|
||||
|
||||
/* Align the data segment at the next page boundary */
|
||||
/* . = ALIGN(0x1000); */
|
||||
. = ALIGN(0x1000);
|
||||
|
||||
PROVIDE(data = .);
|
||||
PROVIDE(_data = .);
|
||||
|
||||
/* The data segment */
|
||||
.data : {
|
||||
*(.data)
|
||||
*(.data .data.*)
|
||||
}
|
||||
|
||||
PROVIDE(edata = .);
|
||||
|
@ -45,13 +57,15 @@ SECTIONS
|
|||
PROVIDE(__bss_start = .);
|
||||
|
||||
.bss : {
|
||||
*(.bss)
|
||||
*(.bss .bss.*)
|
||||
*(COMMON)
|
||||
}
|
||||
|
||||
PROVIDE(end = .);
|
||||
PROVIDE(_end = .);
|
||||
|
||||
/DISCARD/ : {
|
||||
*(.stab .stab_info .stabstr .eh_frame .note.GNU-stack .note.gnu.property .comment)
|
||||
/* *(.stab .stab_info .stabstr) */
|
||||
*(.eh_frame .note.GNU-stack .note.gnu.property .comment)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue