From 074f6066845cb564751d4fa604e5f591c8265b41 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 24 Aug 2017 08:33:16 -0700 Subject: [PATCH] ld: Replace regexp with string match Replace regexp with string match to workaround dejagnu 1.4.4 which complains: ERROR: bad switch "-fPIE": must be -all, -about, -indices, -inline, -expanded, -line, -linestop, -lineanchor, -nocase, -start, or -- * testsuite/ld-i386/i386.exp (undefined_weak): Replace regexp with string match. * testsuite/ld-x86-64/x86-64.exp (undefined_weak): Likewise. --- ld/ChangeLog | 6 ++++++ ld/testsuite/ld-i386/i386.exp | 4 ++-- ld/testsuite/ld-x86-64/x86-64.exp | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 6a3a35f2fc9..e6d0f41c0f9 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2017-08-24 H.J. Lu + + * testsuite/ld-i386/i386.exp (undefined_weak): Replace regexp + with string match. + * testsuite/ld-x86-64/x86-64.exp (undefined_weak): Likewise. + 2017-08-24 H.J. Lu * testsuite/ld-x86-64/x86-64.exp: Run pr22001-1b on x32. diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index c91a8611f37..c813a80551a 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -468,8 +468,8 @@ proc undefined_weak {cflags ldflags} { set testname "$testname ($cflags $ldflags)" } - if { [ regexp "\-fPIE" $cflags] - && ![ regexp "\-z nodynamic-undefined-weak" $ldflags] } { + if { [string match "*-fPIE*" $cflags] + && ![string match "*-z nodynamic-undefined-weak*" $ldflags] } { set weak_symbol "Weak defined" } else { set weak_symbol "Weak undefined" diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 7382a1bbfe6..45e93b2c96b 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -577,8 +577,8 @@ proc undefined_weak {cflags ldflags} { set testname "$testname ($cflags $ldflags)" } - if { [ regexp "\-fPIE" $cflags] - && ![ regexp "nodynamic-undefined-weak" $ldflags] } { + if { [string match "*-fPIE*" $cflags] + && ![string match "*nodynamic-undefined-weak*" $ldflags] } { set weak_symbol "Weak defined" } else { set weak_symbol "Weak undefined" -- 2.30.2