diff -r 1af5c1be89f8 -r 92d87f2e53c2 tools/elf4rom/src/dwarflocmanager.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/elf4rom/src/dwarflocmanager.cpp	Fri Jan 15 09:07:44 2010 +0000
@@ -0,0 +1,66 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+* 
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <iostream>
+#include "dwarfmanager.h"
+#include "inputfile.h"
+
+const string DwarfLocManager::iLocSectionName(".debug_loc");
+
+void DwarfLocManager::ProcessSection(FileShdrPair & aPair, Dwarf_Byte_Ptr aStart, Dwarf_Byte_Ptr aEnd){
+	Dwarf_Byte_Ptr start = aStart;
+	Dwarf_Byte_Ptr end = aEnd;
+	size_t pointer_size = iDwarfInfoManager.GetPointerSize();
+	while (start < end){
+		// TODO: this doesn't deal with 64-bit Dwarf
+		Dwarf_Byte_Ptr lower = start;
+		Dwarf_Word w1 = GetValue(start, pointer_size);
+		start+= pointer_size;
+		Dwarf_Byte_Ptr upper = start;
+		Dwarf_Word w2  = GetValue(start, pointer_size);
+		start+= pointer_size;
+
+		if (w1 == 0 && w2 == 0){
+			continue;
+		}
+		if (w1 == 0xffffffff){
+			LinearAddr addr = w2;
+			LinearAddr relocatedAddress = aPair.iXIPFileDetails.Relocate(addr);
+			if (addr != relocatedAddress)
+				WriteValue(start - pointer_size, relocatedAddress, pointer_size);
+			continue;
+		}
+
+		if (aPair.iXIPFileDetails.iGCCProduced){
+			LinearAddr addr = w1;
+			LinearAddr relocatedAddress = aPair.iXIPFileDetails.Relocate(addr);
+			if (addr != relocatedAddress)
+				WriteValue(lower, relocatedAddress, pointer_size);			
+			addr = w2;
+			relocatedAddress = aPair.iXIPFileDetails.Relocate(addr);
+			if (addr != relocatedAddress)
+				WriteValue(upper, relocatedAddress, pointer_size);			
+		}
+		
+		Dwarf_Half length = GetValue(start, 2);
+		start += 2;
+		EditLocationExpression (start, pointer_size, length, aPair);		
+		start += length;
+
+	}
+}