[Scummvm-cvs-logs] SF.net SVN: scummvm:[50138] scummvm/branches/gsoc2010-plugins/backends/ platform/ps2
toneman1138 at users.sourceforge.net
toneman1138 at users.sourceforge.net
Tue Jun 22 11:55:40 CEST 2010
Revision: 50138
http://scummvm.svn.sourceforge.net/scummvm/?rev=50138&view=rev
Author: toneman1138
Date: 2010-06-22 09:55:40 +0000 (Tue, 22 Jun 2010)
Log Message:
-----------
fixed errors in linker scripts that were preventing GP-relative section for small data from working correctly
Modified Paths:
--------------
scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2
scummvm/branches/gsoc2010-plugins/backends/platform/ps2/main_prog.ld
scummvm/branches/gsoc2010-plugins/backends/platform/ps2/plugin.ld
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2 2010-06-22 08:57:25 UTC (rev 50137)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2 2010-06-22 09:55:40 UTC (rev 50138)
@@ -77,7 +77,7 @@
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
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ps2/main_prog.ld
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ps2/main_prog.ld 2010-06-22 08:57:25 UTC (rev 50137)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ps2/main_prog.ld 2010-06-22 09:55:40 UTC (rev 50138)
@@ -70,11 +70,10 @@
*(.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 @@
*(.bss)
*(.bss.*)
*(.gnu.linkonce.b*)
- /* *(COMMON) May have to take this out*/
}
_end_bss = .;
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ps2/plugin.ld
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ps2/plugin.ld 2010-06-22 08:57:25 UTC (rev 50137)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ps2/plugin.ld 2010-06-22 09:55:40 UTC (rev 50138)
@@ -51,7 +51,23 @@
.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 @@
*(.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);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list