Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Fix dlltool tests for ARM targets, which do not support the --leading-underscore option.

Browse Source 
PR 19495
	* testsuite/binutils-all/dlltool.exp: Fix tests for targets which
	do not support inserting leading underscores.
This commit is contained in:
Nick Clifton
2016-01-20 14:52:33 +00:00
parent 0bff6e2d69
commit 0398b8d6c8
2 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
binutils/ChangeLog
View File

@@ -1,3 +1,9 @@
2016-01-20 Nick Clifton <nickc@redhat.com>
PR 19495
* testsuite/binutils-all/dlltool.exp: Fix tests for targets which
do not support inserting leading underscores.
2016-01-20 Mickael Guene <mickael.guene@st.com> 2016-01-20 Mickael Guene <mickael.guene@st.com>
* readelf.c (get_elf_section_flags): Display y letter for section * readelf.c (get_elf_section_flags): Display y letter for section

43
binutils/testsuite/binutils-all/dlltool.exp
View File

@@ -30,6 +30,13 @@ if {![istarget "i*86-*-*pe*"] \
set target_xfail "no" set target_xfail "no"
} }
# PR 19459: The ARM does not support inserting a leading underscore.
if { [istarget "arm-*-pe*"] } {
set target_no_leading_underscore "yes"
} else {
set target_no_leading_underscore "no"
}
if {![info exists DLLTOOL]} then { if {![info exists DLLTOOL]} then {
return return
} }
@@ -81,7 +88,11 @@ if ![string match "" $err] then {
pass "dlltool -p (execution)" pass "dlltool -p (execution)"
set got [binutils_run $NM "tmpdir/libalias.a"] set got [binutils_run $NM "tmpdir/libalias.a"]
set want "00000000 I __imp__prefix_symbol.*00000000 T _prefix_symbol.*00000000 I __imp__symbol.*00000000 T _symbol" if { "$target_no_leading_underscore" == "yes" } {
set want "00000000 I __imp_prefixsymbol.*00000000 T prefixsymbol.*00000000 I __imp_symbol.*00000000 T symbol"
} else {
set want "00000000 I __imp__prefix_symbol.*00000000 T _prefix_symbol.*00000000 I __imp__symbol.*00000000 T _symbol"
}
if [regexp $want $got] then { if [regexp $want $got] then {
pass "dlltool -p (symbol names)" pass "dlltool -p (symbol names)"
@@ -111,7 +122,11 @@ if ![string match "" $err] then {
pass "dlltool -p (execution) alias-2.def" pass "dlltool -p (execution) alias-2.def"
set got [binutils_run $NM "tmpdir/libalias2.a"] set got [binutils_run $NM "tmpdir/libalias2.a"]
set want "00000000 I __imp__prefix_symbol.*00000000 T _prefix_symbol.*00000000 I __imp__symbol.*00000000 T _symbol" if { "$target_no_leading_underscore" == "yes" } {
set want "00000000 I __imp_prefixsymbol.*00000000 T prefixsymbol.*00000000 I __imp_symbol.*00000000 T symbol"
} else {
set want "00000000 I __imp__prefix_symbol.*00000000 T _prefix_symbol.*00000000 I __imp__symbol.*00000000 T _symbol"
}
if [regexp $want $got] then { if [regexp $want $got] then {
pass "dlltool -p (symbol names) alias-2.def" pass "dlltool -p (symbol names) alias-2.def"
@@ -141,10 +156,6 @@ if ![string match "" $err] then {
pass "dlltool (fastcall export no leading underscore)" pass "dlltool (fastcall export no leading underscore)"
} }
if { "$target_xfail" == "yes" } {
setup_xfail *-*
}
verbose "$DLLTOOL --no-leading-underscore -p prefix -l tmpdir/libalias_nu.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" 1 verbose "$DLLTOOL --no-leading-underscore -p prefix -l tmpdir/libalias_nu.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" 1
catch "exec $DLLTOOL --no-leading-underscore -p prefix -l tmpdir/libalias_nu.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" err catch "exec $DLLTOOL --no-leading-underscore -p prefix -l tmpdir/libalias_nu.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" err
@@ -217,10 +228,6 @@ if ![string match "" $err] then {
pass "dlltool (fastcall export leading underscore)" pass "dlltool (fastcall export leading underscore)"
} }
if { "$target_xfail" == "yes" } {
setup_xfail *-*
}
verbose "$DLLTOOL --leading-underscore -p prefix -l tmpdir/libalias_u.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" 1 verbose "$DLLTOOL --leading-underscore -p prefix -l tmpdir/libalias_u.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" 1
catch "exec $DLLTOOL --leading-underscore -p prefix -l tmpdir/libalias_u.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" err catch "exec $DLLTOOL --leading-underscore -p prefix -l tmpdir/libalias_u.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" err
@@ -234,7 +241,15 @@ if ![string match "" $err] then {
pass "dlltool -p (execution leading-underscore)" pass "dlltool -p (execution leading-underscore)"
set got [binutils_run $NM "tmpdir/libalias_u.a"] set got [binutils_run $NM "tmpdir/libalias_u.a"]
set want "00000000 I __imp__prefix_symbol.*00000000 T _prefix_symbol.*00000000 I __imp__symbol.*00000000 T _symbol" if { "$target_no_leading_underscore" == "yes" } {
set want "00000000 I __imp_prefixsymbol.*00000000 T prefixsymbol.*00000000 I __imp_symbol.*00000000 T symbol"
} else {
set want "00000000 I __imp__prefix_symbol.*00000000 T _prefix_symbol.*00000000 I __imp__symbol.*00000000 T _symbol"
}
if { "$target_xfail" == "yes" } {
setup_xfail *-*
}
if [regexp $want $got] then { if [regexp $want $got] then {
pass "dlltool -p (symbol names leading underscore)" pass "dlltool -p (symbol names leading underscore)"
@@ -264,7 +279,11 @@ if ![string match "" $err] then {
pass "dlltool -p (execution leading underscore) alias-2.def" pass "dlltool -p (execution leading underscore) alias-2.def"
set got [binutils_run $NM "tmpdir/libalias_u2.a"] set got [binutils_run $NM "tmpdir/libalias_u2.a"]
set want "00000000 I __imp__prefix_symbol.*00000000 T _prefix_symbol.*00000000 I __imp__symbol.*00000000 T _symbol" if { "$target_no_leading_underscore" == "yes" } {
set want "00000000 I __imp_prefixsymbol.*00000000 T prefixsymbol.*00000000 I __imp_symbol.*00000000 T symbol"
} else {
set want "00000000 I __imp__prefix_symbol.*00000000 T _prefix_symbol.*00000000 I __imp__symbol.*00000000 T _symbol"
}
if [regexp $want $got] then { if [regexp $want $got] then {
pass "dlltool -p (symbol names leading underscore) alias-2.def" pass "dlltool -p (symbol names leading underscore) alias-2.def"