libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-23 19:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed errors in linker scripts that were preventing GP-relative section for small data from working correctly

Browse Source 
svn-id: r50138
This commit is contained in:
Tony Puccinelli 2010-06-22 09:55:40 +00:00
parent 38b495aea2
commit fd507fdba0
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backends/platform/ps2/Makefile.ps2
View File

@ -77,7 +77,7 @@ DEPDIR = .deps
TARGET = elf/scummvm.elf
DEFINES += -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -G0 -O2 -Wall -Wno-multichar -fno-rtti -fno-exceptions -DNO_ADAPTOR
DEFINES += -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -G2 -O2 -Wall -Wno-multichar -fno-rtti -fno-exceptions -DNO_ADAPTOR
INCLUDES = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
INCLUDES += -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines

6
backends/platform/ps2/main_prog.ld
View File

@ -70,11 +70,10 @@ SECTIONS {
*(.scommon)
}
/*current PS2 Makefile disables data being put in the gp-relative section,
but ideally this "plugin hole" is so the plugins can all have global data
/*This "plugin hole" is so the plugins can all have global small data
in the same place.*/
__plugin_hole_start = .;
. = _gp + 0x7ff00;
. = _gp + 0x7ff0;
__plugin_hole_end = .;
COMMON :
@ -87,7 +86,6 @@ SECTIONS {
*(.bss)
*(.bss.*)
*(.gnu.linkonce.b*)
/* *(COMMON) May have to take this out*/
}
_end_bss = .;

33
backends/platform/ps2/plugin.ld
View File

@ -51,7 +51,23 @@ SECTIONS {
.rdata ALIGN(128): { *(.rdata) }
.gcc_except_table ALIGN(128): { *(.gcc_except_table) }
/*We assign the output location counter to the plugin hole made
.bss ALIGN(128) : {
*(.bss)
*(.bss.*)
*(.gnu.linkonce.b*)
*(COMMON)
}
_end_bss = .;
_end = . ;
PROVIDE(end = .);
/* Symbols needed by crt0.s. */
PROVIDE(_heap_size = -1);
PROVIDE(_stack = -1);
PROVIDE(_stack_size = 128 * 1024);
/*We assign the output location counter to the plugin hole made
in main_prog.ld, then assign the small data sections to the shorts segment*/
. = __plugin_hole_start;
.lit4 ALIGN(128): { *(.lit4) } : shorts
@ -75,19 +91,4 @@ SECTIONS {
*(.scommon)
}
.bss ALIGN(128) : {
*(.bss)
*(.bss.*)
*(.gnu.linkonce.b*)
*(COMMON)
}
_end_bss = .;
_end = . ;
PROVIDE(end = .);
/* Symbols needed by crt0.s. */
PROVIDE(_heap_size = -1);
PROVIDE(_stack = -1);
PROVIDE(_stack_size = 128 * 1024);
}