From 1d2ca237d83678be5c4782309b1c820636c9f60a Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Tue, 27 Apr 2010 17:28:15 +0000 Subject: 2010-04-27 Kai Tietz * dlltool.c (main): Query for bfd's underscoring default for default target case. 2010-04-27 Kai Tietz * binutils-all/dlltool.exp: Allow test for arm-wince-pe target. --- binutils/ChangeLog | 5 +++++ binutils/dlltool.c | 10 ++++++++++ binutils/testsuite/ChangeLog | 5 +++++ binutils/testsuite/binutils-all/dlltool.exp | 15 ++++++++------- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 60e2f67..2b7d520 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2010-04-27 Kai Tietz + + * dlltool.c (main): Query for bfd's underscoring default for + default target case. + 2010-04-27 Nick Clifton * po/ru.po: Updated Russian translation. diff --git a/binutils/dlltool.c b/binutils/dlltool.c index 280edc1..3a91221 100644 --- a/binutils/dlltool.c +++ b/binutils/dlltool.c @@ -4143,6 +4143,16 @@ main (int ac, char **av) /* Check if we generated PE+. */ create_for_pep = strcmp (mname, "i386:x86-64") == 0; + { + /* Check the default underscore */ + int u = leading_underscore; /* Underscoring mode. -1 for use default. */ + if (u == -1) + bfd_get_target_info (mtable[machine].how_bfd_target, NULL, + NULL, &u, NULL); + if (u != -1) + leading_underscore = (u != 0 ? TRUE : FALSE); + } + if (!dll_name && exp_name) { /* If we are inferring dll_name from exp_name, diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index 00db66d..1b6bafa 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-04-27 Kai Tietz + + * binutils-all/dlltool.exp: Allow test for + arm-wince-pe target. + 2010-03-30 Kai TIetz * binutils-all/objcopy.exp: Mark simple copy executable diff --git a/binutils/testsuite/binutils-all/dlltool.exp b/binutils/testsuite/binutils-all/dlltool.exp index 046fc18..d6f8e3b 100644 --- a/binutils/testsuite/binutils-all/dlltool.exp +++ b/binutils/testsuite/binutils-all/dlltool.exp @@ -14,13 +14,14 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. -if {![istarget "i*86-*-*"] && ![istarget "x86_64-*-mingw*"] } { +if {![istarget "i*86-*-*"] && ![istarget "x86_64-*-mingw*"] && ![istarget "arm-*-pe*]} { return } if {![istarget "i*86-*-*pe*"] \ && ![istarget "i*86-*-cygwin*"] \ && ![istarget "i*86-*-mingw32*"] \ + && ![istarget "arm-*-pe*"] \ && ![istarget "x86_64-*-mingw*"] } { set target_xfail "yes" } else { @@ -35,8 +36,8 @@ if {[which $DLLTOOL] == 0} then { return } -verbose "$DLLTOOL -d $srcdir/$subdir/fastcall.def" 1 -catch "exec $DLLTOOL -d $srcdir/$subdir/fastcall.def" err +verbose "$DLLTOOL --leading-underscore -d $srcdir/$subdir/fastcall.def" 1 +catch "exec $DLLTOOL --leading-underscore -d $srcdir/$subdir/fastcall.def" err if ![string match "" $err] then { send_log "$err\n" @@ -50,8 +51,8 @@ if { "$target_xfail" == "yes" } { setup_xfail *-* } -verbose "$DLLTOOL -p prefix -l tmpdir/libalias.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" 1 -catch "exec $DLLTOOL -p prefix -l tmpdir/libalias.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" err +verbose "$DLLTOOL -p prefix --leading-underscore -l tmpdir/libalias.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" 1 +catch "exec $DLLTOOL -p prefix --leading-underscore -l tmpdir/libalias.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" err if ![string match "" $err] then { send_log "$err\n" @@ -80,8 +81,8 @@ if [regexp $want $got] then { fail "dlltool -p (import name)" } -verbose "$DLLTOOL -p prefix -l tmpdir/libalias2.a -d $srcdir/$subdir/alias-2.def $dlltool_gas_flag" 1 -catch "exec $DLLTOOL -p prefix -l tmpdir/libalias2.a -d $srcdir/$subdir/alias-2.def $dlltool_gas_flag" err +verbose "$DLLTOOL -p prefix --leading-underscore -l tmpdir/libalias2.a -d $srcdir/$subdir/alias-2.def $dlltool_gas_flag" 1 +catch "exec $DLLTOOL -p prefix --leading-underscore -l tmpdir/libalias2.a -d $srcdir/$subdir/alias-2.def $dlltool_gas_flag" err if ![string match "" $err] then { send_log "$err\n" -- cgit v1.1