diff options
| author | Tony Puccinelli | 2010-08-12 23:55:12 +0000 |
|---|---|---|
| committer | Tony Puccinelli | 2010-08-12 23:55:12 +0000 |
| commit | 139a96182d2a52e25b42ec35f834f7a10f30675c (patch) | |
| tree | 1b4e2a3082528cbc44ff4ec7cf4729b0bc0938f0 /backends/plugins | |
| parent | cb3acc96efe450de692f7762b30478f441d40732 (diff) | |
| download | scummvm-rg350-139a96182d2a52e25b42ec35f834f7a10f30675c.tar.gz scummvm-rg350-139a96182d2a52e25b42ec35f834f7a10f30675c.tar.bz2 scummvm-rg350-139a96182d2a52e25b42ec35f834f7a10f30675c.zip | |
modified DS makefile to use new plugin design where only one plugin is loaded at a time and tested successfully on the DS. Added code to prevent a crash in the case where there are no engine plugins present. Removed code for R_ARM_TARGET1 in arm-loader, as it is no longer used and was never used successfully
svn-id: r52052
Diffstat (limited to 'backends/plugins')
| -rw-r--r-- | backends/plugins/arm-loader.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/backends/plugins/arm-loader.cpp b/backends/plugins/arm-loader.cpp index 7e8269220b..d8ed083962 100644 --- a/backends/plugins/arm-loader.cpp +++ b/backends/plugins/arm-loader.cpp @@ -110,18 +110,6 @@ bool ARMDLObject::relocate(Common::SeekableReadStream* DLFile, unsigned long off DBG("R_ARM_JUMP24: PC-relative jump, ld takes care of all relocation work for us.\n"); break; - case R_ARM_TARGET1: - if (sym->st_shndx < SHN_LOPROC) { // Only shift for plugin section. - a = *target; // Get full 32 bits of addend - relocation = a + (Elf32_Addr)_segment; // Shift by main offset - - *target = relocation; - - DBG("R_ARM_TARGET1: i=%d, a=%x, origTarget=%x, target=%x\n", i, a, origTarget, *target); - DBG("Make sure --target1-abs is a flag to LD!\n"); - } - break; - case R_ARM_V4BX: DBG("R_ARM_V4BX: No relocation calculation necessary.\n"); break; |