Fix implib test failures

bfd/
	* elf.c (_bfd_elf_filter_global_symbols): Skip local symbols.
	(swap_out_syms): Return an error when not finding ELF output
	section rather than asserting.
	* elflink.c (elf_output_implib): Call bfd_set_error on no symbols.
ld/
	* testsuite/lib/ld-lib.exp (run_ld_link_tests): Add optional
	parameter to pass list of xfails.
	* testsuite/ld-elf/elf.exp: Add xfails for implib tests.  Tidy
	implib test formatting.  Don't set .data start address.
	* testsuite/ld-elf/implib.s: Remove first .bss directive and
	replace second one with equivalent .section directive.
	* testsuite/ld-elf/empty-implib.out: Add expected final error.
	* testsuite/ld-elf/implib.rd: Update.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ddf29bf5e58d7f6c136f2970f50f2aeb9ec11084..b145feba18bb45bb378ffb7f5833722009c2c928 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,13 @@
+2016-07-21  Nick Clifton  <nickc@redhat.com>
+
+       * elf.c (_bfd_elf_filter_global_symbols): Skip local symbols.
+       (swap_out_syms): Return an error when not finding ELF output
+       section rather than asserting.
+
+2016-07-21  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+       * elflink.c (elf_output_implib): Call bfd_set_error on no symbols.
+
 2016-07-20  John Baldwin  <jhb@FreeBSD.org>
 
        * elf.c (elfcore_grok_freebsd_psinfo): Check for minimum note size

diff --git a/bfd/elf.c b/bfd/elf.c
index ba1774e7b40ace2e51058154794b718a29fd45d1..274cd535faedcb6452b01db65ae056a778990c74 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -3893,9 +3893,10 @@ _bfd_elf_filter_global_symbols (bfd *abfd, struct bfd_link_info *info,
        continue;
 
       h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, FALSE);
+      if (h == NULL)
+       continue;
       if (h->type != bfd_link_hash_defined && h->type != bfd_link_hash_defweak)
        continue;
-
       if (h->linker_def || h->ldscript_def)
        continue;
 
@@ -7643,7 +7644,9 @@ error_return:
                     section of a symbol to be a section that is
                     actually in the output file.  */
                  sec2 = bfd_get_section_by_name (abfd, sec->name);
-                 if (sec2 == NULL)
+                 if (sec2 != NULL)
+                   shndx = _bfd_elf_section_from_bfd_section (abfd, sec2);
+                 if (shndx == SHN_BAD)
                    {
                      _bfd_error_handler (_("\
 Unable to find equivalent output section for symbol '%s' from section '%s'"),
@@ -7652,9 +7655,6 @@ Unable to find equivalent output section for symbol '%s' from section '%s'"),
                      bfd_set_error (bfd_error_invalid_operation);
                      goto error_return;
                    }
-
-                 shndx = _bfd_elf_section_from_bfd_section (abfd, sec2);
-                 BFD_ASSERT (shndx != SHN_BAD);
                }
            }
 

diff --git a/bfd/elflink.c b/bfd/elflink.c
index a994b839f9c152b276912ee0b596eda822bd2acc..5bc57408e47056d8c393f7247ab6312927c598cc 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -11091,6 +11091,7 @@ elf_output_implib (bfd *abfd, struct bfd_link_info *info)
     symcount = _bfd_elf_filter_global_symbols (abfd, info, sympp, symcount);
   if (symcount == 0)
     {
+      bfd_set_error (bfd_error_no_symbols);
       (*_bfd_error_handler) (_("%B: no symbol found for import library"),
                             implib_bfd);
       goto free_sym_buf;

diff --git a/ld/ChangeLog b/ld/ChangeLog
index a2493d0daf47eccfda7722a3b5b7ca8e38383d90..ad26f6201568ca0d47756c9edbbcc858afa47a00 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,14 @@
+2016-07-21  Alan Modra  <amodra@gmail.com>
+
+       * testsuite/lib/ld-lib.exp (run_ld_link_tests): Add optional
+       parameter to pass list of xfails.
+       * testsuite/ld-elf/elf.exp: Add xfails for implib tests.  Tidy
+       implib test formatting.  Don't set .data start address.
+       * testsuite/ld-elf/implib.s: Remove first .bss directive and
+       replace second one with equivalent .section directive.
+       * testsuite/ld-elf/empty-implib.out: Add expected final error.
+       * testsuite/ld-elf/implib.rd: Update.
+
 2016-07-20  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/20376

diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index 832f313c5b4f290a37df83d5e5dfcd4c3e624cb0..b67105fa4413aba45bfcb363f3e1464c48d0bb9c 100644 (file)
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -136,21 +136,40 @@ foreach t $test_list {
     run_dump_test [file rootname $t]
 }
 
+# Targets using the generic linker backend don't support generating
+# an import library.
+set xfail_implib ""
+if { [istarget "d30v-*-*"]
+     || [istarget "dlx-*-*"]
+     || [istarget "fr30-*-*"]
+     || ([istarget "frv-*-*"] && ![istarget "frv-*-linux*"])
+     || [istarget "ft32-*-*"]
+     || [istarget "i860-*-*"]
+     || [istarget "i960-*-*"]
+     || [istarget "iq2000-*-*"]
+     || [istarget "mn10200-*-*"]
+     || [istarget "moxie-*-*"]
+     || [istarget "msp430-*-*"]
+     || [istarget "mt-*-*"]
+     || [istarget "pj*-*-*"] } {
+    set xfail_implib "*-*-*"
+}
+
 # Check that the --out-implib option work correctly.
 run_ld_link_tests {
     {"Generate empty import library"
-     "--out-implib=tmpdir/implib.lib" ""
-     "--defsym NO_GLOBAL=1"
-     {implib.s}
-     {{ld empty-implib.out}}
-     "implib"}
+       "--out-implib=tmpdir/implib.lib" ""
+       "--defsym NO_GLOBAL=1"
+       {implib.s}
+       {{ld empty-implib.out}}
+       "implib"}
     {"Generate import library"
-     "-Tdata=0x1000 --out-implib=tmpdir/implib.lib" ""
-     ""
-     {implib.s}
-     {{readelf {-s tmpdir/implib.lib} implib.rd}}
-     "implib"}
-}
+       "--out-implib=tmpdir/implib.lib" ""
+       ""
+       {implib.s}
+       {{readelf {-s tmpdir/implib.lib} implib.rd}}
+       "implib"}
+} $xfail_implib
 
 if { [istarget *-*-linux*]
      || [istarget *-*-nacl*]

diff --git a/ld/testsuite/ld-elf/empty-implib.out b/ld/testsuite/ld-elf/empty-implib.out
index b123064df3f6f429c59fe204d57e57ed76a8d5be..f611eb7791af9fd51ee67e87fd19382f469e8172 100644 (file)
--- a/ld/testsuite/ld-elf/empty-implib.out
+++ b/ld/testsuite/ld-elf/empty-implib.out
@@ -1,2 +1,3 @@
 .*: .*: no symbol found for import library
 .*: .*: failed to generate import library
+.*: final link failed: No symbols

diff --git a/ld/testsuite/ld-elf/implib.rd b/ld/testsuite/ld-elf/implib.rd
index 9f854a59bd26054a8fdb49f6dbaac4120b2c7ef1..6835f39a31164cefc537f18647167011e0756f72 100644 (file)
--- a/ld/testsuite/ld-elf/implib.rd
+++ b/ld/testsuite/ld-elf/implib.rd
@@ -1,10 +1,10 @@
-File: tmpdir/implib.lib
+File: tmpdir/implib\.lib
 
-Symbol table '.symtab' contains 3 entries:
-   Num:    Value +Size Type    Bind   Vis      Ndx Name
-     0: [0-9a-f]+     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0+100[0-3]     1 OBJECT  GLOBAL DEFAULT  ABS exported1
-     2: 0+100[0-3]     1 OBJECT  GLOBAL DEFAULT  ABS exported2
+Symbol table '\.symtab' contains 3 entries:
+ +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +0: [0-9a-f]+ +0 NOTYPE +LOCAL +DEFAULT +UND 
+ +1: [0-9a-f]+ +1 OBJECT +GLOBAL DEFAULT +ABS exported1
+ +2: [0-9a-f]+ +1 OBJECT +GLOBAL DEFAULT +ABS exported2
 
 File: tmpdir/implib
 

diff --git a/ld/testsuite/ld-elf/implib.s b/ld/testsuite/ld-elf/implib.s
index a86a940c138d7dd65e42c609adbe594c579061ac..e4d527b22939163f796b73109ee63680bd030aed 100644 (file)
--- a/ld/testsuite/ld-elf/implib.s
+++ b/ld/testsuite/ld-elf/implib.s
@@ -1,5 +1,4 @@
 .ifndef NO_GLOBAL
-       .bss
        .comm   exported1,1
 
        .data
@@ -10,7 +9,7 @@ exported2:
        .byte   21
 .endif
 
-       .bss
+       .section ".bss", "aw", %nobits
 not_exported1:
        .space  1
        .size   not_exported1, 1

diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 62f97689ac5fb5c17d6309a7cc2036a07cbe9d5d..9cd1959fa1e0177811819508ef5b8dbd215207cf 100644 (file)
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -1159,7 +1159,9 @@ proc ar_simple_create { ar aropts target objects } {
 #     in all other cases, any output from the linker during linking is
 #     treated as a sign of an error and FAILs the test.
 #
-proc run_ld_link_tests { ldtests } {
+# args is an optional list of target triplets to be xfailed.
+#
+proc run_ld_link_tests { ldtests args } {
     global ld
     global as
     global nm
@@ -1188,6 +1190,10 @@ proc run_ld_link_tests { ldtests } {
            continue
        }
 
+       foreach target $args {
+           setup_xfail $target
+       }
+
        set ld_options [lindex $testitem 1]
        set ld_after [lindex $testitem 2]
        set as_options [lindex $testitem 3]