Commit c5bf9e22 authored by Rui Ueyama's avatar Rui Ueyama
Browse files

Merging r308935: 

------------------------------------------------------------------------
r308935 | tstellar | 2017-07-24 16:13:31 -0700 (Mon, 24 Jul 2017) | 13 lines

Fix ObjCPass on big-endian host

Summary:
This fixes test/mach-o/objc-image-info-pass-output.yaml on
big-endian hosts.

Reviewers: lhames, kledzik, ruiu

Reviewed By: ruiu

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D35052
------------------------------------------------------------------------

llvm-svn: 308937
parent dfc54902

lld/lib/ReaderWriter/MachO/ObjCPass.cpp

+6 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include "ArchHandler.h"

#include "File.h"

#include "MachONormalizedFileBinaryUtils.h"

#include "MachOPasses.h"

#include "lld/Core/DefinedAtom.h"

#include "lld/Core/File.h"
@@ -29,7 +30,7 @@ namespace mach_o { 
///

class ObjCImageInfoAtom : public SimpleDefinedAtom {

public:

  ObjCImageInfoAtom(const File &file,

  ObjCImageInfoAtom(const File &file, bool isBig,

                    MachOLinkingContext::ObjCConstraint objCConstraint,

                    uint32_t swiftVersion)

      : SimpleDefinedAtom(file) {
@@ -54,6 +55,8 @@ public: 
    }



    Data.info.flags |= (swiftVersion << 8);



    normalized::write32(Data.bytes + 4, Data.info.flags, isBig);

  }



  ~ObjCImageInfoAtom() override = default;
@@ -109,7 +112,8 @@ public: 
private:



  const DefinedAtom* getImageInfo() {

    return new (_file.allocator()) ObjCImageInfoAtom(_file,

    bool IsBig = MachOLinkingContext::isBigEndian(_ctx.arch());

    return new (_file.allocator()) ObjCImageInfoAtom(_file, IsBig,

                                                     _ctx.objcConstraint(),

                                                     _ctx.swiftVersion());

  }