public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r11-8692] aix: collect2 text files in archive
@ 2021-07-06 19:12 David Edelsohn
  0 siblings, 0 replies; only message in thread
From: David Edelsohn @ 2021-07-06 19:12 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:aa9834c93e25f7d9da2d705bfe6abb271437c74f

commit r11-8692-gaa9834c93e25f7d9da2d705bfe6abb271437c74f
Author: David Edelsohn <dje.gcc@gmail.com>
Date:   Thu May 20 14:07:18 2021 -0400

    aix: collect2 text files in archive
    
    Rust places text files in archives.  AIX ld ignores such files with a
    warning.  The collect2 wrapper for ld had been exiting with a fatal
    error if it scanned an archive that contained a non-COFF file.
    
    This patch updates collect2.c to issue a warning and ignore the file
    member, matching the behavior of AIX ld.  GCC can encounter archives
    created by Rust and should not issue a fatal error.  This changes
    fatal_error to warning, with an implicit location and no associated
    optimization flag.
    
    gcc/ChangeLog:
    
    2021-05-20  Clement Chigot  <clement.chigot@atos.net>
                David Edelsohn  <dje.gcc@gmail.com>
    
            * collect2.c (scan_prog_file): Issue non-fatal warning for
            non-COFF files.
    
    (cherry picked from commit 5a3bf28119c7a8d2d43d26b5eee588ee0e4472e5)

Diff:
---
 gcc/collect2.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gcc/collect2.c b/gcc/collect2.c
index bd371430ab7..0c8af29879d 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -2783,7 +2783,10 @@ scan_prog_file (const char *prog_name, scanpass which_pass,
       if ((ldptr = ldopen (CONST_CAST (char *, prog_name), ldptr)) != NULL)
 	{
 	  if (! MY_ISCOFF (HEADER (ldptr).f_magic))
-	    fatal_error (input_location, "%s: not a COFF file", prog_name);
+	    {
+	      warning (0, "%s: not a COFF file", prog_name);
+	      continue;
+	    }
 
 	  if (GCC_CHECK_HDR (ldptr))
 	    {


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-07-06 19:12 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-06 19:12 [gcc r11-8692] aix: collect2 text files in archive David Edelsohn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).