--- a/sbsv2/raptor/lib/config/gcc.xml Tue Mar 23 13:34:00 2010 +0000
+++ b/sbsv2/raptor/lib/config/gcc.xml Tue Mar 23 17:11:09 2010 +0000
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<build xmlns="http://symbian.com/xml/build" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symbian.com/xml/build ../../schema/build/2_0.xsd">
-
- <!-- build configurations for GCC compilers -->
+ <!-- build variants for GCC toolchains -->
<var name="tools2_base" extends="root">
-
<varRef ref="default.interfaces"/>
<varRef ref="default.locations"/>
- <!-- picked up from the Environment -->
+
+ <!-- toolchain tools -->
<env name='RANLIB' default='$(GCCPREFIX)ranlib$(DOTEXE)' type='tool'/>
<env name='GCC' default='$(GCCPREFIX)g++$(DOTEXE)' type='tool'/>
<env name='AR' default='$(GCCPREFIX)ar$(DOTEXE)' type='tool'/>
+
+ <set name='COMPILER' value='$(GCC) -c' type='tool' versionCommand='$(GCC) -v' versionResult='gcc version (3.[456])|(4.[0-9])'/>
+ <set name='LINKER' value='$(GCC)'/>
+
+ <!-- tools and scripts -->
+ <env name='JAVATC' default='$(JAVA_HOME)/bin/java' type='tool'/> <!-- Java used by Trace Compiler -->
<!-- interfaces -->
<set name="INTERFACE.exe" value="Tools.exe"/>
<set name="INTERFACE.lib" value="Tools.lib"/>
- <!-- Java used by Trace Compiler -->
- <env name='JAVA_HOME' default='' type='path'/>
- <env name='JAVATC' default='$(JAVA_HOME)/bin/java' type='tool'/>
-
<!-- link to bld.inf and mmp platform names -->
<set name='TRADITIONAL_PLATFORM' value='TOOLS2'/>
+
+ <!-- Java used by Trace Compiler -->
+ <set name='CFLAGS' value='-fdefer-pop -fmerge-constants -fthread-jumps -floop-optimize -fif-conversion -fif-conversion2 -fguess-branch-probability -fcprop-registers -foptimize-sibling-calls -fstrength-reduce -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -frerun-loop-opt -fgcse -fgcse-lm -fgcse-sm -fgcse-las -fdelete-null-pointer-checks -fexpensive-optimizations -fregmove -fschedule-insns -fschedule-insns2 -fsched-interblock -fsched-spec -fcaller-saves -fpeephole2 -freorder-blocks -freorder-functions -fstrict-aliasing -funit-at-a-time -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -pipe -Wall -Wno-ctor-dtor-privacy -Wno-unknown-pragmas -m32'/>
+ <env name='JAVA_HOME' default='' type='path'/>
<set name='VARIANTPLATFORM' value='tools2'/>
- <!-- used by FLM code -->
- <set name='COMPILER' value='$(GCC) -c' type='tool' versionCommand='$(GCC) -v' versionResult='gcc version (3.[456])|(4.[0-9])'/>
-
- <set name='CFLAGS' value='-fdefer-pop -fmerge-constants -fthread-jumps -floop-optimize -fif-conversion -fif-conversion2 -fguess-branch-probability -fcprop-registers -foptimize-sibling-calls -fstrength-reduce -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -frerun-loop-opt -fgcse -fgcse-lm -fgcse-sm -fgcse-las -fdelete-null-pointer-checks -fexpensive-optimizations -fregmove -fschedule-insns -fschedule-insns2 -fsched-interblock -fsched-spec -fcaller-saves -fpeephole2 -freorder-blocks -freorder-functions -fstrict-aliasing -funit-at-a-time -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -pipe -Wall -Wno-ctor-dtor-privacy -Wno-unknown-pragmas -m32'/>
-
<!-- msys based programs sometimes don't search the path properly.
COMPILER_PATH can be set to tell gcc where to find
as.exe (sometimes it doesn't and a build step fails).
@@ -39,8 +39,6 @@
<!-- macro definitions set by mmps etc -->
<set name='CDEFS' value='$(MMPDEFS)'/>
-
-
<set name='CDEFS.DEFAULT' value='__SYMBIAN32__ __TOOLS__ __TOOLS2__ __EXE__ __SUPPORT_CPP_EXCEPTIONS__ __PRODUCT_INCLUDE__="$(PRODUCT_INCLUDE)"'/>
<set name='CDEFS.WIN32' value='$(CDEFS.DEFAULT) _WIN32 WIN32 _WINDOWS __TOOLS2_WINDOWS__'/>
<set name='CDEFS.LINUX' value='$(CDEFS.DEFAULT) __LINUX__ __TOOLS2_LINUX__'/>
@@ -58,7 +56,6 @@
<!-- always use stlport headers -->
<set name='SYSTEMINCLUDE' value='$(EPOCINCLUDE)/tools/stlport'/>
- <set name='LINKER' value='$(GCC)'/>
<set name='LFLAGS' value=''/>
<set name='STATICLIBRARY' value='stlport.5.1'/>
<set name='LIBS' value=''/>