# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1272489827 -3600
# Node ID e5a9edf0be251663c57b53d692f7cd8b89af66f3
# Parent  5e522efbae7b8199be0f076f77fc79a5e6d5c78e# Parent  54aa4a06a0758e5a36979db377361f5052271957
Remerge fixes for Bug 476, Bug 1895, Bug 2149, Bug 2049, Bug 2509 and Bug 2539

diff -r 54aa4a06a075 -r e5a9edf0be25 sbsv1_os/e32toolp/makmake/mmp.pm
--- a/sbsv1_os/e32toolp/makmake/mmp.pm	Fri Apr 23 14:02:54 2010 +0100
+++ b/sbsv1_os/e32toolp/makmake/mmp.pm	Wed Apr 28 22:23:47 2010 +0100
@@ -1706,14 +1706,19 @@
 			next LINE;
 		}
 		if( /^PAGED$/o) {
-			if ($CodePagingTargetMode == PAGED or $DataPagingTargetMode == PAGED) {
+			#revert "PAGED" keyword from code and data paged to code paged only
+			#if ($CodePagingTargetMode == PAGED or $DataPagingTargetMode == PAGED) {
+			if ($CodePagingTargetMode == PAGED) {
 				push @MmpWarn, "$CurFile($LineNum) : duplicate paging setting\n";
 			}
-			if ($CodePagingTargetMode == UNPAGED or $DataPagingTargetMode == UNPAGED) {
+			#revert "PAGED" keyword from code and data paged to code paged only
+			#if ($CodePagingTargetMode == UNPAGED or $DataPagingTargetMode == UNPAGED) {
+			if ($CodePagingTargetMode == UNPAGED) {
 				push @MmpWarn, "$CurFile($LineNum) : conflict paging setting\n";
 			}
 			$CodePagingTargetMode = PAGED;
-			$DataPagingTargetMode = PAGED;
+			#revert "PAGED" keyword from code and data paged to code paged only
+			#$DataPagingTargetMode = PAGED;
 			next LINE;
 			}
 		if( /^UNPAGED$/o) {