[Scummvm-cvs-logs] SF.net SVN: scummvm:[51188] scummvm/branches/gsoc2010-plugins/backends/ platform/ds/arm9

[toneman1138 at users.sourceforge.net]

Revision: 51188
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51188&view=rev
Author:   toneman1138
Date:     2010-07-23 01:05:26 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
Added linker flags to ensure R_ARM_TARGET1 is treated as R_ARM_ABS32

Modified Paths:
--------------
    scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile
    scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/dsloader.cpp

Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile	2010-07-23 00:39:23 UTC (rev 51187)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile	2010-07-23 01:05:26 UTC (rev 51188)
@@ -248,7 +248,7 @@
 
 DEFINES += -DREDUCE_MEMORY_USAGE
 
-LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt#-Wl,--gc-sections
+LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,--target1-abs,-Map,map.txt#-Wl,--gc-sections
 
 ifdef WRAP_MALLOC
 	LDFLAGS += -Wl,--wrap,malloc
@@ -279,7 +279,7 @@
 PLUGIN_PREFIX =
 PLUGIN_SUFFIX = .plg
 PLUGIN_EXTRA_DEPS = $(portdir)/source/plugin.ld $(portdir)/source/plugin.syms $(EXECUTABLE)
-PLUGIN_LDFLAGS += -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),-T$(portdir)/source/plugin.ld,--retain-symbols-file,$(portdir)/source/plugin.syms -lstdc++ -lc -mthumb-interwork -mno-fpu#-Wl,--gc-sections -mno-crt0 $(DEVKITPRO)/devkitARM/arm-eabi/lib/ds_arm9_crt0.o
+PLUGIN_LDFLAGS += -nostartfiles -Wl,-q,--target1-abs,--just-symbols,$(EXECUTABLE),-T$(portdir)/source/plugin.ld,--retain-symbols-file,$(portdir)/source/plugin.syms -lstdc++ -lc -mthumb-interwork -mno-fpu#-Wl,--gc-sections -mno-crt0 $(DEVKITPRO)/devkitARM/arm-eabi/lib/ds_arm9_crt0.o
 MKDIR = mkdir -p
 RM = rm -f
 RM_REC = rm -rf

Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/dsloader.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/dsloader.cpp	2010-07-23 00:39:23 UTC (rev 51187)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/dsloader.cpp	2010-07-23 01:05:26 UTC (rev 51188)
@@ -142,7 +142,7 @@
 				*target = relocation;
 
 				DBG("R_ARM_TARGET1: i=%d, a=%x, origTarget=%x, target=%x\n", i, a, origTarget, *target);
-				seterror("WARNING: THIS RELOCATION CODE UNTESTED!\n"); //TODO: test cruise for corpse on ARM target!
+				DBG("Make sure --target1-abs is a flag to LD.\n");
 			}
 			break;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.