This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[committed, PATCH] Support single digit GCC version
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: binutils at sourceware dot org
- Date: Tue, 11 Jul 2017 08:42:15 -0700
- Subject: [committed, PATCH] Support single digit GCC version
- Authentication-results: sourceware.org; auth=none
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
On Fedora 26, "g++ -dumpversion" displays "7", instead of "7.1.1".
Update selective.exp to support single digit GCC version. Also
remove duplicated [4-9] version check.
* testsuite/ld-selective/selective.exp: Support single digit
GCC version.
---
ld/ChangeLog | 5 +++++
ld/testsuite/ld-selective/selective.exp | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1f978bf..90bbed7a 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2017-07-11 H.J. Lu <hongjiu.lu@intel.com>
+
+ * testsuite/ld-selective/selective.exp: Support single digit
+ GCC version.
+
2017-07-11 Jiong Wang <jiong.wang@arm.com>
* testsuite/ld-aarch64/dt_textrel.d: Use "#pass" instead of ".*" to
diff --git a/ld/testsuite/ld-selective/selective.exp b/ld/testsuite/ld-selective/selective.exp
index 8d58c16..11c8f3f 100644
--- a/ld/testsuite/ld-selective/selective.exp
+++ b/ld/testsuite/ld-selective/selective.exp
@@ -102,7 +102,8 @@ foreach testitem $seltests {
# the functionality we try to test for cannot be expected to work.
set version [remote_exec host "$CXX -dumpversion"]
set version [lindex $version 1]
- if [regexp "^(\[1-9\]\[0-9\]+|\[4-9\]|3.(\[1-9\]\[0-9\]+|\[4-9\]))\\." $version] {
+ if { [regexp "^(\[1-9\]\[0-9\]+|\[4-9\]|3.(\[1-9\]\[0-9\]+))\\." $version] \
+ || [regexp "^(\[1-9\]\[0-9\]+|\[4-9\])" $version] } {
set testflags "$cflags $cxxflags"
setup_xfail {*-*-*}
} else {
--
2.9.4