Run more ld tests when not native

Message ID CAMe9rOpwx2eV49FVjm5Cq0sHMoqMx=j3KrBvHHBR4GZv9=qkjA@mail.gmail.com
State New
Headers show

Commit Message

H.J. Lu Jan. 10, 2017, 7 p.m.
On Mon, Jan 2, 2017 at 5:34 AM, Alan Modra <amodra@gmail.com> wrote:
> Many of the ld tests are not run for cross builds, in some cases

> because the test needs to run a newly linked executable, and in others

> simply because it was easier to write the test for native only.  Even

> when a test needs to run, it's good to compile and link to exercise

> the linker.  So that's what this patch does.  I've also rid us of

> the old ld_link procedure with all the HOSTING_CRT0 etc. setup.  It's

> much simpler to just link with $CC.

>

> This does mean that a cross build with cross-compiler installed but

> no cross C-library will give lots of failures.  If that turns out to

> be too annoying, I guess we can write a tcl procedure to detect it and

> not run all the extra tests.

>

>         * Makefile.am (bootstrap): Delete rule.

>         (ld-partial, ld1, ld1-full, ld2, ld3): Likewise.

>         (HOSTING_CRT0, HOSTING_SCRT0): Don't define.

>         (HOSTING_LIBS, HOSTING_SLIBS, HOSTING_EMU): Likewise.

>         * configure.ac (HOSTING_CRT0, HOSTING_SCRT0): Don't define.

>         (HOSTING_LIBS, HOSTING_SLIBS): Likewise.

>         * configure.host (HOSTING_CRT0, HOSTING_LIBS): Don't define.

>         * Makefile.in: Regenerate.

>         * configure: Regenerate.

>         * testsuite/config/default.exp (get_link_files): Delete.

>         (HOSTING_CRT0, HOSTING_SCRT0, HOSTING_LIBS, HOSTING_SLIBS): Don't

>         define.

>         (ld_simple_link): Delete.

>         * testsuite/lib/ld-lib.exp (default_ld_link): Delete

>         (default_ld_simple_link): Rename to default_ld_link.

>         (ld_simple_link_defsyms): Rename to ld_link_defsyms.

>         (run_ld_link_tests): Use ld_link, not ld_simple_link.

>         (run_cc_link_tests): Likewise.

>         (run_ld_link_exec_tests): Use $CC or $CXX to link, not $ld.

>         Don't run exe when not native, and return unsupported.

>         * testsuite/ld-bootstrap/bootstrap.exp: Create gccld1 etc. dirs.

>         Link ld1 etc. using $CC.

>         * testsuite/ld-cdtest/cdtest.exp: Link cdtest using $CC.

>         * testsuite/ld-checks/checks.exp: Use ld_link, not ld_simple_link.

>         * testsuite/ld-cygwin/exe-export.exp: Likewise.

>         * testsuite/ld-elf/binutils.exp: Likewise.

>         * testsuite/ld-elf/eh-group.exp: Likewise.

>         * testsuite/ld-elf/exclude.exp: Likewise.

>         * testsuite/ld-elf/frame.exp: Likewise.

>         * testsuite/ld-elf/sec-to-seg.exp: Likewise.

>         * testsuite/ld-elf/tls_common.exp: Likewise.

>         * testsuite/ld-elfcomm/elfcomm.exp: Likewise.

>         * testsuite/ld-fastcall/fastcall.exp: Likewise.

>         * testsuite/ld-gc/gc.exp: Likewise.

>         * testsuite/ld-ifunc/binutils.exp: Likewise.

>         * testsuite/ld-mep/mep.exp: Likewise.

>         * testsuite/ld-mips-elf/mips-elf-flags.exp: Likewise.

>         * testsuite/ld-mn10300/mn10300.exp: Likewise.

>         * testsuite/ld-nios2/nios2.exp: Likewise.

>         * testsuite/ld-pe/pe-compile.exp: Likewise.

>         * testsuite/ld-pe/pe-run.exp: Likewise.

>         * testsuite/ld-pe/pe-run2.exp: Likewise.

>         * testsuite/ld-plugin/plugin.exp: Likewise.

>         * testsuite/ld-scripts/align.exp: Likewise.

>         * testsuite/ld-scripts/alignof.exp: Likewise.

>         * testsuite/ld-scripts/assert.exp: Likewise.

>         * testsuite/ld-scripts/defined.exp: Likewise.

>         * testsuite/ld-scripts/extern.exp: Likewise.

>         * testsuite/ld-scripts/log2.exp: Likewise.

>         * testsuite/ld-scripts/map-address.exp: Likewise.

>         * testsuite/ld-scripts/phdrs.exp: Likewise.

>         * testsuite/ld-scripts/phdrs2.exp: Likewise.

>         * testsuite/ld-scripts/script.exp: Likewise.

>         * testsuite/ld-scripts/section-flags.exp: Likewise.

>         * testsuite/ld-scripts/sizeof.exp: Likewise.

>         * testsuite/ld-scripts/sysroot-prefix.exp: Likewise.

>         * testsuite/ld-scripts/weak.exp: Likewise.

>         * testsuite/ld-selective/selective.exp: Likewise.

>         * testsuite/ld-sh/sh.exp: Likewise.

>         * testsuite/ld-sh/sh64/relax.exp: Likewise.

>         * testsuite/ld-sh/sh64/relfail.exp: Likewise.

>         * testsuite/ld-srec/srec.exp: Likewise.

>         * testsuite/ld-tic6x/tic6x.exp: Likewise.

>         * testsuite/ld-undefined/weak-undef.exp: Likewise.

>         * testsuite/ld-versados/versados.exp: Likewise.

>         * testsuite/ld-x86-64/dwarfreloc.exp: Likewise.

>         * testsuite/ld-xtensa/coalesce.exp: Likewise.

>         * testsuite/ld-xtensa/diff_overflow.exp: Likewise.

>         * testsuite/ld-xtensa/lcall.exp: Likewise.

>         * testsuite/ld-elf/audit.exp: Run non-native too.

>         * testsuite/ld-elf/compress.exp: Likewise.  Replace ld options with

>         gcc -Wl, options.

>         * testsuite/ld-elf/dwarf.exp: Run non-native too.  Use ld_link,

>         not ld_simple_link.  Add -Wl,--no-as-needed to some tests.

>         * testsuite/ld-elf/elf.exp: Run non-native too.  Formatting.

>         * testsuite/ld-elf/indirect.exp: Run non-native too.  Add

>         -Wl,--no-as-needed to most tests.

>         * testsuite/ld-elf/shared.exp: Run non-native too.  Use braces

>         to simplify quoting.  Set run_tests using [list] rather than

>         brace assignment to expand $extralibs.  Add -Wl,--no-as-needed

>         to many test.  Prefix ld options with -Wl,.

>         (mix_pic_and_non_pic): Don't run exe if not native.

>         * testsuite/ld-elf/wrap.exp: Run non-native too.  Add

>         -Wl,--no-as-needed and prefix ld options with -Wl,.

>         * testsuite/ld-elfvers/vers.exp: Run non-native too.  Use ld_link,

>         not ld_simple_link.

>         * testsuite/ld-elfvsb/elfvsb.exp: Likewise.

>         (visibility_test): Don't run exe if not native.

>         * testsuite/ld-elfweak/elfweak.exp: Run non-native too.  Use ld_link,

>         not ld_simple_link.

>         (build_exec): Don't run exe if not native.

>         * testsuite/ld-ifunc/ifunc.exp: Run non-native too.  Use ld_link,

>         not ld_simple_link.  Link using $CC.  Add -Wl,--no-as-needed

>         to some tests and prefix ld options with -Wl,.  Expect GNU

>         for hppa-linux even when no ifuncs.  Delete cleanup.

>         * testsuite/ld-pie/pie.exp: Run non-native too.

>         * testsuite/ld-plugin/lto.exp: Likewise.

>         * testsuite/ld-shared/shared.exp: Likewise.  Use ld_link,

>         not ld_simple_link.

>         (shared_test): Don't run exe if not native.

>         * testsuite/ld-size/size.exp: Run non-native too.  Add

>         -Wl,--no-as-needed to some tests.  Prefix ld options with -Wl,.

>         * testsuite/ld-unique/unique.exp: Run non-native too.  Use ld_link,

>         not ld_simple_link.  Link using $CC.  Add -Wl,--no-as-needed

>         to some tests and prefix ld options with -Wl,.  Expect GNU

>         for hppa-linux even when no unique syms.  Delete cleanup.

>         * testsuite/ld-x86-64/tls.exp: Add -Wl,--no-as-needed to some

>         tests and prefix ld options with -Wl,.

>         * testsuite/ld-x86-64/x86-64.exp: Use ld_link, not ld_simple_link.

>         Add -Wl,--no-as-needed to some tests.  Prefix ld options with -Wl,.

>


I checked in this patch to fix i386 ld tests.

H.J.

Comments

Alan Modra Jan. 10, 2017, 9:50 p.m. | #1
On Tue, Jan 10, 2017 at 11:00:51AM -0800, H.J. Lu wrote:
> I checked in this patch to fix i386 ld tests.


Sorry, and thanks for cleaning up after me.  I didn't modify the
x86_64 and i386 tests to run when non-native, thinking there were
plenty of people running native tests.  Perhaps the i386 tests at
least should be run non-native?

-- 
Alan Modra
Australia Development Lab, IBM
H.J. Lu Jan. 10, 2017, 10:06 p.m. | #2
On Tue, Jan 10, 2017 at 1:50 PM, Alan Modra <amodra@gmail.com> wrote:
> On Tue, Jan 10, 2017 at 11:00:51AM -0800, H.J. Lu wrote:

>> I checked in this patch to fix i386 ld tests.

>

> Sorry, and thanks for cleaning up after me.  I didn't modify the

> x86_64 and i386 tests to run when non-native, thinking there were

> plenty of people running native tests.  Perhaps the i386 tests at

> least should be run non-native?

>


Some i386 tests are run-time tests.  I build and test i386 binutils on
x86-64 with

CC="/usr/gcc-6.1.1-32bit/bin/gcc -m32"
CXX="/usr/gcc-6.1.1-32bit/bin/g++ -m32"  RUNTESTFLAGS="--target_board
'unix{-m32}'" \
/export/gnu/import/git/sources/binutils-gdb/configure \


-- 
H.J.
H.J. Lu Jan. 11, 2017, 6:40 p.m. | #3
On Tue, Jan 10, 2017 at 4:56 PM, Alan Modra <amodra@gmail.com> wrote:
> On Tue, Jan 10, 2017 at 02:06:36PM -0800, H.J. Lu wrote:

>> On Tue, Jan 10, 2017 at 1:50 PM, Alan Modra <amodra@gmail.com> wrote:

>> > On Tue, Jan 10, 2017 at 11:00:51AM -0800, H.J. Lu wrote:

>> >> I checked in this patch to fix i386 ld tests.

>> >

>> > Sorry, and thanks for cleaning up after me.  I didn't modify the

>> > x86_64 and i386 tests to run when non-native, thinking there were

>> > plenty of people running native tests.  Perhaps the i386 tests at

>> > least should be run non-native?

>> >

>>

>> Some i386 tests are run-time tests.  I build and test i386 binutils on

>> x86-64 with

>

> I understand.  What I was suggesting is that those run-time tests be

> compiled and linked if you have $CC available, eg. i686-linux-gnu-gcc

> installed on your x86_64-linux-gnu system.  run_ld_link_exec_tests now

> tests isnative itself before running a test binary.

>

> The downside of making a change like the following is that if your

> system does have i686-linux-gnu-gcc available but not the

> corresponding C library then you'll get more linker testsuite

> failures.


Sure.

> diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp

> index 973a110..2c54552 100644

> --- a/ld/testsuite/ld-i386/i386.exp

> +++ b/ld/testsuite/ld-i386/i386.exp

> @@ -494,9 +494,8 @@ proc undefined_weak {cflags ldflags} {

>  # Add $PLT_CFLAGS if PLT is expected.

>  global PLT_CFLAGS

>

> -# Must be Linux native with the C compiler

> -if { [isnative]

> -     && [istarget "i?86-*-linux*"]

> +# Must be Linux with the C compiler

> +if { [istarget "i?86-*-linux*"]

>       && [which $CC] != 0 } {

>      run_cc_link_tests [list \

>         [list \

> @@ -820,9 +819,8 @@ if { [isnative]

>      undefined_weak "-fPIE" "-pie -z nodynamic-undefined-weak"

>  }

>

> -# Must be native with the C compiler and working IFUNC support,

> -if { [isnative]

> -     && [check_ifunc_available]

> +# Must have a compiler and working IFUNC support,

> +if { [check_ifunc_available]

>       && [istarget "i?86-*-*"]

>       && [which $CC] != 0 } {

>      run_cc_link_tests [list \

>

> --

> Alan Modra

> Australia Development Lab, IBM




-- 
H.J.

Patch hide | download patch | download mbox

From e92372274e77fc0ce87f35a833de8a60d733580a Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 10 Jan 2017 10:54:39 -0800
Subject: [PATCH] i386: Pass -Wl,-R,tmpdir/-Wl --as-needed to $CC

Since linker tests were changed to use $CC, instead of $LD, we need
to pass -Wl,-R,tmpdir and -Wl,--as-needed to $CC.

	* testsuite/ld-i386/i386.exp: Pass -Wl,-R,tmpdir to GCC driver.
	* testsuite/ld-i386/tls.exp: Likewise.
---
 ld/ChangeLog                  | 6 ++++++
 ld/testsuite/ld-i386/i386.exp | 4 ++--
 ld/testsuite/ld-i386/tls.exp  | 6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 72826b9..ef2c466 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@ 
+2017-01-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* testsuite/ld-i386/i386.exp: Pass -Wl,-R,tmpdir and
+	-Wl,--as-needed to $CC.
+	* testsuite/ld-i386/tls.exp: Likewise.
+
 2017-01-10  Nick Clifton  <nickc@redhat.com>
 
 	* po/sv.po: Updated Swedish translation.
diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index e748e8b..973a110 100644
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -472,7 +472,7 @@  proc undefined_weak {cflags ldflags} {
     run_ld_link_exec_tests [list \
 	[list \
 	    "Run pr19704" \
-	    "$ldflags tmpdir/libpr19704.so -R tmpdir" \
+	    "$ldflags tmpdir/libpr19704.so -Wl,-R,tmpdir" \
 	    "" \
 	    { pr19704a.c } \
 	    "pr19704" \
@@ -757,7 +757,7 @@  if { [isnative]
 	] \
 	[list \
 	    "Run copyreloc-main with PIE and GOTOFF" \
-	    "--as-needed tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \
+	    "-Wl,--as-needed tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \
 	    "" \
 	    { dummy.s } \
 	    "copyreloc-main" \
diff --git a/ld/testsuite/ld-i386/tls.exp b/ld/testsuite/ld-i386/tls.exp
index 3cf183e..1653104 100644
--- a/ld/testsuite/ld-i386/tls.exp
+++ b/ld/testsuite/ld-i386/tls.exp
@@ -98,7 +98,7 @@  run_ld_link_exec_tests [list \
     [list \
 	"TLS GD/LD -> IE transition without PLT" \
 	"tmpdir/tls-main1.o tmpdir/tls-gd1.o tmpdir/tls-ld1.o \
-	 tmpdir/libtls-1a.so -R tmpdir" \
+	 tmpdir/libtls-1a.so -Wl,-R,tmpdir" \
 	"" \
 	{ dummy.s } \
 	"tls-1d" \
@@ -107,7 +107,7 @@  run_ld_link_exec_tests [list \
     [list \
 	"TLS without PLT (1)" \
 	"tmpdir/tls-main1.o \
-	 tmpdir/libtls-1a.so tmpdir/libtls-1b.so -R tmpdir" \
+	 tmpdir/libtls-1a.so tmpdir/libtls-1b.so -Wl,-R,tmpdir" \
 	"" \
 	{ dummy.s } \
 	"tls-1e" \
@@ -116,7 +116,7 @@  run_ld_link_exec_tests [list \
     [list \
 	"TLS without PLT (2)" \
 	"tmpdir/tls-main1.o tmpdir/tls-def1.o \
-	 tmpdir/libtls-1b.so -R tmpdir" \
+	 tmpdir/libtls-1b.so -Wl,-R,tmpdir" \
 	"" \
 	{ dummy.s } \
 	"tls-1f" \
-- 
2.7.4