# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1272379737 -10800 # Node ID 5e522efbae7b8199be0f076f77fc79a5e6d5c78e # Parent d90029decf65f5548b5d331a99a3820f741b4e8b Revision: 201017 Kit: 201017 diff -r d90029decf65 -r 5e522efbae7b sbsv1_os/e32toolp/makmake/mmp.pm --- a/sbsv1_os/e32toolp/makmake/mmp.pm Wed Apr 14 17:09:28 2010 +0300 +++ b/sbsv1_os/e32toolp/makmake/mmp.pm Tue Apr 27 17:48:57 2010 +0300 @@ -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) {