diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/testsuite/ld-plugin/plugin.exp | 10 | ||||
| -rw-r--r-- | ld/testsuite/lib/ld-lib.exp | 5 |
3 files changed, 18 insertions, 4 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 08bd13a..8da742a 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2010-11-05 Dave Korn <dave.korn.cygwin@gmail.com> + + * ld-plugin/plugin.exp (testobjfiles): Dont use HOSTING_CRT0. + (testobjfiles_notext): Likewise. + (libs): Don't use HOSTING_LIBS; fill with default symbol defs instead. + * lib/ld-lib.exp (ld_simple_link_defsyms): Add cygming clause. + 2010-11-05 Alan Modra <amodra@gmail.com> * ld-elfvers/vers32c.dsym, * ld-elfvers/vers32c.ver: Delete. diff --git a/ld/testsuite/ld-plugin/plugin.exp b/ld/testsuite/ld-plugin/plugin.exp index bb4f31c..3b5e077 100644 --- a/ld/testsuite/ld-plugin/plugin.exp +++ b/ld/testsuite/ld-plugin/plugin.exp @@ -53,10 +53,6 @@ set lt_objdir [regsub "objdir=" "$lt_objdir" ""] set plugin_path "$base_dir/$lt_objdir/$plugin_name" verbose "Full plugin path $plugin_path" 2 -set testobjfiles "$HOSTING_CRT0 tmpdir/main.o tmpdir/func.o tmpdir/text.o" -set testobjfiles_notext "$HOSTING_CRT0 tmpdir/main.o tmpdir/func.o" -set libs "$HOSTING_LIBS" - set regclm "-plugin-opt registerclaimfile" set regas "-plugin-opt registerallsymbolsread" set regcln "-plugin-opt registercleanup" @@ -87,6 +83,12 @@ if { $can_compile && !$failed_compile } { } } +set testobjfiles "tmpdir/main.o tmpdir/func.o tmpdir/text.o" +set testobjfiles_notext "tmpdir/main.o tmpdir/func.o" +# Rather than having libs we just define dummy values for anything +# we may need to link a target exe; we aren't going to run it anyway. +set libs "[ld_simple_link_defsyms] --defsym ${_}printf=0 --defsym ${_}puts=0" + set plugin_tests [list \ [list "load plugin" "-plugin $plugin_path \ $testobjfiles $libs" "" "" {{ld plugin-1.d}} "main.x" ] \ diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index e5e19eb..3d120c8 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -369,6 +369,11 @@ proc ld_simple_link_defsyms {} { append flags " --defsym __gccmain=0" } + # Windows targets need __main, prefixed with underscore. + if {[istarget *-*-cygwin* ] || [istarget *-*-mingw*]} { + append flags " --defsym ___main=0" + } + # PowerPC EABI code calls __eabi. if {[istarget powerpc*-*-eabi*] || [istarget powerpc*-*-rtems*]} { append flags " --defsym __eabi=0" |