[PATCH] Fix Bugzillia ID 41830 - --all-headers output in wrong order for GNU compatibility

[Shoaib Meenai via llvm-commits]

You may wanna submit this on Phabricator instead, so it gets more visibility. See the instructions in https://llvm.org/docs/Phabricator.html

On 5/13/19, 6:23 AM, "llvm-commits on behalf of Nicholas Krause via llvm-commits" <llvm-commits-bounces at lists.llvm.org on behalf of llvm-commits at lists.llvm.org> wrote:

    This fixes the bugzilla ID 41830 in order for the --all-headers command
    flag to print correctly and comply to the standard set by GNU objdump
    for printing out the information required by this flag.
    
    Signed-off-by: Nicholas Krause <xerofoify at gmail.com>
    ---
     llvm/tools/llvm-objdump/llvm-objdump.cpp | 4 ++--
     1 file changed, 2 insertions(+), 2 deletions(-)
    
    diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
    index 3fddfd2d349..9bc6ebb7af1 100644
    --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
    +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
    @@ -1912,6 +1912,8 @@ static void dumpObject(ObjectFile *O, const Archive *A = nullptr,
         disassembleObject(O, Relocations);
       if (Relocations && !Disassemble)
         printRelocations(O);
    +  if (PrivateHeaders || FirstPrivateHeader)
    +    printPrivateFileHeaders(O, FirstPrivateHeader);
       if (DynamicRelocations)
         printDynamicRelocations(O);
       if (SectionHeaders)
    @@ -1922,8 +1924,6 @@ static void dumpObject(ObjectFile *O, const Archive *A = nullptr,
         printSymbolTable(O, ArchiveName);
       if (UnwindInfo)
         printUnwindInfo(O);
    -  if (PrivateHeaders || FirstPrivateHeader)
    -    printPrivateFileHeaders(O, FirstPrivateHeader);
       if (ExportsTrie)
         printExportsTrie(O);
       if (Rebase)
    -- 
    2.20.1
    
    _______________________________________________
    llvm-commits mailing list
    llvm-commits at lists.llvm.org
    https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.llvm.org_cgi-2Dbin_mailman_listinfo_llvm-2Dcommits&d=DwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=o3kDXzdBUE3ljQXKeTWOMw&m=fqLpr_2seOCYFlgqiiamgKdhwz1QkFG1NhQeIXOigkU&s=jKbt5OEwNMirahPusJBpUgIrHlaDBWtmJJdSIu0fZaY&e=