[commit: ghc] master: Skip 64-bit symbol tables (1b336d9)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1b336d9064514219f370a4a12d7019f23393600e/ghc

>---------------------------------------------------------------

commit 1b336d9064514219f370a4a12d7019f23393600e
Author: Sylvain HENRY <hsyl20 at gmail.com>
Date:   Mon Nov 14 17:16:27 2016 -0500

    Skip 64-bit symbol tables
    
    This patch makes the RTS linker skip 64-bit symbol table entries.  See
    https://mail.haskell.org/pipermail/ghc-devs/2016-November/013210.html
    
    Test Plan: validate
    
    Reviewers: austin, erikd, simonmar, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: osa1, thomie
    
    Differential Revision: https://phabricator.haskell.org/D2697
    
    GHC Trac Issues: #12827


>---------------------------------------------------------------

1b336d9064514219f370a4a12d7019f23393600e
 rts/linker/LoadArchive.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rts/linker/LoadArchive.c b/rts/linker/LoadArchive.c
index 1aa4daa..04bd455 100644
--- a/rts/linker/LoadArchive.c
+++ b/rts/linker/LoadArchive.c
@@ -288,12 +288,14 @@ static HsInt loadArchive_ (pathchar *path)
                 memcpy(fileName, gnuFileIndex + n, thisFileNameSize);
                 fileName[thisFileNameSize] = '\0';
             }
-            else if (fileName[1] == ' ') {
+            /* Skip 32-bit symbol table ("/" + 15 blank characters)
+               and  64-bit symbol table ("/SYM64/" + 9 blank characters) */
+            else if (fileName[1] == ' ' || (0 == strncmp(&fileName[1], "SYM64/", 6))) {
                 fileName[0] = '\0';
                 thisFileNameSize = 0;
             }
             else {
-                barf("loadArchive: GNU-variant filename offset not found while reading filename from `%s'", path);
+                barf("loadArchive: invalid GNU-variant filename `%.16s' while reading filename from `%s'", fileName, path);
             }
         }
         /* Finally, the case where the filename field actually contains