From: Paul Brook Date: Tue, 7 Mar 2006 18:55:12 +0000 (+0000) Subject: 2006-03-07 Paul Brook X-Git-Tag: gdb-csl-20060226-branch-merge-to-csl-local-1~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6341159ca41e496a5bb3726c6e6e0459230503e;p=thirdparty%2Fbinutils-gdb.git 2006-03-07 Paul Brook Backport from mainline. * gdb/testsuite/lib/compiler.c: Extract armcc version number. * gdb/testsuite/lib/compiler.cc: Ditto. --- diff --git a/ChangeLog.csl b/ChangeLog.csl index 282b2bbc0a6..f8e41556e33 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,9 @@ +2006-03-07 Paul Brook + + Backport from mainline. + * gdb/testsuite/lib/compiler.c: Extract armcc version number. + * gdb/testsuite/lib/compiler.cc: Ditto. + 2006-03-07 Paul Brook Backport from mainline. diff --git a/gdb/testsuite/lib/compiler.c b/gdb/testsuite/lib/compiler.c index 7160591a93c..bfec521be08 100644 --- a/gdb/testsuite/lib/compiler.c +++ b/gdb/testsuite/lib/compiler.c @@ -70,3 +70,7 @@ set compiler_info [join {hpacc __HP_aCC} -] numbers seperated by '.'s: currently "7.0.0.0" */ set need_a_set [regsub -all {\.} [join {xlc __xlc__} -] - compiler_info] #endif + +#if defined (__ARMCC_VERSION) +set compiler_info [join {armcc __ARMCC_VERSION} -] +#endif diff --git a/gdb/testsuite/lib/compiler.cc b/gdb/testsuite/lib/compiler.cc index 60319007bc1..444fb6376a3 100644 --- a/gdb/testsuite/lib/compiler.cc +++ b/gdb/testsuite/lib/compiler.cc @@ -58,3 +58,7 @@ set compiler_info [join {hpacc __HP_aCC} -] numbers seperated by '.'s: currently "7.0.0.0" */ set need_a_set [regsub -all {\.} [join {xlc __xlc__} -] - compiler_info] #endif + +#if defined (__ARMCC_VERSION) +set compiler_info [join {armcc __ARMCC_VERSION} -] +#endif