# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1267296343 0
# Node ID 6ff989683ec7f30da4d7ffc8e1cbdf3aace9dada
# Parent  d4b442d2337901ddfc9c87abdf2805a2b3da40d1
Reapply fixes for Bug 476, missing make.exe and scpp.exe, Bug 1895

diff -r d4b442d23379 -r 6ff989683ec7 sbsv1_os/e32toolp/binutils/make.exe
Binary file sbsv1_os/e32toolp/binutils/make.exe has changed
diff -r d4b442d23379 -r 6ff989683ec7 sbsv1_os/e32toolp/binutils/scpp.exe
Binary file sbsv1_os/e32toolp/binutils/scpp.exe has changed
diff -r d4b442d23379 -r 6ff989683ec7 sbsv1_os/e32toolp/genutil/conv_khronos_openvg_hdr_to_cpp.pl
--- a/sbsv1_os/e32toolp/genutil/conv_khronos_openvg_hdr_to_cpp.pl	Fri Feb 19 23:57:18 2010 +0200
+++ b/sbsv1_os/e32toolp/genutil/conv_khronos_openvg_hdr_to_cpp.pl	Sat Feb 27 18:45:43 2010 +0000
@@ -62,11 +62,12 @@
   {
     @lines = <INFILE>;
     my $s = "";
-    foreach (@lines) {
+    foreach my $line (@lines) {
       # Find function prototype lines
-      if (/^VG[U]?_API_CALL/ || length($s) != 0) {
-	    $s = $s.$_;
-		if (/;/) {
+      if ($line =~ /^VG[U]?_API_CALL/ || length($s) != 0) {
+      $line =~ s/^VG[U]?_API_CALL/EXPORT_C/;
+	    $s = $s.$line;
+		if ($line =~ /;/) {
 		  # Convert the function prototype into a stub function definition
 		  $s =~ s/\;$/ { }/;
 		  # Record the stub functions.  There will be a stub implementation
diff -r d4b442d23379 -r 6ff989683ec7 sbsv1_os/e32toolp/makmake/makmake.pl
--- a/sbsv1_os/e32toolp/makmake/makmake.pl	Fri Feb 19 23:57:18 2010 +0200
+++ b/sbsv1_os/e32toolp/makmake/makmake.pl	Sat Feb 27 18:45:43 2010 +0000
@@ -457,7 +457,7 @@
 					@reusedHash = featurevariantmap->CheckOldVmapFile($vmap, \%FeatureVariantInfo);
 				}
 			}
-			if(defined(@reusedHash))
+			if(@reusedHash)
 			{
 				$FeatureVariantInfo{$bld."_LABEL"} = $reusedHash[0];
 				$FeatureVariantInfo{$bld."_FEATURES"} = $reusedHash[1];
@@ -558,7 +558,7 @@
 	$variant_info = &Path_Chop($E32env::Data{BldPath}).$Path{BldInfPath}."\\FeatureVariantInfo\\".$Plat{Real}."\\".$Plat{Real}.".".$FeatureVariantInfo{NAME}.".info" if ! -e $MMPFILE;
 # modified by SV end: makefile improvement 
 	my $variant_key = "VARIANT_PLAT_NAME_".&Path_Split('Base', $MMPFILE);
-	$variant_info_new = $variant_info.".tmp";
+	my $variant_info_new = $variant_info.".tmp";
 	open VARIANTINFOR_NEW, ">$variant_info_new" or die "ERROR: Can't open or create file \"$variant_info_new\"\n";
 
 	# Open the variant infor file
diff -r d4b442d23379 -r 6ff989683ec7 toolsandutils/buildsystem/extension/base/bootstrap.mk
--- a/toolsandutils/buildsystem/extension/base/bootstrap.mk	Fri Feb 19 23:57:18 2010 +0200
+++ b/toolsandutils/buildsystem/extension/base/bootstrap.mk	Sat Feb 27 18:45:43 2010 +0000
@@ -1,7 +1,7 @@
 # Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
@@ -77,13 +77,15 @@
 ifeq "$(CPU)" "arm"
 ASMINCPATH := . $(EPOCBLDABS) $(ASMINCPATH) $(EXTENSION_ROOT) $(EPOCCPUINC)
 ARMASM_OUT := $(shell armasm 2>&1)
-ARMASM_OUT_4 := $(word 4,$(ARMASM_OUT))
+ARMASM_OUT_RVCT := $(wordlist 1,6,$(ARMASM_OUT))
 ARMASM_OUT_6 := $(word 6,$(ARMASM_OUT))
 
 # Use GCC toolchain if no other is available
 TOOLVER := GCC
 
-RVCTSTR := $(strip $(findstring RVCT, $(ARMASM_OUT_4)))
+# ARM/Thumb Macro Assembler, RVCT2.2 [Build 616]
+# ARM Assembler, RVCT4.0 [Build 529]
+RVCTSTR := $(strip $(findstring RVCT, $(ARMASM_OUT_RVCT)))
 ifeq "$(RVCTSTR)" "RVCT"
         TOOLVER := RVCT
         OP := --