OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
H.J. Lu 2017-08-24 08:33:16 -07:00
parent 28e6a46bcb
commit 074f606684
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ld/ChangeLog
View File

@ -1,3 +1,9 @@
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.

4
ld/testsuite/ld-i386/i386.exp
View File

@ -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"

4
ld/testsuite/ld-x86-64/x86-64.exp
View File

@ -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"