This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Fix dlltool tests for ARM targets, which do not support the --leading-underscore option.
- From: Nick Clifton <nickc at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 20 Jan 2016 14:53:15 -0000
- Subject: [binutils-gdb] Fix dlltool tests for ARM targets, which do not support the --leading-underscore option.
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0398b8d6c86a44df0acd8c538b5fc279331a150f
commit 0398b8d6c86a44df0acd8c538b5fc279331a150f
Author: Nick Clifton <nickc@redhat.com>
Date: Wed Jan 20 14:52:33 2016 +0000
Fix dlltool tests for ARM targets, which do not support the --leading-underscore option.
PR 19495
* testsuite/binutils-all/dlltool.exp: Fix tests for targets which
do not support inserting leading underscores.
Diff:
---
binutils/ChangeLog | 6 ++++
binutils/testsuite/binutils-all/dlltool.exp | 43 +++++++++++++++++++++--------
2 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 2d23f20..d836de3 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -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>
* readelf.c (get_elf_section_flags): Display y letter for section
diff --git a/binutils/testsuite/binutils-all/dlltool.exp b/binutils/testsuite/binutils-all/dlltool.exp
index 7df95e6..cdc9464 100644
--- a/binutils/testsuite/binutils-all/dlltool.exp
+++ b/binutils/testsuite/binutils-all/dlltool.exp
@@ -30,6 +30,13 @@ if {![istarget "i*86-*-*pe*"] \
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 {
return
}
@@ -81,7 +88,11 @@ if ![string match "" $err] then {
pass "dlltool -p (execution)"
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 {
pass "dlltool -p (symbol names)"
@@ -111,7 +122,11 @@ if ![string match "" $err] then {
pass "dlltool -p (execution) alias-2.def"
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 {
pass "dlltool -p (symbol names) alias-2.def"
@@ -141,10 +156,6 @@ if ![string match "" $err] then {
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
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)"
}
-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
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)"
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 {
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"
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 {
pass "dlltool -p (symbol names leading underscore) alias-2.def"