summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2006-03-07 18:55:12 +0000
committerPaul Brook <paul@codesourcery.com>2006-03-07 18:55:12 +0000
commitd6341159ca41e496a5bb3726c6e6e0459230503e (patch)
tree7fd695cbafa12aba1f2ed6241ba69da5499063bd
parente619155dd318a0b543919da9840e5bfcc1706f22 (diff)
downloadbinutils-gdb-d6341159ca41e496a5bb3726c6e6e0459230503e.tar.gz
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.
-rw-r--r--ChangeLog.csl6
-rw-r--r--gdb/testsuite/lib/compiler.c4
-rw-r--r--gdb/testsuite/lib/compiler.cc4
3 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl
index 282b2bbc0a6..f8e41556e33 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,6 +1,12 @@
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.
2006-03-03 Khem Raj <khem@mvista.com>
* remote-rdp.c (remote_rdp_xfer_inferior_memory): Use gdb_byte.
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