From e8fc5f207093e8a0518dca5d815233e912945e2d Mon Sep 17 00:00:00 2001
From: Tony Puccinelli
Date: Wed, 28 Jul 2010 00:08:32 +0000
Subject: various manual tweaks to get ds port compiling from branch again
 after earlier merge from trunk

svn-id: r51398
---
 backends/plugins/ds/ds-provider.cpp | 2 +-
 backends/plugins/elf-loader.cpp     | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'backends/plugins')

diff --git a/backends/plugins/ds/ds-provider.cpp b/backends/plugins/ds/ds-provider.cpp
index 53987ff3fa..ef3864003b 100644
--- a/backends/plugins/ds/ds-provider.cpp
+++ b/backends/plugins/ds/ds-provider.cpp
@@ -29,7 +29,7 @@
 #include "backends/plugins/dynamic-plugin.h"
 #include "common/fs.h"
 
-#include "backends/platform/ds/arm9/source/dsloader.h"
+#include "backends/plugins/elf-loader.h"
 
 
 class DSPlugin : public DynamicPlugin {
diff --git a/backends/plugins/elf-loader.cpp b/backends/plugins/elf-loader.cpp
index eae8bebcc7..afb69714fa 100644
--- a/backends/plugins/elf-loader.cpp
+++ b/backends/plugins/elf-loader.cpp
@@ -37,6 +37,10 @@
 #include "common/fs.h"
 #include "elf-loader.h"
 
+#ifdef __DS__
+#include <nds.h>
+#endif
+
 #define __DEBUG_PLUGINS__
 
 #ifdef __DEBUG_PLUGINS__
@@ -48,7 +52,7 @@
 #define seterror(x,...) printf(x, ## __VA_ARGS__)
 
 /**
- * Flushes the data cache.
+ * Flushes the data cache (Platform Specific).
  */
 void flushDataCache() {
 #ifdef __DS__
@@ -304,7 +308,7 @@ void DLObject::relocateSymbols(Elf32_Addr offset) {
 #else
 		// Make sure we don't relocate special valued symbols
 		if (s->st_shndx < SHN_LOPROC) {
-				relocCount++;
+				mainCount++;
 				s->st_value += offset;
 				if (s->st_value < (Elf32_Addr)_segment || s->st_value > (Elf32_Addr)_segment + _segmentSize)
 					seterror("Symbol out of bounds! st_value = %x\n", s->st_value);
-- 
cgit v1.2.3