2006-03-07 Paul Brook <paul@codesourcery.com>

	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 282b2bbc0a693cff395f07dcd2a5f5d37cb55d0f..f8e41556e332e20a7f7ca14dcba2845fd99025a4 100644 (file)
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,9 @@
+2006-03-07  Paul Brook  <paul@codesourcery.com>
+
+       Backport from mainline.
+       * gdb/testsuite/lib/compiler.c: Extract armcc version number.
+       * gdb/testsuite/lib/compiler.cc: Ditto.
+
 2006-03-07  Paul Brook  <paul@codesourcery.com>
 
        Backport from mainline.

diff --git a/gdb/testsuite/lib/compiler.c b/gdb/testsuite/lib/compiler.c
index 7160591a93c20c067182fb6eec3efe52da6d7f25..bfec521be08637e90ddb95cac493546b8ebdf4f9 100644 (file)
--- 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 60319007bc1e97684f3288d30f98bec2128da6f3..444fb6376a300b9f71c36251d75d149d726b58e7 100644 (file)
--- 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