Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-GCC
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28520
Modified Files:
Compiler-GCC.cpp Compiler-GCC.h
Log Message:
VanillaVersion() introduced.
Index: Compiler-GCC.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-GCC/Compiler-GCC.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Compiler-GCC.h 19 Feb 2007 18:43:50 -0000 1.3
--- Compiler-GCC.h 20 Mar 2007 20:30:56 -0000 1.4
***************
*** 22,25 ****
--- 22,27 ----
virtual std::string getCompilerName(void);
virtual std::string getCompilerVersion(void);
+ virtual std::string getCompilerVanillaVersion(void);
+
virtual std::string Language(void);
***************
*** 42,45 ****
--- 44,49 ----
virtual std::string getCompilerName(void);
virtual std::string getCompilerVersion(void);
+ virtual std::string getCompilerVanillaVersion(void);
+
virtual std::string Language(void);
Index: Compiler-GCC.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-GCC/Compiler-GCC.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Compiler-GCC.cpp 19 Feb 2007 18:43:50 -0000 1.3
--- Compiler-GCC.cpp 20 Mar 2007 20:30:56 -0000 1.4
***************
*** 67,70 ****
--- 67,91 ----
}
+ std::string CompilerGCC::getCompilerVanillaVersion(void)
+ {
+ std::string v = Version();
+ std::string cmd = "I=`";
+ std::string result;
+
+ if (!(v.find("(GCC)")>0))
+ return(v);
+
+ cmd+=compilerBinary;
+
+ cmd+=" --version | ";
+ cmd+=CBM_PROG_HEAD;
+ cmd+=" -1`; echo $I | ";
+ cmd+=CBM_PROG_CUT;
+ cmd+=" -f3 -d' '";
+
+ system->exec(cmd, result);
+ return(result);
+ }
+
std::string CompilerGCC::Language(void)
{
***************
*** 129,132 ****
--- 150,174 ----
}
+ std::string CompilerGCC_cpp::getCompilerVanillaVersion(void)
+ {
+ std::string v = Version();
+ std::string cmd = "I=`";
+ std::string result;
+
+ if (!(v.find("(GCC)")>0))
+ return(v);
+
+ cmd+=compilerBinary;
+
+ cmd+=" --version | ";
+ cmd+=CBM_PROG_HEAD;
+ cmd+=" -1`; echo $I | ";
+ cmd+=CBM_PROG_CUT;
+ cmd+=" -f3 -d' '";
+
+ system->exec(cmd, result);
+ return(result);
+ }
+
std::string CompilerGCC_cpp::Language(void)
{
|
