diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-08-24 08:33:16 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-08-24 08:33:16 -0700 |
| commit | 074f6066845cb564751d4fa604e5f591c8265b41 (patch) | |
| tree | 07029927eff4850268aa19949b8e9ad95cbfb573 | |
| parent | 28e6a46bcb00e9972540e4d12a98cc3f6fbb9d87 (diff) | |
| download | gdb-074f6066845cb564751d4fa604e5f591c8265b41.zip gdb-074f6066845cb564751d4fa604e5f591c8265b41.tar.gz gdb-074f6066845cb564751d4fa604e5f591c8265b41.tar.bz2 | |
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.
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-i386/i386.exp | 4 | ||||
| -rw-r--r-- | 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 6a3a35f..e6d0f41 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,11 @@ 2017-08-24 H.J. Lu <hongjiu.lu@intel.com> + * 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 <hongjiu.lu@intel.com> + * testsuite/ld-x86-64/x86-64.exp: Run pr22001-1b on x32. 2017-08-24 H.J. Lu <hongjiu.lu@intel.com> diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index c91a861..c813a80 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 7382a1b..45e93b2 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" |