Update Makefile and ld

This commit is contained in:
Ethan Roseman 2020-04-24 02:29:37 -04:00
parent 722897188c
commit deaebdf713
2 changed files with 7 additions and 22 deletions

View File

@ -20,7 +20,7 @@ LDFLAGS = -T undefined_syms.txt -T $(LD_SCRIPT) -Map $(BUILD_DIR)/sm64.map
####################### Other Tools #########################
# N64 tools
TOOLS_DIR = ../tools
TOOLS_DIR = ../n64splitter/bin
MIO0TOOL = $(TOOLS_DIR)/mio0
N64CKSUM = $(TOOLS_DIR)/n64cksum
N64GRAPHICS = $(TOOLS_DIR)/n64graphics

View File

@ -8,27 +8,6 @@ SECTIONS
* (.boot);
}
/* load MIO0 and level data at 0x800000 */
.rodata 0x800000 : {
FILL (0x01) /* fill unused with 0x01 */
* (.mio0);
* (.rodata);
* (.data);
* (.MIPS.abiflags);
. = ALIGN(0x10);
}
/* use segmented addressing for behaviors */
.behavior 0x13000000 : AT( LOADADDR(.rodata) + SIZEOF(.rodata) ) {
FILL (0x01) /* fill unused with 0x01 */
* (.behavior);
behavior_length = . - 0x13000000;
/* default 4MB data (12MB ROM) */
. = 0x400000 - SIZEOF(.rodata);
}
__load_behavior_data = LOADADDR(.behavior);
__load_behavior_data_end = LOADADDR(.behavior) + behavior_length;
/* 0x00000000 000040-000B70 [B30] */
.text00000000 0x00000000 : AT(0x000040) {
* (.text00000000);
@ -264,4 +243,10 @@ SECTIONS
* (.text002B7000);
}
/* Discard everything not specifically mentioned above. */
/DISCARD/ :
{
*(*);
}
}