Backport from mainline

        2013-02-03  David Edelsohn  <dje.gcc@gmail.com>
                    Andrew Dixie  <andrewd@gentrack.com>

        * collect2.c (GCC_CHECK_HDR): Do not scan objects with F_LOADONLY
        flag set.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@195763 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8e31396..a588eba 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2013-02-05  David Edelsohn  <dje.gcc@gmail.com>
+
+       Backport from mainline
+       2013-02-03  David Edelsohn  <dje.gcc@gmail.com>
+                   Andrew Dixie  <andrewd@gentrack.com>
+
+       * collect2.c (GCC_CHECK_HDR): Do not scan objects with F_LOADONLY
+       flag set.
+

 2013-02-05  Richard Biener  <rguenther@suse.de>
 
        Backport from mainline
 2013-02-05  Richard Biener  <rguenther@suse.de>
 
        Backport from mainline

diff --git a/gcc/collect2.c b/gcc/collect2.c
index a44b2e7..748a3f4 100644 (file)
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -2932,12 +2932,14 @@ scan_libraries (const char *prog_name)
 /* 0757 = U803XTOCMAGIC (AIX 4.3) and 0767 = U64_TOCMAGIC (AIX V5) */
 #if TARGET_AIX_VERSION >= 51
 #   define GCC_CHECK_HDR(X) \
 /* 0757 = U803XTOCMAGIC (AIX 4.3) and 0767 = U64_TOCMAGIC (AIX V5) */
 #if TARGET_AIX_VERSION >= 51
 #   define GCC_CHECK_HDR(X) \

-     ((HEADER (X).f_magic == U802TOCMAGIC && ! aix64_flag) \
-      || (HEADER (X).f_magic == 0767 && aix64_flag))
+     (((HEADER (X).f_magic == U802TOCMAGIC && ! aix64_flag) \
+       || (HEADER (X).f_magic == 0767 && aix64_flag)) \
+      && !(HEADER (X).f_flags & F_LOADONLY))

 #else
 #   define GCC_CHECK_HDR(X) \
 #else
 #   define GCC_CHECK_HDR(X) \

-     ((HEADER (X).f_magic == U802TOCMAGIC && ! aix64_flag) \
-      || (HEADER (X).f_magic == 0757 && aix64_flag))
+     (((HEADER (X).f_magic == U802TOCMAGIC && ! aix64_flag) \
+       || (HEADER (X).f_magic == 0757 && aix64_flag)) \
+      && !(HEADER (X).f_flags & F_LOADONLY))

 #endif
 
 #endif
 #endif
 
 #endif