Remerge fixes for Bug 476, Bug 1895, Bug 2149, Bug 2049, Bug 2509 and Bug 2539 RCL_3
authorWilliam Roberts <williamr@symbian.org>
Wed, 28 Apr 2010 22:23:47 +0100
branchRCL_3
changeset 35 e5a9edf0be25
parent 34 5e522efbae7b (diff)
parent 33 54aa4a06a075 (current diff)
child 39 8c93132f4c49
Remerge fixes for Bug 476, Bug 1895, Bug 2149, Bug 2049, Bug 2509 and Bug 2539
toolsandutils/buildsystem/extension/base/bootstrap.flm
toolsandutils/buildsystem/extension/base/bootstrap.xml
--- 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) {